Skip to content

Commit 8f5e731

Browse files
authored
DPL: modernize namespaces (#4349)
1 parent 7a967a6 commit 8f5e731

File tree

3 files changed

+10
-28
lines changed

3 files changed

+10
-28
lines changed

Framework/Core/include/Framework/AODReaderHelpers.h

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,15 @@
88
// granted to it by virtue of its status as an Intergovernmental Organization
99
// or submit itself to any jurisdiction.
1010

11-
#ifndef o2_framework_readers_AODReaderHelpers_INCLUDED_H
12-
#define o2_framework_readers_AODReaderHelpers_INCLUDED_H
11+
#ifndef O2_FRAMEWORK_AODREADERHELPERS_H_
12+
#define O2_FRAMEWORK_AODREADERHELPERS_H_
1313

1414
#include "Framework/TableBuilder.h"
1515
#include "Framework/AlgorithmSpec.h"
1616
#include "Framework/Logger.h"
1717
#include <uv.h>
1818

19-
namespace o2
20-
{
21-
namespace framework
22-
{
23-
namespace readers
19+
namespace o2::framework::readers
2420
{
2521

2622
struct RuntimeWatchdog {
@@ -71,8 +67,6 @@ struct AODReaderHelpers {
7167
static AlgorithmSpec aodSpawnerCallback(std::vector<InputSpec> requested);
7268
};
7369

74-
} // namespace readers
75-
} // namespace framework
76-
} // namespace o2
70+
} // namespace o2::framework::readers
7771

78-
#endif
72+
#endif // O2_FRAMEWORK_AODREADERHELPERS_H_

Framework/Core/src/FrameworkGUIDeviceInspector.cxx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@
2323
#include <cstdlib>
2424
#include <iostream>
2525

26-
namespace o2
27-
{
28-
namespace framework
29-
{
30-
namespace gui
26+
namespace o2::framework::gui
3127
{
3228

3329
struct ChannelsTableHelper {
@@ -292,6 +288,4 @@ void displayDeviceInspector(DeviceSpec const& spec,
292288
}
293289
}
294290

295-
} // namespace gui
296-
} // namespace framework
297-
} // namespace o2
291+
} // namespace o2::framework::gui

Framework/Core/src/FrameworkGUIDevicesGraph.cxx

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "Framework/DeviceInfo.h"
1515
#include "Framework/LogParsingHelpers.h"
1616
#include "Framework/PaletteHelpers.h"
17+
#include "Framework/Logger.h"
1718
#include "FrameworkGUIDeviceInspector.h"
1819
#include "Framework/Logger.h"
1920
#include "../src/WorkflowHelpers.h"
@@ -31,13 +32,8 @@
3132
static inline ImVec2 operator+(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x + rhs.x, lhs.y + rhs.y); }
3233
static inline ImVec2 operator-(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x - rhs.x, lhs.y - rhs.y); }
3334

34-
namespace o2
35-
{
36-
namespace framework
35+
namespace o2::framework::gui
3736
{
38-
namespace gui
39-
{
40-
4137
struct NodeColor {
4238
ImVec4 normal;
4339
ImVec4 hovered;
@@ -558,6 +554,4 @@ void showTopologyNodeGraph(WorkspaceGUIState& state,
558554
ImGui::End();
559555
}
560556

561-
} // namespace gui
562-
} // namespace framework
563-
} // namespace o2
557+
} // namespace o2::framework::gui

0 commit comments

Comments
 (0)