Fixes the build for c++20 and new version of boost

2 files changed, 6 insertions, 8 deletions

diff --git a/binparse/CMakeLists.txt b/binparse/CMakeLists.txt
index e436331..6c396e3 100644
--- a/binparse/CMakeLists.txt
+++ b/binparse/CMakeLists.txt
@@ -11,10 +11,6 @@ target_include_directories(binparse
 	INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-target_compile_options(binparse
-	PUBLIC "-std=c++14"
-)
-
 target_link_libraries(binparse
 	PRIVATE fusion-utils
-)
\ No newline at end of file
+)
diff --git a/binparse/parse.cpp b/binparse/parse.cpp
index de0f04d..6887f43 100644
--- a/binparse/parse.cpp
+++ b/binparse/parse.cpp
@@ -1,12 +1,14 @@
 #include "parse.hpp"
 
+#include <istream>
+
 namespace binparse {
 
 UnexpectedEOS::UnexpectedEOS()
 : std::runtime_error("Unexpected end of stream.")
 {}
 
-UnexpectedEOS::UnexpectedEOS(std::__cxx11::string location)
+UnexpectedEOS::UnexpectedEOS(std::string location)
 : std::runtime_error("Unexpected end of stream after " + location)
 {}
 
@@ -80,7 +82,7 @@ Offset16 parse<Offset16>(std::istream& is, std::string name) {
 }
 
 template<>
-Value24 parse<Value24>(std::istream& is, std::__cxx11::string name)
+Value24 parse<Value24>(std::istream& is, std::string name)
 {
 	return Value24(parse<std::array<uint8_t, 3>>(is, name));	
 }
@@ -147,4 +149,4 @@ void dump_bytes(std::istream& is, std::vector<uint8_t>& buffer, std::string name
 	}
 }
 
-}
\ No newline at end of file
+}