Skip to content

Commit 3116e29

Browse files
authored
Release candidate (simdjson#655)
* Release candidate
1 parent d2406f2 commit 3116e29

File tree

6 files changed

+634
-818
lines changed

6 files changed

+634
-818
lines changed

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ if (NOT CMAKE_BUILD_TYPE)
55
set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
66
endif()
77

8-
project(simdjson
9-
DESCRIPTION "Parsing gigabytes of JSON per second"
8+
project(simdjson
9+
DESCRIPTION "Parsing gigabytes of JSON per second"
1010
LANGUAGES CXX
1111
)
1212

@@ -26,9 +26,9 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
2626

2727
set(SIMDJSON_LIB_NAME simdjson)
2828
set(PROJECT_VERSION_MAJOR 0)
29-
set(PROJECT_VERSION_MINOR 2)
30-
set(PROJECT_VERSION_PATCH 1)
31-
set(SIMDJSON_LIB_VERSION "0.2.1" CACHE STRING "simdjson library version")
29+
set(PROJECT_VERSION_MINOR 3)
30+
set(PROJECT_VERSION_PATCH 0)
31+
set(SIMDJSON_LIB_VERSION "0.3.0" CACHE STRING "simdjson library version")
3232
set(SIMDJSON_LIB_SOVERSION "0" CACHE STRING "simdjson library soversion")
3333

3434
option(SIMDJSON_IMPLEMENTATION_HASWELL "Include the haswell implementation" ON)

include/simdjson/simdjson_version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#define SIMDJSON_SIMDJSON_VERSION_H
55

66
/** The version of simdjson being used (major.minor.revision) */
7-
#define SIMDJSON_VERSION 0.2.1
7+
#define SIMDJSON_VERSION 0.3.0
88

99
namespace simdjson {
1010
enum {
@@ -15,11 +15,11 @@ enum {
1515
/**
1616
* The minor version (major.MINOR.revision) of simdjson being used.
1717
*/
18-
SIMDJSON_VERSION_MINOR = 2,
18+
SIMDJSON_VERSION_MINOR = 3,
1919
/**
2020
* The revision (major.minor.REVISION) of simdjson being used.
2121
*/
22-
SIMDJSON_VERSION_REVISION = 1
22+
SIMDJSON_VERSION_REVISION = 0
2323
};
2424
} // namespace simdjson
2525

singleheader/amalgamation_demo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on Sun Mar 29 15:07:05 PDT 2020. Do not edit! */
1+
/* auto-generated on Tue 31 Mar 2020 17:00:28 EDT. Do not edit! */
22

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

singleheader/simdjson.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on Sun Mar 29 15:07:05 PDT 2020. Do not edit! */
1+
/* auto-generated on Tue 31 Mar 2020 17:00:28 EDT. Do not edit! */
22
#include "simdjson.h"
33

44
/* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */
@@ -68,11 +68,11 @@ POSSIBILITY OF SUCH DAMAGE.
6868
namespace simdjson {
6969

7070
// Can be found on Intel ISA Reference for CPUID
71-
constexpr uint32_t cpuid_avx2_bit = 1 << 5; // Bit 5 of EBX for EAX=0x7
72-
constexpr uint32_t cpuid_bmi1_bit = 1 << 3; // bit 3 of EBX for EAX=0x7
73-
constexpr uint32_t cpuid_bmi2_bit = 1 << 8; // bit 8 of EBX for EAX=0x7
74-
constexpr uint32_t cpuid_sse42_bit = 1 << 20; // bit 20 of ECX for EAX=0x1
75-
constexpr uint32_t cpuid_pclmulqdq_bit = 1 << 1; // bit 1 of ECX for EAX=0x1
71+
constexpr uint32_t cpuid_avx2_bit = 1 << 5; ///< @private Bit 5 of EBX for EAX=0x7
72+
constexpr uint32_t cpuid_bmi1_bit = 1 << 3; ///< @private bit 3 of EBX for EAX=0x7
73+
constexpr uint32_t cpuid_bmi2_bit = 1 << 8; ///< @private bit 8 of EBX for EAX=0x7
74+
constexpr uint32_t cpuid_sse42_bit = 1 << 20; ///< @private bit 20 of ECX for EAX=0x1
75+
constexpr uint32_t cpuid_pclmulqdq_bit = 1 << 1; ///< @private bit 1 of ECX for EAX=0x1
7676

7777
enum instruction_set {
7878
DEFAULT = 0x0,

0 commit comments

Comments
 (0)