Skip to content

Commit d9d0d63

Browse files
committed
Remove need for style_set boolean
1 parent 9a1f04e commit d9d0d63

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

src/command-line-parser.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,6 @@ options_t parse_command_line(int argc, char *argv[])
617617
break;
618618
case 'S': // --style
619619
options.style = optarg;
620-
options.style_set = true;
621620
break;
622621
case 'i': // --tablespace-index
623622
options.tblsmain_index = optarg;

src/options.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ struct options_t
164164
bool pass_prompt = false;
165165

166166
bool output_backend_set = false;
167-
bool style_set = false;
168167
}; // struct options_t
169168

170169
#endif // OSM2PGSQL_OPTIONS_HPP

src/osm2pgsql.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ static void check_for_nodes_table(options_t const &options)
336336

337337
static void check_and_set_style(options_t *options)
338338
{
339-
if (!options->style_set) {
339+
if (options->style.empty()) {
340340
if (options->output_backend == "flex" ||
341341
options->output_backend == "gazetteer") {
342342
throw std::runtime_error{"You have to set the config file "

0 commit comments

Comments
 (0)