Skip to content

Commit 378e6bf

Browse files
authored
DPL: drop "using namespace" at top-level (#5006)
1 parent 28c85c0 commit 378e6bf

File tree

4 files changed

+8
-18
lines changed

4 files changed

+8
-18
lines changed

Framework/Core/include/Framework/ASoA.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
#include <cassert>
2828
#include <fmt/format.h>
2929

30-
using o2::framework::runtime_error_f;
31-
3230
namespace o2::soa
3331
{
3432
template <typename... C>
@@ -1091,7 +1089,7 @@ class Table
10911089
auto label = T::columnLabel();
10921090
auto index = mTable->schema()->GetAllFieldIndices(label);
10931091
if (index.empty() == true) {
1094-
throw runtime_error_f("Unable to find column with label %s", label);
1092+
throw o2::framework::runtime_error_f("Unable to find column with label %s", label);
10951093
}
10961094
return mTable->column(index[0]).get();
10971095
} else {

Framework/Core/include/Framework/DataInputDirector.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@
1818
#include <regex>
1919
#include "rapidjson/fwd.h"
2020

21-
namespace o2
21+
namespace o2::framework
2222
{
23-
namespace framework
24-
{
25-
using namespace rapidjson;
2623

2724
struct FileNameHolder {
2825
std::string fileName;
@@ -130,11 +127,10 @@ struct DataInputDirector {
130127
bool mDebugMode = false;
131128
bool mAlienSupport = false;
132129

133-
bool readJsonDocument(Document* doc);
130+
bool readJsonDocument(rapidjson::Document* doc);
134131
bool isValid();
135132
};
136133

137-
} // namespace framework
138-
} // namespace o2
134+
} // namespace o2::framework
139135

140136
#endif // o2_framework_DataInputDirector_H_INCLUDED

Framework/Core/include/Framework/DataOutputDirector.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020

2121
#include "rapidjson/fwd.h"
2222

23-
namespace o2
24-
{
25-
namespace framework
23+
namespace o2::framework
2624
{
2725
using namespace rapidjson;
2826

@@ -105,7 +103,6 @@ struct DataOutputDirector {
105103
const std::tuple<std::string, std::string, int> memptyanswer = std::make_tuple(std::string(""), std::string(""), -1);
106104
};
107105

108-
} // namespace framework
109-
} // namespace o2
106+
} // namespace o2::framework
110107

111108
#endif // o2_framework_DataOutputDirector_H_INCLUDED

Framework/Core/test/Mocking.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414
#include "Framework/SimpleOptionsRetriever.h"
1515
#include "../src/WorkflowHelpers.h"
1616

17-
using namespace o2::framework;
18-
19-
std::unique_ptr<ConfigContext> makeEmptyConfigContext()
17+
std::unique_ptr<o2::framework::ConfigContext> makeEmptyConfigContext()
2018
{
19+
using namespace o2::framework;
2120
// FIXME: Ugly... We need to fix ownership and make sure the ConfigContext
2221
// either owns or shares ownership of the registry.
2322
std::vector<std::unique_ptr<ParamRetriever>> retrievers;

0 commit comments

Comments
 (0)