Merge pull request #686 from redboltz/fix_685

Fixed #685.

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2018-05-12 version 3.0.1
+
+  * Add fuzz directory to release tar ball (#686)
+  * Add include file checking for X-Code (#683)
+
 # 2018-05-09 version 3.0.0
 
 ## << breaking changes >>

README.md

@@ -1,7 +1,7 @@
 `msgpack` for C/C++
 ===================
 
-Version 3.0.0 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)
+Version 3.0.1 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)
 
 It's like JSON but smaller and faster.
 

appveyor.yml

@@ -1,4 +1,4 @@
-version: 3.0.0.{build}
+version: 3.0.1.{build}
 
 image:
 - Visual Studio 2015

include/msgpack/type.hpp

@@ -42,12 +42,13 @@
 #include "adaptor/cpp11/unordered_map.hpp"
 #include "adaptor/cpp11/unordered_set.hpp"
 
-#if __cplusplus >= 201703
-
+#if MSGPACK_HAS_INCLUDE(<optional>)
 #include "adaptor/cpp17/optional.hpp"
-#include "adaptor/cpp17/string_view.hpp"
+#endif // MSGPACK_HAS_INCLUDE(<optional>)
 
-#endif // __cplusplus >= 201703
+#if MSGPACK_HAS_INCLUDE(<string_view>)
+#include "adaptor/cpp17/string_view.hpp"
+#endif // MSGPACK_HAS_INCLUDE(<string_view>)
 
 #endif // defined(MSGPACK_USE_CPP03)
 

include/msgpack/v1/cpp_config_decl.hpp

@@ -128,4 +128,10 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 
 #endif // MSGPACK_USE_CPP03
 
+#if defined(__has_include)
+#define MSGPACK_HAS_INCLUDE __has_include
+#else  // defined(__has_include)
+#define MSGPACK_HAS_INCLUDE(header) 0
+#endif // defined(__has_include)
+
 #endif // MSGPACK_V1_CPP_CONFIG_DECL_HPP

include/msgpack/version_master.h

@@ -1,3 +1,3 @@
 #define MSGPACK_VERSION_MAJOR    3
 #define MSGPACK_VERSION_MINOR    0
-#define MSGPACK_VERSION_REVISION 0
+#define MSGPACK_VERSION_REVISION 1

makedist.sh

@@ -19,6 +19,7 @@ tar --append --file=$filename $prefix/test
 tar --append --file=$filename $prefix/include
 tar --append --file=$filename $prefix/erb
 tar --append --file=$filename $prefix/src
+tar --append --file=$filename $prefix/fuzz
 
 tar --append --file=$filename $prefix/CMakeLists.txt
 tar --append --file=$filename $prefix/Files.cmake