Skip to content

Commit 615218a

Browse files
jkeiserjkeiser
authored
Merge pull request simdjson#2237 from simdjson/jkeiser/simdjson-vscode
Reduce errors in vscode
2 parents 7a9ff93 + 4c1b0a4 commit 615218a

10 files changed

Lines changed: 22 additions & 105 deletions

File tree

‎.clangd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ CompileFlags:
2525
Diagnostics:
2626
Suppress:
2727
- pp_including_mainfile_in_preamble
28+
- unused-includes
2829
---
2930
# Amalgamated files that require or partly define an implementation
3031
If:

‎.vscode/settings.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,10 @@
110110
"semaphore": "cpp",
111111
"stop_token": "cpp",
112112
"cfenv": "cpp"
113+
},
114+
"cmake.configureSettings": {
115+
"CMAKE_EXPORT_COMPILE_COMMANDS": "YES",
116+
"SIMDJSON_DEVELOPER_MODE": "ON",
117+
"SIMDJSON_SINGLEHEADER": "OFF"
113118
}
114119
}

‎CMakeLists.txt‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ endif()
5151
if(is_top_project)
5252
option(SIMDJSON_DEVELOPER_MODE "Enable targets for developing simdjson" OFF)
5353
option(BUILD_SHARED_LIBS "Build simdjson as a shared library" OFF)
54+
option(SIMDJSON_SINGLEHEADER "Disable singleheader generation" ON)
5455
endif()
5556

5657
include(cmake/handle-deprecations.cmake)
@@ -155,11 +156,13 @@ endif()
155156
include(CMakePackageConfigHelpers)
156157
include(GNUInstallDirs)
157158

158-
install(
159-
FILES singleheader/simdjson.h
160-
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
161-
COMPONENT simdjson_Development
162-
)
159+
if(SIMDJSON_SINGLEHEADER)
160+
install(
161+
FILES singleheader/simdjson.h
162+
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
163+
COMPONENT simdjson_Development
164+
)
165+
endif()
163166

164167
install(
165168
TARGETS simdjson
@@ -286,8 +289,9 @@ add_subdirectory(tools) ## This needs to be before tests because of cxxopts
286289
# most of the data has been moved to https://github.com/simdjson/simdjson-data
287290
add_subdirectory(jsonexamples)
288291

289-
292+
if(SIMDJSON_SINGLEHEADER)
290293
add_subdirectory(singleheader)
294+
endif()
291295

292296

293297

‎include/simdjson/generic/ondemand/document-inl.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
#ifndef SIMDJSON_CONDITIONAL_INCLUDE
44
#define SIMDJSON_GENERIC_ONDEMAND_DOCUMENT_INL_H
55
#include "simdjson/generic/ondemand/base.h"
6-
#include "simdjson/generic/ondemand/array-inl.h"
76
#include "simdjson/generic/ondemand/array_iterator.h"
87
#include "simdjson/generic/ondemand/document.h"
9-
#include "simdjson/generic/ondemand/json_iterator-inl.h"
10-
#include "simdjson/generic/ondemand/json_path_to_pointer_conversion.h"
11-
#include "simdjson/generic/ondemand/json_path_to_pointer_conversion-inl.h"
128
#include "simdjson/generic/ondemand/json_type.h"
13-
#include "simdjson/generic/ondemand/object-inl.h"
149
#include "simdjson/generic/ondemand/raw_json_string.h"
1510
#include "simdjson/generic/ondemand/value.h"
11+
#include "simdjson/generic/ondemand/array-inl.h"
12+
#include "simdjson/generic/ondemand/json_iterator-inl.h"
13+
#include "simdjson/generic/ondemand/object-inl.h"
1614
#include "simdjson/generic/ondemand/value_iterator-inl.h"
1715
#endif // SIMDJSON_CONDITIONAL_INCLUDE
1816

‎include/simdjson/generic/ondemand/document_stream.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ class document_stream {
316316
friend class document;
317317
friend class json_iterator;
318318
friend struct simdjson_result<ondemand::document_stream>;
319-
friend struct internal::simdjson_result_base<ondemand::document_stream>;
319+
friend struct simdjson::internal::simdjson_result_base<ondemand::document_stream>;
320320
}; // document_stream
321321

322322
} // namespace ondemand

‎include/simdjson/generic/ondemand/json_path_to_pointer_conversion-inl.h‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎include/simdjson/generic/ondemand/json_path_to_pointer_conversion.h‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎include/simdjson/generic/ondemand/parser.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ class parser {
340340

341341
private:
342342
/** @private [for benchmarking access] The implementation to use */
343-
std::unique_ptr<internal::dom_parser_implementation> implementation{};
343+
std::unique_ptr<simdjson::internal::dom_parser_implementation> implementation{};
344344
size_t _capacity{0};
345345
size_t _max_capacity;
346346
size_t _max_depth{DEFAULT_MAX_DEPTH};

‎include/simdjson/generic/ondemand/value-inl.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
#include "simdjson/generic/ondemand/array.h"
77
#include "simdjson/generic/ondemand/array_iterator.h"
88
#include "simdjson/generic/ondemand/json_iterator.h"
9-
#include "simdjson/generic/ondemand/json_path_to_pointer_conversion.h"
10-
#include "simdjson/generic/ondemand/json_path_to_pointer_conversion-inl.h"
119
#include "simdjson/generic/ondemand/json_type.h"
1210
#include "simdjson/generic/ondemand/object.h"
1311
#include "simdjson/generic/ondemand/raw_json_string.h"

‎include/simdjson/generic/ondemand/value_iterator-inl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#include "simdjson/generic/atomparsing.h"
77
#include "simdjson/generic/numberparsing.h"
88
#include "simdjson/generic/ondemand/json_iterator.h"
9+
#include "simdjson/generic/ondemand/value_iterator.h"
910
#include "simdjson/generic/ondemand/json_type-inl.h"
1011
#include "simdjson/generic/ondemand/raw_json_string-inl.h"
11-
#include "simdjson/generic/ondemand/value_iterator.h"
1212
#endif // SIMDJSON_CONDITIONAL_INCLUDE
1313

1414
namespace simdjson {

0 commit comments

Comments
 (0)