Imported Upstream version 1.7.2

Change-Id: Ia68c1fdd604232635c5b636ba98ac0a84beffbcb
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5decc50..7787850 100644 (file)
--- 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.1 )
+SET( JSONCPP_VERSION 1.7.2 )
 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 9da6d39..18ce358 100644 (file)
--- 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.1"
+# define JSONCPP_VERSION_STRING "1.7.2"
 # define JSONCPP_VERSION_MAJOR 1
 # define JSONCPP_VERSION_MINOR 7
-# define JSONCPP_VERSION_PATCH 1
+# define JSONCPP_VERSION_PATCH 2
 # define JSONCPP_VERSION_QUALIFIER
 # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8))
 

diff --git a/src/lib_json/json_tool.h b/src/lib_json/json_tool.h
index ec2b1f2..d16d7b8 100644 (file)
--- a/src/lib_json/json_tool.h
+++ b/src/lib_json/json_tool.h
@@ -63,7 +63,7 @@ typedef char UIntToStringBuffer[uintToStringBufferSize];
 static inline void uintToString(LargestUInt value, char*& current) {
   *--current = 0;
   do {
-    *--current = static_cast<signed char>(value % 10U + static_cast<unsigned>('0'));
+    *--current = static_cast<char>(value % 10U + static_cast<unsigned>('0'));
     value /= 10;
   } while (value != 0);
 }

diff --git a/version b/version
index 943f9cb..f8a696c 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-1.7.1
+1.7.2