Skip to content

Commit 1db7b92

Browse files
ktfktf
committed
Align to syntax style for namespaces
1 parent 6ed3dbd commit 1db7b92

File tree

81 files changed

+394
-240
lines changed

Some content is hidden

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

81 files changed

+394
-240
lines changed

‎Framework/Core/include/Framework/AlgorithmSpec.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616

1717
#include <functional>
1818

19-
namespace o2 {
20-
namespace framework {
19+
namespace o2
20+
{
21+
namespace framework
22+
{
2123

2224
/// This is the class holding the actual algorithm to be used. Notice that the
2325
/// InitCallback can be used to define stateful data as it returns a

‎Framework/Core/include/Framework/BoostOptionsRetriever.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717
#include <string>
1818
#include <vector>
1919

20-
namespace o2 {
21-
namespace framework {
20+
namespace o2
21+
{
22+
namespace framework
23+
{
2224

2325
// FIXME: For the moment we only support basic types. Should probably support
2426
// (nested) vectors and maps as well. If FairMQ plugins can be used
@@ -41,7 +43,7 @@ class BoostOptionsRetriever : public ParamRetriever {
4143
bool mIgnoreUnknown;
4244
};
4345

44-
}
45-
}
46+
} // namespace framework
47+
} // namespace o2
4648
#endif // FRAMEWORK_BOOSTOPTIONSRETRIEVER_H
4749

‎Framework/Core/include/Framework/CallbackRegistry.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,6 @@ class CallbackRegistry
142142
// store of RegistryPairs
143143
std::tuple<Args...> mStore;
144144
};
145-
}
146-
}
145+
} // namespace framework
146+
} // namespace o2
147147
#endif // FRAMEWORK_CALLBACKREGISTRY_H

‎Framework/Core/include/Framework/CallbackService.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ class CallbackService
6060
Callbacks mCallbacks;
6161
};
6262

63-
} // framework
64-
} // o2
63+
} // namespace framework
64+
} // namespace o2
6565
#endif // FRAMEWORK_CALLBACKSERVICE_H

‎Framework/Core/include/Framework/ChannelMatching.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
#include <vector>
1717
#include <string>
1818

19-
namespace o2 {
20-
namespace framework {
19+
namespace o2
20+
{
21+
namespace framework
22+
{
2123

2224
struct LogicalChannel {
2325
std::string name;

‎Framework/Core/include/Framework/ChannelSpec.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212

1313
#include <string>
1414

15-
namespace o2 {
16-
namespace framework {
15+
namespace o2
16+
{
17+
namespace framework
18+
{
1719

1820
/// These map to zeromq connection
1921
/// methods.
@@ -52,7 +54,7 @@ struct OutputChannelSpec {
5254
size_t listeners;
5355
};
5456

55-
}
56-
}
57+
} // namespace framework
58+
} // namespace o2
5759

5860
#endif // FRAMEWORK_CHANNELSPEC_H

‎Framework/Core/include/Framework/ConfigParamRegistry.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
#include <string>
1616
#include <cassert>
1717

18-
namespace o2 {
19-
namespace framework {
18+
namespace o2
19+
{
20+
namespace framework
21+
{
2022

2123
/// This provides unified access to the parameters specified in the workflow
2224
/// specification.
@@ -61,7 +63,7 @@ template <> inline bool ConfigParamRegistry::get<bool>(const char *key) const {
6163
return mRetriever->getBool(key);
6264
}
6365

64-
}
65-
}
66+
} // namespace framework
67+
} // namespace o2
6668

6769
#endif //FRAMEWORK_CONFIGPARAMREGISTRY_H

‎Framework/Core/include/Framework/ConfigParamSpec.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
#include <string>
1414
#include "Framework/Variant.h"
1515

16-
namespace o2 {
17-
namespace framework {
16+
namespace o2
17+
{
18+
namespace framework
19+
{
1820

1921
/// @class ConfigParamSpec Definition of options for a processor
2022
/// An option definition consists of a name, a type, a help message, and
@@ -61,7 +63,7 @@ struct ConfigParamSpec {
6163
HelpString help;
6264
};
6365

64-
}
65-
}
66+
} // namespace framework
67+
} // namespace o2
6668

6769
#endif // FRAMEWORK_CONFIGPARAMSPEC_H

‎Framework/Core/include/Framework/ConfigParamsHelper.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
#include <string>
1919
#include <type_traits>
2020

21-
namespace o2 {
22-
namespace framework {
21+
namespace o2
22+
{
23+
namespace framework
24+
{
2325

2426
using options_description = boost::program_options::options_description;
2527

@@ -98,6 +100,6 @@ struct ConfigParamsHelper
98100
}
99101
};
100102

101-
}
102-
}
103+
} // namespace framework
104+
} // namespace o2
103105
#endif // FRAMEWORK_CONFIGPARAMSHELPER_H

‎Framework/Core/include/Framework/ControlService.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
#ifndef FRAMEWORK_CONTROLSERVICE_H
1111
#define FRAMEWORK_CONTROLSERVICE_H
1212

13-
namespace o2 {
14-
namespace framework {
13+
namespace o2
14+
{
15+
namespace framework
16+
{
1517

1618
// A service that data processors can use to talk to control and ask for
1719
// their own state change or others.
@@ -20,6 +22,6 @@ class ControlService {
2022
virtual void readyToQuit(bool all = false) = 0; // Tell the control that I am ready to quit
2123
};
2224

23-
} // framework
24-
} // o2
25+
} // namespace framework
26+
} // namespace o2
2527
#endif // FRAMEWORK_ROOTFILESERVICE_H

0 commit comments

Comments
 (0)