Skip to content

Commit

Permalink
[arccore] Déplace les classes de 'arccore/base' du namespace 'Arccore…
Browse files Browse the repository at this point in the history
…' vers le namespace 'Arcane'.
  • Loading branch information
grospelliergilles committed Feb 14, 2025
1 parent 7f102eb commit 3d279a7
Show file tree
Hide file tree
Showing 80 changed files with 529 additions and 430 deletions.
2 changes: 1 addition & 1 deletion arcane/src/arcane/impl/SequentialParallelMng.cc
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

namespace Arcane
{
using RequestListBase = Arccore::MessagePassing::internal::RequestListBase;
using RequestListBase = Arcane::MessagePassing::internal::RequestListBase;
using IRequestList = Parallel::IRequestList;
using namespace Arcane::MessagePassing;

Expand Down
3 changes: 2 additions & 1 deletion arcane/src/arcane/parallel/mpi/MpiParallelMng.cc
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
namespace Arcane
{
using namespace Arcane::MessagePassing;
using namespace Arccore::MessagePassing::Mpi;
using namespace Arcane::MessagePassing::Mpi;
using BasicSerializeMessage = Arcane::MessagePassing::internal::BasicSerializeMessage;

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
Expand Down
4 changes: 0 additions & 4 deletions arcane/src/arcane/utils/ExternalRef.h
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
#include "arccore/base/ExternalRef.h"
namespace Arcane::Internal
{
using Arccore::Internal::ExternalRef;
}
6 changes: 0 additions & 6 deletions arcane/src/arcane/utils/UtilsTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,6 @@ using Accelerator::RunQueue;
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

//! Constante pour indiquer que la dimension d'un tableau est dynamique
inline constexpr Int32 DynExtent = -1;

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

class DefaultLayout;
template<int RankValue> class RightLayoutN;
template<int RankValue> class LeftLayoutN;
Expand Down
6 changes: 3 additions & 3 deletions arccore/src/base/arccore/base/APReal.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
//-----------------------------------------------------------------------------
// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// See the top-level COPYRIGHT file for details.
// SPDX-License-Identifier: Apache-2.0
//-----------------------------------------------------------------------------
/*---------------------------------------------------------------------------*/
/* APReal.h (C) 2000-2018 */
/* APReal.h (C) 2000-2025 */
/* */
/* Réel en précision arbitraire. */
/*---------------------------------------------------------------------------*/
Expand All @@ -23,7 +23,7 @@
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

namespace Arccore
namespace Arcane
{

/*---------------------------------------------------------------------------*/
Expand Down
6 changes: 3 additions & 3 deletions arccore/src/base/arccore/base/ArccoreGlobal.cc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
//-----------------------------------------------------------------------------
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// See the top-level COPYRIGHT file for details.
// SPDX-License-Identifier: Apache-2.0
//-----------------------------------------------------------------------------
/*---------------------------------------------------------------------------*/
/* ArccoreGlobal.cc (C) 2000-2024 */
/* ArccoreGlobal.cc (C) 2000-2025 */
/* */
/* Déclarations générales de Arccore. */
/*---------------------------------------------------------------------------*/
Expand Down Expand Up @@ -48,7 +48,7 @@
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

namespace Arccore
namespace Arcane
{
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
Expand Down
117 changes: 62 additions & 55 deletions arccore/src/base/arccore/base/ArccoreGlobal.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ typedef ARCCORE_TYPE_INT64 Int64;
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

namespace Arccore
namespace Arcane
{

/*---------------------------------------------------------------------------*/
Expand Down Expand Up @@ -585,19 +585,33 @@ _checkPointer(T* t,const char* file,const char* func,int line)
return t;
}
# ifdef __GNUG__
# define ARCCORE_D_WHERE(a) Arccore::_doAssert(a,__FILE__,__PRETTY_FUNCTION__,__LINE__)
# define ARCCORE_DCHECK_POINTER(a) Arccore::_checkPointer((a),__FILE__,__PRETTY_FUNCTION__,__LINE__);
#define ARCCORE_D_WHERE(a) ::Arcane::_doAssert(a, __FILE__, __PRETTY_FUNCTION__, __LINE__)
#define ARCCORE_DCHECK_POINTER(a) ::Arcane::_checkPointer((a), __FILE__, __PRETTY_FUNCTION__, __LINE__);
# else
# define ARCCORE_D_WHERE(a) Arccore::_doAssert(a,__FILE__,"(NoInfo)",__LINE__)
# define ARCCORE_DCHECK_POINTER(a) Arccore::_checkPointer((a),__FILE__,"(NoInfo"),__LINE__);
# endif
# define ARCCORE_CHECK_PTR(a) \
{if (!(a)){Arccore::arccorePrintf("Null value");ARCCORE_D_WHERE("ARCCORE_ASSERT");}}
{ \
if (!(a)) { \
::Arcane::arccorePrintf("Null value"); \
ARCCORE_D_WHERE("ARCCORE_ASSERT"); \
} \
}

# define ARCCORE_ASSERT(a,b) \
{if (!(a)){ Arccore::arccorePrintf("Assertion '%s' fails:",#a); Arccore::arccorePrintf b; ARCCORE_D_WHERE("ARCCORE_ASSERT");}}
{ \
if (!(a)) { \
::Arcane::arccorePrintf("Assertion '%s' fails:", #a); \
::Arcane::arccorePrintf b; \
ARCCORE_D_WHERE("ARCCORE_ASSERT"); \
} \
}
# define ARCCORE_WARNING(a) \
{ Arccore::arccorePrintf a; ARCCORE_D_WHERE("ARCCORE_WARNING"); }
{ \
::Arcane::arccorePrintf a; \
ARCCORE_D_WHERE("ARCCORE_WARNING"); \
}
#else
# define ARCCORE_CHECK_PTR(a)
# define ARCCORE_ASSERT(a,b)
Expand Down Expand Up @@ -665,80 +679,73 @@ class String;
class StringView;
class StringFormatterArg;
class StringBuilder;
// Pas dans cette composante mais comme cette interface on la met ici
// pour compatibilité avec l'existant
class ITraceMng;

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

} // End namespace Arccore
} // End namespace Arcane

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

namespace Arcane
{
// Pas dans cette composante mais comme cette interface on la met ici
// pour compatibilité avec l'existant
class ITraceMng;
} // namespace Arcane
namespace Arccore
{
using Arcane::ITraceMng;
}

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

namespace Arcane
namespace Arccore
{
using Arccore::StringView;
using Arccore::String;
using Arccore::StringBuilder;
using Arccore::StringFormatterArg;
using Arccore::Int16;
using Arccore::Int32;
using Arccore::Int64;
using Arccore::UInt32;
using Arccore::UInt64;

using Arccore::Real;
using Arccore::Pointer;
using Arccore::APReal;
using Arccore::Short;
using Arccore::Integer;
using Arcane::ITraceMng;
using Arcane::String;
using Arcane::StringBuilder;
using Arcane::StringFormatterArg;
using Arcane::StringView;
using Arcane::UInt32;
using Arcane::UInt64;

using Arcane::APReal;
using Arcane::Integer;
using Arcane::Pointer;
using Arcane::Real;
using Arcane::Short;

//! Type 'Brain Float16'
using BFloat16 = Arccore::BFloat16;
using BFloat16 = Arcane::BFloat16;

//! Type 'Float16' (binary16)
using Float16 = Arccore::Float16;
using Float16 = Arcane::Float16;

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

//! Type représentant un entier sur 8 bits
using Int8 = Arccore::Int8;
using Int8 = Arcane::Int8;

//! Type représentant un floattan sur 128 bits
using Float128 = Arccore::Float128;
using Float128 = Arcane::Float128;

//! Type représentant un entier sur 128 bits
using Int128 = Arccore::Int128;

using Arccore::arccoreIsCheck;
using Arccore::arccoreSetCheck;
using Arccore::arccoreIsDebug;
using Arccore::arccorePrintf;
using Arccore::arccoreDebugPause;
using Arccore::arccoreSetPauseOnError;
using Arccore::arccoreNullPointerError;
using Arccore::arccoreRangeError;
using Arccore::arccoreCheckRange;
using Arccore::arccoreCheckAt;
using Arccore::arccoreThrowNullPointerError;
using Arccore::arccoreThrowIfNull;

using Arccore::TrueType;
using Arccore::FalseType;
using Int128 = Arcane::Int128;
using Int16 = Arcane::Int16;
using Int32 = Arcane::Int32;
using Int64 = Arcane::Int64;

using Arcane::arccoreCheckAt;
using Arcane::arccoreCheckRange;
using Arcane::arccoreDebugPause;
using Arcane::arccoreIsCheck;
using Arcane::arccoreIsDebug;
using Arcane::arccoreNullPointerError;
using Arcane::arccorePrintf;
using Arcane::arccoreRangeError;
using Arcane::arccoreSetCheck;
using Arcane::arccoreSetPauseOnError;
using Arcane::arccoreThrowIfNull;
using Arcane::arccoreThrowNullPointerError;

using Arcane::FalseType;
using Arcane::TrueType;
}

/*---------------------------------------------------------------------------*/
Expand Down
6 changes: 3 additions & 3 deletions arccore/src/base/arccore/base/ArgumentException.cc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
//-----------------------------------------------------------------------------
// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// See the top-level COPYRIGHT file for details.
// SPDX-License-Identifier: Apache-2.0
//-----------------------------------------------------------------------------
/*---------------------------------------------------------------------------*/
/* ArgumentException.cc (C) 2000-2018 */
/* ArgumentException.cc (C) 2000-2025 */
/* */
/* Exception lorsqu'un argument est invalide. */
/*---------------------------------------------------------------------------*/
Expand All @@ -17,7 +17,7 @@
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

namespace Arccore
namespace Arcane
{

/*---------------------------------------------------------------------------*/
Expand Down
6 changes: 3 additions & 3 deletions arccore/src/base/arccore/base/ArgumentException.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
//-----------------------------------------------------------------------------
// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// See the top-level COPYRIGHT file for details.
// SPDX-License-Identifier: Apache-2.0
//-----------------------------------------------------------------------------
/*---------------------------------------------------------------------------*/
/* ArgumentException.h (C) 2000-2018 */
/* ArgumentException.h (C) 2000-2025 */
/* */
/* Exception lorsqu'un argument est invalide. */
/*---------------------------------------------------------------------------*/
Expand All @@ -19,7 +19,7 @@
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

namespace Arccore
namespace Arcane
{

/*---------------------------------------------------------------------------*/
Expand Down
6 changes: 3 additions & 3 deletions arccore/src/base/arccore/base/Array2View.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
//-----------------------------------------------------------------------------
// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// See the top-level COPYRIGHT file for details.
// SPDX-License-Identifier: Apache-2.0
//-----------------------------------------------------------------------------
/*---------------------------------------------------------------------------*/
/* Array2View.h (C) 2000-2022 */
/* Array2View.h (C) 2000-2025 */
/* */
/* Vue d'un tableau 2D. */
/*---------------------------------------------------------------------------*/
Expand All @@ -20,7 +20,7 @@
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

namespace Arccore
namespace Arcane
{

/*---------------------------------------------------------------------------*/
Expand Down
6 changes: 3 additions & 3 deletions arccore/src/base/arccore/base/Array3View.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
//-----------------------------------------------------------------------------
// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// See the top-level COPYRIGHT file for details.
// SPDX-License-Identifier: Apache-2.0
//-----------------------------------------------------------------------------
/*---------------------------------------------------------------------------*/
/* Array3View.h (C) 2000-2022 */
/* Array3View.h (C) 2000-2025 */
/* */
/* Vue d'un tableau 3D. */
/*---------------------------------------------------------------------------*/
Expand All @@ -19,7 +19,7 @@
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

namespace Arccore
namespace Arcane
{

/*---------------------------------------------------------------------------*/
Expand Down
6 changes: 3 additions & 3 deletions arccore/src/base/arccore/base/Array4View.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
//-----------------------------------------------------------------------------
// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// See the top-level COPYRIGHT file for details.
// SPDX-License-Identifier: Apache-2.0
//-----------------------------------------------------------------------------
/*---------------------------------------------------------------------------*/
/* Array4View.h (C) 2000-2022 */
/* Array4View.h (C) 2000-2025 */
/* */
/* Vue d'un tableau 4D. */
/*---------------------------------------------------------------------------*/
Expand All @@ -19,7 +19,7 @@
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

namespace Arccore
namespace Arcane
{

/*---------------------------------------------------------------------------*/
Expand Down
2 changes: 1 addition & 1 deletion arccore/src/base/arccore/base/ArrayIterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

namespace Arccore
namespace Arcane
{

/*---------------------------------------------------------------------------*/
Expand Down
Loading

0 comments on commit 3d279a7

Please sign in to comment.