Skip to content

Commit bdf88c0

Browse files
grospelliergillesgrospelliergilles
authored
Merge pull request #1984 from arcaneframework/dev/gg-move-arccore-trace-in-namespace-arcane
Move types of component 'arccore/serialize' from namespace `Arccore` to namespace `Arcane`
2 parents 00143a3 + 9f2ea3e commit bdf88c0

16 files changed

+94
-69
lines changed

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -666,10 +666,6 @@ class StringView;
666666
class StringFormatterArg;
667667
class StringBuilder;
668668

669-
// Pas dans cette composante mais comme cette interface on la met ici
670-
// pour compatibilité avec l'existant
671-
class ITraceMng;
672-
673669
/*---------------------------------------------------------------------------*/
674670
/*---------------------------------------------------------------------------*/
675671

@@ -678,13 +674,26 @@ class ITraceMng;
678674
/*---------------------------------------------------------------------------*/
679675
/*---------------------------------------------------------------------------*/
680676

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+
688+
/*---------------------------------------------------------------------------*/
689+
/*---------------------------------------------------------------------------*/
690+
681691
namespace Arcane
682692
{
683693
using Arccore::StringView;
684694
using Arccore::String;
685695
using Arccore::StringBuilder;
686696
using Arccore::StringFormatterArg;
687-
using Arccore::ITraceMng;
688697
using Arccore::Int16;
689698
using Arccore::Int32;
690699
using Arccore::Int64;

‎arccore/src/base/arccore/base/RefDeclarations.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,5 +248,13 @@ class ReferenceCounterAccessor<class_name>\
248248
/*---------------------------------------------------------------------------*/
249249
/*---------------------------------------------------------------------------*/
250250

251+
namespace Arcane
252+
{
253+
using Arccore::ReferenceCounterTag;
254+
}
255+
256+
/*---------------------------------------------------------------------------*/
257+
/*---------------------------------------------------------------------------*/
258+
251259
#endif
252260

‎arccore/src/message_passing/arccore/message_passing/MessagePassingGlobal.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,12 @@
3333
namespace Arcane
3434
{
3535
class ISerializer;
36+
class ITimeMetricCollector;
3637
}
3738
namespace Arccore
3839
{
39-
class ITimeMetricCollector;
4040
using Arcane::ISerializer;
41-
}
42-
namespace Arcane
43-
{
44-
using Arccore::ITimeMetricCollector;
41+
using Arcane::ITimeMetricCollector;
4542
}
4643

4744
namespace Arcane::MessagePassing

‎arccore/src/trace/arccore/trace/ITimeMetricCollector.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-
/* ITimeMetricCollector.h (C) 2000-2020 */
8+
/* ITimeMetricCollector.h (C) 2000-2025 */
99
/* */
1010
/* Interface gérant les statistiques sur les temps d'exécution. */
1111
/*---------------------------------------------------------------------------*/
@@ -23,7 +23,7 @@
2323
* API en cours de définition. Ne pas utiliser en dehors de Arccore/Arcane.
2424
*/
2525

26-
namespace Arccore
26+
namespace Arcane
2727
{
2828

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

‎arccore/src/trace/arccore/trace/ITraceMng.h

Lines changed: 11 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-
/* ITraceMng.h (C) 2000-2021 */
8+
/* ITraceMng.h (C) 2000-2025 */
99
/* */
1010
/* Gestionnaire des traces. */
1111
/*---------------------------------------------------------------------------*/
@@ -24,7 +24,7 @@
2424
/*---------------------------------------------------------------------------*/
2525
/*---------------------------------------------------------------------------*/
2626

27-
namespace Arccore
27+
namespace Arcane
2828
{
2929

3030
/*---------------------------------------------------------------------------*/
@@ -413,4 +413,12 @@ ITraceMng* arccoreCreateDefaultTraceMng();
413413
/*---------------------------------------------------------------------------*/
414414
/*---------------------------------------------------------------------------*/
415415

416+
namespace Arccore
417+
{
418+
using Arcane::arccoreCreateDefaultTraceMng;
419+
}
420+
421+
/*---------------------------------------------------------------------------*/
422+
/*---------------------------------------------------------------------------*/
423+
416424
#endif

‎arccore/src/trace/arccore/trace/StandaloneTraceMessage.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-
/* StandaloneTraceMessage.h (C) 2000-2021 */
8+
/* StandaloneTraceMessage.h (C) 2000-2025 */
99
/* */
1010
/* Message de trace indépendant du 'ITraceMng'. */
1111
/*---------------------------------------------------------------------------*/
@@ -21,7 +21,7 @@
2121
/*---------------------------------------------------------------------------*/
2222
/*---------------------------------------------------------------------------*/
2323

24-
namespace Arccore
24+
namespace Arcane
2525
{
2626

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

‎arccore/src/trace/arccore/trace/TimeMetric.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-
/* TimeMetric.h (C) 2000-2020 */
8+
/* TimeMetric.h (C) 2000-2025 */
99
/* */
1010
/* Classes gérant les métriques temporelles. */
1111
/*---------------------------------------------------------------------------*/
@@ -17,7 +17,7 @@
1717
/*---------------------------------------------------------------------------*/
1818
/*---------------------------------------------------------------------------*/
1919

20-
namespace Arccore
20+
namespace Arcane
2121
{
2222

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

‎arccore/src/trace/arccore/trace/TimeMetric.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-
/* TimeMetric.h (C) 2000-2020 */
8+
/* TimeMetric.h (C) 2000-2025 */
99
/* */
1010
/* Classes gérant les métriques temporelles. */
1111
/*---------------------------------------------------------------------------*/
@@ -23,7 +23,7 @@
2323
/*
2424
* API en cours de définition. Ne pas utiliser en dehors de Arccore/Arcane.
2525
*/
26-
namespace Arccore
26+
namespace Arcane
2727
{
2828
/*!
2929
* \brief Catégories standards pour les phases temporelles.

‎arccore/src/trace/arccore/trace/Trace.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-
/* Trace.h (C) 2000-2017 */
8+
/* Trace.h (C) 2000-2025 */
99
/* */
1010
/* Traces. */
1111
/*---------------------------------------------------------------------------*/
@@ -19,7 +19,7 @@
1919
/*---------------------------------------------------------------------------*/
2020
/*---------------------------------------------------------------------------*/
2121

22-
namespace Arccore
22+
namespace Arcane
2323
{
2424

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

‎arccore/src/trace/arccore/trace/TraceAccessor.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-
/* TraceAccessor.cc (C) 2000-2020 */
8+
/* TraceAccessor.cc (C) 2000-2025 */
99
/* */
1010
/* Accès aux traces. */
1111
/*---------------------------------------------------------------------------*/
@@ -17,7 +17,7 @@
1717
/*---------------------------------------------------------------------------*/
1818
/*---------------------------------------------------------------------------*/
1919

20-
namespace Arccore
20+
namespace Arcane
2121
{
2222

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

‎arccore/src/trace/arccore/trace/TraceAccessor.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-
/* TraceAccessor.h (C) 2000-2021 */
8+
/* TraceAccessor.h (C) 2000-2025 */
99
/* */
1010
/* Accès aux traces. */
1111
/*---------------------------------------------------------------------------*/
@@ -20,7 +20,7 @@
2020
/*---------------------------------------------------------------------------*/
2121
/*---------------------------------------------------------------------------*/
2222

23-
namespace Arccore
23+
namespace Arcane
2424
{
2525

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

‎arccore/src/trace/arccore/trace/TraceClassConfig.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-
/* TraceClassConfig.h (C) 2000-2018 */
8+
/* TraceClassConfig.h (C) 2000-2025 */
99
/* */
1010
/* Configuration d'une classe de messages. */
1111
/*---------------------------------------------------------------------------*/
@@ -19,7 +19,7 @@
1919
/*---------------------------------------------------------------------------*/
2020
/*---------------------------------------------------------------------------*/
2121

22-
namespace Arccore
22+
namespace Arcane
2323
{
2424

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

‎arccore/src/trace/arccore/trace/TraceGlobal.h

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/*---------------------------------------------------------------------------*/
3131
/*---------------------------------------------------------------------------*/
3232

33-
namespace Arccore
33+
namespace Arcane
3434
{
3535
class ITraceStream;
3636
class ITraceMng;
@@ -62,33 +62,34 @@ namespace Trace
6262
/*---------------------------------------------------------------------------*/
6363
/*---------------------------------------------------------------------------*/
6464

65-
ARCCORE_DECLARE_REFERENCE_COUNTED_CLASS(ITraceStream)
66-
ARCCORE_DECLARE_REFERENCE_COUNTED_CLASS(ITraceMng)
65+
ARCCORE_DECLARE_REFERENCE_COUNTED_CLASS(Arcane::ITraceStream)
66+
ARCCORE_DECLARE_REFERENCE_COUNTED_CLASS(Arcane::ITraceMng)
6767

6868
/*---------------------------------------------------------------------------*/
6969
/*---------------------------------------------------------------------------*/
7070

71-
namespace Arcane
71+
namespace Arccore
7272
{
7373

7474
/*---------------------------------------------------------------------------*/
7575
/*---------------------------------------------------------------------------*/
7676

77-
using Arccore::ITraceStream;
78-
using Arccore::ITraceMng;
79-
using Arccore::TraceAccessor;
80-
using Arccore::TraceMessageClass;
81-
using Arccore::TraceClassConfig;
82-
using Arccore::TraceMessage;
83-
using Arccore::TraceMessageDbg;
84-
using Arccore::TraceMessageListenerArgs;
85-
using Arccore::ITraceMessageListener;
86-
using Arccore::ITimeMetricCollector;
87-
using Arccore::TimeMetricSentry;
88-
using Arccore::TimeMetricId;
89-
using Arccore::TimeMetricAction;
90-
using Arccore::TimeMetricActionBuildInfo;
91-
namespace Trace = ::Arccore::Trace;
77+
using Arcane::ITraceStream;
78+
using Arcane::ITraceMng;
79+
using Arcane::TraceAccessor;
80+
using Arcane::TraceMessageClass;
81+
using Arcane::TraceClassConfig;
82+
using Arcane::TraceMessage;
83+
using Arcane::TraceMessageDbg;
84+
using Arcane::TraceMessageListenerArgs;
85+
using Arcane::ITraceMessageListener;
86+
using Arcane::ITimeMetricCollector;
87+
using Arcane::TimeMetricSentry;
88+
using Arcane::TimeMetricId;
89+
using Arcane::TimeMetricAction;
90+
using Arcane::TimeMetricActionBuildInfo;
91+
using Arcane::StandaloneTraceMessage;
92+
namespace Trace = ::Arcane::Trace;
9293

9394
/*---------------------------------------------------------------------------*/
9495
/*---------------------------------------------------------------------------*/

‎arccore/src/trace/arccore/trace/TraceMessage.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-
/* TraceMessage.cc (C) 2000-2018 */
8+
/* TraceMessage.cc (C) 2000-2025 */
99
/* */
1010
/* Gestion des messages. */
1111
/*---------------------------------------------------------------------------*/
@@ -19,7 +19,7 @@
1919
/*---------------------------------------------------------------------------*/
2020
/*---------------------------------------------------------------------------*/
2121

22-
namespace Arccore
22+
namespace Arcane
2323
{
2424

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

‎arccore/src/trace/arccore/trace/TraceMessage.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-
/* TraceMessage.h (C) 2000-2018 */
8+
/* TraceMessage.h (C) 2000-2025 */
99
/* */
1010
/* Message de trace. */
1111
/*---------------------------------------------------------------------------*/
@@ -21,7 +21,7 @@
2121
/*---------------------------------------------------------------------------*/
2222
/*---------------------------------------------------------------------------*/
2323

24-
namespace Arccore
24+
namespace Arcane
2525
{
2626

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

0 commit comments

Comments
 (0)