Merge branch 'develop'

Author: ludocode

.travis.yml

@@ -1,5 +1,11 @@
 language: c
 
+addons:
+  apt:
+    packages:
+      - clang
+      - valgrind
+
 script: tools/ci.sh
 
 compiler:
@@ -10,9 +16,3 @@ compiler:
 env:
   - AMALGAMATED=1
   - STANDARD=1
-
-# travis doesn't currently have scan-build and valgrind by default
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get -y install valgrind
-  - bash -c 'if [[ "$CC" == "scan-build" ]]; then sudo apt-get -y install clang; fi'

Doxyfile

@@ -3,8 +3,6 @@
 PROJECT_NAME = "MPack"
 PROJECT_BRIEF = "A C encoding/decoding library for the MessagePack serialization format."
 
-# This is the only place where the version number is defined.
-# The packaging script pulls the version number from here.
 PROJECT_NUMBER = develop
 
 INPUT = \

SConstruct

@@ -45,7 +45,6 @@ allconfigs = noioconfigs + ["-DMPACK_STDIO=1"]
 debugflags = ["-DDEBUG", "-O0"]
 releaseflags = ["-Os"]
 cflags = ["-std=c99", "-Wc++-compat"]
-cxxflags = ["-xc++", "-std=c++98"]
 
 
 # Functions to add a variant build. One variant build will build and run the
@@ -98,11 +97,17 @@ if ARGUMENTS.get('all'):
     AddBuilds("embed-node", ["-DMPACK_NODE=1"] + cflags, [])
 
     # miscellaneous test builds
-    AddBuilds("cxx", allfeatures + allconfigs + cxxflags, ["-lstdc++"])
+    AddBuilds("cxx", allfeatures + allconfigs + ["-xc++", "-std=c++98"], ["-lstdc++"])
     AddBuilds("notrack", ["-DMPACK_NO_TRACKING=1"] + allfeatures + allconfigs + cflags, [])
     AddBuilds("realloc", allfeatures + allconfigs + debugflags + cflags + ["-DMPACK_REALLOC=test_realloc"], [])
 
-    # 32-bit builds (note Travis-CI doesn't support multilib)
+    # Travis-CI currently only has GCC 4.6 and Clang 3.4, doesn't properly support these options
+    if 'TRAVIS' not in env:
+        AddBuilds("c11", allfeatures + allconfigs + ["-std=c11", "-Wc++-compat"], [])
+        AddBuilds("cxx11", allfeatures + allconfigs + ["-xc++", "-std=c++11"], ["-lstdc++"])
+        AddBuilds("cxx14", allfeatures + allconfigs + ["-xc++", "-std=c++14"], ["-lstdc++"])
+
+    # 32-bit builds (Travis-CI doesn't support multilib)
     if 'TRAVIS' not in env and '64' in platform.architecture()[0]:
         AddBuilds("32",     allfeatures + allconfigs + cflags + ["-m32"], ["-m32"])
-        AddBuilds("cxx-32", allfeatures + allconfigs + cxxflags + ["-m32"], ["-m32", "-lstdc++"])
+        AddBuilds("cxx11-32", allfeatures + allconfigs + ["-xc++", "-std=c++11"] + ["-m32"], ["-m32", "-lstdc++"])

src/mpack/mpack-common.h

@@ -42,7 +42,7 @@
 
 #define MPACK_VERSION_MAJOR 0  /**< The major version number of MPack. */
 #define MPACK_VERSION_MINOR 5  /**< The minor version number of MPack. */
-#define MPACK_VERSION_PATCH 0  /**< The patch version number of MPack. */
+#define MPACK_VERSION_PATCH 1  /**< The patch version number of MPack. */
 
 /** A number containing the version number of MPack for comparison purposes. */
 #define MPACK_VERSION ((MPACK_VERSION_MAJOR * 10000) + \

src/mpack/mpack-node.c

@@ -856,7 +856,7 @@ void mpack_node_flag_error(mpack_node_t node, mpack_error_t error) {
 #if MPACK_DEBUG && MPACK_STDIO && MPACK_SETJMP && !MPACK_NO_PRINT
 static void mpack_node_print_element(mpack_node_t node, size_t depth) {
     mpack_node_data_t* data = node.data;
-    switch (data.type) {
+    switch (data->type) {
 
         case mpack_type_nil:
             printf("null");
@@ -890,9 +890,9 @@ static void mpack_node_print_element(mpack_node_t node, size_t depth) {
         case mpack_type_str:
             {
                 putchar('"');
-                const char* data = mpack_node_data(node);
+                const char* bytes = mpack_node_data(node);
                 for (size_t i = 0; i < data->value.data.l; ++i) {
-                    char c = data[i];
+                    char c = bytes[i];
                     switch (c) {
                         case '\n': printf("\\n"); break;
                         case '\\': printf("\\\\"); break;

test/mpack-config.h

@@ -50,8 +50,5 @@
 #define MPACK_NODE_MAX_DEPTH_WITHOUT_MALLOC 32
 #endif
 
-// don't include debug print functions in code coverage
-#define MPACK_NO_PRINT 1
-
 #endif