Skip to content

Commit 32bc0da

Browse files
committed
Regenerate singleheader
1 parent 66acab4 commit 32bc0da

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

singleheader/README.md

100755100644
File mode changed.

singleheader/amalgamate_demo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on Thu Apr 23 09:19:14 PDT 2020. Do not edit! */
1+
/* auto-generated on Thu Apr 23 15:36:58 PDT 2020. Do not edit! */
22

33
#include <iostream>
44
#include "simdjson.h"

singleheader/simdjson.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on Thu Apr 23 09:19:14 PDT 2020. Do not edit! */
1+
/* auto-generated on Thu Apr 23 15:36:58 PDT 2020. Do not edit! */
22
#include "simdjson.h"
33

44
/* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */
@@ -502,7 +502,7 @@ const detect_best_supported_implementation_on_first_use detect_best_supported_im
502502

503503
internal::atomic_ptr<const implementation> active_implementation{&internal::detect_best_supported_implementation_on_first_use_singleton};
504504

505-
constexpr const std::initializer_list<const implementation *> available_implementation_pointers {
505+
const std::initializer_list<const implementation *> available_implementation_pointers {
506506
#if SIMDJSON_IMPLEMENTATION_HASWELL
507507
&haswell_singleton,
508508
#endif

singleheader/simdjson.h

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on Thu Apr 23 09:19:14 PDT 2020. Do not edit! */
1+
/* auto-generated on Thu Apr 23 15:36:58 PDT 2020. Do not edit! */
22
/* begin file simdjson.h */
33
#ifndef SIMDJSON_H
44
#define SIMDJSON_H
@@ -103,6 +103,20 @@ enum {
103103
#define IS_ARM64 1
104104
#endif
105105

106+
#if (!defined(IS_X86_64)) && (!defined(IS_ARM64))
107+
#if _MSC_VER
108+
#pragma message("The simdjson library is designed\
109+
for 64-bit processors and it seems that you are not\
110+
compiling for a known 64-bit platform. All fast kernels\
111+
will be disabled and performance may be poor. Please\
112+
use a 64-bt target such as x64 or 64-bit ARM.")
113+
#else
114+
#error "The simdjson library is designed\
115+
for 64-bit processors. It seems that you are not\
116+
compiling for a known 64-bit platform."
117+
#endif
118+
#endif // (!defined(IS_X86_64)) && (!defined(IS_ARM64))
119+
106120
// this is almost standard?
107121
#undef STRINGIFY_IMPLEMENTATION_
108122
#undef STRINGIFY
@@ -344,6 +358,7 @@ constexpr size_t DEFAULT_MAX_DEPTH = 1024;
344358
#define SIMDJSON_PUSH_DISABLE_WARNINGS _Pragma("GCC diagnostic push")
345359
// gcc doesn't seem to disable all warnings with all and extra, add warnings here as necessary
346360
#define SIMDJSON_PUSH_DISABLE_ALL_WARNINGS SIMDJSON_PUSH_DISABLE_WARNINGS \
361+
SIMDJSON_DISABLE_GCC_WARNING(-Weffc++) \
347362
SIMDJSON_DISABLE_GCC_WARNING(-Wall) \
348363
SIMDJSON_DISABLE_GCC_WARNING(-Wconversion) \
349364
SIMDJSON_DISABLE_GCC_WARNING(-Wextra) \

0 commit comments

Comments
 (0)