Skip to content

Commit 99667f7

Browse files
jkeiserjkeiser
committed
Create top level simdjson.h (simdjson#515)
- Allows everyone to #include the same way, singleheader or not.
1 parent 0b21203 commit 99667f7

51 files changed

Lines changed: 2621 additions & 2608 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎amalgamation.sh‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,7 @@ stage2_build_tape.cpp
2727

2828
# order matters
2929
ALLCHEADERS="
30-
simdjson/simdjson_version.h
31-
simdjson/portability.h
32-
simdjson/isadetection.h
33-
simdjson/jsonformatutils.h
34-
simdjson/simdjson.h
35-
simdjson/common_defs.h
36-
simdjson/padded_string.h
37-
simdjson/jsonioutil.h
38-
simdjson/jsonminifier.h
39-
simdjson/document.h
40-
simdjson/parsedjson.h
41-
simdjson/jsonparser.h
42-
simdjson/jsonstream.h
30+
simdjson.h
4331
"
4432

4533
found_includes=()

‎benchmark/bench_parse_call.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include <benchmark/benchmark.h>
2-
#include "simdjson/document.h"
3-
#include "simdjson/jsonparser.h"
2+
#include "simdjson.h"
43
using namespace simdjson;
54
using namespace benchmark;
65
using namespace std;

‎benchmark/benchfeatures.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,8 @@
2929
#ifdef __linux__
3030
#include <libgen.h>
3131
#endif
32-
//#define DEBUG
33-
#include "simdjson/common_defs.h"
34-
#include "simdjson/isadetection.h"
35-
#include "simdjson/jsonioutil.h"
36-
#include "simdjson/document.h"
32+
33+
#include "simdjson.h"
3734

3835
#include <functional>
3936

‎benchmark/benchmarker.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@
3232
#include <libgen.h>
3333
#endif
3434
//#define DEBUG
35-
#include "simdjson/common_defs.h"
36-
#include "simdjson/isadetection.h"
37-
#include "simdjson/jsonioutil.h"
38-
#include "simdjson/jsonparser.h"
39-
#include "simdjson/document.h"
35+
#include "simdjson.h"
4036

4137
#include <functional>
4238

‎benchmark/distinctuseridcompetition.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#include "simdjson/jsonioutil.h"
2-
#include "simdjson/document.h"
1+
#include "simdjson.h"
32
#include <algorithm>
43
#include <unistd.h>
54
#include <vector>

‎benchmark/event_counter.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@
2929
#ifdef __linux__
3030
#include <libgen.h>
3131
#endif
32-
//#define DEBUG
33-
#include "simdjson/common_defs.h"
34-
#include "simdjson/isadetection.h"
32+
33+
#include "simdjson.h"
3534

3635
using std::string;
3736
using std::vector;

‎benchmark/get_corpus_benchmark.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11

2-
#include "simdjson/common_defs.h"
3-
#include "simdjson/jsonioutil.h"
4-
#include "simdjson/jsonparser.h"
2+
#include "simdjson.h"
53
#include <chrono>
64
#include <cstring>
75
#include <iostream>

‎benchmark/minifiercompetition.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
#include <unistd.h>
33

44
#include "benchmark.h"
5-
#include "simdjson/jsonioutil.h"
6-
#include "simdjson/jsonminifier.h"
7-
#include "simdjson/jsonparser.h"
5+
#include "simdjson.h"
86

97
// #define RAPIDJSON_SSE2 // bad
108
// #define RAPIDJSON_SSE42 // bad

‎benchmark/parse.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,8 @@
2828
#ifdef __linux__
2929
#include <libgen.h>
3030
#endif
31-
//#define DEBUG
32-
#include "simdjson/common_defs.h"
33-
#include "simdjson/isadetection.h"
34-
#include "simdjson/jsonioutil.h"
35-
#include "simdjson/document.h"
31+
32+
#include "simdjson.h"
3633

3734
#include <functional>
3835

‎benchmark/parse_stream.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
#include <algorithm>
33
#include <chrono>
44
#include <vector>
5-
#include "simdjson/jsonstream.h"
5+
#include "simdjson.h"
66
#include <map>
7-
#include "simdjson/jsonparser.h"
8-
#include "simdjson/parsedjson.h"
97

108
#define NB_ITERATION 5
119
#define MIN_BATCH_SIZE 200000

0 commit comments

Comments
 (0)