Merge branch 'master' of https://github.com/danielaparker/jsoncons in…

…to csv-dev2
danielaparker · Jan 16, 2025 · c607373 · c607373
2 parents 8e15c2f + 551f344
commit c607373
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -170,7 +170,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Get latest CMake and ninja
-        uses: lukka/[email protected].3
+        uses: lukka/[email protected].4
       - name: cmake
         run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DJSONCONS_BUILD_TESTS=On 
       - name: build
@@ -189,7 +189,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Get latest CMake and ninja
-        uses: lukka/[email protected].3
+        uses: lukka/[email protected].4
       - name: cmake
         run: cmake -S . -B build -DJSONCONS_SANITIZE=ON -DCMAKE_BUILD_TYPE=Debug -DJSONCONS_BUILD_TESTS=On 
       - name: build
@@ -210,7 +210,7 @@ jobs:
         run: apt-get update ; apt-get install -y unzip git
       - uses: actions/checkout@v4
       - name: Get latest CMake and ninja
-        uses: lukka/[email protected].3
+        uses: lukka/[email protected].4
       - name: cmake
         run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DJSONCONS_BUILD_TESTS=On 
       - name: build
@@ -231,7 +231,7 @@ jobs:
         run: apt-get update ; apt-get install -y unzip git
       - uses: actions/checkout@v4
       - name: Get latest CMake and ninja
-        uses: lukka/[email protected].3
+        uses: lukka/[email protected].4
       - name: cmake
         run: cmake -S . -B build -DJSONCONS_SANITIZE=ON -DCMAKE_BUILD_TYPE=Debug -DJSONCONS_BUILD_TESTS=On 
       - name: build

diff --git a/include/jsoncons/detail/grisu3.hpp b/include/jsoncons/detail/grisu3.hpp
@@ -34,7 +34,6 @@ minor modifications.
 #ifndef JSONCONS_DETAIL_GRISU3_HPP
 #define JSONCONS_DETAIL_GRISU3_HPP 
 
-#pragma once
 #include <cassert>
 #include <cinttypes>
 #include <cmath>

diff --git a/include/jsoncons/text_source_adaptor.hpp b/include/jsoncons/text_source_adaptor.hpp
@@ -80,7 +80,6 @@ namespace jsoncons {
     class json_source_adaptor 
     {
     public:
-        using value_type = typename Source::value_type;
         using value_type = typename Source::value_type;
         using source_type = Source;
     private:

diff --git a/include/jsoncons/utility/heap_string.hpp b/include/jsoncons/utility/heap_string.hpp
@@ -12,6 +12,8 @@
 #include <memory> // std::allocator
 
 #include <jsoncons/config/compiler_support.hpp>
+#include <jsoncons/config/jsoncons_config.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 
 namespace jsoncons {
 namespace utility {

diff --git a/include/jsoncons_ext/csv/csv_encoder.hpp b/include/jsoncons_ext/csv/csv_encoder.hpp
@@ -21,6 +21,7 @@
 #include <jsoncons/json_exception.hpp>
 #include <jsoncons/json_visitor.hpp>
 #include <jsoncons/sink.hpp>
+#include <jsoncons_ext/csv/csv_error.hpp>
 #include <jsoncons_ext/csv/csv_options.hpp>
 
 namespace jsoncons { namespace csv {

diff --git a/include/jsoncons_ext/ubjson/ubjson_parser.hpp b/include/jsoncons_ext/ubjson/ubjson_parser.hpp
@@ -16,6 +16,7 @@
 #include <utility> // std::move
 
 #include <jsoncons/config/jsoncons_config.hpp>
+#include <jsoncons/detail/parse_number.hpp>
 #include <jsoncons/json_visitor.hpp>
 #include <jsoncons/ser_context.hpp>
 #include <jsoncons/source.hpp>