Skip to content

Commit d1629b2

Browse files
drolbrdrolbr
committed
Fixed various search-and-replace false positives.
1 parent d4cca87 commit d1629b2

26 files changed

+107
-107
lines changed

‎osm-3s_testing/expected/osm3s_query_1/stderr.log‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ encoding remark: Please enter your query and terminate it with CTRL+D.
22
encoding remark: Your input starts with a tag but not the root tag. Thus, a line with the
33
datatype declaration and a line with the root tag 'osm-script' is
44
added. This shifts line numbering by -2 line(s).
5-
runtime error: open64: 2 No such file or directory /osm3s_v0.7.53_osm_base Dispatcher_Client::1
5+
runtime error: open64: 2 No such file or directory /osm3s_v0.7.54_osm_base Dispatcher_Client::1

‎src/expat/translate_xapi.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ int main(int argc, char* argv[])
345345
return 1;
346346
}
347347
}
348-
else if (input.substr(0, 9) == "std::map?bbox=")
348+
else if (input.substr(0, 9) == "map?bbox=")
349349
{
350350
std::string south, north, east, west;
351351
input = input.substr(9);

‎src/overpass_api/dispatch/osm3s_query.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ int main(int argc, char *argv[])
9696
{
9797
std::cout<<"Unknown argument: "<<argv[argpos]<<"\n\n"
9898
"Accepted arguments are:\n"
99-
" --db-dir=$DB_DIR: The directory where the database resides. If you std::set this parameter\n"
99+
" --db-dir=$DB_DIR: The directory where the database resides. If you set this parameter\n"
100100
" then osm3s_query will read from the database without using the dispatcher management.\n"
101101
" --dump-xml: Don't execute the query but only dump the query in XML format.\n"
102102
" --dump-pretty-ql: Don't execute the query but only dump the query in pretty QL format.\n"
103103
" --dump-compact-ql: Don't execute the query but only dump the query in compact QL format.\n"
104104
" --dump-bbox-ql: Don't execute the query but only dump the query in a suitable form\n"
105-
" for an OpenLayers slippy std::map.\n"
105+
" for an OpenLayers slippy map.\n"
106106
" --clone=$TARGET_DIR: Write a consistent copy of the entire database to the given $TARGET_DIR.\n"
107107
" --rules: Ignore all time limits and allow area creation by this query.\n"
108108
" --quiet: Don't print anything on stderr.\n"

‎src/overpass_api/frontend/map_ql_parser.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ TStatement* create_item_statement(typename TStatement::Factory& stmt_factory,
270270
std::string from, uint line_nr)
271271
{
272272
std::map< std::string, std::string > attr;
273-
attr["std::set"] = from;
273+
attr["set"] = from;
274274
return stmt_factory.create_statement("item", line_nr, attr);
275275
}
276276

@@ -416,7 +416,7 @@ TStatement* create_map_to_area_statement(typename TStatement::Factory& stmt_fact
416416
std::map< std::string, std::string > attr;
417417
attr["from"] = (from == "" ? "_" : from);
418418
attr["into"] = into;
419-
return stmt_factory.create_statement("std::map-to-area", line_nr, attr);
419+
return stmt_factory.create_statement("map-to-area", line_nr, attr);
420420
}
421421

422422
template< class TStatement >

‎src/overpass_api/osm-backend/compare_osm_base_maps.test.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void clear_nodes_to_map(std::vector< std::pair< uint32, Uint32_Index > >& id_to_
5858

5959
if (!deviations_exist)
6060
std::cout<<"For "<<id_to_idx.size()
61-
<<" nodes their idx in bin matches their idx in std::map.\n";
61+
<<" nodes their idx in bin matches their idx in map.\n";
6262

6363
id_to_idx.clear();
6464
}
@@ -104,7 +104,7 @@ void clear_ways_to_map(std::vector< std::pair< uint32, Uint31_Index > >& id_to_i
104104

105105
if (!deviations_exist)
106106
std::cout<<"For "<<id_to_idx.size()
107-
<<" ways their idx in bin matches their idx in std::map.\n";
107+
<<" ways their idx in bin matches their idx in map.\n";
108108

109109
id_to_idx.clear();
110110
}
@@ -150,7 +150,7 @@ void clear_relations_to_map(std::vector< std::pair< uint32, Uint31_Index > >& id
150150

151151
if (!deviations_exist)
152152
std::cout<<"For "<<id_to_idx.size()
153-
<<" relations their idx in bin matches their idx in std::map.\n";
153+
<<" relations their idx in bin matches their idx in map.\n";
154154

155155
id_to_idx.clear();
156156
}

‎src/overpass_api/osm-backend/generate_test_file.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4034,12 +4034,12 @@ int main(int argc, char* args[])
40344034
" </max-value>\n";
40354035
if (std::string(args[2]) == "make_74" || std::string(args[2]) == "make_75")
40364036
std::cout<<
4037-
" <value-std::set id=\"1\">\n"
4037+
" <value-set id=\"1\">\n"
40384038
" <tag k=\"node_key_7\" v=\"node_value_1;node_value_2\"/>\n"
40394039
" <tag k=\"way_key_7\" v=\"way_value_1\"/>\n"
40404040
" <tag k=\"relation_key_7\" v=\"relation_value_1\"/>\n"
40414041
" <tag k=\"unused_key_7\" v=\"\"/>\n"
4042-
" </value-std::set>\n";
4042+
" </value-set>\n";
40434043
if (std::string(args[2]) == "make_76")
40444044
std::cout<<
40454045
" <id-and-type id=\"1\">\n"

‎src/overpass_api/osm-backend/generate_test_file_interpreter.cc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ int main(int argc, char* args[])
559559
"\n"
560560
" function display_map(div_id, query_url, lat, lon, zoom) {\n"
561561
"\n"
562-
" std::map = new OpenLayers.Map(div_id, {\n"
562+
" map = new OpenLayers.Map(div_id, {\n"
563563
" controls:[\n"
564564
" new OpenLayers.Control.Navigation(),\n"
565565
" new OpenLayers.Control.PanZoomBar(),\n"
@@ -574,13 +574,13 @@ int main(int argc, char* args[])
574574
" } );\n"
575575
"\n"
576576
" layerMapnik = new OpenLayers.Layer.OSM.Mapnik(\"Mapnik\");\n"
577-
" std::map.addLayer(layerMapnik);\n"
577+
" map.addLayer(layerMapnik);\n"
578578
"\n"
579579
" var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection(\"EPSG:4326\"), new OpenLayers.Projection(\"EPSG:900913\"));\n"
580580
"\n"
581-
" std::map.setCenter (lonLat, zoom);\n"
581+
" map.setCenter (lonLat, zoom);\n"
582582
"\n"
583-
" //Initialise the std::vector layer using OpenLayers.Format.OSM\n"
583+
" //Initialise the vector layer using OpenLayers.Format.OSM\n"
584584
" var styleMap = new OpenLayers.StyleMap({\n"
585585
" strokeColor: \"blue\",\n"
586586
" strokeWidth: 10,\n"
@@ -600,9 +600,9 @@ int main(int argc, char* args[])
600600
" layer.events.register(\"featuresadded\", layer,\n"
601601
" make_remove_closure(div_id + \"_progressbar\"));\n"
602602
"\n"
603-
" std::map.addLayers([layer]);\n"
603+
" map.addLayers([layer]);\n"
604604
"\n"
605-
" return std::map;\n"
605+
" return map;\n"
606606
" }\n"
607607
"\n"
608608
" var maps = new Array();\n"
@@ -1020,7 +1020,7 @@ int main(int argc, char* args[])
10201020
"\n"
10211021
" function display_map(div_id, query_url, lat, lon, zoom) {\n"
10221022
"\n"
1023-
" std::map = new OpenLayers.Map(div_id, {\n"
1023+
" map = new OpenLayers.Map(div_id, {\n"
10241024
" controls:[\n"
10251025
" new OpenLayers.Control.Navigation(),\n"
10261026
" new OpenLayers.Control.PanZoomBar(),\n"
@@ -1035,13 +1035,13 @@ int main(int argc, char* args[])
10351035
" } );\n"
10361036
"\n"
10371037
" layerMapnik = new OpenLayers.Layer.OSM.Mapnik(\"Mapnik\");\n"
1038-
" std::map.addLayer(layerMapnik);\n"
1038+
" map.addLayer(layerMapnik);\n"
10391039
"\n"
10401040
" var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection(\"EPSG:4326\"), new OpenLayers.Projection(\"EPSG:900913\"));\n"
10411041
"\n"
1042-
" std::map.setCenter (lonLat, zoom);\n"
1042+
" map.setCenter (lonLat, zoom);\n"
10431043
"\n"
1044-
" //Initialise the std::vector layer using OpenLayers.Format.OSM\n"
1044+
" //Initialise the vector layer using OpenLayers.Format.OSM\n"
10451045
" var styleMap = new OpenLayers.StyleMap({\n"
10461046
" strokeColor: \"blue\",\n"
10471047
" strokeWidth: 10,\n"
@@ -1061,9 +1061,9 @@ int main(int argc, char* args[])
10611061
" layer.events.register(\"featuresadded\", layer,\n"
10621062
" make_remove_closure(div_id + \"_progressbar\"));\n"
10631063
"\n"
1064-
" std::map.addLayers([layer]);\n"
1064+
" map.addLayers([layer]);\n"
10651065
"\n"
1066-
" return std::map;\n"
1066+
" return map;\n"
10671067
" }\n"
10681068
"\n"
10691069
" var maps = new Array();\n"

‎src/overpass_api/osm-backend/update_database.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ int main(int argc, char* argv[])
8282
abort = true;
8383
}
8484
}
85-
else if (!(strncmp(argv[argpos], "--std::map-compression-method=", 25)))
85+
else if (!(strncmp(argv[argpos], "--map-compression-method=", 25)))
8686
{
8787
if (std::string(argv[argpos]).substr(25) == "no")
8888
basic_settings().map_compression_method = File_Blocks_Index< Uint31_Index >::NO_COMPRESSION;
@@ -95,9 +95,9 @@ int main(int argc, char* argv[])
9595
else
9696
{
9797
#ifdef HAVE_LZ4
98-
std::cerr<<"For --std::map-compression-method, please use \"no\", \"gz\", or \"lz4\" as value.\n";
98+
std::cerr<<"For --map-compression-method, please use \"no\", \"gz\", or \"lz4\" as value.\n";
9999
#else
100-
std::cerr<<"For --std::map-compression-method, please use \"no\" or \"gz\" as value.\n";
100+
std::cerr<<"For --map-compression-method, please use \"no\" or \"gz\" as value.\n";
101101
#endif
102102
abort = true;
103103
}

‎src/overpass_api/statements/aggregators.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ bool try_parse_input_set(const Token_Node_Ptr& tree_it, Error_Output* error_outp
140140
if (!tree_it.rhs()->lhs)
141141
{
142142
if (error_output)
143-
error_output->add_parse_error("Input std::set required if dot is present", tree_it->line_col.first);
143+
error_output->add_parse_error("Input set required if dot is present", tree_it->line_col.first);
144144
return false;
145145
}
146146

@@ -364,7 +364,7 @@ Statement* Evaluator_Set_Count::Statement_Maker::create_statement(
364364
if (!tree_it.rhs()->lhs)
365365
{
366366
if (error_output)
367-
error_output->add_parse_error("Input std::set required if dot is present", tree_it->line_col.first);
367+
error_output->add_parse_error("Input set required if dot is present", tree_it->line_col.first);
368368
return 0;
369369
}
370370

‎src/overpass_api/statements/difference.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ void Difference_Statement::add_statement(Statement* statement, std::string text)
5252
if (substatements.size() >= 2)
5353
{
5454
std::ostringstream temp;
55-
temp<<"A std::set difference always requires exactly two substatements: "
56-
"the std::set of elements to copy to the result minus "
57-
"the std::set of elements to leave out in the result.";
55+
temp<<"A set difference always requires exactly two substatements: "
56+
"the set of elements to copy to the result minus "
57+
"the set of elements to leave out in the result.";
5858
add_static_error(temp.str());
5959
}
6060

0 commit comments

Comments
 (0)