fix ref wrapper

Author: archibate

README.md

@@ -168,6 +168,9 @@ Here is a list of configurable macros, define them **before** including this hea
 * `#define DEBUG_SHOW_TIMESTAMP 1` - enable printing a timestamp for each line of debug output (e.g. "09:57:32")
 * `#define DEBUG_SHOW_TIMESTAMP 2` (default) - printing timestamp relative to program staring time rather than system real time
 
+* `#define DEBUG_SHOW_THREAD_ID 0` (default) - do not print the thread id
+* `#define DEBUG_SHOW_THREAD_ID 1` - print the current thread id
+
 * `#define DEBUG_SHOW_LOCATION 1` (default) - show source location mark before each line of the debug output (e.g. "file.cpp:233")
 * `#define DEBUG_SHOW_LOCATION 0` - do not show the location mark
 

README.zh_CN.md

@@ -165,6 +165,13 @@ your_file.cpp:233:  assertion failed: 3 < 0
 * `#define DEBUG_STEPPING 1` - 启用单步调试，每次打印调试输出时暂停，手动按下回车键以继续
 * `#define DEBUG_STEPPING 2` - 启用单步调试，但改为触发一个'陷阱'中断，以便调试器捕获
 
+* `#define DEBUG_SHOW_TIMESTAMP 0` - 不打印时间戳
+* `#define DEBUG_SHOW_TIMESTAMP 1` - 打印时间戳（例如"09:57:32"）
+* `#define DEBUG_SHOW_TIMESTAMP 2` (默认) - 打印时间戳，但是相对于程序启动时间而不是系统实时时间
+
+* `#define DEBUG_SHOW_THREAD_ID 0` (默认) - 不打印线程ID
+* `#define DEBUG_SHOW_THREAD_ID 1` - 打印当前线程ID
+
 * `#define DEBUG_SHOW_LOCATION 1` (默认) - 在每一行调试输出前加上打印该信息的代码文件名和行号 (例如：file.cpp:233)
 * `#define DEBUG_SHOW_LOCATION 0` - 不显示代码文件名和行号
 

debug.hpp

@@ -84,6 +84,9 @@
 // `#define DEBUG_SHOW_TIMESTAMP 2` (default) - printing timestamp relative to
 // program staring time rather than system real time
 //
+// `#define DEBUG_SHOW_THREAD_ID 0` (default) - do not print the thread id
+// `#define DEBUG_SHOW_THREAD_ID 1` - print the current thread id
+//
 // `#define DEBUG_SHOW_LOCATION 1` (default) - show source location mark before
 // each line of the debug output (e.g. "file.cpp:233")
 // `#define DEBUG_SHOW_LOCATION 0` - do not show the location mark
@@ -298,7 +301,7 @@
 #  include <unordered_map>
 # endif
 # ifndef DEBUG_SOURCE_LOCATION
-#  if __cplusplus >= 202'002L
+#  if __cplusplus >= 202002L
 #   if defined(__has_include)
 #    if __has_include(<source_location>)
 #     include <source_location>
@@ -310,7 +313,7 @@
 #  endif
 # endif
 # ifndef DEBUG_SOURCE_LOCATION
-#  if __cplusplus >= 201'505L
+#  if __cplusplus >= 201505L
 #   if defined(__has_include)
 #    if __has_include(<experimental/source_location>)
 #     include <experimental/source_location>
@@ -352,14 +355,17 @@
 # elif DEBUG_SHOW_TIMESTAMP == 2
 #  include <chrono>
 # endif
+# if DEBUG_SHOW_THREAD_ID
+#  include <thread>
+# endif
 # if defined(__has_include)
 #  if __has_include(<variant>)
 #   include <variant>
 #  endif
 # endif
 # ifndef DEBUG_STRING_VIEW
 #  if defined(__has_include)
-#   if __cplusplus >= 201'703L
+#   if __cplusplus >= 201703L
 #    if __has_include(<string_view>)
 #     include <string_view>
 #     if __cpp_lib_string_view
@@ -373,7 +379,7 @@
 #  include <string>
 #  define DEBUG_STRING_VIEW std::string
 # endif
-# if __cplusplus >= 202'002L
+# if __cplusplus >= 202002L
 #  if defined(__has_cpp_attribute)
 #   if __has_cpp_attribute(unlikely)
 #    define DEBUG_UNLIKELY [[unlikely]]
@@ -462,7 +468,7 @@ struct DEBUG_NODISCARD debug {
     }
 
     struct debug_special_void {
-        char const (&repr())[5] const {
+        char const (&repr() const)[5] {
             return "void";
         }
     };
@@ -722,15 +728,15 @@ struct DEBUG_NODISCARD debug {
             bool add_comma = false;
             std::apply(
                 [&](auto &&...args) {
-                (([&] {
-                    if (add_comma) {
-                        oss << DEBUG_TUPLE_COMMA;
-                    }
-                    add_comma = true;
-                    debug_format(oss, std::forward<decltype(args)>(args));
-                }()),
-                 ...);
-            },
+                    (([&] {
+                         if (add_comma) {
+                             oss << DEBUG_TUPLE_COMMA;
+                         }
+                         add_comma = true;
+                         debug_format(oss, std::forward<decltype(args)>(args));
+                     }()),
+                     ...);
+                },
                 t);
             oss << DEBUG_TUPLE_BRACE[1];
         } else if constexpr (std::is_enum<T>::value) {
@@ -829,6 +835,12 @@ struct DEBUG_NODISCARD debug {
                                      std::declval<T const &>().get()));
     DEBUG_COND(is_optional, (((void)*std::declval<T const &>(), (void)0),
                              ((void)(bool)std::declval<T const &>(), (void)0)));
+    DEBUG_COND(
+        reference_wrapper,
+        (typename std::enable_if<
+            std::is_same<typename T::type &,
+                         decltype(std::declval<T const &>().get())>::value,
+            int>::type)0);
 #  define DEBUG_CON(n, ...) \
       template <class T> \
       struct debug_cond_##n : debug_bool_constant<__VA_ARGS__> {};
@@ -840,9 +852,6 @@ struct DEBUG_NODISCARD debug {
     DEBUG_CON(error_code, std::is_same<T, std::errc>::value ||
                               std::is_same<T, std::error_code>::value ||
                               std::is_same<T, std::error_condition>::value);
-    DEBUG_CON(reference_wrapper,
-              std::is_same<typename T::type &,
-                           decltype(std::declval<T const &>().get())>::value);
 #  if __cpp_char8_t
     DEBUG_CON(unicode_char, std::is_same<T, char8_t>::value ||
                                 std::is_same<T, char16_t>::value ||
@@ -1578,6 +1587,9 @@ struct DEBUG_NODISCARD debug {
         oss << elapsed % 1000;
         oss.flags(flags);
         oss << ' ';
+# endif
+# if DEBUG_SHOW_THREAD_ID
+        oss << '[' << std::this_thread::get_id() << ']' << ' ';
 # endif
         char const *fn = loc.file_name();
         for (char const *fp = fn; *fp; ++fp) {

test.cpp

@@ -1,3 +1,4 @@
+#define DEBUG_SHOW_THREAD_ID 1
 #include "debug.hpp"
 #include <map>
 #include <set>
@@ -50,13 +51,9 @@ struct Student4 {
 #endif
 };
 
-template <class T>
-void func(T const &t) {
-    static_assert(std::is_same<T, char[3]>::value, "T must be std::string");
-}
-
 int main() {
-    func("ki");
+    debug(), 1;
+#if 0
     int i = 42;
     debug(), "the answer:", i;
     std::vector<int> a{1, 2, 3, 4, 5};
@@ -178,6 +175,7 @@ int main() {
     debug(), z14;
 
     return 0;
+#endif
 }
 
 /*