roland/xo-expression2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Roland Conybeare 2023-10-23 14:33:38 -04:00
commit 474446218d
6 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -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 ex2 DESTINATION bin/indentlog/example)
install(TARGETS ex3 DESTINATION bin/indentlog/example)
install(TARGETS ex4 DESTINATION bin/indentlog/example)
install(TARGETS indentlog_ex1 DESTINATION bin/indentlog/example)
install(TARGETS indentlog_ex2 DESTINATION bin/indentlog/example)
install(TARGETS indentlog_ex3 DESTINATION bin/indentlog/example)
install(TARGETS indentlog_ex4 DESTINATION bin/indentlog/example)

4
example/ex1/CMakeLists.txt
View file

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

6
example/ex2/CMakeLists.txt
View file

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

4
example/ex3/CMakeLists.txt
View file

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

4
example/ex4/CMakeLists.txt
View file

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

2
include/xo/indentlog/log_state.hpp
View file

@ -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;