jasder
/
simdjson
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Preparing a new patch release.

This commit is contained in:
Daniel Lemire 2020-06-28 12:40:13 -04:00
parent 172d669780
commit 077907b7c3
6 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -7,11 +7,15 @@ project(simdjson
set(PROJECT_VERSION_MAJOR 0)
set(PROJECT_VERSION_MINOR 4)
set(PROJECT_VERSION_PATCH 1)
set(SIMDJSON_LIB_VERSION "0.4.1" CACHE STRING "simdjson library version")
set(PROJECT_VERSION_PATCH 2)
set(SIMDJSON_LIB_VERSION "0.4.2" CACHE STRING "simdjson library version")
set(SIMDJSON_LIB_SOVERSION "2" CACHE STRING "simdjson library soversion")
set(SIMDJSON_GITHUB_REPOSITORY https://github.com/simdjson/simdjson)
# The SIMDJSON_LIB_SOVERSION is 0 for versions before 0.3.0.
# The SIMDJSON_LIB_SOVERSION is 1 for version 0.3.
# The SIMDJSON_LIB_SOVERSION is 2 for version 0.4.
include(GNUInstallDirs)
include(cmake/simdjson-flags.cmake)
include(cmake/simdjson-user-cmakecache.cmake)
@ -43,8 +47,8 @@ add_subdirectory(windows)
if(NOT(SIMDJSON_JUST_LIBRARY))
add_subdirectory(dependencies) ## This needs to be before tools because of cxxopts
add_subdirectory(tools) ## This needs to be before tests because of cxxopts
add_subdirectory(singleheader)
endif()
add_subdirectory(singleheader)
#
# Compile tools / tests / benchmarks

2
Doxyfile
View File

@ -38,7 +38,7 @@ PROJECT_NAME = simdjson
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = "0.4.1"
PROJECT_NUMBER = "0.4.2"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a

4
include/simdjson/simdjson_version.h
View File

@ -4,7 +4,7 @@
#define SIMDJSON_SIMDJSON_VERSION_H
/** The version of simdjson being used (major.minor.revision) */
#define SIMDJSON_VERSION 0.4.1
#define SIMDJSON_VERSION 0.4.2
namespace simdjson {
enum {
@ -19,7 +19,7 @@ enum {
/**
* The revision (major.minor.REVISION) of simdjson being used.
*/
SIMDJSON_VERSION_REVISION = 1
SIMDJSON_VERSION_REVISION = 2
};
} // namespace simdjson

2
singleheader/amalgamate_demo.cpp
View File

@ -1,4 +1,4 @@
/* auto-generated on Fri 26 Jun 2020 20:03:28 EDT. Do not edit! */
/* auto-generated on Sun 28 Jun 2020 12:39:28 EDT. Do not edit! */
#include <iostream>
#include "simdjson.h"

2
singleheader/simdjson.cpp
View File

@ -1,4 +1,4 @@
/* auto-generated on Fri 26 Jun 2020 20:03:28 EDT. Do not edit! */
/* auto-generated on Sun 28 Jun 2020 12:39:28 EDT. Do not edit! */
/* begin file src/simdjson.cpp */
#include "simdjson.h"

14
singleheader/simdjson.h
View File

@ -1,4 +1,4 @@
/* auto-generated on Fri 26 Jun 2020 20:03:28 EDT. Do not edit! */
/* auto-generated on Sun 28 Jun 2020 12:39:28 EDT. Do not edit! */
/* begin file include/simdjson.h */
#ifndef SIMDJSON_H
#define SIMDJSON_H
@ -190,7 +190,6 @@ use a 64-bit target such as x64 or 64-bit ARM.")
#endif
#endif
// workaround for large stack sizes under -O0.
// https://github.com/simdjson/simdjson/issues/691
#ifdef __APPLE__
@ -204,6 +203,13 @@ use a 64-bit target such as x64 or 64-bit ARM.")
#endif
#endif
#if SIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT
// No matter what happened, we undefine SIMDJSON_THREADS_ENABLED and so disable threads.
#undef SIMDJSON_THREADS_ENABLED
#endif
#if defined(__clang__)
#define NO_SANITIZE_UNDEFINED __attribute__((no_sanitize("undefined")))
#elif defined(__GNUC__)
@ -2032,7 +2038,7 @@ SIMDJSON_DISABLE_UNDESIRED_WARNINGS
#define SIMDJSON_SIMDJSON_VERSION_H
/** The version of simdjson being used (major.minor.revision) */
#define SIMDJSON_VERSION 0.4.1
#define SIMDJSON_VERSION 0.4.2
namespace simdjson {
enum {
@ -2047,7 +2053,7 @@ enum {
/**
* The revision (major.minor.REVISION) of simdjson being used.
*/
SIMDJSON_VERSION_REVISION = 1
SIMDJSON_VERSION_REVISION = 2
};
} // namespace simdjson