Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit a3a2a3b

Browse files
pranavkpranavk
committed
Format settings_macro newline escapes
They became out-of-sync after we added min_value, max_value to them.
1 parent 1809446 commit a3a2a3b

File tree

1 file changed

+39
-39
lines changed

1 file changed

+39
-39
lines changed

‎src/include/settings/settings_macro.h

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
#ifdef SETTING_string
3434
#undef SETTING_string
3535
#endif
36-
#define SETTING_int(name, description, default_value, min_value, max_value, is_mutable, is_persistent) \
36+
#define SETTING_int(name, description, default_value, min_value, max_value, is_mutable, is_persistent) \
3737
DEFINE_int32(name, default_value, description);
3838

3939
#define SETTING_double(name, description, default_value, min_value, max_value, is_mutable, is_persistent) \
4040
DEFINE_double(name, default_value, description);
4141

42-
#define SETTING_bool(name, description, default_value, is_mutable, is_persistent) \
42+
#define SETTING_bool(name, description, default_value, is_mutable, is_persistent) \
4343
DEFINE_bool(name, default_value, description);
4444

45-
#define SETTING_string(name, description, default_value, is_mutable, is_persistent) \
45+
#define SETTING_string(name, description, default_value, is_mutable, is_persistent) \
4646
DEFINE_string(name, default_value, description);
4747
#endif
4848

@@ -59,16 +59,16 @@
5959
#ifdef SETTING_string
6060
#undef SETTING_string
6161
#endif
62-
#define SETTING_int(name, description, default_value, min_value, max_value, is_mutable, is_persistent) \
62+
#define SETTING_int(name, description, default_value, min_value, max_value, is_mutable, is_persistent) \
6363
DECLARE_int32(name);
6464

6565
#define SETTING_double(name, description, default_value, min_value, max_value, is_mutable, is_persistent) \
6666
DECLARE_double(name);
6767

68-
#define SETTING_bool(name, description, default_value, is_mutable, is_persistent) \
68+
#define SETTING_bool(name, description, default_value, is_mutable, is_persistent) \
6969
DECLARE_bool(name);
7070

71-
#define SETTING_string(name, description, default_value, is_mutable, is_persistent) \
71+
#define SETTING_string(name, description, default_value, is_mutable, is_persistent) \
7272
DECLARE_string(name);
7373
#endif
7474

@@ -85,40 +85,40 @@
8585
#ifdef SETTING_string
8686
#undef SETTING_string
8787
#endif
88-
#define SETTING_int(name, description, default_value, min_value, max_value, is_mutable, is_persistent) \
89-
DefineSetting( \
90-
peloton::settings::SettingId::name, \
91-
#name, type::ValueFactory::GetIntegerValue(FLAGS_##name), \
92-
description, type::ValueFactory::GetIntegerValue(default_value), \
93-
type::ValueFactory::GetIntegerValue(min_value), \
94-
type::ValueFactory::GetIntegerValue(max_value),\
88+
#define SETTING_int(name, description, default_value, min_value, max_value, is_mutable, is_persistent) \
89+
DefineSetting( \
90+
peloton::settings::SettingId::name, \
91+
#name, type::ValueFactory::GetIntegerValue(FLAGS_##name), \
92+
description, type::ValueFactory::GetIntegerValue(default_value), \
93+
type::ValueFactory::GetIntegerValue(min_value), \
94+
type::ValueFactory::GetIntegerValue(max_value), \
9595
is_mutable, is_persistent);
9696

97-
#define SETTING_double(name, description, default_value, min_value, max_value, is_mutable, is_persistent) \
98-
DefineSetting( \
99-
peloton::settings::SettingId::name, \
100-
#name, type::ValueFactory::GetDecimalValue(FLAGS_##name), \
101-
description, type::ValueFactory::GetDecimalValue(default_value), \
102-
type::ValueFactory::GetDecimalValue(min_value), \
103-
type::ValueFactory::GetDecimalValue(max_value),\
104-
is_mutable, is_persistent);\
105-
106-
#define SETTING_bool(name, description, default_value, is_mutable, is_persistent) \
107-
DefineSetting( \
108-
peloton::settings::SettingId::name, \
109-
#name, type::ValueFactory::GetBooleanValue(FLAGS_##name), \
110-
description, type::ValueFactory::GetBooleanValue(default_value), \
111-
type::ValueFactory::GetBooleanValue(default_value), \
112-
type::ValueFactory::GetBooleanValue(default_value),\
97+
#define SETTING_double(name, description, default_value, min_value, max_value, is_mutable, is_persistent) \
98+
DefineSetting( \
99+
peloton::settings::SettingId::name, \
100+
#name, type::ValueFactory::GetDecimalValue(FLAGS_##name), \
101+
description, type::ValueFactory::GetDecimalValue(default_value), \
102+
type::ValueFactory::GetDecimalValue(min_value), \
103+
type::ValueFactory::GetDecimalValue(max_value), \
113104
is_mutable, is_persistent);
114105

115-
#define SETTING_string(name, description, default_value, is_mutable, is_persistent) \
116-
DefineSetting( \
117-
peloton::settings::SettingId::name, \
118-
#name, type::ValueFactory::GetVarcharValue(FLAGS_##name), \
119-
description, type::ValueFactory::GetVarcharValue(default_value), \
120-
type::ValueFactory::GetVarcharValue(default_value), \
121-
type::ValueFactory::GetVarcharValue(default_value),\
106+
#define SETTING_bool(name, description, default_value, is_mutable, is_persistent) \
107+
DefineSetting( \
108+
peloton::settings::SettingId::name, \
109+
#name, type::ValueFactory::GetBooleanValue(FLAGS_##name), \
110+
description, type::ValueFactory::GetBooleanValue(default_value), \
111+
type::ValueFactory::GetBooleanValue(default_value), \
112+
type::ValueFactory::GetBooleanValue(default_value), \
113+
is_mutable, is_persistent);
114+
115+
#define SETTING_string(name, description, default_value, is_mutable, is_persistent) \
116+
DefineSetting( \
117+
peloton::settings::SettingId::name, \
118+
#name, type::ValueFactory::GetVarcharValue(FLAGS_##name), \
119+
description, type::ValueFactory::GetVarcharValue(default_value), \
120+
type::ValueFactory::GetVarcharValue(default_value), \
121+
type::ValueFactory::GetVarcharValue(default_value), \
122122
is_mutable, is_persistent);
123123
#endif
124124

@@ -135,15 +135,15 @@
135135
#ifdef SETTING_string
136136
#undef SETTING_string
137137
#endif
138-
#define SETTING_int(name, description, default_value, min_value, max_value, is_mutable, is_persistent) \
138+
#define SETTING_int(name, description, default_value, min_value, max_value, is_mutable, is_persistent) \
139139
name,
140140

141141
#define SETTING_double(name, description, default_value, min_value, max_value, is_mutable, is_persistent) \
142142
name,
143143

144-
#define SETTING_bool(name, description, default_value, is_mutable, is_persistent) \
144+
#define SETTING_bool(name, description, default_value, is_mutable, is_persistent) \
145145
name,
146146

147-
#define SETTING_string(name, description, default_value, is_mutable, is_persistent) \
147+
#define SETTING_string(name, description, default_value, is_mutable, is_persistent) \
148148
name,
149149
#endif

0 commit comments

Comments
 (0)