Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/danielaparker/jsoncons in…
Browse files Browse the repository at this point in the history
…to jsonpath_length
  • Loading branch information
danielaparker committed Jan 24, 2025
2 parents 06759ab + 96e06a5 commit 69250a1
Show file tree
Hide file tree
Showing 11 changed files with 1,690 additions and 410 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion include/jsoncons/basic_json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,6 @@ namespace jsoncons {

using key_type = typename policy_type::template member_key<char_type,char_traits_type,char_allocator_type>;


using reference = basic_json&;
using const_reference = const basic_json&;
using pointer = basic_json*;
Expand Down
1 change: 0 additions & 1 deletion include/jsoncons/detail/grisu3.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ minor modifications.
#ifndef JSONCONS_DETAIL_GRISU3_HPP
#define JSONCONS_DETAIL_GRISU3_HPP

#pragma once
#include <cassert>
#include <cinttypes>
#include <cmath>
Expand Down
2 changes: 2 additions & 0 deletions include/jsoncons/utility/heap_string.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit 69250a1

Please sign in to comment.