Merge branch 'release-0.6.2'

CMakeLists.txt

@@ -10,30 +10,25 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE)
 set(JSONBOX_SOURCES
   src/JsonWritingError.cpp
   src/Value.cpp
-  src/Array.cpp
   src/SolidusEscaper.cpp
   src/Escaper.cpp
   src/Indenter.cpp
   src/IndentCanceller.cpp
   src/JsonParsingError.cpp
   src/Convert.cpp
-  src/Object.cpp
 )
 set(JSONBOX_HEADERS
-  include/JsonBox/Array.h
   include/JsonBox/Convert.h
   include/JsonBox/Escaper.h
   include/JsonBox/Grammar.h
   include/JsonBox/IndentCanceller.h
   include/JsonBox/Indenter.h
   include/JsonBox/JsonParsingError.h
   include/JsonBox/JsonWritingError.h
-  include/JsonBox/Object.h
   include/JsonBox/OutputFilter.h
   include/JsonBox/SolidusEscaper.h
   include/JsonBox/Value.h
   include/JsonBox.h
-  ${CMAKE_CURRENT_BINARY_DIR}/Export.h
 )
 
 # build library
@@ -55,6 +50,14 @@ export(TARGETS JsonBox
   FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
 )
 
+# Macro used to install headers while keeping the directory hierarchy.
+MACRO(INSTALL_HEADERS_WITH_DIRECTORY HEADER_LIST)
+  FOREACH(HEADER ${${HEADER_LIST}})
+    STRING(REGEX MATCH "(.*)[/\\]" DIR ${HEADER})
+	INSTALL(FILES ${HEADER} COMPONENT dev DESTINATION ${DIR})
+  ENDFOREACH(HEADER)
+ENDMACRO(INSTALL_HEADERS_WITH_DIRECTORY)
+
 # install
 install(TARGETS JsonBox
   COMPONENT lib
@@ -64,9 +67,10 @@ install(TARGETS JsonBox
   RUNTIME DESTINATION bin
   INCLUDES DESTINATION include
 )
-install(FILES ${JSONBOX_HEADERS}
+INSTALL_HEADERS_WITH_DIRECTORY(JSONBOX_HEADERS)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Export.h
   COMPONENT dev
-  DESTINATION include
+  DESTINATION include/JsonBox
 )
 install(EXPORT ${PROJECT_NAME}
   DESTINATION lib${LIB_SUFFIX}/cmake

Doxyfile

@@ -32,7 +32,7 @@ PROJECT_NAME           = "Json Box"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.6.1
+PROJECT_NUMBER         = 0.6.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

include/JsonBox.h

@@ -25,7 +25,5 @@
  */
 
 #include <JsonBox/Value.h>
-#include <JsonBox/Array.h>
-#include <JsonBox/Object.h>
 
 #endif

include/JsonBox/Convert.h

@@ -1,12 +1,13 @@
 #ifndef JB_CONVERTER_H
 #define JB_CONVERTER_H
 
+#include <vector>
 #include <string>
 #include <stdint.h>
 
 namespace JsonBox {
 
-	typedef std::basic_string<int32_t> String32;
+	typedef std::vector<int32_t> String32;
 
 	/**
 	 * This class is used to encode/decode/transcode UTF8, 16 and 32.