From f2ae8f8d96c026df6174f102122c6b02426599dd Mon Sep 17 00:00:00 2001 From: BenPinet Date: Mon, 3 Aug 2026 11:31:22 +0200 Subject: [PATCH] fix(Logger): replace warn with warning BREAKING CHANGE: change members name in Logger struct --- include/geode/basic/console_logger_client.hpp | 2 +- include/geode/basic/factory.hpp | 2 +- include/geode/basic/file_logger_client.hpp | 2 +- include/geode/basic/input.hpp | 2 +- include/geode/basic/logger.hpp | 8 ++++---- include/geode/basic/logger_client.hpp | 2 +- include/geode/basic/logger_manager.hpp | 2 +- .../model/representation/io/geode/geode_brep_input.hpp | 2 +- .../representation/io/geode/geode_section_input.hpp | 2 +- src/geode/basic/console_logger_client.cpp | 6 +++--- src/geode/basic/file_logger_client.cpp | 6 +++--- src/geode/basic/logger.cpp | 10 +++++----- src/geode/basic/logger_manager.cpp | 8 ++++---- src/geode/mesh/helpers/detail/surface_merger.cpp | 2 +- src/geode/model/helpers/aabb_model_helpers.cpp | 2 +- src/geode/model/helpers/component_mensurations.cpp | 2 +- src/geode/model/helpers/surface_radial_sort.cpp | 5 +++-- .../model/mixin/core/detail/relationships_impl.cpp | 4 ++-- src/geode/model/mixin/core/relationships.cpp | 2 +- .../representation/io/geode/geode_brep_output.cpp | 2 +- .../representation/io/geode/geode_section_output.cpp | 2 +- tests/basic/test-logger.cpp | 6 +++--- 22 files changed, 41 insertions(+), 40 deletions(-) diff --git a/include/geode/basic/console_logger_client.hpp b/include/geode/basic/console_logger_client.hpp index f12df673d..c2bd25215 100644 --- a/include/geode/basic/console_logger_client.hpp +++ b/include/geode/basic/console_logger_client.hpp @@ -42,7 +42,7 @@ namespace geode void info( const std::string &message ) override; - void warn( const std::string &message ) override; + void warning( const std::string &message ) override; void error( const std::string &message ) override; diff --git a/include/geode/basic/factory.hpp b/include/geode/basic/factory.hpp index 5eca709a9..6bd4ee738 100644 --- a/include/geode/basic/factory.hpp +++ b/include/geode/basic/factory.hpp @@ -82,7 +82,7 @@ namespace geode Creator( create_function_impl< DerivedClass > ) ) .second ) { - Logger::warn( + Logger::warning( "Factory: Trying to register twice the same key" ); } } diff --git a/include/geode/basic/file_logger_client.hpp b/include/geode/basic/file_logger_client.hpp index 53f9a5f2e..a3d33a206 100644 --- a/include/geode/basic/file_logger_client.hpp +++ b/include/geode/basic/file_logger_client.hpp @@ -48,7 +48,7 @@ namespace geode void info( const std::string &message ) override; - void warn( const std::string &message ) override; + void warning( const std::string &message ) override; void error( const std::string &message ) override; diff --git a/include/geode/basic/input.hpp b/include/geode/basic/input.hpp index 8fb46c363..6ab4e7c18 100644 --- a/include/geode/basic/input.hpp +++ b/include/geode/basic/input.hpp @@ -78,7 +78,7 @@ namespace geode { if( inspect_required_ ) { - geode::Logger::warn( + geode::Logger::warning( "[Input] The file loader notified INCONSISTENCIES in the " "given data file. In consequence, the loaded structure is " "likely BROKEN, and there is NO GUARANTEE that any further " diff --git a/include/geode/basic/logger.hpp b/include/geode/basic/logger.hpp index 8e86ddcc1..d9a857031 100644 --- a/include/geode/basic/logger.hpp +++ b/include/geode/basic/logger.hpp @@ -36,7 +36,7 @@ namespace geode /*! * Custom OpenGeode logger. Can be used with several levels: * Logger::info( "My information is ", 42 ); - * Logger::warn( "My warning is ", 42, " or more" ); + * Logger::warning( "My warning is ", 42, " or more" ); */ class opengeode_basic_api Logger { @@ -46,8 +46,8 @@ namespace geode trace, debug, info, - warn, - err, + warning, + error, critical, off }; @@ -81,7 +81,7 @@ namespace geode } template < typename... Args > - static void warn( const Args &...args ) + static void warning( const Args &...args ) { log_warn( absl::StrCat( args... ) ); } diff --git a/include/geode/basic/logger_client.hpp b/include/geode/basic/logger_client.hpp index 6aa57bd7c..83d80cc54 100644 --- a/include/geode/basic/logger_client.hpp +++ b/include/geode/basic/logger_client.hpp @@ -38,7 +38,7 @@ namespace geode virtual void info( const std::string &message ) = 0; - virtual void warn( const std::string &message ) = 0; + virtual void warning( const std::string &message ) = 0; virtual void error( const std::string &message ) = 0; diff --git a/include/geode/basic/logger_manager.hpp b/include/geode/basic/logger_manager.hpp index bbc9af305..aac00421a 100644 --- a/include/geode/basic/logger_manager.hpp +++ b/include/geode/basic/logger_manager.hpp @@ -47,7 +47,7 @@ namespace geode static void info( const std::string &message ); - static void warn( const std::string &message ); + static void warning( const std::string &message ); static void error( const std::string &message ); diff --git a/include/geode/model/representation/io/geode/geode_brep_input.hpp b/include/geode/model/representation/io/geode/geode_brep_input.hpp index b77dd3084..cb49b4beb 100644 --- a/include/geode/model/representation/io/geode/geode_brep_input.hpp +++ b/include/geode/model/representation/io/geode/geode_brep_input.hpp @@ -71,7 +71,7 @@ namespace geode { BRepBuilder builder{ brep }; const auto level = Logger::level(); - Logger::set_level( Logger::LEVEL::warn ); + Logger::set_level( Logger::LEVEL::warning ); async::parallel_invoke( [&builder, &directory] { builder.load_identifier( directory ); diff --git a/include/geode/model/representation/io/geode/geode_section_input.hpp b/include/geode/model/representation/io/geode/geode_section_input.hpp index 6780c119a..394ad7e0a 100644 --- a/include/geode/model/representation/io/geode/geode_section_input.hpp +++ b/include/geode/model/representation/io/geode/geode_section_input.hpp @@ -71,7 +71,7 @@ namespace geode { SectionBuilder builder{ section }; const auto level = Logger::level(); - Logger::set_level( Logger::LEVEL::warn ); + Logger::set_level( Logger::LEVEL::warning ); async::parallel_invoke( [&builder, &directory] { builder.load_identifier( directory ); diff --git a/src/geode/basic/console_logger_client.cpp b/src/geode/basic/console_logger_client.cpp index cc996fd5f..d9af35606 100644 --- a/src/geode/basic/console_logger_client.cpp +++ b/src/geode/basic/console_logger_client.cpp @@ -57,7 +57,7 @@ namespace geode logger_impl_->info( message ); } - void warn( const std::string &message ) + void warning( const std::string &message ) { logger_impl_->warn( message ); } @@ -95,9 +95,9 @@ namespace geode impl_->info( message ); } - void ConsoleLoggerClient::warn( const std::string &message ) + void ConsoleLoggerClient::warning( const std::string &message ) { - impl_->warn( message ); + impl_->warning( message ); } void ConsoleLoggerClient::error( const std::string &message ) diff --git a/src/geode/basic/file_logger_client.cpp b/src/geode/basic/file_logger_client.cpp index b9b374ae7..273cb0bf5 100644 --- a/src/geode/basic/file_logger_client.cpp +++ b/src/geode/basic/file_logger_client.cpp @@ -76,7 +76,7 @@ namespace geode logger_impl_->info( message ); } - void warn( const std::string &message ) + void warning( const std::string &message ) { logger_impl_->warn( message ); } @@ -128,9 +128,9 @@ namespace geode impl_->info( message ); } - void FileLoggerClient::warn( const std::string &message ) + void FileLoggerClient::warning( const std::string &message ) { - impl_->warn( message ); + impl_->warning( message ); } void FileLoggerClient::error( const std::string &message ) diff --git a/src/geode/basic/logger.cpp b/src/geode/basic/logger.cpp index 62cc3f06c..45c875b3e 100644 --- a/src/geode/basic/logger.cpp +++ b/src/geode/basic/logger.cpp @@ -74,15 +74,15 @@ namespace geode void log_warn( const std::string &message ) { - if( level_ <= LEVEL::warn ) + if( level_ <= LEVEL::warning ) { - LoggerManager::warn( message ); + LoggerManager::warning( message ); } } void log_error( const std::string &message ) { - if( level_ <= LEVEL::err ) + if( level_ <= LEVEL::error ) { LoggerManager::error( message ); } @@ -103,8 +103,8 @@ namespace geode { geode::Logger::LEVEL::trace, geode::Logger::log_trace }, { geode::Logger::LEVEL::debug, geode::Logger::log_debug }, { geode::Logger::LEVEL::info, geode::Logger::log_info }, - { geode::Logger::LEVEL::warn, geode::Logger::log_warn }, - { geode::Logger::LEVEL::err, geode::Logger::log_error }, + { geode::Logger::LEVEL::warning, geode::Logger::log_warn }, + { geode::Logger::LEVEL::error, geode::Logger::log_error }, { geode::Logger::LEVEL::critical, geode::Logger::log_critical } }; diff --git a/src/geode/basic/logger_manager.cpp b/src/geode/basic/logger_manager.cpp index f8bbe25f2..6f21ae819 100644 --- a/src/geode/basic/logger_manager.cpp +++ b/src/geode/basic/logger_manager.cpp @@ -61,11 +61,11 @@ namespace geode } } - void warn( const std::string &message ) + void warning( const std::string &message ) { for( auto &logger : loggers_ ) { - logger->warn( message ); + logger->warning( message ); } } @@ -114,9 +114,9 @@ namespace geode instance().impl_->info( message ); } - void LoggerManager::warn( const std::string &message ) + void LoggerManager::warning( const std::string &message ) { - instance().impl_->warn( message ); + instance().impl_->warning( message ); } void LoggerManager::error( const std::string &message ) diff --git a/src/geode/mesh/helpers/detail/surface_merger.cpp b/src/geode/mesh/helpers/detail/surface_merger.cpp index f3d3b2655..e27d56de9 100644 --- a/src/geode/mesh/helpers/detail/surface_merger.cpp +++ b/src/geode/mesh/helpers/detail/surface_merger.cpp @@ -140,7 +140,7 @@ namespace geode } catch( const OpenGeodeException& e ) { - Logger::warn( e.what() ); + Logger::warning( e.what() ); } } diff --git a/src/geode/model/helpers/aabb_model_helpers.cpp b/src/geode/model/helpers/aabb_model_helpers.cpp index f8bae5a47..41235dfe4 100644 --- a/src/geode/model/helpers/aabb_model_helpers.cpp +++ b/src/geode/model/helpers/aabb_model_helpers.cpp @@ -57,7 +57,7 @@ namespace } if( nb_non_empty_elements < nb_elements ) { - geode::Logger::warn( absl::StrCat( "[create_model_aabb] ", + geode::Logger::warning( absl::StrCat( "[create_model_aabb] ", nb_elements - nb_non_empty_elements, " out of ", nb_elements, " components have empty meshes, not included in the " "AABBTree." ) ); diff --git a/src/geode/model/helpers/component_mensurations.cpp b/src/geode/model/helpers/component_mensurations.cpp index 656b008e4..1f416952b 100644 --- a/src/geode/model/helpers/component_mensurations.cpp +++ b/src/geode/model/helpers/component_mensurations.cpp @@ -175,7 +175,7 @@ namespace } if( grouped_sided_surfaces.size() > 1 ) { - geode::Logger::warn( block.component_id().string(), + geode::Logger::warning( block.component_id().string(), " has unconnected boundaries. This block has either " "topologically distinct parts or there are holes between the " "block boundary surfaces." ); diff --git a/src/geode/model/helpers/surface_radial_sort.cpp b/src/geode/model/helpers/surface_radial_sort.cpp index bc7e846ed..1ac3c3a03 100644 --- a/src/geode/model/helpers/surface_radial_sort.cpp +++ b/src/geode/model/helpers/surface_radial_sort.cpp @@ -211,8 +211,9 @@ namespace geode { if( edge_id == mesh.nb_edges() - 1 ) { - Logger::warn( "[surface_radial_sort] Degenerated polygons " - "has been found on all the edges of Line ", + Logger::warning( + "[surface_radial_sort] Degenerated polygons " + "has been found on all the edges of Line ", line.id().string(), ". The result of surface_radial_sort is not " "guaranteed." ); diff --git a/src/geode/model/mixin/core/detail/relationships_impl.cpp b/src/geode/model/mixin/core/detail/relationships_impl.cpp index 96e2e1fdf..e709d3320 100644 --- a/src/geode/model/mixin/core/detail/relationships_impl.cpp +++ b/src/geode/model/mixin/core/detail/relationships_impl.cpp @@ -124,8 +124,8 @@ namespace geode if( const auto component_id = relation_edge_index( from.id(), to.id() ) ) { - Logger::warn( "This relation already exists (", from.string(), - " and ", to.string(), ")" ); + Logger::warning( "This relation already exists (", + from.string(), " and ", to.string(), ")" ); return component_id.value(); } const auto index = GraphBuilder::create( *graph_ )->create_edge( diff --git a/src/geode/model/mixin/core/relationships.cpp b/src/geode/model/mixin/core/relationships.cpp index 43d29d097..4fae8f60f 100644 --- a/src/geode/model/mixin/core/relationships.cpp +++ b/src/geode/model/mixin/core/relationships.cpp @@ -148,7 +148,7 @@ namespace geode { const auto relation_type = relation_type_->value( component_id.value() ); - Logger::warn( "There is already a ", + Logger::warning( "There is already a ", relation_to_string( relation_type ), " between (", from.string(), " and ", to.string(), ")" ); return component_id.value(); diff --git a/src/geode/model/representation/io/geode/geode_brep_output.cpp b/src/geode/model/representation/io/geode/geode_brep_output.cpp index d87bea054..00de03e73 100644 --- a/src/geode/model/representation/io/geode/geode_brep_output.cpp +++ b/src/geode/model/representation/io/geode/geode_brep_output.cpp @@ -50,7 +50,7 @@ namespace geode const BRep& brep, std::string_view directory ) const { const auto level = Logger::level(); - Logger::set_level( Logger::LEVEL::warn ); + Logger::set_level( Logger::LEVEL::warning ); async::parallel_invoke( [&directory, &brep] { brep.save_identifier( directory ); diff --git a/src/geode/model/representation/io/geode/geode_section_output.cpp b/src/geode/model/representation/io/geode/geode_section_output.cpp index f785496f6..fefa57b11 100644 --- a/src/geode/model/representation/io/geode/geode_section_output.cpp +++ b/src/geode/model/representation/io/geode/geode_section_output.cpp @@ -40,7 +40,7 @@ namespace geode const Section& section, std::string_view directory ) const { const auto level = Logger::level(); - Logger::set_level( Logger::LEVEL::warn ); + Logger::set_level( Logger::LEVEL::warning ); async::parallel_invoke( [&directory, §ion] { section.save_identifier( directory ); diff --git a/tests/basic/test-logger.cpp b/tests/basic/test-logger.cpp index 00af0ccb1..5f046f7e0 100644 --- a/tests/basic/test-logger.cpp +++ b/tests/basic/test-logger.cpp @@ -53,7 +53,7 @@ namespace std::cout << "Old school logger => " << message << '\n'; } - void warn( const std::string &message ) override + void warning( const std::string &message ) override { std::cout << "Old school logger => " << message << '\n'; } @@ -74,7 +74,7 @@ namespace geode::Logger::trace( "test ", "trace" ); geode::Logger::debug( "test ", "debug" ); geode::Logger::info( "test ", "info" ); - geode::Logger::warn( "test ", "warn" ); + geode::Logger::warning( "test ", "warning" ); geode::Logger::error( "test ", "error" ); geode::Logger::critical( "test ", "critial" ); } @@ -131,7 +131,7 @@ namespace const auto &huge_msg = test_huge_message(); test_change_log_file( huge_msg ); - geode::Logger::set_level( geode::Logger::LEVEL::err ); + geode::Logger::set_level( geode::Logger::LEVEL::error ); test_logger(); } } // namespace