Skip to content

Commit ad3e395

Browse files
grospelliergillesgrospelliergilles
committed
[arccore+arcane] Déplace les classes de 'arccore/collections' du namespace 'Arccore' vers 'Arcane'.
 de la
1 parent d27b6a4 commit ad3e395

20 files changed

+141
-99
lines changed

‎arcane/src/arcane/totalview/tv_display_arcane_types.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* tv_display_arcane_types.cc (C) 2000-2018 */
8+
/* tv_display_arcane_types.cc (C) 2000-2025 */
99
/* */
1010
/* Informations pour le debugging avec totalview */
1111
/*---------------------------------------------------------------------------*/
@@ -141,7 +141,7 @@ class _ItemSharedInfo
141141
/* Arcane::Array (sur type de base) */
142142
/*---------------------------------------------------------------------------*/
143143

144-
namespace Arccore
144+
namespace Arcane
145145
{
146146
template<typename type> int
147147
_displayArray(const AbstractArray<type>* obj,const char* type_name)
@@ -161,13 +161,13 @@ _displayArray(const AbstractArray<type>* obj,const char* type_name)
161161

162162
#define TV_DISPLAY_ARRAY_TYPE(type)\
163163
ATTR_USED int \
164-
TV_ttf_display_type(const Arccore::Array<type>* obj)\
164+
TV_ttf_display_type(const Arcane::Array<type>* obj)\
165165
{ return _displayArray(obj,#type); }\
166166
ATTR_USED int \
167-
TV_ttf_display_type(const Arccore::UniqueArray<type>* obj)\
167+
TV_ttf_display_type(const Arcane::UniqueArray<type>* obj)\
168168
{ return _displayArray(obj,#type); }\
169169
ATTR_USED int \
170-
TV_ttf_display_type(const Arccore::SharedArray<type>* obj)\
170+
TV_ttf_display_type(const Arcane::SharedArray<type>* obj)\
171171
{ return _displayArray(obj,#type); }
172172

173173
// Les instances souhaitées doivent être explicitement instanciées

‎arcane/src/arcane/utils/ArcaneGlobal.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -503,20 +503,6 @@ Int64 arcaneCurrentThread();
503503
/*---------------------------------------------------------------------------*/
504504
/*---------------------------------------------------------------------------*/
505505

506-
/*!
507-
* \internal
508-
* \brief Structure équivalente à la valeur booléenne \a vrai
509-
*/
510-
struct TrueType {};
511-
/*!
512-
\internal
513-
\brief Structure équivalente à la valeur booléenne \a vrai
514-
*/
515-
struct FalseType {};
516-
517-
/*---------------------------------------------------------------------------*/
518-
/*---------------------------------------------------------------------------*/
519-
520506
#ifdef ARCANE_DEBUG
521507
extern "C++" ARCANE_UTILS_EXPORT bool _checkDebug(size_t);
522508
#define ARCANE_DEBUGP(a,b) if (_checkDebug(a)) { arcanePrintf b; }

‎arccore/src/base/arccore/base/ArccoreGlobal.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,8 @@ using Arccore::arccoreCheckAt;
728728
using Arccore::arccoreThrowNullPointerError;
729729
using Arccore::arccoreThrowIfNull;
730730

731+
using Arccore::TrueType;
732+
using Arccore::FalseType;
731733
}
732734

733735
/*---------------------------------------------------------------------------*/

‎arccore/src/base/arccore/base/ArrayViewCommon.h

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* ArrayViewCommon.h (C) 2000-2023 */
8+
/* ArrayViewCommon.h (C) 2000-2025 */
99
/* */
1010
/* Déclarations communes aux classes ArrayView, ConstArrayView et Span. */
1111
/*---------------------------------------------------------------------------*/
@@ -291,25 +291,26 @@ arccoreCheckLargeArraySize(size_t size)
291291
/*---------------------------------------------------------------------------*/
292292
/*---------------------------------------------------------------------------*/
293293

294-
template<typename IntType> class ArraySizeChecker;
294+
template <typename IntType> class ArraySizeChecker;
295295

296296
//! Spécialisation pour tester la conversion en Int32
297-
template<>
297+
template <>
298298
class ArraySizeChecker<Int32>
299299
{
300300
public:
301-
template<typename SizeType> ARCCORE_HOST_DEVICE
302-
static Int32 check(SizeType size)
301+
302+
template <typename SizeType> ARCCORE_HOST_DEVICE static Int32 check(SizeType size)
303303
{
304304
return arccoreCheckArraySize(size);
305305
}
306306
};
307307

308308
//! Spécialisation pour tester la conversion en Int64
309-
template<>
309+
template <>
310310
class ArraySizeChecker<Int64>
311311
{
312312
public:
313+
313314
static ARCCORE_HOST_DEVICE Int64 check(std::size_t size)
314315
{
315316
return arccoreCheckLargeArraySize(size);
@@ -319,9 +320,32 @@ class ArraySizeChecker<Int64>
319320
/*---------------------------------------------------------------------------*/
320321
/*---------------------------------------------------------------------------*/
321322

322-
}
323+
} // namespace Arccore
324+
325+
/*---------------------------------------------------------------------------*/
326+
/*---------------------------------------------------------------------------*/
327+
328+
namespace Arcane::impl
329+
{
330+
using Arccore::impl::arccoreCheckIsPositive;
331+
using Arccore::impl::arccoreCheckIsValidInt64;
332+
using Arccore::impl::arccoreCheckIsValidInteger;
333+
using Arccore::impl::arccoreThrowNegativeSize;
334+
using Arccore::impl::arccoreThrowTooBigInt64;
335+
using Arccore::impl::arccoreThrowTooBigInteger;
336+
using Arccore::impl::areEqual;
337+
using Arccore::impl::areEqual2D;
338+
using Arccore::impl::dumpArray;
339+
using Arccore::impl::subViewInterval;
340+
} // namespace Arcane::impl
341+
342+
namespace Arcane
343+
{
344+
using Arccore::arccoreCheckArraySize;
345+
using Arccore::arccoreCheckLargeArraySize;
346+
} // namespace Arcane
323347

324348
/*---------------------------------------------------------------------------*/
325349
/*---------------------------------------------------------------------------*/
326350

327-
#endif
351+
#endif

‎arccore/src/base/arccore/base/BaseTypes.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ using Arccore::UInt16;
280280

281281
// Ces classes sont internes à Arccore/Arcane
282282
using Arccore::BasicTranscoder;
283+
using Arccore::ArrayRange;
283284
}
284285

285286
/*---------------------------------------------------------------------------*/

‎arccore/src/base/arccore/base/Span.h

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* Span.h (C) 2000-2024 */
8+
/* Span.h (C) 2000-2025 */
99
/* */
1010
/* Vues sur des tableaux C. */
1111
/*---------------------------------------------------------------------------*/
@@ -1049,4 +1049,17 @@ binaryRead(std::istream& istr,const Span<std::byte>& bytes);
10491049
/*---------------------------------------------------------------------------*/
10501050
/*---------------------------------------------------------------------------*/
10511051

1052+
namespace Arcane
1053+
{
1054+
using Arccore::binaryRead;
1055+
using Arccore::binaryWrite;
1056+
using Arccore::asSmallSpan;
1057+
using Arccore::asSpan;
1058+
using Arccore::asWritableBytes;
1059+
using Arccore::sampleSpan;
1060+
}
1061+
1062+
/*---------------------------------------------------------------------------*/
1063+
/*---------------------------------------------------------------------------*/
1064+
10521065
#endif

‎arccore/src/collections/arccore/collections/Array.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* Array.cc (C) 2000-2024 */
8+
/* Array.cc (C) 2000-2025 */
99
/* */
1010
/* Vecteur de données 1D. */
1111
/*---------------------------------------------------------------------------*/
@@ -23,7 +23,7 @@
2323
/*---------------------------------------------------------------------------*/
2424
/*---------------------------------------------------------------------------*/
2525

26-
namespace Arccore
26+
namespace Arcane
2727
{
2828

2929
/*---------------------------------------------------------------------------*/

‎arccore/src/collections/arccore/collections/Array.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* Array.h (C) 2000-2024 */
8+
/* Array.h (C) 2000-2025 */
99
/* */
1010
/* Tableau 1D. */
1111
/*---------------------------------------------------------------------------*/
@@ -26,7 +26,7 @@
2626
/*---------------------------------------------------------------------------*/
2727
/*---------------------------------------------------------------------------*/
2828

29-
namespace Arccore
29+
namespace Arcane
3030
{
3131

3232
/*---------------------------------------------------------------------------*/

‎arccore/src/collections/arccore/collections/Array2.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* Array2.h (C) 2000-2023 */
8+
/* Array2.h (C) 2000-2025 */
99
/* */
1010
/* Tableau 2D classique. */
1111
/*---------------------------------------------------------------------------*/
12-
#ifndef ARCCORE_UTILS_ARRAY2_H
13-
#define ARCCORE_UTILS_ARRAY2_H
12+
#ifndef ARCCORE_COLLECTIONS_ARRAY2_H
13+
#define ARCCORE_COLLECTIONS_ARRAY2_H
1414
/*---------------------------------------------------------------------------*/
1515
/*---------------------------------------------------------------------------*/
1616

@@ -23,7 +23,7 @@
2323
/*---------------------------------------------------------------------------*/
2424
/*---------------------------------------------------------------------------*/
2525

26-
namespace Arccore
26+
namespace Arcane
2727
{
2828

2929
/*---------------------------------------------------------------------------*/

‎arccore/src/collections/arccore/collections/ArrayDebugInfo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* ArrayDebugInfo.h (C) 2000-2023 */
8+
/* ArrayDebugInfo.h (C) 2000-2025 */
99
/* */
1010
/* Informations de debug pour les classes tableaux. */
1111
/*---------------------------------------------------------------------------*/
@@ -23,7 +23,7 @@
2323
/*---------------------------------------------------------------------------*/
2424
/*---------------------------------------------------------------------------*/
2525

26-
namespace Arccore
26+
namespace Arcane
2727
{
2828

2929
/*---------------------------------------------------------------------------*/

‎arccore/src/collections/arccore/collections/ArrayTraits.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* ArrayTraits.h (C) 2000-2024 */
8+
/* ArrayTraits.h (C) 2000-2025 */
99
/* */
1010
/* Caractéristiques d'un tableau 1D. */
1111
/*---------------------------------------------------------------------------*/
@@ -58,7 +58,7 @@ class ArrayTraits
5858
*/
5959
#define ARCCORE_DEFINE_ARRAY_PODTYPE(datatype) \
6060
template <> \
61-
class ArrayTraits<datatype> \
61+
class ArrayTraits<datatype> \
6262
{ \
6363
public: \
6464
\

‎arccore/src/collections/arccore/collections/CollectionsGlobal.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* CollectionsGlobal.cc (C) 2000-2024 */
8+
/* CollectionsGlobal.cc (C) 2000-2025 */
99
/* */
1010
/* Définitions globales de la composante 'Collections' de 'Arccore'. */
1111
/*---------------------------------------------------------------------------*/
@@ -18,7 +18,7 @@
1818
/*---------------------------------------------------------------------------*/
1919
/*---------------------------------------------------------------------------*/
2020

21-
namespace Arccore
21+
namespace Arcane
2222
{
2323

2424
/*---------------------------------------------------------------------------*/

0 commit comments

Comments
 (0)