Skip to content

Commit 9fa0654

Browse files
grospelliergillesgrospelliergilles
authored
Merge pull request #1985 from arcaneframework/dev/gg-move-arccore-base-in-namespace-arcane
Move types of component 'arccore/base' from namespace `Arccore` to namespace `Arcane`
2 parents 7f102eb + 8b871dd commit 9fa0654

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+547
-445
lines changed

‎arcane/src/arcane/impl/SequentialParallelMng.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060

6161
namespace Arcane
6262
{
63-
using RequestListBase = Arccore::MessagePassing::internal::RequestListBase;
63+
using RequestListBase = Arcane::MessagePassing::internal::RequestListBase;
6464
using IRequestList = Parallel::IRequestList;
6565
using namespace Arcane::MessagePassing;
6666

‎arcane/src/arcane/parallel/mpi/MpiParallelMng.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
namespace Arcane
6161
{
6262
using namespace Arcane::MessagePassing;
63-
using namespace Arccore::MessagePassing::Mpi;
63+
using namespace Arcane::MessagePassing::Mpi;
64+
using BasicSerializeMessage = Arcane::MessagePassing::internal::BasicSerializeMessage;
6465

6566
/*---------------------------------------------------------------------------*/
6667
/*---------------------------------------------------------------------------*/

‎arcane/src/arcane/utils/ExternalRef.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
#include "arccore/base/ExternalRef.h"
2-
namespace Arcane::Internal
3-
{
4-
using Arccore::Internal::ExternalRef;
5-
}

‎arcane/src/arcane/utils/UtilsTypes.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,6 @@ using Accelerator::RunQueue;
141141
/*---------------------------------------------------------------------------*/
142142
/*---------------------------------------------------------------------------*/
143143

144-
//! Constante pour indiquer que la dimension d'un tableau est dynamique
145-
inline constexpr Int32 DynExtent = -1;
146-
147-
/*---------------------------------------------------------------------------*/
148-
/*---------------------------------------------------------------------------*/
149-
150144
class DefaultLayout;
151145
template<int RankValue> class RightLayoutN;
152146
template<int RankValue> class LeftLayoutN;

‎arccore/src/base/arccore/base/APReal.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-
/* APReal.h (C) 2000-2018 */
8+
/* APReal.h (C) 2000-2025 */
99
/* */
1010
/* Réel en précision arbitraire. */
1111
/*---------------------------------------------------------------------------*/
@@ -23,7 +23,7 @@
2323
/*---------------------------------------------------------------------------*/
2424
/*---------------------------------------------------------------------------*/
2525

26-
namespace Arccore
26+
namespace Arcane
2727
{
2828

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

‎arccore/src/base/arccore/base/ArccoreGlobal.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-
/* ArccoreGlobal.cc (C) 2000-2024 */
8+
/* ArccoreGlobal.cc (C) 2000-2025 */
99
/* */
1010
/* Déclarations générales de Arccore. */
1111
/*---------------------------------------------------------------------------*/
@@ -48,7 +48,7 @@
4848
/*---------------------------------------------------------------------------*/
4949
/*---------------------------------------------------------------------------*/
5050

51-
namespace Arccore
51+
namespace Arcane
5252
{
5353
/*---------------------------------------------------------------------------*/
5454
/*---------------------------------------------------------------------------*/

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

Lines changed: 62 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ typedef ARCCORE_TYPE_INT64 Int64;
168168
/*---------------------------------------------------------------------------*/
169169
/*---------------------------------------------------------------------------*/
170170

171-
namespace Arccore
171+
namespace Arcane
172172
{
173173

174174
/*---------------------------------------------------------------------------*/
@@ -585,19 +585,33 @@ _checkPointer(T* t,const char* file,const char* func,int line)
585585
return t;
586586
}
587587
# ifdef __GNUG__
588-
# define ARCCORE_D_WHERE(a) Arccore::_doAssert(a,__FILE__,__PRETTY_FUNCTION__,__LINE__)
589-
# define ARCCORE_DCHECK_POINTER(a) Arccore::_checkPointer((a),__FILE__,__PRETTY_FUNCTION__,__LINE__);
588+
#define ARCCORE_D_WHERE(a) ::Arcane::_doAssert(a, __FILE__, __PRETTY_FUNCTION__, __LINE__)
589+
#define ARCCORE_DCHECK_POINTER(a) ::Arcane::_checkPointer((a), __FILE__, __PRETTY_FUNCTION__, __LINE__);
590590
# else
591591
# define ARCCORE_D_WHERE(a) Arccore::_doAssert(a,__FILE__,"(NoInfo)",__LINE__)
592592
# define ARCCORE_DCHECK_POINTER(a) Arccore::_checkPointer((a),__FILE__,"(NoInfo"),__LINE__);
593593
# endif
594594
# define ARCCORE_CHECK_PTR(a) \
595-
{if (!(a)){Arccore::arccorePrintf("Null value");ARCCORE_D_WHERE("ARCCORE_ASSERT");}}
595+
{ \
596+
if (!(a)) { \
597+
::Arcane::arccorePrintf("Null value"); \
598+
ARCCORE_D_WHERE("ARCCORE_ASSERT"); \
599+
} \
600+
}
596601

597602
# define ARCCORE_ASSERT(a,b) \
598-
{if (!(a)){ Arccore::arccorePrintf("Assertion '%s' fails:",#a); Arccore::arccorePrintf b; ARCCORE_D_WHERE("ARCCORE_ASSERT");}}
603+
{ \
604+
if (!(a)) { \
605+
::Arcane::arccorePrintf("Assertion '%s' fails:", #a); \
606+
::Arcane::arccorePrintf b; \
607+
ARCCORE_D_WHERE("ARCCORE_ASSERT"); \
608+
} \
609+
}
599610
# define ARCCORE_WARNING(a) \
600-
{ Arccore::arccorePrintf a; ARCCORE_D_WHERE("ARCCORE_WARNING"); }
611+
{ \
612+
::Arcane::arccorePrintf a; \
613+
ARCCORE_D_WHERE("ARCCORE_WARNING"); \
614+
}
601615
#else
602616
# define ARCCORE_CHECK_PTR(a)
603617
# define ARCCORE_ASSERT(a,b)
@@ -665,80 +679,73 @@ class String;
665679
class StringView;
666680
class StringFormatterArg;
667681
class StringBuilder;
682+
// Pas dans cette composante mais comme cette interface on la met ici
683+
// pour compatibilité avec l'existant
684+
class ITraceMng;
668685

669686
/*---------------------------------------------------------------------------*/
670687
/*---------------------------------------------------------------------------*/
671688

672-
} // End namespace Arccore
689+
} // End namespace Arcane
673690

674691
/*---------------------------------------------------------------------------*/
675692
/*---------------------------------------------------------------------------*/
676693

677-
namespace Arcane
678-
{
679-
// Pas dans cette composante mais comme cette interface on la met ici
680-
// pour compatibilité avec l'existant
681-
class ITraceMng;
682-
} // namespace Arcane
683-
namespace Arccore
684-
{
685-
using Arcane::ITraceMng;
686-
}
687-
688694
/*---------------------------------------------------------------------------*/
689695
/*---------------------------------------------------------------------------*/
690696

691-
namespace Arcane
697+
namespace Arccore
692698
{
693-
using Arccore::StringView;
694-
using Arccore::String;
695-
using Arccore::StringBuilder;
696-
using Arccore::StringFormatterArg;
697-
using Arccore::Int16;
698-
using Arccore::Int32;
699-
using Arccore::Int64;
700-
using Arccore::UInt32;
701-
using Arccore::UInt64;
702-
703-
using Arccore::Real;
704-
using Arccore::Pointer;
705-
using Arccore::APReal;
706-
using Arccore::Short;
707-
using Arccore::Integer;
699+
using Arcane::ITraceMng;
700+
using Arcane::String;
701+
using Arcane::StringBuilder;
702+
using Arcane::StringFormatterArg;
703+
using Arcane::StringView;
704+
using Arcane::UInt32;
705+
using Arcane::UInt64;
706+
707+
using Arcane::APReal;
708+
using Arcane::Integer;
709+
using Arcane::Pointer;
710+
using Arcane::Real;
711+
using Arcane::Short;
708712

709713
//! Type 'Brain Float16'
710-
using BFloat16 = Arccore::BFloat16;
714+
using BFloat16 = Arcane::BFloat16;
711715

712716
//! Type 'Float16' (binary16)
713-
using Float16 = Arccore::Float16;
717+
using Float16 = Arcane::Float16;
714718

715719
//! Type flottant IEEE-753 simple précision (binary32)
716720
using Float32 = float;
717721

718722
//! Type représentant un entier sur 8 bits
719-
using Int8 = Arccore::Int8;
723+
using Int8 = Arcane::Int8;
720724

721725
//! Type représentant un floattan sur 128 bits
722-
using Float128 = Arccore::Float128;
726+
using Float128 = Arcane::Float128;
723727

724728
//! Type représentant un entier sur 128 bits
725-
using Int128 = Arccore::Int128;
726-
727-
using Arccore::arccoreIsCheck;
728-
using Arccore::arccoreSetCheck;
729-
using Arccore::arccoreIsDebug;
730-
using Arccore::arccorePrintf;
731-
using Arccore::arccoreDebugPause;
732-
using Arccore::arccoreSetPauseOnError;
733-
using Arccore::arccoreNullPointerError;
734-
using Arccore::arccoreRangeError;
735-
using Arccore::arccoreCheckRange;
736-
using Arccore::arccoreCheckAt;
737-
using Arccore::arccoreThrowNullPointerError;
738-
using Arccore::arccoreThrowIfNull;
739-
740-
using Arccore::TrueType;
741-
using Arccore::FalseType;
729+
using Int128 = Arcane::Int128;
730+
using Int16 = Arcane::Int16;
731+
using Int32 = Arcane::Int32;
732+
using Int64 = Arcane::Int64;
733+
734+
using Arcane::arccoreCheckAt;
735+
using Arcane::arccoreCheckRange;
736+
using Arcane::arccoreDebugPause;
737+
using Arcane::arccoreIsCheck;
738+
using Arcane::arccoreIsDebug;
739+
using Arcane::arccoreNullPointerError;
740+
using Arcane::arccorePrintf;
741+
using Arcane::arccoreRangeError;
742+
using Arcane::arccoreSetCheck;
743+
using Arcane::arccoreSetPauseOnError;
744+
using Arcane::arccoreThrowIfNull;
745+
using Arcane::arccoreThrowNullPointerError;
746+
747+
using Arcane::FalseType;
748+
using Arcane::TrueType;
742749
}
743750

744751
/*---------------------------------------------------------------------------*/

‎arccore/src/base/arccore/base/ArgumentException.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-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-
/* ArgumentException.cc (C) 2000-2018 */
8+
/* ArgumentException.cc (C) 2000-2025 */
99
/* */
1010
/* Exception lorsqu'un argument est invalide. */
1111
/*---------------------------------------------------------------------------*/
@@ -17,7 +17,7 @@
1717
/*---------------------------------------------------------------------------*/
1818
/*---------------------------------------------------------------------------*/
1919

20-
namespace Arccore
20+
namespace Arcane
2121
{
2222

2323
/*---------------------------------------------------------------------------*/

‎arccore/src/base/arccore/base/ArgumentException.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-
/* ArgumentException.h (C) 2000-2018 */
8+
/* ArgumentException.h (C) 2000-2025 */
99
/* */
1010
/* Exception lorsqu'un argument est invalide. */
1111
/*---------------------------------------------------------------------------*/
@@ -19,7 +19,7 @@
1919
/*---------------------------------------------------------------------------*/
2020
/*---------------------------------------------------------------------------*/
2121

22-
namespace Arccore
22+
namespace Arcane
2323
{
2424

2525
/*---------------------------------------------------------------------------*/

‎arccore/src/base/arccore/base/Array2View.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-
/* Array2View.h (C) 2000-2022 */
8+
/* Array2View.h (C) 2000-2025 */
99
/* */
1010
/* Vue d'un tableau 2D. */
1111
/*---------------------------------------------------------------------------*/
@@ -20,7 +20,7 @@
2020
/*---------------------------------------------------------------------------*/
2121
/*---------------------------------------------------------------------------*/
2222

23-
namespace Arccore
23+
namespace Arcane
2424
{
2525

2626
/*---------------------------------------------------------------------------*/

‎arccore/src/base/arccore/base/Array3View.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-
/* Array3View.h (C) 2000-2022 */
8+
/* Array3View.h (C) 2000-2025 */
99
/* */
1010
/* Vue d'un tableau 3D. */
1111
/*---------------------------------------------------------------------------*/
@@ -19,7 +19,7 @@
1919
/*---------------------------------------------------------------------------*/
2020
/*---------------------------------------------------------------------------*/
2121

22-
namespace Arccore
22+
namespace Arcane
2323
{
2424

2525
/*---------------------------------------------------------------------------*/

‎arccore/src/base/arccore/base/Array4View.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-
/* Array4View.h (C) 2000-2022 */
8+
/* Array4View.h (C) 2000-2025 */
99
/* */
1010
/* Vue d'un tableau 4D. */
1111
/*---------------------------------------------------------------------------*/
@@ -19,7 +19,7 @@
1919
/*---------------------------------------------------------------------------*/
2020
/*---------------------------------------------------------------------------*/
2121

22-
namespace Arccore
22+
namespace Arcane
2323
{
2424

2525
/*---------------------------------------------------------------------------*/

‎arccore/src/base/arccore/base/ArrayIterator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/*---------------------------------------------------------------------------*/
2222
/*---------------------------------------------------------------------------*/
2323

24-
namespace Arccore
24+
namespace Arcane
2525
{
2626

2727
/*---------------------------------------------------------------------------*/

0 commit comments

Comments
 (0)