From b58c84457922a2119242fccb93883efcb52e29fd Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Mon, 21 Mar 2016 21:04:10 -0500 Subject: [PATCH] 1.7.1 <- 1.7.0 And 1.7.0 is recalled b/c we accidentally had SecureAlloc by default. --- CMakeLists.txt | 2 +- include/json/version.h | 4 ++-- version | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a89f6e..5decc50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ ENDMACRO() #SET( JSONCPP_VERSION_MAJOR X ) #SET( JSONCPP_VERSION_MINOR Y ) #SET( JSONCPP_VERSION_PATCH Z ) -SET( JSONCPP_VERSION 1.7.0 ) +SET( JSONCPP_VERSION 1.7.1 ) jsoncpp_parse_version( ${JSONCPP_VERSION} JSONCPP_VERSION ) #IF(NOT JSONCPP_VERSION_FOUND) # MESSAGE(FATAL_ERROR "Failed to parse version string properly. Expect X.Y.Z") diff --git a/include/json/version.h b/include/json/version.h index 6317404..9da6d39 100644 --- a/include/json/version.h +++ b/include/json/version.h @@ -3,10 +3,10 @@ #ifndef JSON_VERSION_H_INCLUDED # define JSON_VERSION_H_INCLUDED -# define JSONCPP_VERSION_STRING "1.7.0" +# define JSONCPP_VERSION_STRING "1.7.1" # define JSONCPP_VERSION_MAJOR 1 # define JSONCPP_VERSION_MINOR 7 -# define JSONCPP_VERSION_PATCH 0 +# define JSONCPP_VERSION_PATCH 1 # define JSONCPP_VERSION_QUALIFIER # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8)) diff --git a/version b/version index bd8bf88..943f9cb 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.7.0 +1.7.1