Merge remote-tracking branch 'origin/master' into feature/w-error

ethz-asl · Dec 22, 2023 · 37ee9a3 · 37ee9a3
2 parents eed1c92 + c18078e
commit 37ee9a3
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 27 deletions.
diff --git a/.github/workflows/cpp_ubuntu20_04.yml b/.github/workflows/cpp_ubuntu20_04.yml
@@ -3,6 +3,9 @@ on:
   pull_request:
     branches:
       - "master"
+  push:
+    branches:
+      - "master"
 
 jobs:
   build:
@@ -12,8 +15,9 @@ jobs:
       matrix:
         rosdistro: ['noetic']
         gcc: ['8', '9', '10']
+        cxx: ['11', '14', '17']
     container: ros:${{ matrix.rosdistro }}-ros-base-focal
-    name: ROS ${{ matrix.rosdistro }} - GCC ${{ matrix.gcc }}
+    name: ROS ${{ matrix.rosdistro }} - GCC ${{ matrix.gcc }} - C++${{ matrix.cxx }}
     steps:
     - uses: actions/checkout@v3
       name: Checkout lpp
@@ -35,7 +39,7 @@ jobs:
       run: sudo apt install -y libgoogle-glog-dev
 
     - name: Build lpp
-      run: source /opt/ros/${{ matrix.rosdistro }}/setup.bash && catkin build lpp && source ${GITHUB_WORKSPACE}/catkin_ws/devel/setup.bash
+      run: source /opt/ros/${{ matrix.rosdistro }}/setup.bash && catkin build -DCMAKE_CXX_STANDARD=${{ matrix.cxx }} lpp && source ${GITHUB_WORKSPACE}/catkin_ws/devel/setup.bash
       working-directory: catkin_ws
       shell: bash
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ if (${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME})
 endif ()
 
 # Set standard of top level project or C++17
-if (NOT DEFINED ${CMAKE_CXX_STANDARD})
+if (NOT DEFINED CMAKE_CXX_STANDARD)
         set(CMAKE_CXX_STANDARD 17)
         add_definitions(-Wall -Wextra -Wpedantic -Werror -Wno-unknown-pragmas)
 else ()

diff --git a/include/log++.h b/include/log++.h
@@ -447,25 +447,25 @@ LPP_INTL::InternalPolicyLog(LPP_GET_KEY(), n, LPP_INTL::BaseSeverity::DEBUG, LPP
 #ifdef MODE_NOLOG
 //lpp
 #define LOG_2(severity, x) (void) LPP_INTL::LppSeverity::severity; InternalLog() << x
-#define LOG_EVERY(severity, n, x) (void) LPP_INTL::LppSeverity::severity; static_assert(std::is_integral_v<decltype(n)>); InternalLog()
-#define LOG_FIRST(severity, n, x) (void) LPP_INTL::LppSeverity::severity; static_assert(std::is_integral_v<decltype(n)>); InternalLog()
-#define LOG_TIMED(severity, t, x) (void) LPP_INTL::LppSeverity::severity; static_assert(std::is_integral_v<decltype(t)>); InternalLog()
+#define LOG_EVERY(severity, n, x) (void) LPP_INTL::LppSeverity::severity; static_assert(std::is_integral<decltype(n)>::value, ""); InternalLog()
+#define LOG_FIRST(severity, n, x) (void) LPP_INTL::LppSeverity::severity; static_assert(std::is_integral<decltype(n)>::value, ""); InternalLog()
+#define LOG_TIMED(severity, t, x) (void) LPP_INTL::LppSeverity::severity; static_assert(std::is_integral<decltype(t)>::value, ""); InternalLog()
 
 //glog
 #define LOG_1(severity) (void) LPP_INTL::GlogSeverity::severity; InternalLog()
 #define DLOG(severity) (void) LPP_INTL::GlogSeverity::severity; InternalLog()
 #define DLOG_EVERY_N(severity, n) (void) LPP_INTL::GlogSeverity::severity; InternalLog()
 #define LOG_EVERY_N(severity, n) (void) LPP_INTL::GlogSeverity::severity; InternalLog()
-#define DLOG_FIRST_N(severity, n) (void) LPP_INTL::GlogSeverity::severity; static_assert(std::is_integral_v<decltype(n)>); InternalLog()
-#define LOG_FIRST_N(severity, n) (void) LPP_INTL::GlogSeverity::severity; static_assert(std::is_integral_v<decltype(n)>); InternalLog()
-#define DLOG_IF_EVERY_N(severity, cond, n) (void) LPP_INTL::GlogSeverity::severity; static_assert(std::is_same<decltype(cond), bool>::value && std::is_integral_v<decltype(n)>); InternalLog()
+#define DLOG_FIRST_N(severity, n) (void) LPP_INTL::GlogSeverity::severity; static_assert(std::is_integral<decltype(n)>::value, ""); InternalLog()
+#define LOG_FIRST_N(severity, n) (void) LPP_INTL::GlogSeverity::severity; static_assert(std::is_integral<decltype(n)>::value, ""); InternalLog()
+#define DLOG_IF_EVERY_N(severity, cond, n) (void) LPP_INTL::GlogSeverity::severity; static_assert(std::is_same<decltype(cond), bool>::value && std::is_integral<decltype(n)>::value, ""); InternalLog()
 #define LOG_IF_EVERY_N(severity, cond, n) DLOG_IF_EVERY_N(severity, cond, n)
-#define LOG_STRING(severity, ptr) (void) LPP_INTL::GlogSeverity::severity; static_assert(std::is_same<decltype(ptr), std::vector<std::string>*>::value || std::is_same<decltype(ptr), std::nullptr_t>::value); InternalLog()
-#define VLOG(verboselevel) static_assert(std::is_integral_v<decltype(verboselevel)>); InternalLog()
-#define VLOG_IF(verboselevel, condition) static_assert(std::is_integral_v<decltype(verboselevel)> && std::is_same<decltype(condition), bool>::value); InternalLog()
-#define VLOG_EVERY_N(verboselevel, n) static_assert(std::is_integral_v<decltype(verboselevel)> && std::is_integral_v<decltype(n)>); InternalLog()
-#define VLOG_IF_EVERY_N(verboselevel, condition, n) static_assert(std::is_integral_v<decltype(verboselevel)> && std::is_same<decltype(condition), bool>::value && std::is_integral_v<decltype(n)>); InternalLog()
-#define DLOG_EVERY_T(severity, t) (void) LPP_INTL::GlogSeverity::severity; static_assert(std::is_integral_v<decltype(t)>); InternalLog()
+#define LOG_STRING(severity, ptr) (void) LPP_INTL::GlogSeverity::severity; static_assert(std::is_same<decltype(ptr), std::vector<std::string>*>::value || std::is_same<decltype(ptr), std::nullptr_t>::value, ""); InternalLog()
+#define VLOG(verboselevel) static_assert(std::is_integral<decltype(verboselevel)>::value, ""); InternalLog()
+#define VLOG_IF(verboselevel, condition) static_assert(std::is_integral<decltype(verboselevel)>::value && std::is_same<decltype(condition), bool>::value, ""); InternalLog()
+#define VLOG_EVERY_N(verboselevel, n) static_assert(std::is_integral<decltype(verboselevel)>::value && std::is_integral<decltype(n)>::value, ""); InternalLog()
+#define VLOG_IF_EVERY_N(verboselevel, condition, n) static_assert(std::is_integral<decltype(verboselevel)>::value && std::is_same<decltype(condition), bool>::value && std::is_integral<decltype(n)>::value, ""); InternalLog()
+#define DLOG_EVERY_T(severity, t) (void) LPP_INTL::GlogSeverity::severity; static_assert(std::is_integral<decltype(t)>::value, ""); InternalLog()
 #define LOG_EVERY_T(severity, t) DLOG_EVERY_T(severity, t)
 
 //ros
@@ -481,14 +481,14 @@ LPP_INTL::InternalPolicyLog(LPP_GET_KEY(), n, LPP_INTL::BaseSeverity::DEBUG, LPP
 #define ROS_ERROR_STREAM(x) LPP_INTL::emptyString(x)
 #define ROS_FATAL_STREAM(x) LPP_INTL::emptyString(x)
 
-#define ROS_DEBUG_ONCE(...) LOG_2(D, LPP_INTL::emptyString(__VA_ARGS__))
-#define ROS_INFO_ONCE(...) LOG_2(I, LPP_INTL::emptyString(__VA_ARGS__))
-#define ROS_WARN_ONCE(...) LOG_2(W, LPP_INTL::emptyString(__VA_ARGS__))
-#define ROS_ERROR_ONCE(...) LOG_2(E, LPP_INTL::emptyString(__VA_ARGS__))
-#define ROS_FATAL_ONCE(...) LOG_2(F, LPP_INTL::emptyString(__VA_ARGS__))
+#define ROS_DEBUG_ONCE(...) LOG_2(D, std::string(LPP_INTL::emptyString(__VA_ARGS__)))
+#define ROS_INFO_ONCE(...) LOG_2(I, std::string(LPP_INTL::emptyString(__VA_ARGS__)))
+#define ROS_WARN_ONCE(...) LOG_2(W, std::string(LPP_INTL::emptyString(__VA_ARGS__)))
+#define ROS_ERROR_ONCE(...) LOG_2(E, std::string(LPP_INTL::emptyString(__VA_ARGS__)))
+#define ROS_FATAL_ONCE(...) LOG_2(F, std::string(LPP_INTL::emptyString(__VA_ARGS__)))
 
-#define ROS_DEBUG_THROTTLE(t, x) static_assert(std::is_integral_v<decltype(t)>); LPP_INTL::emptyString(x)
-#define ROS_DEBUG_STREAM_THROTTLE(t, x) static_assert(std::is_integral_v<decltype(t)>); InternalLog()
+#define ROS_DEBUG_THROTTLE(t, x) static_assert(std::is_integral<decltype(t)>::value, ""); LPP_INTL::emptyString(x)
+#define ROS_DEBUG_STREAM_THROTTLE(t, x) static_assert(std::is_integral<decltype(t)>::value, ""); InternalLog()
 #define ROS_INFO_THROTTLE(t, x) ROS_DEBUG_THROTTLE(t, x)
 #define ROS_INFO_STREAM_THROTTLE(t, x) ROS_DEBUG_STREAM_THROTTLE(t, x)
 #define ROS_WARN_THROTTLE(t, x) ROS_DEBUG_THROTTLE(t, x)
@@ -504,15 +504,15 @@ namespace internal {
 #ifdef MODE_NOLOG
 //! Used to disable logging for printf(3) like syntax
 template<typename... Args>
-constexpr inline std::string_view emptyString([[maybe_unused]] const char *f, [[maybe_unused]] Args... args) {
+constexpr inline const char* emptyString([[maybe_unused]] const char *f, [[maybe_unused]] Args... args) {
   return "";
 }
 
-[[maybe_unused]] constexpr std::string_view emptyString([[maybe_unused]] const char *str) {
+[[maybe_unused]] constexpr const char* emptyString([[maybe_unused]] const char *str) {
   return "";
 }
 
-[[maybe_unused]] constexpr std::string_view emptyString([[maybe_unused]] const std::string& str) {
+[[maybe_unused]] constexpr const char* emptyString([[maybe_unused]] const std::string& str) {
   return "";
 }
 #endif

diff --git a/src/demo.cpp b/src/demo.cpp
@@ -4,7 +4,7 @@
 
 #include <log++.h>
 
-int main(int argc, char **argv) {
+int main([[maybe_unused]] int argc, char **argv) {
   LOG_INIT(argv[0]);
 
   int foo = 5;

diff --git a/test/common/async_tests.h b/test/common/async_tests.h
@@ -5,8 +5,12 @@
 #ifndef LOG_TEST_COMMON_ASYNC_TESTS_H_
 #define LOG_TEST_COMMON_ASYNC_TESTS_H_
 
-#include <thread>
+#if __cplusplus >= 201703L
+#include <mutex>
+#endif
+
 #include <test_utils.h>
+#include <thread>
 
 #define GET_CLASS_NAME(class_ptr, status) abi::__cxa_demangle(typeid(class_ptr).name(), nullptr, nullptr, status)
 
@@ -44,7 +48,12 @@ class TestResult {
    * @return true on success otherwise false
    */
   inline bool get(const std::string &test_name) {
+#if __cplusplus >= 201703L
     std::scoped_lock<std::mutex> lock(test_result_mutex_);
+#elif __cplusplus >= 201103L
+    std::lock_guard<std::mutex> lock(test_result_mutex_);
+#endif
+
     LOG_INIT(*test_argv);
     if (!started_) {
       started_ = true;