Skip to content

Commit 1cf804f

Browse files
committed
runtime: Fix duplicate definitions in set_action.hpp
1 parent 0d9509c commit 1cf804f

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

runtime/include/cloe/trigger/set_action.hpp

+5-7
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,23 @@
3131
#include <cloe/trigger.hpp> // for Action, ActionFactory
3232
#include <cloe/trigger/helper_macros.hpp> // for _X_FACTORY, _X_CALLBACK
3333

34-
namespace cloe {
35-
namespace actions {
34+
namespace cloe::actions {
3635

3736
template <typename T>
3837
T from_string(const std::string& s);
3938

4039
template <>
41-
double from_string<double>(const std::string& s) {
40+
inline double from_string<double>(const std::string& s) {
4241
return std::stod(s);
4342
}
4443

4544
template <>
46-
int from_string<int>(const std::string& s) {
45+
inline int from_string<int>(const std::string& s) {
4746
return std::stoi(s);
4847
}
4948

5049
template <>
51-
bool from_string<bool>(const std::string& s) {
50+
inline bool from_string<bool>(const std::string& s) {
5251
if (s == "true") {
5352
return true;
5453
} else if (s == "false") {
@@ -108,8 +107,7 @@ class SetVariableActionFactory : public ActionFactory {
108107
T* data_ptr_;
109108
};
110109

111-
} // namespace actions
112-
} // namespace cloe
110+
} // namespace cloe::actions
113111

114112
/**
115113
* Macro DEFINE_SET_STATE_ACTION defines an action that has only a single state

0 commit comments

Comments
 (0)