From 5d3755353f169105cb0bc95ee7b1ed433307711b Mon Sep 17 00:00:00 2001
From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com>
Date: Tue, 19 Sep 2023 18:52:52 -0400
Subject: [PATCH] Quick fixes

---
 src/platform/elf.hpp    | 2 +-
 src/platform/mach-o.hpp | 4 ++--
 src/platform/utils.hpp  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/platform/elf.hpp b/src/platform/elf.hpp
index 6ff7c12..921eb4f 100644
--- a/src/platform/elf.hpp
+++ b/src/platform/elf.hpp
@@ -30,7 +30,7 @@ namespace detail {
         FILE* file,
         bool is_little_endian
     ) {
-        static_assert(Bits == 32 || Bits == 64);
+        static_assert(Bits == 32 || Bits == 64, "Unexpected Bits argument");
         using Header = typename std::conditional<Bits == 32, Elf32_Ehdr, Elf64_Ehdr>::type;
         using PHeader = typename std::conditional<Bits == 32, Elf32_Phdr, Elf64_Phdr>::type;
         Header file_header = load_bytes<Header>(file, 0);
diff --git a/src/platform/mach-o.hpp b/src/platform/mach-o.hpp
index e63e7a0..6cdf702 100644
--- a/src/platform/mach-o.hpp
+++ b/src/platform/mach-o.hpp
@@ -69,7 +69,7 @@ namespace detail {
 
     template<std::size_t Bits>
     static uintptr_t macho_get_text_vmaddr_mach(FILE* obj_file, off_t offset, bool is_64, bool should_swap) {
-        static_assert(Bits == 32 || Bits == 64);
+        static_assert(Bits == 32 || Bits == 64, "Unexpected Bits argument");
         using Mach_Header = typename std::conditional<Bits == 32, mach_header, mach_header_64>::type;
         using Segment_Command = typename std::conditional<Bits == 32, segment_command, segment_command_64>::type;
         uint32_t ncmds;
@@ -101,7 +101,7 @@ namespace detail {
             actual_offset += cmd.cmdsize;
         }
         // somehow no __TEXT section was found...
-        CPPTRACE_VERIFY(false, "Couldn't find __TEXT section while parsing Mach-O object")
+        CPPTRACE_VERIFY(false, "Couldn't find __TEXT section while parsing Mach-O object");
         return 0;
     }
 
diff --git a/src/platform/utils.hpp b/src/platform/utils.hpp
index 8d2e13a..eb92667 100644
--- a/src/platform/utils.hpp
+++ b/src/platform/utils.hpp
@@ -382,7 +382,7 @@ namespace detail {
         >::type = 0
     >
     raii_wrapper<T, D> raii_wrap(T&& obj, D deleter) {
-        return {std::move(obj), deleter};
+        return raii_wrapper<T, D>(std::move(obj), deleter);
     }
 
     inline void file_deleter(FILE* ptr) {