Skip to content

Commit 5be4d37

Browse files
authored
Merge pull request simdjson#1129 from simdjson/jkeiser/inl
Move inline/* to *-inl.h
2 parents 0a2bca3 + 1e6c9db commit 5be4d37

14 files changed

+3794
-2291
lines changed

HACKING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ simdjson's source structure, from the top level, looks like this:
4343
* simdjson.h: A "main include" that includes files from include/simdjson/. This is equivalent to
4444
the distributed simdjson.h.
4545
* simdjson/*.h: Declarations for public simdjson classes and functions.
46-
* simdjson/inline/*.h: Definitions for public simdjson classes and functions.
46+
* simdjson/*-inl.h: Definitions for public simdjson classes and functions.
4747
* **src:** The source files for non-inlined functionality (e.g. the architecture-specific parser
4848
implementations).
4949
* simdjson.cpp: A "main source" that includes all implementation files from src/. This is

include/simdjson.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@ SIMDJSON_DISABLE_UNDESIRED_WARNINGS
5858
#include "simdjson/dom/parsedjson_iterator.h"
5959

6060
// Inline functions
61-
#include "simdjson/inline/array.h"
62-
#include "simdjson/inline/document_stream.h"
63-
#include "simdjson/inline/document.h"
64-
#include "simdjson/inline/element.h"
65-
#include "simdjson/inline/error.h"
66-
#include "simdjson/inline/object.h"
67-
#include "simdjson/inline/padded_string.h"
68-
#include "simdjson/inline/parsedjson_iterator.h"
69-
#include "simdjson/inline/parser.h"
70-
#include "simdjson/inline/tape_ref.h"
61+
#include "simdjson/dom/array-inl.h"
62+
#include "simdjson/dom/document_stream-inl.h"
63+
#include "simdjson/dom/document-inl.h"
64+
#include "simdjson/dom/element-inl.h"
65+
#include "simdjson/error-inl.h"
66+
#include "simdjson/dom/object-inl.h"
67+
#include "simdjson/padded_string-inl.h"
68+
#include "simdjson/dom/parsedjson_iterator-inl.h"
69+
#include "simdjson/dom/parser-inl.h"
70+
#include "simdjson/internal/tape_ref-inl.h"
7171

7272
SIMDJSON_POP_DISABLE_WARNINGS
7373

include/simdjson/inline/array.h renamed to include/simdjson/dom/array-inl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ inline std::ostream& operator<<(std::ostream& out, const simdjson_result<dom::ar
181181

182182
} // namespace simdjson
183183

184-
#include "simdjson/inline/element.h"
184+
#include "simdjson/dom/element-inl.h"
185185

186186
#if defined(__cpp_lib_ranges)
187187
static_assert(std::ranges::view<simdjson::dom::array>);
File renamed without changes.
File renamed without changes.
File renamed without changes.

singleheader/simdjson.cpp

Lines changed: 3563 additions & 2200 deletions
Large diffs are not rendered by default.

singleheader/simdjson.h

Lines changed: 219 additions & 79 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)