@@ -2389,7 +2389,10 @@ namespace {
23892389 if(auto_create_args) {
23902390 CmdLine::declare_arg(argname, argval, "...");
23912391 } else {
2392- Logger::warn("config") << argname << "=" << argval << " ignored" << std::endl;
2392+ Logger::warn("config") << argname
2393+ << "=" << argval
2394+ << " ignored"
2395+ << std::endl;
23932396 }
23942397 }
23952398 }
@@ -2401,17 +2404,22 @@ namespace {
24012404
24022405 void parse_config_file(int argc, char** argv) {
24032406 geo_assert(argc >= 1);
2404- std::string program_name = String::to_uppercase(FileSystem::base_name(argv[0]));
2407+ std::string program_name = String::to_uppercase(
2408+ FileSystem::base_name(argv[0])
2409+ );
24052410 static bool init = false;
24062411 if(init) {
24072412 return;
24082413 }
24092414 init = true;
2410- Logger::out("config") << "Configuration file name:" << config_file_name
2411- << std::endl;
2412- Logger::out("config") << "Home directory:" << FileSystem::home_directory()
2413- << std::endl;
2414- std::string config_filename = FileSystem::home_directory() + "/" + config_file_name;
2415+ Logger::out("config")
2416+ << "Configuration file name:" << config_file_name
2417+ << std::endl;
2418+ Logger::out("config")
2419+ << "Home directory:" << FileSystem::home_directory()
2420+ << std::endl;
2421+ std::string config_filename =
2422+ FileSystem::home_directory() + "/" + config_file_name;
24152423 parse_config_file(config_filename, program_name);
24162424 }
24172425
@@ -2609,7 +2617,9 @@ namespace GEO {
26092617 return geo_argv;
26102618 }
26112619
2612- void set_config_file_name(const std::string& filename, bool auto_create) {
2620+ void set_config_file_name(
2621+ const std::string& filename, bool auto_create
2622+ ) {
26132623 config_file_name = filename;
26142624 auto_create_args = auto_create;
26152625 }
@@ -6577,10 +6587,11 @@ namespace {
65776587 geo_argused(max_threads);
65786588
65796589#pragma omp parallel for schedule(dynamic)
6580- for(index_t i = 0; i < threads.size(); i++) {
6581- set_thread_id(threads[i],i);
6582- set_current_thread(threads[i]);
6583- threads[i]->run();
6590+ for(int i = 0; i < int(threads.size()); i++) {
6591+ index_t ii = index_t(i);
6592+ set_thread_id(threads[ii],ii);
6593+ set_current_thread(threads[ii]);
6594+ threads[ii]->run();
65846595 }
65856596 }
65866597
@@ -22274,7 +22285,7 @@ namespace GEO {
2227422285
2227522286 geo_register_Delaunay_creator(Delaunay2d, "BDEL2d");
2227622287 geo_register_Delaunay_creator(RegularWeightedDelaunay2d, "BPOW2d");
22277-
22288+
2227822289#ifndef GEOGRAM_PSM
2227922290 geo_register_Delaunay_creator(Delaunay_NearestNeighbors, "NN");
2228022291#endif
0 commit comments