Skip to content

Commit 37be808

Browse files
jeremy-rifkinjeremy-rifkin
committed
Put everything, including internal code, in the abi namespace. Undo the internal:: namespace changes.
1 parent a3dce5b commit 37be808

File tree

90 files changed

+419
-423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+419
-423
lines changed

‎include/cpptrace/gdb_jit.hpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <cstdint>
77

8-
namespace cpptrace {
8+
CPPTRACE_BEGIN_NAMESPACE
99
namespace detail {
1010
// https://sourceware.org/gdb/current/onlinedocs/gdb.html/JIT-Interface.html
1111
extern "C" {
@@ -37,9 +37,7 @@ namespace detail {
3737
extern struct jit_descriptor __jit_debug_descriptor;
3838
}
3939
}
40-
}
4140

42-
CPPTRACE_BEGIN_NAMESPACE
4341
namespace experimental {
4442
inline void register_jit_objects_from_gdb_jit_interface() {
4543
clear_all_jit_objects();

‎src/binary/elf.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include <elf.h>
2121

22-
namespace cpptrace {
23-
namespace internal {
22+
CPPTRACE_BEGIN_NAMESPACE
23+
namespace detail {
2424
elf::elf(
2525
std::unique_ptr<base_file> file,
2626
bool is_little_endian,
@@ -213,7 +213,7 @@ namespace internal {
213213

214214
template<typename T, typename std::enable_if<std::is_integral<T>::value, int>::type>
215215
T elf::byteswap_if_needed(T value) {
216-
if(cpptrace::internal::is_little_endian() == is_little_endian) {
216+
if(detail::is_little_endian() == is_little_endian) {
217217
return value;
218218
} else {
219219
return byteswap(value);
@@ -462,7 +462,7 @@ namespace internal {
462462
}
463463
if(get_cache_mode() == cache_mode::prioritize_memory) {
464464
return elf::open(object_path)
465-
.transform([](elf&& obj) { return maybe_owned<elf>{internal::make_unique<elf>(std::move(obj))}; });
465+
.transform([](elf&& obj) { return maybe_owned<elf>{detail::make_unique<elf>(std::move(obj))}; });
466466
} else {
467467
static std::mutex m;
468468
std::unique_lock<std::mutex> lock{m};
@@ -478,6 +478,6 @@ namespace internal {
478478
}
479479
}
480480
}
481-
}
481+
CPPTRACE_END_NAMESPACE
482482

483483
#endif

‎src/binary/elf.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include <string>
1414
#include <unordered_map>
1515

16-
namespace cpptrace {
17-
namespace internal {
16+
CPPTRACE_BEGIN_NAMESPACE
17+
namespace detail {
1818
// TODO: make methods const and a bunch of members mutable
1919
class elf {
2020
std::unique_ptr<base_file> file;
@@ -137,7 +137,7 @@ namespace internal {
137137

138138
NODISCARD Result<maybe_owned<elf>, internal_error> open_elf_cached(const std::string& object_path);
139139
}
140-
}
140+
CPPTRACE_END_NAMESPACE
141141

142142
#endif
143143

‎src/binary/mach-o.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include <mach-o/stab.h>
3131
#include <mach-o/arch.h>
3232

33-
namespace cpptrace {
34-
namespace internal {
33+
CPPTRACE_BEGIN_NAMESPACE
34+
namespace detail {
3535
bool is_mach_o(std::uint32_t magic) {
3636
switch(magic) {
3737
case FAT_MAGIC:
@@ -706,7 +706,7 @@ namespace internal {
706706
if(get_cache_mode() == cache_mode::prioritize_memory) {
707707
return mach_o::open(object_path)
708708
.transform([](mach_o&& obj) {
709-
return maybe_owned<mach_o>{internal::make_unique<mach_o>(std::move(obj))};
709+
return maybe_owned<mach_o>{detail::make_unique<mach_o>(std::move(obj))};
710710
});
711711
} else {
712712
static std::mutex m;
@@ -723,7 +723,7 @@ namespace internal {
723723
}
724724
}
725725
}
726-
}
726+
CPPTRACE_END_NAMESPACE
727727

728728
#pragma GCC diagnostic pop
729729

‎src/binary/mach-o.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include <mach-o/loader.h>
2020
#include <mach-o/nlist.h>
2121

22-
namespace cpptrace {
23-
namespace internal {
22+
CPPTRACE_BEGIN_NAMESPACE
23+
namespace detail {
2424
bool file_is_mach_o(cstring_view object_path) noexcept;
2525

2626
struct load_command_entry {
@@ -143,7 +143,7 @@ namespace internal {
143143

144144
NODISCARD Result<maybe_owned<mach_o>, internal_error> open_mach_o_cached(const std::string& object_path);
145145
}
146-
}
146+
CPPTRACE_END_NAMESPACE
147147

148148
#endif
149149

‎src/binary/module_base.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include "binary/pe.hpp"
2020
#endif
2121

22-
namespace cpptrace {
23-
namespace internal {
22+
CPPTRACE_BEGIN_NAMESPACE
23+
namespace detail {
2424
#if IS_LINUX
2525
Result<std::uintptr_t, internal_error> get_module_image_base(const std::string& object_path) {
2626
static std::mutex mutex;
@@ -94,4 +94,4 @@ namespace internal {
9494
}
9595
#endif
9696
}
97-
}
97+
CPPTRACE_END_NAMESPACE

‎src/binary/module_base.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#include <cstdint>
77
#include <string>
88

9-
namespace cpptrace {
10-
namespace internal {
9+
CPPTRACE_BEGIN_NAMESPACE
10+
namespace detail {
1111
Result<std::uintptr_t, internal_error> get_module_image_base(const std::string& object_path);
1212
}
13-
}
13+
CPPTRACE_END_NAMESPACE
1414

1515
#endif

‎src/binary/object.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include <windows.h>
2525
#endif
2626

27-
namespace cpptrace {
28-
namespace internal {
27+
CPPTRACE_BEGIN_NAMESPACE
28+
namespace detail {
2929
#if IS_LINUX || IS_APPLE
3030
#if defined(CPPTRACE_HAS_DL_FIND_OBJECT) || defined(CPPTRACE_HAS_DLADDR1)
3131
std::string resolve_l_name(const char* l_name) {
@@ -187,4 +187,4 @@ namespace internal {
187187
};
188188
}
189189
}
190-
}
190+
CPPTRACE_END_NAMESPACE

‎src/binary/object.hpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
#include <vector>
77
#include <cstdint>
88

9-
namespace cpptrace {
10-
11-
namespace internal {
9+
CPPTRACE_BEGIN_NAMESPACE
10+
namespace detail {
1211
object_frame get_frame_object_info(frame_ptr address);
1312

1413
std::vector<object_frame> get_frames_object_info(const std::vector<frame_ptr>& addresses);
1514

1615
object_frame resolve_safe_object_frame(const safe_object_frame& frame);
1716
}
18-
}
17+
CPPTRACE_END_NAMESPACE
1918

2019
#endif

‎src/binary/pe.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#endif
1616
#include <windows.h>
1717

18-
namespace cpptrace {
19-
namespace internal {
18+
CPPTRACE_BEGIN_NAMESPACE
19+
namespace detail {
2020
template<typename T, typename std::enable_if<std::is_integral<T>::value, int>::type = 0>
2121
T pe_byteswap_if_needed(T value) {
2222
// PE header values are little endian, I think dos e_lfanew should be too
@@ -92,6 +92,6 @@ namespace internal {
9292
}
9393
}
9494
}
95-
}
95+
CPPTRACE_END_NAMESPACE
9696

9797
#endif

0 commit comments

Comments
 (0)