Merge pull request #332 from beached/v3

Updated to header_libraries 2.73.1, this fixes mingw issues with tests
beached · Oct 29, 2022 · cb9ff24 · cb9ff24
2 parents 4b8ddaa + a6d50d9
commit cb9ff24
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@
 cmake_minimum_required( VERSION 3.14 )
 
 project( "daw-json-link"
-         VERSION "3.2.0"
+         VERSION "3.2.1"
          DESCRIPTION "Static JSON parsing in C++"
          HOMEPAGE_URL "https://github.com/beached/daw_json_link"
          LANGUAGES C CXX )

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -17,7 +17,7 @@ include( FetchContent )
 FetchContent_Declare(
         daw_header_libraries
         GIT_REPOSITORY https://github.com/beached/header_libraries.git
-        GIT_TAG v2.72.1
+        GIT_TAG v2.73.1
 )
 
 FetchContent_Declare(

diff --git a/include/daw/json/impl/to_daw_json_string.h b/include/daw/json/impl/to_daw_json_string.h
@@ -26,11 +26,11 @@
 #include <daw/daw_traits.h>
 #include <daw/daw_utility.h>
 #include <daw/daw_visit.h>
+#include <daw/third_party/dragonbox/dragonbox.h>
 #include <daw/utf8/unchecked.h>
 
 #include <array>
 #include <ciso646>
-#include <daw/third_party/dragonbox/dragonbox.h>
 #include <optional>
 #include <sstream>
 #include <string>
@@ -1326,7 +1326,7 @@ namespace daw::json {
 			// This is only ever called in a constant expression. But will not
 			// compile if exceptions are disabled and it tries to throw
 			template<typename Name>
-			missing_required_mapping_for<Name> missing_required_mapping_error( ) {
+			DAW_ATTRIB_NOINLINE void missing_required_mapping_error( ) {
 #ifdef DAW_USE_EXCEPTIONS
 				throw missing_required_mapping_for<Name>{ };
 #else
@@ -1539,7 +1539,8 @@ namespace daw::json {
 					if( ( whole_dig < -4 ) | ( whole_dig > 6 ) ) {
 						char buff[50]{ };
 						char *ptr = buff;
-						ptr = daw::jkj::dragonbox::to_chars_detail::to_chars( dec, ptr, digits );
+						ptr = daw::jkj::dragonbox::to_chars_detail::to_chars( dec, ptr,
+						                                                      digits );
 						out_it.copy_buffer( buff, ptr );
 						return out_it;
 					}

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -885,7 +885,7 @@ include( ./cmake/git_properties.cmake )
 if( GIT_FOUND )
     message( STATUS "Git revision: ${SOURCE_CONTROL_REVISION}" )
     add_executable( json_benchmark src/json_benchmark.cpp )
-    target_compile_definitions( json_benchmark PRIVATE -DSOURCE_CONTROL_REVISION= "${BUILD_VERSION}" )
+    target_compile_definitions( json_benchmark PRIVATE -DSOURCE_CONTROL_REVISION="${BUILD_VERSION}" )
     target_link_libraries( json_benchmark PRIVATE json_test )
     if( DEFINED MSVC AND NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" )
         add_compile_options( "/bigobj" )