Merge remote-tracking branch 'origin/main'

CMakeLists.txt

@@ -45,7 +45,7 @@ xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets
 # ----------------------------------------------------------------
 
 install(TARGETS hello DESTINATION bin/indentlog/example)
-install(TARGETS ex1 DESTINATION bin/indentlog/example)
+install(TARGETS indentlog_ex1 DESTINATION bin/indentlog/example)
-install(TARGETS ex2 DESTINATION bin/indentlog/example)
+install(TARGETS indentlog_ex2 DESTINATION bin/indentlog/example)
-install(TARGETS ex3 DESTINATION bin/indentlog/example)
+install(TARGETS indentlog_ex3 DESTINATION bin/indentlog/example)
-install(TARGETS ex4 DESTINATION bin/indentlog/example)
+install(TARGETS indentlog_ex4 DESTINATION bin/indentlog/example)

example/ex1/CMakeLists.txt

@@ -1,2 +1,2 @@
-add_executable(ex1 ex1.cpp)
+add_executable(indentlog_ex1 ex1.cpp)
-xo_include_options2(ex1)
+xo_include_options2(indentlog_ex1)

example/ex2/CMakeLists.txt

@@ -1,2 +1,4 @@
-add_executable(ex2 ex2.cpp)
+# NOTE: need target names to be globally unique within the xo umbrella
-xo_include_options2(ex2)
+
+add_executable(indentlog_ex2 ex2.cpp)
+xo_include_options2(indentlog_ex2)

example/ex3/CMakeLists.txt

@@ -1,2 +1,2 @@
-add_executable(ex3 ex3.cpp)
+add_executable(indentlog_ex3 ex3.cpp)
-xo_include_options2(ex3)
+xo_include_options2(indentlog_ex3)

example/ex4/CMakeLists.txt

@@ -1,2 +1,2 @@
-add_executable(ex4 ex4.cpp)
+add_executable(indentlog_ex4 ex4.cpp)
-xo_include_options2(ex4)
+xo_include_options2(indentlog_ex4)

include/xo/indentlog/log_state.hpp

@@ -347,7 +347,7 @@ namespace xo {
                     ss << code_location(this->file_, this->line_,
                                         log_config::code_location_color);
 
-                    std::string ss_str = std::move(ss.str()); /*c++20*/
+                    std::string ss_str = ss.str(); /*hoping for copy elision here*/
                     sbuf2->sputn(ss_str.c_str(), ss_str.size());
 
                     this->location_flag_ = false;