Put everything, including internal code, in the abi namespace. Undo the internal:: namespace changes.

Author: jeremy-rifkin

include/cpptrace/gdb_jit.hpp

@@ -5,7 +5,7 @@
 
 #include <cstdint>
 
-namespace cpptrace {
+CPPTRACE_BEGIN_NAMESPACE
 namespace detail {
     // https://sourceware.org/gdb/current/onlinedocs/gdb.html/JIT-Interface.html
     extern "C" {
@@ -37,9 +37,7 @@ namespace detail {
         extern struct jit_descriptor __jit_debug_descriptor;
     }
 }
-}
 
-CPPTRACE_BEGIN_NAMESPACE
 namespace experimental {
     inline void register_jit_objects_from_gdb_jit_interface() {
         clear_all_jit_objects();

src/binary/elf.cpp

@@ -19,8 +19,8 @@
 
 #include <elf.h>
 
-namespace cpptrace {
-namespace internal {
+CPPTRACE_BEGIN_NAMESPACE
+namespace detail {
     elf::elf(
         std::unique_ptr<base_file> file,
         bool is_little_endian,
@@ -213,7 +213,7 @@ namespace internal {
 
     template<typename T, typename std::enable_if<std::is_integral<T>::value, int>::type>
     T elf::byteswap_if_needed(T value) {
-        if(cpptrace::internal::is_little_endian() == is_little_endian) {
+        if(detail::is_little_endian() == is_little_endian) {
             return value;
         } else {
             return byteswap(value);
@@ -462,7 +462,7 @@ namespace internal {
         }
         if(get_cache_mode() == cache_mode::prioritize_memory) {
             return elf::open(object_path)
-                .transform([](elf&& obj) { return maybe_owned<elf>{internal::make_unique<elf>(std::move(obj))}; });
+                .transform([](elf&& obj) { return maybe_owned<elf>{detail::make_unique<elf>(std::move(obj))}; });
         } else {
             static std::mutex m;
             std::unique_lock<std::mutex> lock{m};
@@ -478,6 +478,6 @@ namespace internal {
         }
     }
 }
-}
+CPPTRACE_END_NAMESPACE
 
 #endif

src/binary/elf.hpp

@@ -13,8 +13,8 @@
 #include <string>
 #include <unordered_map>
 
-namespace cpptrace {
-namespace internal {
+CPPTRACE_BEGIN_NAMESPACE
+namespace detail {
     // TODO: make methods const and a bunch of members mutable
     class elf {
         std::unique_ptr<base_file> file;
@@ -137,7 +137,7 @@ namespace internal {
 
     NODISCARD Result<maybe_owned<elf>, internal_error> open_elf_cached(const std::string& object_path);
 }
-}
+CPPTRACE_END_NAMESPACE
 
 #endif
 

src/binary/mach-o.cpp

@@ -30,8 +30,8 @@
 #include <mach-o/stab.h>
 #include <mach-o/arch.h>
 
-namespace cpptrace {
-namespace internal {
+CPPTRACE_BEGIN_NAMESPACE
+namespace detail {
     bool is_mach_o(std::uint32_t magic) {
         switch(magic) {
             case FAT_MAGIC:
@@ -706,7 +706,7 @@ namespace internal {
         if(get_cache_mode() == cache_mode::prioritize_memory) {
             return mach_o::open(object_path)
                 .transform([](mach_o&& obj) {
-                    return maybe_owned<mach_o>{internal::make_unique<mach_o>(std::move(obj))};
+                    return maybe_owned<mach_o>{detail::make_unique<mach_o>(std::move(obj))};
                 });
         } else {
             static std::mutex m;
@@ -723,7 +723,7 @@ namespace internal {
         }
     }
 }
-}
+CPPTRACE_END_NAMESPACE
 
 #pragma GCC diagnostic pop
 

src/binary/mach-o.hpp

@@ -19,8 +19,8 @@
 #include <mach-o/loader.h>
 #include <mach-o/nlist.h>
 
-namespace cpptrace {
-namespace internal {
+CPPTRACE_BEGIN_NAMESPACE
+namespace detail {
     bool file_is_mach_o(cstring_view object_path) noexcept;
 
     struct load_command_entry {
@@ -143,7 +143,7 @@ namespace internal {
 
     NODISCARD Result<maybe_owned<mach_o>, internal_error> open_mach_o_cached(const std::string& object_path);
 }
-}
+CPPTRACE_END_NAMESPACE
 
 #endif
 

src/binary/module_base.cpp

@@ -19,8 +19,8 @@
  #include "binary/pe.hpp"
 #endif
 
-namespace cpptrace {
-namespace internal {
+CPPTRACE_BEGIN_NAMESPACE
+namespace detail {
     #if IS_LINUX
     Result<std::uintptr_t, internal_error> get_module_image_base(const std::string& object_path) {
         static std::mutex mutex;
@@ -94,4 +94,4 @@ namespace internal {
     }
     #endif
 }
-}
+CPPTRACE_END_NAMESPACE

src/binary/module_base.hpp

@@ -6,10 +6,10 @@
 #include <cstdint>
 #include <string>
 
-namespace cpptrace {
-namespace internal {
+CPPTRACE_BEGIN_NAMESPACE
+namespace detail {
     Result<std::uintptr_t, internal_error> get_module_image_base(const std::string& object_path);
 }
-}
+CPPTRACE_END_NAMESPACE
 
 #endif

src/binary/object.cpp

@@ -24,8 +24,8 @@
  #include <windows.h>
 #endif
 
-namespace cpptrace {
-namespace internal {
+CPPTRACE_BEGIN_NAMESPACE
+namespace detail {
     #if IS_LINUX || IS_APPLE
     #if defined(CPPTRACE_HAS_DL_FIND_OBJECT) || defined(CPPTRACE_HAS_DLADDR1)
     std::string resolve_l_name(const char* l_name) {
@@ -187,4 +187,4 @@ namespace internal {
         };
     }
 }
-}
+CPPTRACE_END_NAMESPACE

src/binary/object.hpp

@@ -6,15 +6,14 @@
 #include <vector>
 #include <cstdint>
 
-namespace cpptrace {
-
-namespace internal {
+CPPTRACE_BEGIN_NAMESPACE
+namespace detail {
     object_frame get_frame_object_info(frame_ptr address);
 
     std::vector<object_frame> get_frames_object_info(const std::vector<frame_ptr>& addresses);
 
     object_frame resolve_safe_object_frame(const safe_object_frame& frame);
 }
-}
+CPPTRACE_END_NAMESPACE
 
 #endif

src/binary/pe.cpp

@@ -15,8 +15,8 @@
 #endif
 #include <windows.h>
 
-namespace cpptrace {
-namespace internal {
+CPPTRACE_BEGIN_NAMESPACE
+namespace detail {
     template<typename T, typename std::enable_if<std::is_integral<T>::value, int>::type = 0>
     T pe_byteswap_if_needed(T value) {
         // PE header values are little endian, I think dos e_lfanew should be too
@@ -92,6 +92,6 @@ namespace internal {
         }
     }
 }
-}
+CPPTRACE_END_NAMESPACE
 
 #endif