diff --git a/.appveyor.yml b/.appveyor.yml
index e510f06b..bd1ad519 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,33 +11,67 @@ environment:
 matrix:
   fast_finish: true
 cache:
-  - c:\projects\glbinding
-  - c:\projects\build-glbinding -> appveyor.yml
-  - c:\tools\vcpkg\installed\
+  - C:\projects\glfw
+  - C:\projects\glbinding
+  - C:\projects\glm
+  - C:\projects\sioclient
+  - C:\projects\build-glfw -> appveyor.yml
+  - C:\projects\build-glbinding -> appveyor.yml
+  - C:\projects\build-glm -> appveyor.yml
+  - C:\projects\build-sioclient -> appveyor.yml
 install:
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
 
-  - vcpkg --triplet x64-windows install glm glfw3 sfml boost-system boost-exception boost-date-time boost-random boost-asio
-
-  - cd c:\tools\vcpkg
-  - vcpkg integrate install
-
   - cd C:\projects
+  - if not exist build-glfw mkdir build-glfw
+  - if not exist build-glm mkdir build-glm
   - if not exist build-glbinding mkdir build-glbinding
+  - if not exist build-sioclient mkdir build-sioclient
+
+  - if not exist "C:\projects\glfw" git clone --depth 1 --no-checkout https://github.com/glfw/glfw.git C:\projects\glfw
+  - cd C:\projects\glfw
+  - git fetch --depth 1 --tags
+  - git checkout %GLFW_VER%
+  - cd ../build-glfw
+  - cmake -DCMAKE_INSTALL_PREFIX=C:\deps\glfw -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -G "Visual Studio 15 2017 Win64" ../glfw
+  - cmake --build . --config %CONFIGURATION%
+  - cmake --build . --config %CONFIGURATION% --target install
+
+  - if not exist "C:\projects\glm" git clone --depth 1 --no-checkout https://github.com/g-truc/glm.git C:\projects\glm
+  - cd C:\projects\glm
+  - git fetch --depth 1 --tags
+  - git checkout %GLM_VER%
+  - cd ../build-glm
+  - cmake -DCMAKE_INSTALL_PREFIX=C:\deps\glm -DGLM_INSTALL_ENABLE=true -G "Visual Studio 15 2017 Win64" ../glm
+  - cmake --build . --config %CONFIGURATION%
+  - cmake --build . --config %CONFIGURATION% --target install
 
   - if not exist "C:\projects\glbinding" git clone --depth 1 --no-checkout https://github.com/cginternals/glbinding C:\projects\glbinding
   - cd C:\projects\glbinding
   - git fetch --depth 1 --tags
   - git checkout v%GLBINDING_VER%
   - cd ../build-glbinding
-  - cmake -DCMAKE_INSTALL_PREFIX=C:\deps\glbinding -DCMAKE_CXX_FLAGS="/D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING /EHsc" -DBUILD_SHARED_LIBS=OFF -DOPTION_BUILD_TESTS=OFF -DOPTION_BUILD_GPU_TESTS=OFF -DOPTION_BUILD_TOOLS=OFF -G "Visual Studio 15 2017 Win64" ../glbinding
+  - cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DCMAKE_INSTALL_PREFIX=C:\deps\glbinding -DCMAKE_CXX_FLAGS="/D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING /EHsc" -DCMAKE_PREFIX_PATH=C:\deps\glfw -DBUILD_SHARED_LIBS=OFF -DOPTION_BUILD_TESTS=OFF -DOPTION_BUILD_GPU_TESTS=OFF -DOPTION_BUILD_TOOLS=OFF -G "Visual Studio 15 2017 Win64" ../glbinding
   - cmake --build . --config %CONFIGURATION%
   - cmake --build . --config %CONFIGURATION% --target install
 
+  - if not exist "C:\projects\sioclient" git clone --depth 1 --branch fixes https://github.com/SwarmMind/socket.io-client-cpp.git C:\projects\sioclient
+  - cd C:\projects\sioclient
+  - git fetch --depth 1 --tags
+  - cd ../build-sioclient
+  - cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DCMAKE_INSTALL_PREFIX=C:\deps\sioclient -DCMAKE_CXX_FLAGS="/D_SCL_SECURE_NO_WARNINGS /EHsc" -DBOOST_ROOT=C:\Libraries\boost_1_67_0 -DBOOST_VER=1.67.0 -G "Visual Studio 15 2017 Win64" ../sioclient
+  - cmake --build . --config %CONFIGURATION%
+  - cmake --build . --config %CONFIGURATION% --target install
+  
+  - if not exist "C:\deps\sfml" mkdir "C:\deps\sfml"
+  - ps: appveyor DownloadFile "https://www.sfml-dev.org/files/SFML-$env:SFML_VER-windows-vc15-64-bit.zip" -FileName "C:\deps\sfml\sfml.zip"
+  - cd "C:\deps\sfml"
+  - 7z x sfml.zip
+
 before_build:
   - cd C:\projects\swarmmind-client
   - mkdir build && cd build
-  - cmake -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_PREFIX_PATH=C:\deps\glbinding -DBOOST_ROOT=C:\Libraries\boost_1_67_0 -G "Visual Studio 15 2017 Win64" ..
+  - cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DCMAKE_PREFIX_PATH=C:\deps\glfw;C:\deps\glbinding;C:\deps\sioclient;C:\deps\sfml\SFML-%SFML_VER% -G "Visual Studio 15 2017 Win64" ..
 build:
   project: build\SwarmMind-Client.sln
   verbosity: minimal
@@ -51,7 +85,7 @@ after_build:
   - ps: cp -r -v shaders package
   - ps: cp -r -v sound package
   - ps: cp -r -v res package
-  - ps: cp -r -v build\src\$env:CONFIGURATION\*.dll package
+  - ps: cp C:\deps\sfml\SFML-$env:SFML_VER\bin\openal32.dll package
 
 artifacts:
   - path: package
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0ce2f73c..169ec7e8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,9 @@
 find_package(glfw3 REQUIRED)
 find_package(glbinding REQUIRED)
 find_package(glm REQUIRED)
+set(SFML_STATIC_LIBRARIES TRUE)
 find_package(SFML COMPONENTS audio REQUIRED)
+find_package(sioclient 1.6.0 REQUIRED)
 
 set(sources "main.cpp")
 
@@ -16,8 +18,6 @@ add_subdirectory(menu)
 add_subdirectory(events)
 add_subdirectory(sound)
 
-add_subdirectory(sioclient)
-
 #Replicate the directory structure in Visual Studio filters
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${sources})
 
diff --git a/src/nlohmann/json.hpp b/src/nlohmann/json.hpp
index c40620ad..ad3d6690 100644
--- a/src/nlohmann/json.hpp
+++ b/src/nlohmann/json.hpp
@@ -1,11 +1,10 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++
-|  |  |__   |  |  | | | |  version 3.3.0
+|  |  |__   |  |  | | | |  version 3.1.2
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
 Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
@@ -31,8 +30,8 @@ SOFTWARE.
 #define NLOHMANN_JSON_HPP
 
 #define NLOHMANN_JSON_VERSION_MAJOR 3
-#define NLOHMANN_JSON_VERSION_MINOR 3
-#define NLOHMANN_JSON_VERSION_PATCH 0
+#define NLOHMANN_JSON_VERSION_MINOR 1
+#define NLOHMANN_JSON_VERSION_PATCH 2
 
 #include <algorithm> // all_of, find, for_each
 #include <cassert> // assert
@@ -67,10 +66,10 @@ namespace nlohmann
 @brief default JSONSerializer template argument
 
 This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+([argument-dependent lookup](http://en.cppreference.com/w/cpp/language/adl))
 for serialization.
 */
-template<typename T = void, typename SFINAE = void>
+template<typename = void, typename = void>
 struct adl_serializer;
 
 template<template<typename U, typename V, typename... Args> class ObjectType =
@@ -119,15 +118,13 @@ using json = basic_json<>;
 // You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
 
 // exclude unsupported compilers
-#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
-    #if defined(__clang__)
-        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
-            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
-        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
-            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
+#if defined(__clang__)
+    #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
+        #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
+    #endif
+#elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+    #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40900
+        #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
     #endif
 #endif
 
@@ -157,12 +154,10 @@ using json = basic_json<>;
     #define JSON_THROW(exception) throw exception
     #define JSON_TRY try
     #define JSON_CATCH(exception) catch(exception)
-    #define JSON_INTERNAL_CATCH(exception) catch(exception)
 #else
     #define JSON_THROW(exception) std::abort()
     #define JSON_TRY if(true)
     #define JSON_CATCH(exception) if(false)
-    #define JSON_INTERNAL_CATCH(exception) if(false)
 #endif
 
 // override exception macros
@@ -177,12 +172,6 @@ using json = basic_json<>;
 #if defined(JSON_CATCH_USER)
     #undef JSON_CATCH
     #define JSON_CATCH JSON_CATCH_USER
-    #undef JSON_INTERNAL_CATCH
-    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
-#endif
-#if defined(JSON_INTERNAL_CATCH_USER)
-    #undef JSON_INTERNAL_CATCH
-    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
 #endif
 
 // manual branch prediction
@@ -218,17 +207,62 @@ using json = basic_json<>;
     NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
     AllocatorType, JSONSerializer>
 
-// #include <nlohmann/detail/meta/cpp_future.hpp>
+/*!
+@brief Helper to determine whether there's a key_type for T.
+
+This helper is used to tell associative containers apart from other containers
+such as sequence containers. For instance, `std::map` passes the test as it
+contains a `mapped_type`, whereas `std::vector` fails the test.
+
+@sa http://stackoverflow.com/a/7728728/266378
+@since version 1.0.0, overworked in version 2.0.6
+*/
+#define NLOHMANN_JSON_HAS_HELPER(type)                                        \
+    template<typename T> struct has_##type {                                  \
+    private:                                                                  \
+        template<typename U, typename = typename U::type>                     \
+        static int detect(U &&);                                              \
+        static void detect(...);                                              \
+    public:                                                                   \
+        static constexpr bool value =                                         \
+                std::is_integral<decltype(detect(std::declval<T>()))>::value; \
+    }
+
+// #include <nlohmann/detail/meta.hpp>
 
 
 #include <ciso646> // not
 #include <cstddef> // size_t
+#include <limits> // numeric_limits
 #include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
+#include <utility> // declval
+
+// #include <nlohmann/json_fwd.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
 
 namespace nlohmann
 {
+/*!
+@brief detail namespace with internal helper functions
+
+This namespace collects functions that should not be exposed,
+implementations of some @ref basic_json methods, and meta-programming helpers.
+
+@since version 2.1.0
+*/
 namespace detail
 {
+/////////////
+// helpers //
+/////////////
+
+template<typename> struct is_basic_json : std::false_type {};
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+
 // alias templates to reduce boilerplate
 template<bool B, typename T = void>
 using enable_if_t = typename std::enable_if<B, T>::type;
@@ -267,188 +301,33 @@ template<> struct make_index_sequence<1> : index_sequence<0> {};
 template<typename... Ts>
 using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
 
-// dispatch utility (taken from ranges-v3)
-template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
-template<> struct priority_tag<0> {};
-
-// taken from ranges-v3
-template<typename T>
-struct static_const
-{
-    static constexpr T value{};
-};
-
-template<typename T>
-constexpr T static_const<T>::value;
-}
-}
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-#include <ciso646> // not
-#include <limits> // numeric_limits
-#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
-#include <utility> // declval
-
-// #include <nlohmann/json_fwd.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/detected.hpp>
-
-
-#include <type_traits>
-
-// #include <nlohmann/detail/meta/void_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template <typename ...Ts> struct make_void
-{
-    using type = void;
-};
-template <typename ...Ts> using void_t = typename make_void<Ts...>::type;
-}
-}
-
-
-// http://en.cppreference.com/w/cpp/experimental/is_detected
-namespace nlohmann
-{
-namespace detail
-{
-struct nonesuch
-{
-    nonesuch() = delete;
-    ~nonesuch() = delete;
-    nonesuch(nonesuch const&) = delete;
-    void operator=(nonesuch const&) = delete;
-};
-
-template <class Default,
-          class AlwaysVoid,
-          template <class...> class Op,
-          class... Args>
-struct detector
-{
-    using value_t = std::false_type;
-    using type = Default;
-};
-
-template <class Default, template <class...> class Op, class... Args>
-struct detector<Default, void_t<Op<Args...>>, Op, Args...>
-{
-    using value_t = std::true_type;
-    using type = Op<Args...>;
-};
-
-template <template <class...> class Op, class... Args>
-using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
-
-template <template <class...> class Op, class... Args>
-using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
-
-template <class Default, template <class...> class Op, class... Args>
-using detected_or = detector<Default, void, Op, Args...>;
-
-template <class Default, template <class...> class Op, class... Args>
-using detected_or_t = typename detected_or<Default, Op, Args...>::type;
-
-template <class Expected, template <class...> class Op, class... Args>
-using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
-
-template <class To, template <class...> class Op, class... Args>
-using is_detected_convertible =
-    std::is_convertible<detected_t<Op, Args...>, To>;
-}
-}
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-/*!
-@brief detail namespace with internal helper functions
+/*
+Implementation of two C++17 constructs: conjunction, negation. This is needed
+to avoid evaluating all the traits in a condition
 
-This namespace collects functions that should not be exposed,
-implementations of some @ref basic_json methods, and meta-programming helpers.
+For example: not std::is_same<void, T>::value and has_value_type<T>::value
+will not compile when T = void (on MSVC at least). Whereas
+conjunction<negation<std::is_same<void, T>>, has_value_type<T>>::value will
+stop evaluating if negation<...>::value == false
 
-@since version 2.1.0
+Please note that those constructs must be used with caution, since symbols can
+become very long quickly (which can slow down compilation and cause MSVC
+internal compiler errors). Only use it when you have to (see example ahead).
 */
-namespace detail
-{
-/////////////
-// helpers //
-/////////////
-
-template<typename> struct is_basic_json : std::false_type {};
-
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
-
-//////////////////////////
-// aliases for detected //
-//////////////////////////
-
-template <typename T>
-using mapped_type_t = typename T::mapped_type;
-
-template <typename T>
-using key_type_t = typename T::key_type;
-
-template <typename T>
-using value_type_t = typename T::value_type;
-
-template <typename T>
-using difference_type_t = typename T::difference_type;
-
-template <typename T>
-using pointer_t = typename T::pointer;
-
-template <typename T>
-using reference_t = typename T::reference;
+template<class...> struct conjunction : std::true_type {};
+template<class B1> struct conjunction<B1> : B1 {};
+template<class B1, class... Bn>
+struct conjunction<B1, Bn...> : std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
 
-template <typename T>
-using iterator_category_t = typename T::iterator_category;
-
-template <typename T>
-using iterator_t = typename T::iterator;
-
-template <typename T, typename... Args>
-using to_json_function = decltype(T::to_json(std::declval<Args>()...));
-
-template <typename T, typename... Args>
-using from_json_function = decltype(T::from_json(std::declval<Args>()...));
-
-template <typename T, typename U>
-using get_template_function = decltype(std::declval<T>().template get<U>());
-
-///////////////////
-// is_ functions //
-///////////////////
-
-template <typename T, typename = void>
-struct is_iterator_traits : std::false_type {};
+template<class B> struct negation : std::integral_constant<bool, not B::value> {};
 
-template <typename T>
-struct is_iterator_traits<std::iterator_traits<T>>
-{
-  private:
-    using traits = std::iterator_traits<T>;
+// dispatch utility (taken from ranges-v3)
+template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
+template<> struct priority_tag<0> {};
 
-  public:
-    static constexpr auto value =
-        is_detected<value_type_t, traits>::value &&
-        is_detected<difference_type_t, traits>::value &&
-        is_detected<pointer_t, traits>::value &&
-        is_detected<iterator_category_t, traits>::value &&
-        is_detected<reference_t, traits>::value;
-};
+////////////////////////
+// has_/is_ functions //
+////////////////////////
 
 // source: https://stackoverflow.com/a/37193089/4116453
 
@@ -458,155 +337,156 @@ struct is_complete_type : std::false_type {};
 template <typename T>
 struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
 
-template <typename BasicJsonType, typename CompatibleObjectType,
-          typename = void>
+NLOHMANN_JSON_HAS_HELPER(mapped_type);
+NLOHMANN_JSON_HAS_HELPER(key_type);
+NLOHMANN_JSON_HAS_HELPER(value_type);
+NLOHMANN_JSON_HAS_HELPER(iterator);
+
+template<bool B, class RealType, class CompatibleObjectType>
 struct is_compatible_object_type_impl : std::false_type {};
 
-template <typename BasicJsonType, typename CompatibleObjectType>
-struct is_compatible_object_type_impl <
-    BasicJsonType, CompatibleObjectType,
-    enable_if_t<is_detected<mapped_type_t, CompatibleObjectType>::value and
-    is_detected<key_type_t, CompatibleObjectType>::value >>
+template<class RealType, class CompatibleObjectType>
+struct is_compatible_object_type_impl<true, RealType, CompatibleObjectType>
 {
-
-    using object_t = typename BasicJsonType::object_t;
-
-    // macOS's is_constructible does not play well with nonesuch...
-    static constexpr bool value =
-        std::is_constructible<typename object_t::key_type,
-        typename CompatibleObjectType::key_type>::value and
-        std::is_constructible<typename object_t::mapped_type,
-        typename CompatibleObjectType::mapped_type>::value;
+    static constexpr auto value =
+        std::is_constructible<typename RealType::key_type, typename CompatibleObjectType::key_type>::value and
+        std::is_constructible<typename RealType::mapped_type, typename CompatibleObjectType::mapped_type>::value;
 };
 
-template <typename BasicJsonType, typename CompatibleObjectType>
+template<class BasicJsonType, class CompatibleObjectType>
 struct is_compatible_object_type
-    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
-
-template <typename BasicJsonType, typename CompatibleStringType,
-          typename = void>
-struct is_compatible_string_type_impl : std::false_type {};
-
-template <typename BasicJsonType, typename CompatibleStringType>
-struct is_compatible_string_type_impl <
-    BasicJsonType, CompatibleStringType,
-    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
-    value_type_t, CompatibleStringType>::value >>
 {
-    static constexpr auto value =
-        std::is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
+    static auto constexpr value = is_compatible_object_type_impl <
+                                  conjunction<negation<std::is_same<void, CompatibleObjectType>>,
+                                  has_mapped_type<CompatibleObjectType>,
+                                  has_key_type<CompatibleObjectType>>::value,
+                                  typename BasicJsonType::object_t, CompatibleObjectType >::value;
 };
 
-template <typename BasicJsonType, typename CompatibleStringType>
-struct is_compatible_string_type
-    : is_compatible_string_type_impl<BasicJsonType, CompatibleStringType> {};
-
-template <typename BasicJsonType, typename CompatibleArrayType, typename = void>
-struct is_compatible_array_type_impl : std::false_type {};
-
-template <typename BasicJsonType, typename CompatibleArrayType>
-struct is_compatible_array_type_impl <
-    BasicJsonType, CompatibleArrayType,
-    enable_if_t<is_detected<value_type_t, CompatibleArrayType>::value and
-    is_detected<iterator_t, CompatibleArrayType>::value >>
+template<typename BasicJsonType, typename T>
+struct is_basic_json_nested_type
 {
-    // This is needed because json_reverse_iterator has a ::iterator type...
-    // Therefore it is detected as a CompatibleArrayType.
-    // The real fix would be to have an Iterable concept.
-    static constexpr bool value = not is_iterator_traits<std::iterator_traits<CompatibleArrayType>>::value;
+    static auto constexpr value = std::is_same<T, typename BasicJsonType::iterator>::value or
+                                  std::is_same<T, typename BasicJsonType::const_iterator>::value or
+                                  std::is_same<T, typename BasicJsonType::reverse_iterator>::value or
+                                  std::is_same<T, typename BasicJsonType::const_reverse_iterator>::value;
 };
 
-template <typename BasicJsonType, typename CompatibleArrayType>
+template<class BasicJsonType, class CompatibleArrayType>
 struct is_compatible_array_type
-    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
+{
+    static auto constexpr value =
+        conjunction<negation<std::is_same<void, CompatibleArrayType>>,
+        negation<is_compatible_object_type<
+        BasicJsonType, CompatibleArrayType>>,
+        negation<std::is_constructible<typename BasicJsonType::string_t,
+        CompatibleArrayType>>,
+        negation<is_basic_json_nested_type<BasicJsonType, CompatibleArrayType>>,
+        has_value_type<CompatibleArrayType>,
+        has_iterator<CompatibleArrayType>>::value;
+};
 
-template <typename RealIntegerType, typename CompatibleNumberIntegerType,
-          typename = void>
+template<bool, typename, typename>
 struct is_compatible_integer_type_impl : std::false_type {};
 
-template <typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type_impl <
-    RealIntegerType, CompatibleNumberIntegerType,
-    enable_if_t<std::is_integral<RealIntegerType>::value and
-    std::is_integral<CompatibleNumberIntegerType>::value and
-    not std::is_same<bool, CompatibleNumberIntegerType>::value >>
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type_impl<true, RealIntegerType, CompatibleNumberIntegerType>
 {
     // is there an assert somewhere on overflows?
     using RealLimits = std::numeric_limits<RealIntegerType>;
     using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
 
     static constexpr auto value =
-        std::is_constructible<RealIntegerType,
-        CompatibleNumberIntegerType>::value and
+        std::is_constructible<RealIntegerType, CompatibleNumberIntegerType>::value and
         CompatibleLimits::is_integer and
         RealLimits::is_signed == CompatibleLimits::is_signed;
 };
 
-template <typename RealIntegerType, typename CompatibleNumberIntegerType>
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
 struct is_compatible_integer_type
-    : is_compatible_integer_type_impl<RealIntegerType,
-      CompatibleNumberIntegerType> {};
+{
+    static constexpr auto value =
+        is_compatible_integer_type_impl <
+        std::is_integral<CompatibleNumberIntegerType>::value and
+        not std::is_same<bool, CompatibleNumberIntegerType>::value,
+        RealIntegerType, CompatibleNumberIntegerType > ::value;
+};
 
 // trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
-template <typename BasicJsonType, typename T, typename = void>
-struct has_from_json : std::false_type {};
-
-template <typename BasicJsonType, typename T>
-struct has_from_json<BasicJsonType, T,
-           enable_if_t<not is_basic_json<T>::value>>
+template<typename BasicJsonType, typename T>
+struct has_from_json
 {
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+  private:
+    // also check the return type of from_json
+    template<typename U, typename = enable_if_t<std::is_same<void, decltype(uncvref_t<U>::from_json(
+                 std::declval<BasicJsonType>(), std::declval<T&>()))>::value>>
+    static int detect(U&&);
+    static void detect(...);
 
-    static constexpr bool value =
-        is_detected_exact<void, from_json_function, serializer,
-        const BasicJsonType&, T&>::value;
+  public:
+    static constexpr bool value = std::is_integral<decltype(
+                                      detect(std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
 };
 
 // This trait checks if JSONSerializer<T>::from_json(json const&) exists
 // this overload is used for non-default-constructible user-defined-types
-template <typename BasicJsonType, typename T, typename = void>
-struct has_non_default_from_json : std::false_type {};
-
 template<typename BasicJsonType, typename T>
-struct has_non_default_from_json<BasicJsonType, T, enable_if_t<not is_basic_json<T>::value>>
+struct has_non_default_from_json
 {
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+  private:
+    template <
+        typename U,
+        typename = enable_if_t<std::is_same<
+                                   T, decltype(uncvref_t<U>::from_json(std::declval<BasicJsonType>()))>::value >>
+    static int detect(U&&);
+    static void detect(...);
 
-    static constexpr bool value =
-        is_detected_exact<T, from_json_function, serializer,
-        const BasicJsonType&>::value;
+  public:
+    static constexpr bool value = std::is_integral<decltype(detect(
+                                      std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
 };
 
 // This trait checks if BasicJsonType::json_serializer<T>::to_json exists
-// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
-template <typename BasicJsonType, typename T, typename = void>
-struct has_to_json : std::false_type {};
-
-template <typename BasicJsonType, typename T>
-struct has_to_json<BasicJsonType, T, enable_if_t<not is_basic_json<T>::value>>
+template<typename BasicJsonType, typename T>
+struct has_to_json
 {
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+  private:
+    template<typename U, typename = decltype(uncvref_t<U>::to_json(
+                 std::declval<BasicJsonType&>(), std::declval<T>()))>
+    static int detect(U&&);
+    static void detect(...);
 
-    static constexpr bool value =
-        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
-        T>::value;
+  public:
+    static constexpr bool value = std::is_integral<decltype(detect(
+                                      std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
 };
 
-template <typename BasicJsonType, typename CompatibleType, typename = void>
-struct is_compatible_type_impl: std::false_type {};
-
-template <typename BasicJsonType, typename CompatibleType>
-struct is_compatible_type_impl <
-    BasicJsonType, CompatibleType,
-    enable_if_t<is_complete_type<CompatibleType>::value >>
+template <typename BasicJsonType, typename CompatibleCompleteType>
+struct is_compatible_complete_type
 {
     static constexpr bool value =
-        has_to_json<BasicJsonType, CompatibleType>::value;
+        not std::is_base_of<std::istream, CompatibleCompleteType>::value and
+        not is_basic_json<CompatibleCompleteType>::value and
+        not is_basic_json_nested_type<BasicJsonType, CompatibleCompleteType>::value and
+        has_to_json<BasicJsonType, CompatibleCompleteType>::value;
 };
 
 template <typename BasicJsonType, typename CompatibleType>
 struct is_compatible_type
-    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
+    : conjunction<is_complete_type<CompatibleType>,
+      is_compatible_complete_type<BasicJsonType, CompatibleType>>
+{
+};
+
+// taken from ranges-v3
+template<typename T>
+struct static_const
+{
+    static constexpr T value{};
+};
+
+template<typename T>
+constexpr T static_const<T>::value;
 }
 }
 
@@ -1028,11 +908,9 @@ inline bool operator<(const value_t lhs, const value_t rhs) noexcept
 #include <ciso646> // and, not
 #include <forward_list> // forward_list
 #include <iterator> // inserter, front_inserter, end
-#include <map> // map
 #include <string> // string
 #include <tuple> // tuple, make_tuple
 #include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
-#include <unordered_map> // unordered_map
 #include <utility> // pair, declval
 #include <valarray> // valarray
 
@@ -1040,9 +918,7 @@ inline bool operator<(const value_t lhs, const value_t rhs) noexcept
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
+// #include <nlohmann/detail/meta.hpp>
 
 // #include <nlohmann/detail/value_t.hpp>
 
@@ -1051,16 +927,6 @@ namespace nlohmann
 {
 namespace detail
 {
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
-{
-    if (JSON_UNLIKELY(not j.is_null()))
-    {
-        JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name())));
-    }
-    n = nullptr;
-}
-
 // overloads for basic_json template parameters
 template<typename BasicJsonType, typename ArithmeticType,
          enable_if_t<std::is_arithmetic<ArithmeticType>::value and
@@ -1111,23 +977,6 @@ void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
     s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
 }
 
-template <
-    typename BasicJsonType, typename CompatibleStringType,
-    enable_if_t <
-        is_compatible_string_type<BasicJsonType, CompatibleStringType>::value and
-        not std::is_same<typename BasicJsonType::string_t,
-                         CompatibleStringType>::value,
-        int > = 0 >
-void from_json(const BasicJsonType& j, CompatibleStringType& s)
-{
-    if (JSON_UNLIKELY(not j.is_string()))
-    {
-        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
-    }
-
-    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-}
-
 template<typename BasicJsonType>
 void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
 {
@@ -1155,6 +1004,16 @@ void from_json(const BasicJsonType& j, EnumType& e)
     e = static_cast<EnumType>(val);
 }
 
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::array_t& arr)
+{
+    if (JSON_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
+}
+
 // forward_list doesn't have an insert method
 template<typename BasicJsonType, typename T, typename Allocator,
          enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
@@ -1184,28 +1043,24 @@ void from_json(const BasicJsonType& j, std::valarray<T>& l)
     std::copy(j.m_value.array->begin(), j.m_value.array->end(), std::begin(l));
 }
 
-template<typename BasicJsonType>
-void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
+template<typename BasicJsonType, typename CompatibleArrayType>
+void from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, priority_tag<0> /*unused*/)
 {
-    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
-}
+    using std::end;
 
-template <typename BasicJsonType, typename T, std::size_t N>
-auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
-                          priority_tag<2> /*unused*/)
--> decltype(j.template get<T>(), void())
-{
-    for (std::size_t i = 0; i < N; ++i)
+    std::transform(j.begin(), j.end(),
+                   std::inserter(arr, end(arr)), [](const BasicJsonType & i)
     {
-        arr[i] = j.at(i).template get<T>();
-    }
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename CompatibleArrayType::value_type>();
+    });
 }
 
 template<typename BasicJsonType, typename CompatibleArrayType>
 auto from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, priority_tag<1> /*unused*/)
 -> decltype(
     arr.reserve(std::declval<typename CompatibleArrayType::size_type>()),
-    j.template get<typename CompatibleArrayType::value_type>(),
     void())
 {
     using std::end;
@@ -1220,34 +1075,25 @@ auto from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, prio
     });
 }
 
-template <typename BasicJsonType, typename CompatibleArrayType>
-void from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr,
-                          priority_tag<0> /*unused*/)
+template<typename BasicJsonType, typename T, std::size_t N>
+void from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr, priority_tag<2> /*unused*/)
 {
-    using std::end;
-
-    std::transform(
-        j.begin(), j.end(), std::inserter(arr, end(arr)),
-        [](const BasicJsonType & i)
+    for (std::size_t i = 0; i < N; ++i)
     {
-        // get<BasicJsonType>() returns *this, this won't call a from_json
-        // method when value_type is BasicJsonType
-        return i.template get<typename CompatibleArrayType::value_type>();
-    });
+        arr[i] = j.at(i).template get<T>();
+    }
 }
 
-template <typename BasicJsonType, typename CompatibleArrayType,
-          enable_if_t <
-              is_compatible_array_type<BasicJsonType, CompatibleArrayType>::value and
-              not is_compatible_object_type<BasicJsonType, CompatibleArrayType>::value and
-              not is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value and
-              not is_basic_json<CompatibleArrayType>::value,
-              int > = 0 >
-
-auto from_json(const BasicJsonType& j, CompatibleArrayType& arr)
--> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
-j.template get<typename CompatibleArrayType::value_type>(),
-void())
+template <
+    typename BasicJsonType, typename CompatibleArrayType,
+    enable_if_t <
+        is_compatible_array_type<BasicJsonType, CompatibleArrayType>::value and
+        not std::is_same<typename BasicJsonType::array_t,
+                         CompatibleArrayType>::value and
+        std::is_constructible <
+            BasicJsonType, typename CompatibleArrayType::value_type >::value,
+        int > = 0 >
+void from_json(const BasicJsonType& j, CompatibleArrayType& arr)
 {
     if (JSON_UNLIKELY(not j.is_array()))
     {
@@ -1255,7 +1101,7 @@ void())
                                       std::string(j.type_name())));
     }
 
-    from_json_array_impl(j, arr, priority_tag<3> {});
+    from_json_array_impl(j, arr, priority_tag<2> {});
 }
 
 template<typename BasicJsonType, typename CompatibleObjectType,
@@ -1338,52 +1184,36 @@ void from_json(const BasicJsonType& j, std::tuple<Args...>& t)
     from_json_tuple_impl(j, t, index_sequence_for<Args...> {});
 }
 
-template <typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
-          typename = enable_if_t<not std::is_constructible<
-                                     typename BasicJsonType::string_t, Key>::value>>
-void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
+struct from_json_fn
 {
-    if (JSON_UNLIKELY(not j.is_array()))
+  private:
+    template<typename BasicJsonType, typename T>
+    auto call(const BasicJsonType& j, T& val, priority_tag<1> /*unused*/) const
+    noexcept(noexcept(from_json(j, val)))
+    -> decltype(from_json(j, val), void())
     {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
-    }
-    for (const auto& p : j)
-    {
-        if (JSON_UNLIKELY(not p.is_array()))
-        {
-            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
-        }
-        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+        return from_json(j, val);
     }
-}
 
-template <typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
-          typename = enable_if_t<not std::is_constructible<
-                                     typename BasicJsonType::string_t, Key>::value>>
-void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
-{
-    if (JSON_UNLIKELY(not j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
-    }
-    for (const auto& p : j)
-    {
-        if (JSON_UNLIKELY(not p.is_array()))
-        {
-            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
-        }
-        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    template<typename BasicJsonType, typename T>
+    void call(const BasicJsonType& /*unused*/, T& /*unused*/, priority_tag<0> /*unused*/) const noexcept
+    {
+        static_assert(sizeof(BasicJsonType) == 0,
+                      "could not find from_json() method in T's namespace");
+#ifdef _MSC_VER
+        // MSVC does not show a stacktrace for the above assert
+        using decayed = uncvref_t<T>;
+        static_assert(sizeof(typename decayed::force_msvc_stacktrace) == 0,
+                      "forcing MSVC stacktrace to show which T we're talking about.");
+#endif
     }
-}
 
-struct from_json_fn
-{
+  public:
     template<typename BasicJsonType, typename T>
-    auto operator()(const BasicJsonType& j, T& val) const
-    noexcept(noexcept(from_json(j, val)))
-    -> decltype(from_json(j, val), void())
+    void operator()(const BasicJsonType& j, T& val) const
+    noexcept(noexcept(std::declval<from_json_fn>().call(j, val, priority_tag<1> {})))
     {
-        return from_json(j, val);
+        return call(j, val, priority_tag<1> {});
     }
 };
 }
@@ -1408,144 +1238,11 @@ constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::va
 #include <valarray> // valarray
 #include <vector> // vector
 
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
-
-
-#include <cstddef> // size_t
-#include <string> // string, to_string
-#include <iterator> // input_iterator_tag
+// #include <nlohmann/detail/meta.hpp>
 
 // #include <nlohmann/detail/value_t.hpp>
 
 
-namespace nlohmann
-{
-namespace detail
-{
-/// proxy class for the items() function
-template<typename IteratorType> class iteration_proxy
-{
-  private:
-    /// helper class for iteration
-    class iteration_proxy_internal
-    {
-      public:
-        using difference_type = std::ptrdiff_t;
-        using value_type = iteration_proxy_internal;
-        using pointer = iteration_proxy_internal*;
-        using reference = iteration_proxy_internal&;
-        using iterator_category = std::input_iterator_tag;
-
-      private:
-        /// the iterator
-        IteratorType anchor;
-        /// an index for arrays (used to create key names)
-        std::size_t array_index = 0;
-        /// last stringified array index
-        mutable std::size_t array_index_last = 0;
-        /// a string representation of the array index
-        mutable std::string array_index_str = "0";
-        /// an empty string (to return a reference for primitive values)
-        const std::string empty_str = "";
-
-      public:
-        explicit iteration_proxy_internal(IteratorType it) noexcept : anchor(it) {}
-
-        iteration_proxy_internal(const iteration_proxy_internal&) = default;
-        iteration_proxy_internal& operator=(const iteration_proxy_internal&) = default;
-
-        /// dereference operator (needed for range-based for)
-        iteration_proxy_internal& operator*()
-        {
-            return *this;
-        }
-
-        /// increment operator (needed for range-based for)
-        iteration_proxy_internal& operator++()
-        {
-            ++anchor;
-            ++array_index;
-
-            return *this;
-        }
-
-        /// equality operator (needed for InputIterator)
-        bool operator==(const iteration_proxy_internal& o) const noexcept
-        {
-            return anchor == o.anchor;
-        }
-
-        /// inequality operator (needed for range-based for)
-        bool operator!=(const iteration_proxy_internal& o) const noexcept
-        {
-            return anchor != o.anchor;
-        }
-
-        /// return key of the iterator
-        const std::string& key() const
-        {
-            assert(anchor.m_object != nullptr);
-
-            switch (anchor.m_object->type())
-            {
-                // use integer array index as key
-                case value_t::array:
-                {
-                    if (array_index != array_index_last)
-                    {
-                        array_index_str = std::to_string(array_index);
-                        array_index_last = array_index;
-                    }
-                    return array_index_str;
-                }
-
-                // use key from the object
-                case value_t::object:
-                    return anchor.key();
-
-                // use an empty key for all primitive types
-                default:
-                    return empty_str;
-            }
-        }
-
-        /// return value of the iterator
-        typename IteratorType::reference value() const
-        {
-            return anchor.value();
-        }
-    };
-
-    /// the container to iterate
-    typename IteratorType::reference container;
-
-  public:
-    /// construct iteration proxy from a container
-    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
-        : container(cont) {}
-
-    /// return iterator begin (needed for range-based for)
-    iteration_proxy_internal begin() noexcept
-    {
-        return iteration_proxy_internal(container.begin());
-    }
-
-    /// return iterator end (needed for range-based for)
-    iteration_proxy_internal end() noexcept
-    {
-        return iteration_proxy_internal(container.end());
-    }
-};
-}
-}
-
-
 namespace nlohmann
 {
 namespace detail
@@ -1586,16 +1283,6 @@ struct external_constructor<value_t::string>
         j.m_value = std::move(s);
         j.assert_invariant();
     }
-
-    template<typename BasicJsonType, typename CompatibleStringType,
-             enable_if_t<not std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
-                         int> = 0>
-    static void construct(BasicJsonType& j, const CompatibleStringType& str)
-    {
-        j.m_type = value_t::string;
-        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
-        j.assert_invariant();
-    }
 };
 
 template<>
@@ -1781,14 +1468,10 @@ void to_json(BasicJsonType& j, const std::vector<bool>& e)
     external_constructor<value_t::array>::construct(j, e);
 }
 
-template <typename BasicJsonType, typename CompatibleArrayType,
-          enable_if_t<is_compatible_array_type<BasicJsonType,
-                      CompatibleArrayType>::value and
-                      not is_compatible_object_type<
-                          BasicJsonType, CompatibleArrayType>::value and
-                      not is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value and
-                      not is_basic_json<CompatibleArrayType>::value,
-                      int> = 0>
+template<typename BasicJsonType, typename CompatibleArrayType,
+         enable_if_t<is_compatible_array_type<BasicJsonType, CompatibleArrayType>::value or
+                     std::is_same<typename BasicJsonType::array_t, CompatibleArrayType>::value,
+                     int> = 0>
 void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
 {
     external_constructor<value_t::array>::construct(j, arr);
@@ -1796,7 +1479,7 @@ void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
 
 template<typename BasicJsonType, typename T,
          enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
-void to_json(BasicJsonType& j, const std::valarray<T>& arr)
+void to_json(BasicJsonType& j, std::valarray<T> arr)
 {
     external_constructor<value_t::array>::construct(j, std::move(arr));
 }
@@ -1808,7 +1491,7 @@ void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
 }
 
 template<typename BasicJsonType, typename CompatibleObjectType,
-         enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value and not is_basic_json<CompatibleObjectType>::value, int> = 0>
+         enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value, int> = 0>
 void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
 {
     external_constructor<value_t::object>::construct(j, obj);
@@ -1820,12 +1503,9 @@ void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
     external_constructor<value_t::object>::construct(j, std::move(obj));
 }
 
-template <
-    typename BasicJsonType, typename T, std::size_t N,
-    enable_if_t<not std::is_constructible<typename BasicJsonType::string_t,
-                const T (&)[N]>::value,
-                int> = 0 >
-void to_json(BasicJsonType& j, const T (&arr)[N])
+template<typename BasicJsonType, typename T, std::size_t N,
+         enable_if_t<not std::is_constructible<typename BasicJsonType::string_t, T (&)[N]>::value, int> = 0>
+void to_json(BasicJsonType& j, T (&arr)[N])
 {
     external_constructor<value_t::array>::construct(j, arr);
 }
@@ -1836,14 +1516,6 @@ void to_json(BasicJsonType& j, const std::pair<Args...>& p)
     j = {p.first, p.second};
 }
 
-// for https://github.com/nlohmann/json/pull/1134
-template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_same<T, typename iteration_proxy<typename BasicJsonType::iterator>::iteration_proxy_internal>::value, int> = 0>
-void to_json(BasicJsonType& j, T b) noexcept
-{
-    j = {{b.key(), b.value()}};
-}
-
 template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
 void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...>)
 {
@@ -1858,12 +1530,35 @@ void to_json(BasicJsonType& j, const std::tuple<Args...>& t)
 
 struct to_json_fn
 {
+  private:
     template<typename BasicJsonType, typename T>
-    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
+    auto call(BasicJsonType& j, T&& val, priority_tag<1> /*unused*/) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
     -> decltype(to_json(j, std::forward<T>(val)), void())
     {
         return to_json(j, std::forward<T>(val));
     }
+
+    template<typename BasicJsonType, typename T>
+    void call(BasicJsonType& /*unused*/, T&& /*unused*/, priority_tag<0> /*unused*/) const noexcept
+    {
+        static_assert(sizeof(BasicJsonType) == 0,
+                      "could not find to_json() method in T's namespace");
+
+#ifdef _MSC_VER
+        // MSVC does not show a stacktrace for the above assert
+        using decayed = uncvref_t<T>;
+        static_assert(sizeof(typename decayed::force_msvc_stacktrace) == 0,
+                      "forcing MSVC stacktrace to show which T we're talking about.");
+#endif
+    }
+
+  public:
+    template<typename BasicJsonType, typename T>
+    void operator()(BasicJsonType& j, T&& val) const
+    noexcept(noexcept(std::declval<to_json_fn>().call(j, std::forward<T>(val), priority_tag<1> {})))
+    {
+        return call(j, std::forward<T>(val), priority_tag<1> {});
+    }
 };
 }
 
@@ -1877,9 +1572,12 @@ constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
 // #include <nlohmann/detail/input/input_adapters.hpp>
 
 
+#include <algorithm> // min
+#include <array> // array
 #include <cassert> // assert
 #include <cstddef> // size_t
 #include <cstring> // strlen
+#include <ios> // streamsize, streamoff, streampos
 #include <istream> // istream
 #include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
 #include <memory> // shared_ptr, make_shared, addressof
@@ -1895,9 +1593,6 @@ namespace nlohmann
 {
 namespace detail
 {
-/// the supported input formats
-enum class input_format_t { json, cbor, msgpack, ubjson };
-
 ////////////////////
 // input adapters //
 ////////////////////
@@ -1906,17 +1601,19 @@ enum class input_format_t { json, cbor, msgpack, ubjson };
 @brief abstract input adapter interface
 
 Produces a stream of std::char_traits<char>::int_type characters from a
-std::istream, a buffer, or some other input type. Accepts the return of
-exactly one non-EOF character for future input. The int_type characters
-returned consist of all valid char values as positive values (typically
-unsigned char), plus an EOF value outside that range, specified by the value
-of the function std::char_traits<char>::eof(). This value is typically -1, but
-could be any arbitrary value which is not a valid char value.
+std::istream, a buffer, or some other input type.  Accepts the return of exactly
+one non-EOF character for future input.  The int_type characters returned
+consist of all valid char values as positive values (typically unsigned char),
+plus an EOF value outside that range, specified by the value of the function
+std::char_traits<char>::eof().  This value is typically -1, but could be any
+arbitrary value which is not a valid char value.
 */
 struct input_adapter_protocol
 {
     /// get a character [0,255] or std::char_traits<char>::eof().
     virtual std::char_traits<char>::int_type get_character() = 0;
+    /// restore the last non-eof() character to input
+    virtual void unget_character() = 0;
     virtual ~input_adapter_protocol() = default;
 };
 
@@ -1944,7 +1641,34 @@ class input_stream_adapter : public input_adapter_protocol
 
     explicit input_stream_adapter(std::istream& i)
         : is(i), sb(*i.rdbuf())
-    {}
+    {
+        // skip byte order mark
+        std::char_traits<char>::int_type c;
+        if ((c = get_character()) == 0xEF)
+        {
+            if ((c = get_character()) == 0xBB)
+            {
+                if ((c = get_character()) == 0xBF)
+                {
+                    return; // Ignore BOM
+                }
+                else if (c != std::char_traits<char>::eof())
+                {
+                    is.unget();
+                }
+                is.putback('\xBB');
+            }
+            else if (c != std::char_traits<char>::eof())
+            {
+                is.unget();
+            }
+            is.putback('\xEF');
+        }
+        else if (c != std::char_traits<char>::eof())
+        {
+            is.unget(); // no byte order mark; process as usual
+        }
+    }
 
     // delete because of pointer members
     input_stream_adapter(const input_stream_adapter&) = delete;
@@ -1958,6 +1682,11 @@ class input_stream_adapter : public input_adapter_protocol
         return sb.sbumpc();
     }
 
+    void unget_character() override
+    {
+        sb.sungetc();  // is.unget() avoided for performance
+    }
+
   private:
     /// the associated input stream
     std::istream& is;
@@ -1969,8 +1698,14 @@ class input_buffer_adapter : public input_adapter_protocol
 {
   public:
     input_buffer_adapter(const char* b, const std::size_t l)
-        : cursor(b), limit(b + l)
-    {}
+        : cursor(b), limit(b + l), start(b)
+    {
+        // skip byte order mark
+        if (l >= 3 and b[0] == '\xEF' and b[1] == '\xBB' and b[2] == '\xBF')
+        {
+            cursor += 3;
+        }
+    }
 
     // delete because of pointer members
     input_buffer_adapter(const input_buffer_adapter&) = delete;
@@ -1986,172 +1721,21 @@ class input_buffer_adapter : public input_adapter_protocol
         return std::char_traits<char>::eof();
     }
 
-  private:
-    /// pointer to the current character
-    const char* cursor;
-    /// pointer past the last character
-    const char* const limit;
-};
-
-template<typename WideStringType, size_t T>
-struct wide_string_input_helper
-{
-    // UTF-32
-    static void fill_buffer(const WideStringType& str, size_t& current_wchar, std::array<std::char_traits<char>::int_type, 4>& utf8_bytes, size_t& utf8_bytes_index, size_t& utf8_bytes_filled)
-    {
-        utf8_bytes_index = 0;
-
-        if (current_wchar == str.size())
-        {
-            utf8_bytes[0] = std::char_traits<char>::eof();
-            utf8_bytes_filled = 1;
-        }
-        else
-        {
-            // get the current character
-            const int wc = static_cast<int>(str[current_wchar++]);
-
-            // UTF-32 to UTF-8 encoding
-            if (wc < 0x80)
-            {
-                utf8_bytes[0] = wc;
-                utf8_bytes_filled = 1;
-            }
-            else if (wc <= 0x7FF)
-            {
-                utf8_bytes[0] = 0xC0 | ((wc >> 6) & 0x1F);
-                utf8_bytes[1] = 0x80 | (wc & 0x3F);
-                utf8_bytes_filled = 2;
-            }
-            else if (wc <= 0xFFFF)
-            {
-                utf8_bytes[0] = 0xE0 | ((wc >> 12) & 0x0F);
-                utf8_bytes[1] = 0x80 | ((wc >> 6) & 0x3F);
-                utf8_bytes[2] = 0x80 | (wc & 0x3F);
-                utf8_bytes_filled = 3;
-            }
-            else if (wc <= 0x10FFFF)
-            {
-                utf8_bytes[0] = 0xF0 | ((wc >> 18) & 0x07);
-                utf8_bytes[1] = 0x80 | ((wc >> 12) & 0x3F);
-                utf8_bytes[2] = 0x80 | ((wc >> 6) & 0x3F);
-                utf8_bytes[3] = 0x80 | (wc & 0x3F);
-                utf8_bytes_filled = 4;
-            }
-            else
-            {
-                // unknown character
-                utf8_bytes[0] = wc;
-                utf8_bytes_filled = 1;
-            }
-        }
-    }
-};
-
-template<typename WideStringType>
-struct wide_string_input_helper<WideStringType, 2>
-{
-    // UTF-16
-    static void fill_buffer(const WideStringType& str, size_t& current_wchar, std::array<std::char_traits<char>::int_type, 4>& utf8_bytes, size_t& utf8_bytes_index, size_t& utf8_bytes_filled)
-    {
-        utf8_bytes_index = 0;
-
-        if (current_wchar == str.size())
-        {
-            utf8_bytes[0] = std::char_traits<char>::eof();
-            utf8_bytes_filled = 1;
-        }
-        else
-        {
-            // get the current character
-            const int wc = static_cast<int>(str[current_wchar++]);
-
-            // UTF-16 to UTF-8 encoding
-            if (wc < 0x80)
-            {
-                utf8_bytes[0] = wc;
-                utf8_bytes_filled = 1;
-            }
-            else if (wc <= 0x7FF)
-            {
-                utf8_bytes[0] = 0xC0 | ((wc >> 6));
-                utf8_bytes[1] = 0x80 | (wc & 0x3F);
-                utf8_bytes_filled = 2;
-            }
-            else if (0xD800 > wc or wc >= 0xE000)
-            {
-                utf8_bytes[0] = 0xE0 | ((wc >> 12));
-                utf8_bytes[1] = 0x80 | ((wc >> 6) & 0x3F);
-                utf8_bytes[2] = 0x80 | (wc & 0x3F);
-                utf8_bytes_filled = 3;
-            }
-            else
-            {
-                if (current_wchar < str.size())
-                {
-                    const int wc2 = static_cast<int>(str[current_wchar++]);
-                    const int charcode = 0x10000 + (((wc & 0x3FF) << 10) | (wc2 & 0x3FF));
-                    utf8_bytes[0] = 0xf0 | (charcode >> 18);
-                    utf8_bytes[1] = 0x80 | ((charcode >> 12) & 0x3F);
-                    utf8_bytes[2] = 0x80 | ((charcode >> 6) & 0x3F);
-                    utf8_bytes[3] = 0x80 | (charcode & 0x3F);
-                    utf8_bytes_filled = 4;
-                }
-                else
-                {
-                    // unknown character
-                    ++current_wchar;
-                    utf8_bytes[0] = wc;
-                    utf8_bytes_filled = 1;
-                }
-            }
-        }
-    }
-};
-
-template<typename WideStringType>
-class wide_string_input_adapter : public input_adapter_protocol
-{
-  public:
-    explicit wide_string_input_adapter(const WideStringType& w) : str(w) {}
-
-    std::char_traits<char>::int_type get_character() noexcept override
+    void unget_character() noexcept override
     {
-        // check if buffer needs to be filled
-        if (utf8_bytes_index == utf8_bytes_filled)
+        if (JSON_LIKELY(cursor > start))
         {
-            fill_buffer<sizeof(typename WideStringType::value_type)>();
-
-            assert(utf8_bytes_filled > 0);
-            assert(utf8_bytes_index == 0);
+            --cursor;
         }
-
-        // use buffer
-        assert(utf8_bytes_filled > 0);
-        assert(utf8_bytes_index < utf8_bytes_filled);
-        return utf8_bytes[utf8_bytes_index++];
     }
 
   private:
-    template<size_t T>
-    void fill_buffer()
-    {
-        wide_string_input_helper<WideStringType, T>::fill_buffer(str, current_wchar, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
-    }
-
-    /// the wstring to process
-    const WideStringType& str;
-
-    /// index of the current wchar in str
-    std::size_t current_wchar = 0;
-
-    /// a buffer for UTF-8 bytes
-    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
-
-    /// index to the utf8_codes array for the next valid byte
-    std::size_t utf8_bytes_index = 0;
-    /// number of valid bytes in the utf8_codes array
-    std::size_t utf8_bytes_filled = 0;
+    /// pointer to the current character
+    const char* cursor;
+    /// pointer past the last character
+    const char* limit;
+    /// pointer to the first character
+    const char* start;
 };
 
 class input_adapter
@@ -2167,15 +1751,6 @@ class input_adapter
     input_adapter(std::istream&& i)
         : ia(std::make_shared<input_stream_adapter>(i)) {}
 
-    input_adapter(const std::wstring& ws)
-        : ia(std::make_shared<wide_string_input_adapter<std::wstring>>(ws)) {}
-
-    input_adapter(const std::u16string& ws)
-        : ia(std::make_shared<wide_string_input_adapter<std::u16string>>(ws)) {}
-
-    input_adapter(const std::u32string& ws)
-        : ia(std::make_shared<wide_string_input_adapter<std::u32string>>(ws)) {}
-
     /// input adapter for buffer
     template<typename CharT,
              typename std::enable_if<
@@ -2206,18 +1781,15 @@ class input_adapter
                  int>::type = 0>
     input_adapter(IteratorType first, IteratorType last)
     {
-#ifndef NDEBUG
         // assertion to check that the iterator range is indeed contiguous,
         // see http://stackoverflow.com/a/35008842/266378 for more discussion
-        const auto is_contiguous = std::accumulate(
-                                       first, last, std::pair<bool, int>(true, 0),
-                                       [&first](std::pair<bool, int> res, decltype(*first) val)
+        assert(std::accumulate(
+                   first, last, std::pair<bool, int>(true, 0),
+                   [&first](std::pair<bool, int> res, decltype(*first) val)
         {
             res.first &= (val == *(std::next(std::addressof(*first), res.second++)));
             return res;
-        }).first;
-        assert(is_contiguous);
-#endif
+        }).first);
 
         // assertion to check that each element is 1 byte long
         static_assert(
@@ -2268,8 +1840,10 @@ class input_adapter
 #include <clocale> // localeconv
 #include <cstddef> // size_t
 #include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
-#include <cstdio> // snprintf
 #include <initializer_list> // initializer_list
+#include <ios> // hex, uppercase
+#include <iomanip> // setw, setfill
+#include <sstream> // stringstream
 #include <string> // char_traits, string
 #include <vector> // vector
 
@@ -2359,14 +1933,12 @@ class lexer
                 return "end of input";
             case token_type::literal_or_value:
                 return "'[', '{', or a literal";
-            // LCOV_EXCL_START
             default: // catch non-enum values
-                return "unknown token";
-                // LCOV_EXCL_STOP
+                return "unknown token"; // LCOV_EXCL_LINE
         }
     }
 
-    explicit lexer(detail::input_adapter_t&& adapter)
+    explicit lexer(detail::input_adapter_t adapter)
         : ia(std::move(adapter)), decimal_point_char(get_decimal_point()) {}
 
     // delete because of pointer members
@@ -3014,13 +2586,11 @@ class lexer
                 goto scan_number_any1;
             }
 
-            // LCOV_EXCL_START
             default:
             {
                 // all other characters are rejected outside scan_number()
-                assert(false);
+                assert(false); // LCOV_EXCL_LINE
             }
-                // LCOV_EXCL_STOP
         }
 
 scan_number_minus:
@@ -3350,16 +2920,7 @@ class lexer
     std::char_traits<char>::int_type get()
     {
         ++chars_read;
-        if (next_unget)
-        {
-            // just reset the next_unget variable and work with current
-            next_unget = false;
-        }
-        else
-        {
-            current = ia->get_character();
-        }
-
+        current = ia->get_character();
         if (JSON_LIKELY(current != std::char_traits<char>::eof()))
         {
             token_string.push_back(std::char_traits<char>::to_char_type(current));
@@ -3367,20 +2928,13 @@ class lexer
         return current;
     }
 
-    /*!
-    @brief unget current character (read it again on next get)
-
-    We implement unget by setting variable next_unget to true. The input is not
-    changed - we just simulate ungetting by modifying chars_read and
-    token_string. The next call to get() will behave as if the unget character
-    is read again.
-    */
+    /// unget current character (return it again on next get)
     void unget()
     {
-        next_unget = true;
         --chars_read;
         if (JSON_LIKELY(current != std::char_traits<char>::eof()))
         {
+            ia->unget_character();
             assert(token_string.size() != 0);
             token_string.pop_back();
         }
@@ -3416,9 +2970,9 @@ class lexer
     }
 
     /// return current string value (implicitly resets the token; useful only once)
-    string_t& get_string()
+    string_t&& move_string()
     {
-        return token_buffer;
+        return std::move(token_buffer);
     }
 
     /////////////////////
@@ -3443,9 +2997,10 @@ class lexer
             if ('\x00' <= c and c <= '\x1F')
             {
                 // escape control characters
-                char cs[9];
-                snprintf(cs, 9, "<U+%.4X>", static_cast<unsigned char>(c));
-                result += cs;
+                std::stringstream ss;
+                ss << "<U+" << std::setw(4) << std::uppercase << std::setfill('0')
+                   << std::hex << static_cast<int>(c) << ">";
+                result += ss.str();
             }
             else
             {
@@ -3467,43 +3022,8 @@ class lexer
     // actual scanner
     /////////////////////
 
-    /*!
-    @brief skip the UTF-8 byte order mark
-    @return true iff there is no BOM or the correct BOM has been skipped
-    */
-    bool skip_bom()
-    {
-        if (get() == 0xEF)
-        {
-            if (get() == 0xBB and get() == 0xBF)
-            {
-                // we completely parsed the BOM
-                return true;
-            }
-            else
-            {
-                // after reading 0xEF, an unexpected character followed
-                return false;
-            }
-        }
-        else
-        {
-            // the first character is not the beginning of the BOM; unget it to
-            // process is later
-            unget();
-            return true;
-        }
-    }
-
     token_type scan()
     {
-        // initially, skip the BOM
-        if (chars_read == 0 and not skip_bom())
-        {
-            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
-            return token_type::parse_error;
-        }
-
         // read next character and ignore whitespace
         do
         {
@@ -3573,9 +3093,6 @@ class lexer
     /// the current character
     std::char_traits<char>::int_type current = std::char_traits<char>::eof();
 
-    /// whether the next get() call should just return current
-    bool next_unget = false;
-
     /// the number of characters read
     std::size_t chars_read = 0;
 
@@ -3613,1293 +3130,519 @@ class lexer
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
-// #include <nlohmann/detail/meta/is_sax.hpp>
-
-
-#include <cstdint> // size_t
-#include <utility> // declval
+// #include <nlohmann/detail/input/input_adapters.hpp>
 
-// #include <nlohmann/detail/meta/detected.hpp>
+// #include <nlohmann/detail/input/lexer.hpp>
 
-// #include <nlohmann/detail/meta/type_traits.hpp>
+// #include <nlohmann/detail/value_t.hpp>
 
 
 namespace nlohmann
 {
 namespace detail
 {
-template <typename T>
-using null_function_t = decltype(std::declval<T&>().null());
-
-template <typename T>
-using boolean_function_t =
-    decltype(std::declval<T&>().boolean(std::declval<bool>()));
-
-template <typename T, typename Integer>
-using number_integer_function_t =
-    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
-
-template <typename T, typename Unsigned>
-using number_unsigned_function_t =
-    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
-
-template <typename T, typename Float, typename String>
-using number_float_function_t = decltype(std::declval<T&>().number_float(
-                                    std::declval<Float>(), std::declval<const String&>()));
-
-template <typename T, typename String>
-using string_function_t =
-    decltype(std::declval<T&>().string(std::declval<String&>()));
-
-template <typename T>
-using start_object_function_t =
-    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
-
-template <typename T, typename String>
-using key_function_t =
-    decltype(std::declval<T&>().key(std::declval<String&>()));
-
-template <typename T>
-using end_object_function_t = decltype(std::declval<T&>().end_object());
-
-template <typename T>
-using start_array_function_t =
-    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
-
-template <typename T>
-using end_array_function_t = decltype(std::declval<T&>().end_array());
-
-template <typename T, typename Exception>
-using parse_error_function_t = decltype(std::declval<T&>().parse_error(
-        std::declval<std::size_t>(), std::declval<const std::string&>(),
-        std::declval<const Exception&>()));
-
-template <typename SAX, typename BasicJsonType>
-struct is_sax
-{
-  private:
-    static_assert(is_basic_json<BasicJsonType>::value,
-                  "BasicJsonType must be of type basic_json<...>");
-
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using exception_t = typename BasicJsonType::exception;
+////////////
+// parser //
+////////////
 
-  public:
-    static constexpr bool value =
-        is_detected_exact<bool, null_function_t, SAX>::value &&
-        is_detected_exact<bool, boolean_function_t, SAX>::value &&
-        is_detected_exact<bool, number_integer_function_t, SAX,
-        number_integer_t>::value &&
-        is_detected_exact<bool, number_unsigned_function_t, SAX,
-        number_unsigned_t>::value &&
-        is_detected_exact<bool, number_float_function_t, SAX, number_float_t,
-        string_t>::value &&
-        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
-        is_detected_exact<bool, start_object_function_t, SAX>::value &&
-        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
-        is_detected_exact<bool, end_object_function_t, SAX>::value &&
-        is_detected_exact<bool, start_array_function_t, SAX>::value &&
-        is_detected_exact<bool, end_array_function_t, SAX>::value &&
-        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
-};
+/*!
+@brief syntax analysis
 
-template <typename SAX, typename BasicJsonType>
-struct is_sax_static_asserts
+This class implements a recursive decent parser.
+*/
+template<typename BasicJsonType>
+class parser
 {
-  private:
-    static_assert(is_basic_json<BasicJsonType>::value,
-                  "BasicJsonType must be of type basic_json<...>");
-
     using number_integer_t = typename BasicJsonType::number_integer_t;
     using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
     using number_float_t = typename BasicJsonType::number_float_t;
     using string_t = typename BasicJsonType::string_t;
-    using exception_t = typename BasicJsonType::exception;
+    using lexer_t = lexer<BasicJsonType>;
+    using token_type = typename lexer_t::token_type;
 
   public:
-    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
-                  "Missing/invalid function: bool null()");
-    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
-                  "Missing/invalid function: bool boolean(bool)");
-    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
-                  "Missing/invalid function: bool boolean(bool)");
-    static_assert(
-        is_detected_exact<bool, number_integer_function_t, SAX,
-        number_integer_t>::value,
-        "Missing/invalid function: bool number_integer(number_integer_t)");
-    static_assert(
-        is_detected_exact<bool, number_unsigned_function_t, SAX,
-        number_unsigned_t>::value,
-        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
-    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
-                  number_float_t, string_t>::value,
-                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
-    static_assert(
-        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
-        "Missing/invalid function: bool string(string_t&)");
-    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
-                  "Missing/invalid function: bool start_object(std::size_t)");
-    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
-                  "Missing/invalid function: bool key(string_t&)");
-    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
-                  "Missing/invalid function: bool end_object()");
-    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
-                  "Missing/invalid function: bool start_array(std::size_t)");
-    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
-                  "Missing/invalid function: bool end_array()");
-    static_assert(
-        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
-        "Missing/invalid function: bool parse_error(std::size_t, const "
-        "std::string&, const exception&)");
-};
-}
-}
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
+    enum class parse_event_t : uint8_t
+    {
+        /// the parser read `{` and started to process a JSON object
+        object_start,
+        /// the parser read `}` and finished processing a JSON object
+        object_end,
+        /// the parser read `[` and started to process a JSON array
+        array_start,
+        /// the parser read `]` and finished processing a JSON array
+        array_end,
+        /// the parser read a key of a value in an object
+        key,
+        /// the parser finished reading a JSON value
+        value
+    };
 
-// #include <nlohmann/detail/input/json_sax.hpp>
+    using parser_callback_t =
+        std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
 
+    /// a parser reading from an input adapter
+    explicit parser(detail::input_adapter_t adapter,
+                    const parser_callback_t cb = nullptr,
+                    const bool allow_exceptions_ = true)
+        : callback(cb), m_lexer(adapter), allow_exceptions(allow_exceptions_)
+    {}
 
-#include <cstddef>
-#include <string>
-#include <vector>
+    /*!
+    @brief public parser interface
 
-// #include <nlohmann/detail/input/parser.hpp>
+    @param[in] strict      whether to expect the last token to be EOF
+    @param[in,out] result  parsed JSON value
 
-// #include <nlohmann/detail/exceptions.hpp>
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    void parse(const bool strict, BasicJsonType& result)
+    {
+        // read first token
+        get_token();
 
+        parse_internal(true, result);
+        result.assert_invariant();
 
-namespace nlohmann
-{
+        // in strict mode, input must be completely read
+        if (strict)
+        {
+            get_token();
+            expect(token_type::end_of_input);
+        }
 
-/*!
-@brief SAX interface
+        // in case of an error, return discarded value
+        if (errored)
+        {
+            result = value_t::discarded;
+            return;
+        }
 
-This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
-Each function is called in different situations while the input is parsed. The
-boolean return value informs the parser whether to continue processing the
-input.
-*/
-template<typename BasicJsonType>
-struct json_sax
-{
-    /// type for (signed) integers
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    /// type for unsigned integers
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    /// type for floating-point numbers
-    using number_float_t = typename BasicJsonType::number_float_t;
-    /// type for strings
-    using string_t = typename BasicJsonType::string_t;
+        // set top-level value to null if it was discarded by the callback
+        // function
+        if (result.is_discarded())
+        {
+            result = nullptr;
+        }
+    }
 
     /*!
-    @brief a null value was read
-    @return whether parsing should proceed
-    */
-    virtual bool null() = 0;
+    @brief public accept interface
 
-    /*!
-    @brief a boolean value was read
-    @param[in] val  boolean value
-    @return whether parsing should proceed
+    @param[in] strict  whether to expect the last token to be EOF
+    @return whether the input is a proper JSON text
     */
-    virtual bool boolean(bool val) = 0;
+    bool accept(const bool strict = true)
+    {
+        // read first token
+        get_token();
 
-    /*!
-    @brief an integer number was read
-    @param[in] val  integer value
-    @return whether parsing should proceed
-    */
-    virtual bool number_integer(number_integer_t val) = 0;
+        if (not accept_internal())
+        {
+            return false;
+        }
 
-    /*!
-    @brief an unsigned integer number was read
-    @param[in] val  unsigned integer value
-    @return whether parsing should proceed
-    */
-    virtual bool number_unsigned(number_unsigned_t val) = 0;
+        // strict => last token must be EOF
+        return not strict or (get_token() == token_type::end_of_input);
+    }
 
+  private:
     /*!
-    @brief an floating-point number was read
-    @param[in] val  floating-point value
-    @param[in] s    raw token value
-    @return whether parsing should proceed
+    @brief the actual parser
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
     */
-    virtual bool number_float(number_float_t val, const string_t& s) = 0;
+    void parse_internal(bool keep, BasicJsonType& result)
+    {
+        // never parse after a parse error was detected
+        assert(not errored);
 
-    /*!
-    @brief a string was read
-    @param[in] val  string value
-    @return whether parsing should proceed
-    @note It is safe to move the passed string.
-    */
-    virtual bool string(string_t& val) = 0;
+        // start with a discarded value
+        if (not result.is_discarded())
+        {
+            result.m_value.destroy(result.m_type);
+            result.m_type = value_t::discarded;
+        }
 
-    /*!
-    @brief the beginning of an object was read
-    @param[in] elements  number of object elements or -1 if unknown
-    @return whether parsing should proceed
-    @note binary formats may report the number of elements
-    */
-    virtual bool start_object(std::size_t elements) = 0;
+        switch (last_token)
+        {
+            case token_type::begin_object:
+            {
+                if (keep)
+                {
+                    if (callback)
+                    {
+                        keep = callback(depth++, parse_event_t::object_start, result);
+                    }
 
-    /*!
-    @brief an object key was read
-    @param[in] val  object key
-    @return whether parsing should proceed
-    @note It is safe to move the passed string.
-    */
-    virtual bool key(string_t& val) = 0;
+                    if (not callback or keep)
+                    {
+                        // explicitly set result to object to cope with {}
+                        result.m_type = value_t::object;
+                        result.m_value = value_t::object;
+                    }
+                }
 
-    /*!
-    @brief the end of an object was read
-    @return whether parsing should proceed
-    */
-    virtual bool end_object() = 0;
+                // read next token
+                get_token();
 
-    /*!
-    @brief the beginning of an array was read
-    @param[in] elements  number of array elements or -1 if unknown
-    @return whether parsing should proceed
-    @note binary formats may report the number of elements
-    */
-    virtual bool start_array(std::size_t elements) = 0;
+                // closing } -> we are done
+                if (last_token == token_type::end_object)
+                {
+                    if (keep and callback and not callback(--depth, parse_event_t::object_end, result))
+                    {
+                        result.m_value.destroy(result.m_type);
+                        result.m_type = value_t::discarded;
+                    }
+                    break;
+                }
 
-    /*!
-    @brief the end of an array was read
-    @return whether parsing should proceed
-    */
-    virtual bool end_array() = 0;
+                // parse values
+                string_t key;
+                BasicJsonType value;
+                while (true)
+                {
+                    // store key
+                    if (not expect(token_type::value_string))
+                    {
+                        return;
+                    }
+                    key = m_lexer.move_string();
 
-    /*!
-    @brief a parse error occurred
-    @param[in] position    the position in the input where the error occurs
-    @param[in] last_token  the last read token
-    @param[in] error_msg   a detailed error message
-    @return whether parsing should proceed (must return false)
-    */
-    virtual bool parse_error(std::size_t position,
-                             const std::string& last_token,
-                             const detail::exception& ex) = 0;
+                    bool keep_tag = false;
+                    if (keep)
+                    {
+                        if (callback)
+                        {
+                            BasicJsonType k(key);
+                            keep_tag = callback(depth, parse_event_t::key, k);
+                        }
+                        else
+                        {
+                            keep_tag = true;
+                        }
+                    }
 
-    virtual ~json_sax() = default;
-};
+                    // parse separator (:)
+                    get_token();
+                    if (not expect(token_type::name_separator))
+                    {
+                        return;
+                    }
 
+                    // parse and add value
+                    get_token();
+                    value.m_value.destroy(value.m_type);
+                    value.m_type = value_t::discarded;
+                    parse_internal(keep, value);
 
-namespace detail
-{
-/*!
-@brief SAX implementation to create a JSON value from SAX events
+                    if (JSON_UNLIKELY(errored))
+                    {
+                        return;
+                    }
 
-This class implements the @ref json_sax interface and processes the SAX events
-to create a JSON value which makes it basically a DOM parser. The structure or
-hierarchy of the JSON value is managed by the stack `ref_stack` which contains
-a pointer to the respective array or object for each recursion depth.
+                    if (keep and keep_tag and not value.is_discarded())
+                    {
+                        result.m_value.object->emplace(std::move(key), std::move(value));
+                    }
 
-After successful parsing, the value that is passed by reference to the
-constructor contains the parsed value.
+                    // comma -> next value
+                    get_token();
+                    if (last_token == token_type::value_separator)
+                    {
+                        get_token();
+                        continue;
+                    }
 
-@tparam BasicJsonType  the JSON type
-*/
-template<typename BasicJsonType>
-class json_sax_dom_parser
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
+                    // closing }
+                    if (not expect(token_type::end_object))
+                    {
+                        return;
+                    }
+                    break;
+                }
 
-    /*!
-    @param[in, out] r  reference to a JSON value that is manipulated while
-                       parsing
-    @param[in] allow_exceptions_  whether parse errors yield exceptions
-    */
-    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true)
-        : root(r), allow_exceptions(allow_exceptions_)
-    {}
+                if (keep and callback and not callback(--depth, parse_event_t::object_end, result))
+                {
+                    result.m_value.destroy(result.m_type);
+                    result.m_type = value_t::discarded;
+                }
+                break;
+            }
 
-    bool null()
-    {
-        handle_value(nullptr);
-        return true;
-    }
+            case token_type::begin_array:
+            {
+                if (keep)
+                {
+                    if (callback)
+                    {
+                        keep = callback(depth++, parse_event_t::array_start, result);
+                    }
 
-    bool boolean(bool val)
-    {
-        handle_value(val);
-        return true;
-    }
+                    if (not callback or keep)
+                    {
+                        // explicitly set result to array to cope with []
+                        result.m_type = value_t::array;
+                        result.m_value = value_t::array;
+                    }
+                }
 
-    bool number_integer(number_integer_t val)
-    {
-        handle_value(val);
-        return true;
-    }
+                // read next token
+                get_token();
 
-    bool number_unsigned(number_unsigned_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_float(number_float_t val, const string_t&)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool string(string_t& val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool start_object(std::size_t len)
-    {
-        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
-
-        if (JSON_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408,
-                                            "excessive object size: " + std::to_string(len)));
-        }
-
-        return true;
-    }
-
-    bool key(string_t& val)
-    {
-        // add null at given key and store the reference for later
-        object_element = &(ref_stack.back()->m_value.object->operator[](val));
-        return true;
-    }
-
-    bool end_object()
-    {
-        ref_stack.pop_back();
-        return true;
-    }
-
-    bool start_array(std::size_t len)
-    {
-        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
-
-        if (JSON_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408,
-                                            "excessive array size: " + std::to_string(len)));
-        }
-
-        return true;
-    }
-
-    bool end_array()
-    {
-        ref_stack.pop_back();
-        return true;
-    }
-
-    bool parse_error(std::size_t, const std::string&,
-                     const detail::exception& ex)
-    {
-        errored = true;
-        if (allow_exceptions)
-        {
-            // determine the proper exception type from the id
-            switch ((ex.id / 100) % 100)
-            {
-                case 1:
-                    JSON_THROW(*reinterpret_cast<const detail::parse_error*>(&ex));
-                case 4:
-                    JSON_THROW(*reinterpret_cast<const detail::out_of_range*>(&ex));
-                // LCOV_EXCL_START
-                case 2:
-                    JSON_THROW(*reinterpret_cast<const detail::invalid_iterator*>(&ex));
-                case 3:
-                    JSON_THROW(*reinterpret_cast<const detail::type_error*>(&ex));
-                case 5:
-                    JSON_THROW(*reinterpret_cast<const detail::other_error*>(&ex));
-                default:
-                    assert(false);
-                    // LCOV_EXCL_STOP
-            }
-        }
-        return false;
-    }
-
-    constexpr bool is_errored() const
-    {
-        return errored;
-    }
-
-  private:
-    /*!
-    @invariant If the ref stack is empty, then the passed value will be the new
-               root.
-    @invariant If the ref stack contains a value, then it is an array or an
-               object to which we can add elements
-    */
-    template<typename Value>
-    BasicJsonType* handle_value(Value&& v)
-    {
-        if (ref_stack.empty())
-        {
-            root = BasicJsonType(std::forward<Value>(v));
-            return &root;
-        }
-        else
-        {
-            assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
-            if (ref_stack.back()->is_array())
-            {
-                ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
-                return &(ref_stack.back()->m_value.array->back());
-            }
-            else
-            {
-                assert(object_element);
-                *object_element = BasicJsonType(std::forward<Value>(v));
-                return object_element;
-            }
-        }
-    }
-
-    /// the parsed JSON value
-    BasicJsonType& root;
-    /// stack to model hierarchy of values
-    std::vector<BasicJsonType*> ref_stack;
-    /// helper to hold the reference for the next object element
-    BasicJsonType* object_element = nullptr;
-    /// whether a syntax error occurred
-    bool errored = false;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-};
-
-template<typename BasicJsonType>
-class json_sax_dom_callback_parser
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using parser_callback_t = typename BasicJsonType::parser_callback_t;
-    using parse_event_t = typename BasicJsonType::parse_event_t;
-
-    json_sax_dom_callback_parser(BasicJsonType& r,
-                                 const parser_callback_t cb,
-                                 const bool allow_exceptions_ = true)
-        : root(r), callback(cb), allow_exceptions(allow_exceptions_)
-    {
-        keep_stack.push_back(true);
-    }
-
-    bool null()
-    {
-        handle_value(nullptr);
-        return true;
-    }
-
-    bool boolean(bool val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_integer(number_integer_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_float(number_float_t val, const string_t&)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool string(string_t& val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool start_object(std::size_t len)
-    {
-        // check callback for object start
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
-        keep_stack.push_back(keep);
-
-        auto val = handle_value(BasicJsonType::value_t::object, true);
-        ref_stack.push_back(val.second);
-
-        // check object limit
-        if (ref_stack.back())
-        {
-            if (JSON_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
-            {
-                JSON_THROW(out_of_range::create(408,
-                                                "excessive object size: " + std::to_string(len)));
-            }
-        }
-
-        return true;
-    }
-
-    bool key(string_t& val)
-    {
-        BasicJsonType k = BasicJsonType(val);
-
-        // check callback for key
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
-        key_keep_stack.push_back(keep);
-
-        // add discarded value at given key and store the reference for later
-        if (keep and ref_stack.back())
-        {
-            object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
-        }
-
-        return true;
-    }
-
-    bool end_object()
-    {
-        if (ref_stack.back())
-        {
-            if (not callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
-            {
-                // discard object
-                *ref_stack.back() = discarded;
-            }
-        }
-
-        assert(not ref_stack.empty());
-        assert(not keep_stack.empty());
-        ref_stack.pop_back();
-        keep_stack.pop_back();
-
-        if (not ref_stack.empty() and ref_stack.back())
-        {
-            // remove discarded value
-            if (ref_stack.back()->is_object())
-            {
-                for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
+                // closing ] -> we are done
+                if (last_token == token_type::end_array)
                 {
-                    if (it->is_discarded())
+                    if (callback and not callback(--depth, parse_event_t::array_end, result))
                     {
-                        ref_stack.back()->erase(it);
-                        break;
+                        result.m_value.destroy(result.m_type);
+                        result.m_type = value_t::discarded;
                     }
+                    break;
                 }
-            }
-        }
-
-        return true;
-    }
-
-    bool start_array(std::size_t len)
-    {
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
-        keep_stack.push_back(keep);
-
-        auto val = handle_value(BasicJsonType::value_t::array, true);
-        ref_stack.push_back(val.second);
-
-        // check array limit
-        if (ref_stack.back())
-        {
-            if (JSON_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
-            {
-                JSON_THROW(out_of_range::create(408,
-                                                "excessive array size: " + std::to_string(len)));
-            }
-        }
-
-        return true;
-    }
-
-    bool end_array()
-    {
-        bool keep = true;
-
-        if (ref_stack.back())
-        {
-            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
-            if (not keep)
-            {
-                // discard array
-                *ref_stack.back() = discarded;
-            }
-        }
 
-        assert(not ref_stack.empty());
-        assert(not keep_stack.empty());
-        ref_stack.pop_back();
-        keep_stack.pop_back();
-
-        // remove discarded value
-        if (not keep and not ref_stack.empty())
-        {
-            if (ref_stack.back()->is_array())
-            {
-                ref_stack.back()->m_value.array->pop_back();
-            }
-        }
-
-        return true;
-    }
-
-    bool parse_error(std::size_t, const std::string&,
-                     const detail::exception& ex)
-    {
-        errored = true;
-        if (allow_exceptions)
-        {
-            // determine the proper exception type from the id
-            switch ((ex.id / 100) % 100)
-            {
-                case 1:
-                    JSON_THROW(*reinterpret_cast<const detail::parse_error*>(&ex));
-                case 4:
-                    JSON_THROW(*reinterpret_cast<const detail::out_of_range*>(&ex));
-                // LCOV_EXCL_START
-                case 2:
-                    JSON_THROW(*reinterpret_cast<const detail::invalid_iterator*>(&ex));
-                case 3:
-                    JSON_THROW(*reinterpret_cast<const detail::type_error*>(&ex));
-                case 5:
-                    JSON_THROW(*reinterpret_cast<const detail::other_error*>(&ex));
-                default:
-                    assert(false);
-                    // LCOV_EXCL_STOP
-            }
-        }
-        return false;
-    }
-
-    constexpr bool is_errored() const
-    {
-        return errored;
-    }
-
-  private:
-    /*!
-    @param[in] v  value to add to the JSON value we build during parsing
-    @param[in] skip_callback  whether we should skip calling the callback
-               function; this is required after start_array() and
-               start_object() SAX events, because otherwise we would call the
-               callback function with an empty array or object, respectively.
-
-    @invariant If the ref stack is empty, then the passed value will be the new
-               root.
-    @invariant If the ref stack contains a value, then it is an array or an
-               object to which we can add elements
-
-    @return pair of boolean (whether value should be kept) and pointer (to the
-            passed value in the ref_stack hierarchy; nullptr if not kept)
-    */
-    template<typename Value>
-    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
-    {
-        assert(not keep_stack.empty());
-
-        // do not handle this value if we know it would be added to a discarded
-        // container
-        if (not keep_stack.back())
-        {
-            return {false, nullptr};
-        }
-
-        // create value
-        auto value = BasicJsonType(std::forward<Value>(v));
-
-        // check callback
-        const bool keep = skip_callback or callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
-
-        // do not handle this value if we just learnt it shall be discarded
-        if (not keep)
-        {
-            return {false, nullptr};
-        }
-
-        if (ref_stack.empty())
-        {
-            root = std::move(value);
-            return {true, &root};
-        }
-        else
-        {
-            // skip this value if we already decided to skip the parent
-            // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
-            if (not ref_stack.back())
-            {
-                return {false, nullptr};
-            }
-
-            assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
-            if (ref_stack.back()->is_array())
-            {
-                ref_stack.back()->m_value.array->push_back(std::move(value));
-                return {true, &(ref_stack.back()->m_value.array->back())};
-            }
-            else
-            {
-                // check if we should store an element for the current key
-                assert(not key_keep_stack.empty());
-                const bool store_element = key_keep_stack.back();
-                key_keep_stack.pop_back();
-
-                if (not store_element)
+                // parse values
+                BasicJsonType value;
+                while (true)
                 {
-                    return {false, nullptr};
-                }
-
-                assert(object_element);
-                *object_element = std::move(value);
-                return {true, object_element};
-            }
-        }
-    }
-
-    /// the parsed JSON value
-    BasicJsonType& root;
-    /// stack to model hierarchy of values
-    std::vector<BasicJsonType*> ref_stack;
-    /// stack to manage which values to keep
-    std::vector<bool> keep_stack;
-    /// stack to manage which object keys to keep
-    std::vector<bool> key_keep_stack;
-    /// helper to hold the reference for the next object element
-    BasicJsonType* object_element = nullptr;
-    /// whether a syntax error occurred
-    bool errored = false;
-    /// callback function
-    const parser_callback_t callback = nullptr;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-    /// a discarded value for the callback
-    BasicJsonType discarded = BasicJsonType::value_t::discarded;
-};
+                    // parse value
+                    value.m_value.destroy(value.m_type);
+                    value.m_type = value_t::discarded;
+                    parse_internal(keep, value);
 
-template<typename BasicJsonType>
-class json_sax_acceptor
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-
-    bool null()
-    {
-        return true;
-    }
-
-    bool boolean(bool)
-    {
-        return true;
-    }
-
-    bool number_integer(number_integer_t)
-    {
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t)
-    {
-        return true;
-    }
-
-    bool number_float(number_float_t, const string_t&)
-    {
-        return true;
-    }
-
-    bool string(string_t&)
-    {
-        return true;
-    }
-
-    bool start_object(std::size_t = std::size_t(-1))
-    {
-        return true;
-    }
-
-    bool key(string_t&)
-    {
-        return true;
-    }
-
-    bool end_object()
-    {
-        return true;
-    }
-
-    bool start_array(std::size_t = std::size_t(-1))
-    {
-        return true;
-    }
-
-    bool end_array()
-    {
-        return true;
-    }
-
-    bool parse_error(std::size_t, const std::string&, const detail::exception&)
-    {
-        return false;
-    }
-};
-}
-
-}
-
-// #include <nlohmann/detail/input/lexer.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-////////////
-// parser //
-////////////
-
-/*!
-@brief syntax analysis
-
-This class implements a recursive decent parser.
-*/
-template<typename BasicJsonType>
-class parser
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using lexer_t = lexer<BasicJsonType>;
-    using token_type = typename lexer_t::token_type;
-
-  public:
-    enum class parse_event_t : uint8_t
-    {
-        /// the parser read `{` and started to process a JSON object
-        object_start,
-        /// the parser read `}` and finished processing a JSON object
-        object_end,
-        /// the parser read `[` and started to process a JSON array
-        array_start,
-        /// the parser read `]` and finished processing a JSON array
-        array_end,
-        /// the parser read a key of a value in an object
-        key,
-        /// the parser finished reading a JSON value
-        value
-    };
-
-    using parser_callback_t =
-        std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
-
-    /// a parser reading from an input adapter
-    explicit parser(detail::input_adapter_t&& adapter,
-                    const parser_callback_t cb = nullptr,
-                    const bool allow_exceptions_ = true)
-        : callback(cb), m_lexer(std::move(adapter)), allow_exceptions(allow_exceptions_)
-    {
-        // read first token
-        get_token();
-    }
-
-    /*!
-    @brief public parser interface
-
-    @param[in] strict      whether to expect the last token to be EOF
-    @param[in,out] result  parsed JSON value
-
-    @throw parse_error.101 in case of an unexpected token
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-    */
-    void parse(const bool strict, BasicJsonType& result)
-    {
-        if (callback)
-        {
-            json_sax_dom_callback_parser<BasicJsonType> sdp(result, callback, allow_exceptions);
-            sax_parse_internal(&sdp);
-            result.assert_invariant();
-
-            // in strict mode, input must be completely read
-            if (strict and (get_token() != token_type::end_of_input))
-            {
-                sdp.parse_error(m_lexer.get_position(),
-                                m_lexer.get_token_string(),
-                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input)));
-            }
-
-            // in case of an error, return discarded value
-            if (sdp.is_errored())
-            {
-                result = value_t::discarded;
-                return;
-            }
-
-            // set top-level value to null if it was discarded by the callback
-            // function
-            if (result.is_discarded())
-            {
-                result = nullptr;
-            }
-        }
-        else
-        {
-            json_sax_dom_parser<BasicJsonType> sdp(result, allow_exceptions);
-            sax_parse_internal(&sdp);
-            result.assert_invariant();
-
-            // in strict mode, input must be completely read
-            if (strict and (get_token() != token_type::end_of_input))
-            {
-                sdp.parse_error(m_lexer.get_position(),
-                                m_lexer.get_token_string(),
-                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input)));
-            }
-
-            // in case of an error, return discarded value
-            if (sdp.is_errored())
-            {
-                result = value_t::discarded;
-                return;
-            }
-        }
-    }
-
-    /*!
-    @brief public accept interface
-
-    @param[in] strict  whether to expect the last token to be EOF
-    @return whether the input is a proper JSON text
-    */
-    bool accept(const bool strict = true)
-    {
-        json_sax_acceptor<BasicJsonType> sax_acceptor;
-        return sax_parse(&sax_acceptor, strict);
-    }
-
-    template <typename SAX>
-    bool sax_parse(SAX* sax, const bool strict = true)
-    {
-        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
-        const bool result = sax_parse_internal(sax);
-
-        // strict mode: next byte must be EOF
-        if (result and strict and (get_token() != token_type::end_of_input))
-        {
-            return sax->parse_error(m_lexer.get_position(),
-                                    m_lexer.get_token_string(),
-                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input)));
-        }
-
-        return result;
-    }
-
-  private:
-    template <typename SAX>
-    bool sax_parse_internal(SAX* sax)
-    {
-        // stack to remember the hieararchy of structured values we are parsing
-        // true = array; false = object
-        std::vector<bool> states;
-        // value to avoid a goto (see comment where set to true)
-        bool skip_to_state_evaluation = false;
-
-        while (true)
-        {
-            if (not skip_to_state_evaluation)
-            {
-                // invariant: get_token() was called before each iteration
-                switch (last_token)
-                {
-                    case token_type::begin_object:
+                    if (JSON_UNLIKELY(errored))
                     {
-                        if (JSON_UNLIKELY(not sax->start_object(std::size_t(-1))))
-                        {
-                            return false;
-                        }
-
-                        // closing } -> we are done
-                        if (get_token() == token_type::end_object)
-                        {
-                            if (JSON_UNLIKELY(not sax->end_object()))
-                            {
-                                return false;
-                            }
-                            break;
-                        }
-
-                        // parse key
-                        if (JSON_UNLIKELY(last_token != token_type::value_string))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string)));
-                        }
-                        else
-                        {
-                            if (JSON_UNLIKELY(not sax->key(m_lexer.get_string())))
-                            {
-                                return false;
-                            }
-                        }
-
-                        // parse separator (:)
-                        if (JSON_UNLIKELY(get_token() != token_type::name_separator))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator)));
-                        }
-
-                        // remember we are now inside an object
-                        states.push_back(false);
-
-                        // parse values
-                        get_token();
-                        continue;
+                        return;
                     }
 
-                    case token_type::begin_array:
+                    if (keep and not value.is_discarded())
                     {
-                        if (JSON_UNLIKELY(not sax->start_array(std::size_t(-1))))
-                        {
-                            return false;
-                        }
-
-                        // closing ] -> we are done
-                        if (get_token() == token_type::end_array)
-                        {
-                            if (JSON_UNLIKELY(not sax->end_array()))
-                            {
-                                return false;
-                            }
-                            break;
-                        }
-
-                        // remember we are now inside an array
-                        states.push_back(true);
-
-                        // parse values (no need to call get_token)
-                        continue;
+                        result.m_value.array->push_back(std::move(value));
                     }
 
-                    case token_type::value_float:
+                    // comma -> next value
+                    get_token();
+                    if (last_token == token_type::value_separator)
                     {
-                        const auto res = m_lexer.get_number_float();
-
-                        if (JSON_UNLIKELY(not std::isfinite(res)))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'"));
-                        }
-                        else
-                        {
-                            if (JSON_UNLIKELY(not sax->number_float(res, m_lexer.get_string())))
-                            {
-                                return false;
-                            }
-                            break;
-                        }
+                        get_token();
+                        continue;
                     }
 
-                    case token_type::literal_false:
+                    // closing ]
+                    if (not expect(token_type::end_array))
                     {
-                        if (JSON_UNLIKELY(not sax->boolean(false)))
-                        {
-                            return false;
-                        }
-                        break;
+                        return;
                     }
+                    break;
+                }
 
-                    case token_type::literal_null:
-                    {
-                        if (JSON_UNLIKELY(not sax->null()))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
+                if (keep and callback and not callback(--depth, parse_event_t::array_end, result))
+                {
+                    result.m_value.destroy(result.m_type);
+                    result.m_type = value_t::discarded;
+                }
+                break;
+            }
 
-                    case token_type::literal_true:
-                    {
-                        if (JSON_UNLIKELY(not sax->boolean(true)))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
+            case token_type::literal_null:
+            {
+                result.m_type = value_t::null;
+                break;
+            }
+
+            case token_type::value_string:
+            {
+                result.m_type = value_t::string;
+                result.m_value = m_lexer.move_string();
+                break;
+            }
 
-                    case token_type::value_integer:
-                    {
-                        if (JSON_UNLIKELY(not sax->number_integer(m_lexer.get_number_integer())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
+            case token_type::literal_true:
+            {
+                result.m_type = value_t::boolean;
+                result.m_value = true;
+                break;
+            }
 
-                    case token_type::value_string:
-                    {
-                        if (JSON_UNLIKELY(not sax->string(m_lexer.get_string())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
+            case token_type::literal_false:
+            {
+                result.m_type = value_t::boolean;
+                result.m_value = false;
+                break;
+            }
 
-                    case token_type::value_unsigned:
-                    {
-                        if (JSON_UNLIKELY(not sax->number_unsigned(m_lexer.get_number_unsigned())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
+            case token_type::value_unsigned:
+            {
+                result.m_type = value_t::number_unsigned;
+                result.m_value = m_lexer.get_number_unsigned();
+                break;
+            }
 
-                    case token_type::parse_error:
-                    {
-                        // using "uninitialized" to avoid "expected" message
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized)));
-                    }
+            case token_type::value_integer:
+            {
+                result.m_type = value_t::number_integer;
+                result.m_value = m_lexer.get_number_integer();
+                break;
+            }
 
-                    default: // the last token was unexpected
+            case token_type::value_float:
+            {
+                result.m_type = value_t::number_float;
+                result.m_value = m_lexer.get_number_float();
+
+                // throw in case of infinity or NAN
+                if (JSON_UNLIKELY(not std::isfinite(result.m_value.number_float)))
+                {
+                    if (allow_exceptions)
                     {
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value)));
+                        JSON_THROW(out_of_range::create(406, "number overflow parsing '" +
+                                                        m_lexer.get_token_string() + "'"));
                     }
+                    expect(token_type::uninitialized);
                 }
+                break;
             }
-            else
+
+            case token_type::parse_error:
             {
-                skip_to_state_evaluation = false;
+                // using "uninitialized" to avoid "expected" message
+                if (not expect(token_type::uninitialized))
+                {
+                    return;
+                }
+                break; // LCOV_EXCL_LINE
             }
 
-            // we reached this line after we successfully parsed a value
-            if (states.empty())
+            default:
             {
-                // empty stack: we reached the end of the hieararchy: done
-                return true;
+                // the last token was unexpected; we expected a value
+                if (not expect(token_type::literal_or_value))
+                {
+                    return;
+                }
+                break; // LCOV_EXCL_LINE
             }
-            else
+        }
+
+        if (keep and callback and not callback(depth, parse_event_t::value, result))
+        {
+            result.m_value.destroy(result.m_type);
+            result.m_type = value_t::discarded;
+        }
+    }
+
+    /*!
+    @brief the actual acceptor
+
+    @invariant 1. The last token is not yet processed. Therefore, the caller
+                  of this function must make sure a token has been read.
+               2. When this function returns, the last token is processed.
+                  That is, the last read character was already considered.
+
+    This invariant makes sure that no token needs to be "unput".
+    */
+    bool accept_internal()
+    {
+        switch (last_token)
+        {
+            case token_type::begin_object:
             {
-                if (states.back())  // array
+                // read next token
+                get_token();
+
+                // closing } -> we are done
+                if (last_token == token_type::end_object)
                 {
-                    // comma -> next value
-                    if (get_token() == token_type::value_separator)
+                    return true;
+                }
+
+                // parse values
+                while (true)
+                {
+                    // parse key
+                    if (last_token != token_type::value_string)
                     {
-                        // parse a new value
-                        get_token();
-                        continue;
+                        return false;
                     }
 
-                    // closing ]
-                    if (JSON_LIKELY(last_token == token_type::end_array))
+                    // parse separator (:)
+                    get_token();
+                    if (last_token != token_type::name_separator)
                     {
-                        if (JSON_UNLIKELY(not sax->end_array()))
-                        {
-                            return false;
-                        }
-
-                        // We are done with this array. Before we can parse a
-                        // new value, we need to evaluate the new state first.
-                        // By setting skip_to_state_evaluation to false, we
-                        // are effectively jumping to the beginning of this if.
-                        assert(not states.empty());
-                        states.pop_back();
-                        skip_to_state_evaluation = true;
-                        continue;
+                        return false;
                     }
-                    else
+
+                    // parse value
+                    get_token();
+                    if (not accept_internal())
                     {
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array)));
+                        return false;
                     }
-                }
-                else  // object
-                {
+
                     // comma -> next value
-                    if (get_token() == token_type::value_separator)
+                    get_token();
+                    if (last_token == token_type::value_separator)
                     {
-                        // parse key
-                        if (JSON_UNLIKELY(get_token() != token_type::value_string))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string)));
-                        }
-                        else
-                        {
-                            if (JSON_UNLIKELY(not sax->key(m_lexer.get_string())))
-                            {
-                                return false;
-                            }
-                        }
-
-                        // parse separator (:)
-                        if (JSON_UNLIKELY(get_token() != token_type::name_separator))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator)));
-                        }
-
-                        // parse values
                         get_token();
                         continue;
                     }
 
                     // closing }
-                    if (JSON_LIKELY(last_token == token_type::end_object))
-                    {
-                        if (JSON_UNLIKELY(not sax->end_object()))
-                        {
-                            return false;
-                        }
+                    return (last_token == token_type::end_object);
+                }
+            }
 
-                        // We are done with this object. Before we can parse a
-                        // new value, we need to evaluate the new state first.
-                        // By setting skip_to_state_evaluation to false, we
-                        // are effectively jumping to the beginning of this if.
-                        assert(not states.empty());
-                        states.pop_back();
-                        skip_to_state_evaluation = true;
-                        continue;
+            case token_type::begin_array:
+            {
+                // read next token
+                get_token();
+
+                // closing ] -> we are done
+                if (last_token == token_type::end_array)
+                {
+                    return true;
+                }
+
+                // parse values
+                while (true)
+                {
+                    // parse value
+                    if (not accept_internal())
+                    {
+                        return false;
                     }
-                    else
+
+                    // comma -> next value
+                    get_token();
+                    if (last_token == token_type::value_separator)
                     {
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object)));
+                        get_token();
+                        continue;
                     }
+
+                    // closing ]
+                    return (last_token == token_type::end_array);
                 }
             }
+
+            case token_type::value_float:
+            {
+                // reject infinity or NAN
+                return std::isfinite(m_lexer.get_number_float());
+            }
+
+            case token_type::literal_false:
+            case token_type::literal_null:
+            case token_type::literal_true:
+            case token_type::value_integer:
+            case token_type::value_string:
+            case token_type::value_unsigned:
+                return true;
+
+            default: // the last token was unexpected
+                return false;
         }
     }
 
@@ -4909,7 +3652,29 @@ class parser
         return (last_token = m_lexer.scan());
     }
 
-    std::string exception_message(const token_type expected)
+    /*!
+    @throw parse_error.101 if expected token did not occur
+    */
+    bool expect(token_type t)
+    {
+        if (JSON_UNLIKELY(t != last_token))
+        {
+            errored = true;
+            expected = t;
+            if (allow_exceptions)
+            {
+                throw_exception();
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    [[noreturn]] void throw_exception() const
     {
         std::string error_msg = "syntax error - ";
         if (last_token == token_type::parse_error)
@@ -4927,16 +3692,22 @@ class parser
             error_msg += "; expected " + std::string(lexer_t::token_type_name(expected));
         }
 
-        return error_msg;
+        JSON_THROW(parse_error::create(101, m_lexer.get_position(), error_msg));
     }
 
   private:
+    /// current level of recursion
+    int depth = 0;
     /// callback function
     const parser_callback_t callback = nullptr;
     /// the type of the last read token
     token_type last_token = token_type::uninitialized;
     /// the lexer
     lexer_t m_lexer;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// possible reason for the syntax error
+    token_type expected = token_type::uninitialized;
     /// whether to throw exceptions in case of errors
     const bool allow_exceptions = true;
 };
@@ -5033,7 +3804,7 @@ class primitive_iterator_t
     primitive_iterator_t const operator++(int) noexcept
     {
         auto result = *this;
-        ++m_it;
+        m_it++;
         return result;
     }
 
@@ -5046,7 +3817,7 @@ class primitive_iterator_t
     primitive_iterator_t const operator--(int) noexcept
     {
         auto result = *this;
-        --m_it;
+        m_it--;
         return result;
     }
 
@@ -5108,7 +3879,7 @@ template<typename BasicJsonType> struct internal_iterator
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
-// #include <nlohmann/detail/meta/cpp_future.hpp>
+// #include <nlohmann/detail/meta.hpp>
 
 // #include <nlohmann/detail/value_t.hpp>
 
@@ -5133,7 +3904,7 @@ This class implements a both iterators (iterator and const_iterator) for the
 
 @requirement The class satisfies the following concept requirements:
 -
-[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+[BidirectionalIterator](http://en.cppreference.com/w/cpp/concept/BidirectionalIterator):
   The iterator that can be moved can be moved in both directions (i.e.
   incremented and decremented).
 
@@ -5645,78 +4416,177 @@ class iter_impl
             case value_t::array:
                 return m_it.array_iterator - other.m_it.array_iterator;
 
-            default:
-                return m_it.primitive_iterator - other.m_it.primitive_iterator;
+            default:
+                return m_it.primitive_iterator - other.m_it.primitive_iterator;
+        }
+    }
+
+    /*!
+    @brief  access to successor
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator[](difference_type n) const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators"));
+
+            case value_t::array:
+                return *std::next(m_it.array_iterator, n);
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+
+            default:
+            {
+                if (JSON_LIKELY(m_it.primitive_iterator.get_value() == -n))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief  return the key of an object iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    typename object_t::key_type key() const
+    {
+        assert(m_object != nullptr);
+
+        if (JSON_LIKELY(m_object->is_object()))
+        {
+            return m_it.object_iterator->first;
+        }
+
+        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators"));
+    }
+
+    /*!
+    @brief  return the value of an iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference value() const
+    {
+        return operator*();
+    }
+
+  private:
+    /// associated JSON instance
+    pointer m_object = nullptr;
+    /// the actual iterator of the associated instance
+    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it;
+};
+}
+}
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+
+#include <cstddef> // size_t
+#include <string> // string, to_string
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/// proxy class for the items() function
+template<typename IteratorType> class iteration_proxy
+{
+  private:
+    /// helper class for iteration
+    class iteration_proxy_internal
+    {
+      private:
+        /// the iterator
+        IteratorType anchor;
+        /// an index for arrays (used to create key names)
+        std::size_t array_index = 0;
+
+      public:
+        explicit iteration_proxy_internal(IteratorType it) noexcept : anchor(it) {}
+
+        /// dereference operator (needed for range-based for)
+        iteration_proxy_internal& operator*()
+        {
+            return *this;
+        }
+
+        /// increment operator (needed for range-based for)
+        iteration_proxy_internal& operator++()
+        {
+            ++anchor;
+            ++array_index;
+
+            return *this;
         }
-    }
-
-    /*!
-    @brief  access to successor
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference operator[](difference_type n) const
-    {
-        assert(m_object != nullptr);
 
-        switch (m_object->m_type)
+        /// inequality operator (needed for range-based for)
+        bool operator!=(const iteration_proxy_internal& o) const noexcept
         {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators"));
-
-            case value_t::array:
-                return *std::next(m_it.array_iterator, n);
+            return anchor != o.anchor;
+        }
 
-            case value_t::null:
-                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+        /// return key of the iterator
+        std::string key() const
+        {
+            assert(anchor.m_object != nullptr);
 
-            default:
+            switch (anchor.m_object->type())
             {
-                if (JSON_LIKELY(m_it.primitive_iterator.get_value() == -n))
-                {
-                    return *m_object;
-                }
+                // use integer array index as key
+                case value_t::array:
+                    return std::to_string(array_index);
 
-                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+                // use key from the object
+                case value_t::object:
+                    return anchor.key();
+
+                // use an empty key for all primitive types
+                default:
+                    return "";
             }
         }
-    }
-
-    /*!
-    @brief  return the key of an object iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    const typename object_t::key_type& key() const
-    {
-        assert(m_object != nullptr);
 
-        if (JSON_LIKELY(m_object->is_object()))
+        /// return value of the iterator
+        typename IteratorType::reference value() const
         {
-            return m_it.object_iterator->first;
+            return anchor.value();
         }
+    };
 
-        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators"));
-    }
+    /// the container to iterate
+    typename IteratorType::reference container;
 
-    /*!
-    @brief  return the value of an iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference value() const
+  public:
+    /// construct iteration proxy from a container
+    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
+        : container(cont) {}
+
+    /// return iterator begin (needed for range-based for)
+    iteration_proxy_internal begin() noexcept
     {
-        return operator*();
+        return iteration_proxy_internal(container.begin());
     }
 
-  private:
-    /// associated JSON instance
-    pointer m_object = nullptr;
-    /// the actual iterator of the associated instance
-    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it;
+    /// return iterator end (needed for range-based for)
+    iteration_proxy_internal end() noexcept
+    {
+        return iteration_proxy_internal(container.end());
+    }
 };
 }
 }
 
-// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
-
 // #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
 
 
@@ -5741,10 +4611,10 @@ create @ref const_reverse_iterator).
 
 @requirement The class satisfies the following concept requirements:
 -
-[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+[BidirectionalIterator](http://en.cppreference.com/w/cpp/concept/BidirectionalIterator):
   The iterator that can be moved can be moved in both directions (i.e.
   incremented and decremented).
-- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
+- [OutputIterator](http://en.cppreference.com/w/cpp/concept/OutputIterator):
   It is possible to write to the pointed-to element (only if @a Base is
   @ref iterator).
 
@@ -5761,11 +4631,11 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
     using reference = typename Base::reference;
 
     /// create reverse iterator from iterator
-    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
+    json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
         : base_iterator(it) {}
 
     /// create reverse iterator from base class
-    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
+    json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
 
     /// post-increment (it++)
     json_reverse_iterator const operator++(int)
@@ -5962,23 +4832,21 @@ class output_adapter
 #include <cmath> // ldexp
 #include <cstddef> // size_t
 #include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
-#include <cstdio> // snprintf
 #include <cstring> // memcpy
+#include <iomanip> // setw, setfill
+#include <ios> // hex
 #include <iterator> // back_inserter
 #include <limits> // numeric_limits
+#include <sstream> // stringstream
 #include <string> // char_traits, string
 #include <utility> // make_pair, move
 
 // #include <nlohmann/detail/input/input_adapters.hpp>
 
-// #include <nlohmann/detail/input/json_sax.hpp>
-
 // #include <nlohmann/detail/exceptions.hpp>
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
-// #include <nlohmann/detail/meta/is_sax.hpp>
-
 // #include <nlohmann/detail/value_t.hpp>
 
 
@@ -5991,16 +4859,14 @@ namespace detail
 ///////////////////
 
 /*!
-@brief deserialization of CBOR, MessagePack, and UBJSON values
+@brief deserialization of CBOR and MessagePack values
 */
-template<typename BasicJsonType, typename SAX = json_sax_dom_parser<BasicJsonType>>
+template<typename BasicJsonType>
 class binary_reader
 {
     using number_integer_t = typename BasicJsonType::number_integer_t;
     using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
     using string_t = typename BasicJsonType::string_t;
-    using json_sax_t = SAX;
 
   public:
     /*!
@@ -6010,63 +4876,70 @@ class binary_reader
     */
     explicit binary_reader(input_adapter_t adapter) : ia(std::move(adapter))
     {
-        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
         assert(ia);
     }
 
     /*!
-    @param[in] format  the binary format to parse
-    @param[in] sax_    a SAX event processor
+    @brief create a JSON value from CBOR input
+
     @param[in] strict  whether to expect the input to be consumed completed
+    @return JSON value created from CBOR input
 
-    @return
+    @throw parse_error.110 if input ended unexpectedly or the end of file was
+                           not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported byte was read
     */
-    bool sax_parse(const input_format_t format,
-                   json_sax_t* sax_,
-                   const bool strict = true)
+    BasicJsonType parse_cbor(const bool strict)
     {
-        sax = sax_;
-        bool result = false;
-
-        switch (format)
+        const auto res = parse_cbor_internal();
+        if (strict)
         {
-            case input_format_t::cbor:
-                result = parse_cbor_internal();
-                break;
+            get();
+            expect_eof();
+        }
+        return res;
+    }
 
-            case input_format_t::msgpack:
-                result = parse_msgpack_internal();
-                break;
+    /*!
+    @brief create a JSON value from MessagePack input
 
-            case input_format_t::ubjson:
-                result = parse_ubjson_internal();
-                break;
+    @param[in] strict  whether to expect the input to be consumed completed
+    @return JSON value created from MessagePack input
 
-            // LCOV_EXCL_START
-            default:
-                assert(false);
-                // LCOV_EXCL_STOP
+    @throw parse_error.110 if input ended unexpectedly or the end of file was
+                           not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported byte was read
+    */
+    BasicJsonType parse_msgpack(const bool strict)
+    {
+        const auto res = parse_msgpack_internal();
+        if (strict)
+        {
+            get();
+            expect_eof();
         }
+        return res;
+    }
 
-        // strict mode: next byte must be EOF
-        if (result and strict)
-        {
-            if (format == input_format_t::ubjson)
-            {
-                get_ignore_noop();
-            }
-            else
-            {
-                get();
-            }
+    /*!
+    @brief create a JSON value from UBJSON input
 
-            if (JSON_UNLIKELY(current != std::char_traits<char>::eof()))
-            {
-                return sax->parse_error(chars_read, get_token_string(), parse_error::create(110, chars_read, "expected end of input"));
-            }
-        }
+    @param[in] strict  whether to expect the input to be consumed completed
+    @return JSON value created from UBJSON input
 
-        return result;
+    @throw parse_error.110 if input ended unexpectedly or the end of file was
+                           not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported byte was read
+    */
+    BasicJsonType parse_ubjson(const bool strict)
+    {
+        const auto res = parse_ubjson_internal();
+        if (strict)
+        {
+            get_ignore_noop();
+            expect_eof();
+        }
+        return res;
     }
 
     /*!
@@ -6086,16 +4959,14 @@ class binary_reader
     @param[in] get_char  whether a new character should be retrieved from the
                          input (true, default) or whether the last read
                          character should be considered instead
-
-    @return whether a valid CBOR value was passed to the SAX parser
     */
-    bool parse_cbor_internal(const bool get_char = true)
+    BasicJsonType parse_cbor_internal(const bool get_char = true)
     {
         switch (get_char ? get() : current)
         {
             // EOF
             case std::char_traits<char>::eof():
-                return unexpect_eof();
+                JSON_THROW(parse_error::create(110, chars_read, "unexpected end of input"));
 
             // Integer 0x00..0x17 (0..23)
             case 0x00:
@@ -6122,31 +4993,19 @@ class binary_reader
             case 0x15:
             case 0x16:
             case 0x17:
-                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+                return static_cast<number_unsigned_t>(current);
 
             case 0x18: // Unsigned integer (one-byte uint8_t follows)
-            {
-                uint8_t number;
-                return get_number(number) and sax->number_unsigned(number);
-            }
+                return get_number<uint8_t>();
 
             case 0x19: // Unsigned integer (two-byte uint16_t follows)
-            {
-                uint16_t number;
-                return get_number(number) and sax->number_unsigned(number);
-            }
+                return get_number<uint16_t>();
 
             case 0x1A: // Unsigned integer (four-byte uint32_t follows)
-            {
-                uint32_t number;
-                return get_number(number) and sax->number_unsigned(number);
-            }
+                return get_number<uint32_t>();
 
             case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
-            {
-                uint64_t number;
-                return get_number(number) and sax->number_unsigned(number);
-            }
+                return get_number<uint64_t>();
 
             // Negative integer -1-0x00..-1-0x17 (-1..-24)
             case 0x20:
@@ -6173,31 +5032,27 @@ class binary_reader
             case 0x35:
             case 0x36:
             case 0x37:
-                return sax->number_integer(static_cast<int8_t>(0x20 - 1 - current));
+                return static_cast<int8_t>(0x20 - 1 - current);
 
             case 0x38: // Negative integer (one-byte uint8_t follows)
             {
-                uint8_t number;
-                return get_number(number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
+                return static_cast<number_integer_t>(-1) - get_number<uint8_t>();
             }
 
             case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
             {
-                uint16_t number;
-                return get_number(number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
+                return static_cast<number_integer_t>(-1) - get_number<uint16_t>();
             }
 
             case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
             {
-                uint32_t number;
-                return get_number(number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
+                return static_cast<number_integer_t>(-1) - get_number<uint32_t>();
             }
 
             case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
             {
-                uint64_t number;
-                return get_number(number) and sax->number_integer(static_cast<number_integer_t>(-1)
-                        - static_cast<number_integer_t>(number));
+                return static_cast<number_integer_t>(-1) -
+                       static_cast<number_integer_t>(get_number<uint64_t>());
             }
 
             // UTF-8 string (0x00..0x17 bytes follow)
@@ -6231,8 +5086,7 @@ class binary_reader
             case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
             case 0x7F: // UTF-8 string (indefinite length)
             {
-                string_t s;
-                return get_cbor_string(s) and sax->string(s);
+                return get_cbor_string();
             }
 
             // array (0x00..0x17 data items follow)
@@ -6260,34 +5114,39 @@ class binary_reader
             case 0x95:
             case 0x96:
             case 0x97:
-                return get_cbor_array(static_cast<std::size_t>(current & 0x1F));
+            {
+                return get_cbor_array(current & 0x1F);
+            }
 
             case 0x98: // array (one-byte uint8_t for n follows)
             {
-                uint8_t len;
-                return get_number(len) and get_cbor_array(static_cast<std::size_t>(len));
+                return get_cbor_array(get_number<uint8_t>());
             }
 
             case 0x99: // array (two-byte uint16_t for n follow)
             {
-                uint16_t len;
-                return get_number(len) and get_cbor_array(static_cast<std::size_t>(len));
+                return get_cbor_array(get_number<uint16_t>());
             }
 
             case 0x9A: // array (four-byte uint32_t for n follow)
             {
-                uint32_t len;
-                return get_number(len) and get_cbor_array(static_cast<std::size_t>(len));
+                return get_cbor_array(get_number<uint32_t>());
             }
 
             case 0x9B: // array (eight-byte uint64_t for n follow)
             {
-                uint64_t len;
-                return get_number(len) and get_cbor_array(static_cast<std::size_t>(len));
+                return get_cbor_array(get_number<uint64_t>());
             }
 
             case 0x9F: // array (indefinite length)
-                return get_cbor_array(std::size_t(-1));
+            {
+                BasicJsonType result = value_t::array;
+                while (get() != 0xFF)
+                {
+                    result.push_back(parse_cbor_internal(false));
+                }
+                return result;
+            }
 
             // map (0x00..0x17 pairs of data items follow)
             case 0xA0:
@@ -6314,56 +5173,62 @@ class binary_reader
             case 0xB5:
             case 0xB6:
             case 0xB7:
-                return get_cbor_object(static_cast<std::size_t>(current & 0x1F));
+            {
+                return get_cbor_object(current & 0x1F);
+            }
 
             case 0xB8: // map (one-byte uint8_t for n follows)
             {
-                uint8_t len;
-                return get_number(len) and get_cbor_object(static_cast<std::size_t>(len));
+                return get_cbor_object(get_number<uint8_t>());
             }
 
             case 0xB9: // map (two-byte uint16_t for n follow)
             {
-                uint16_t len;
-                return get_number(len) and get_cbor_object(static_cast<std::size_t>(len));
+                return get_cbor_object(get_number<uint16_t>());
             }
 
             case 0xBA: // map (four-byte uint32_t for n follow)
             {
-                uint32_t len;
-                return get_number(len) and get_cbor_object(static_cast<std::size_t>(len));
+                return get_cbor_object(get_number<uint32_t>());
             }
 
             case 0xBB: // map (eight-byte uint64_t for n follow)
             {
-                uint64_t len;
-                return get_number(len) and get_cbor_object(static_cast<std::size_t>(len));
+                return get_cbor_object(get_number<uint64_t>());
             }
 
             case 0xBF: // map (indefinite length)
-                return get_cbor_object(std::size_t(-1));
+            {
+                BasicJsonType result = value_t::object;
+                while (get() != 0xFF)
+                {
+                    auto key = get_cbor_string();
+                    result[key] = parse_cbor_internal();
+                }
+                return result;
+            }
 
             case 0xF4: // false
-                return sax->boolean(false);
+            {
+                return false;
+            }
 
             case 0xF5: // true
-                return sax->boolean(true);
+            {
+                return true;
+            }
 
             case 0xF6: // null
-                return sax->null();
+            {
+                return value_t::null;
+            }
 
             case 0xF9: // Half-Precision Float (two-byte IEEE 754)
             {
                 const int byte1 = get();
-                if (JSON_UNLIKELY(not unexpect_eof()))
-                {
-                    return false;
-                }
+                unexpect_eof();
                 const int byte2 = get();
-                if (JSON_UNLIKELY(not unexpect_eof()))
-                {
-                    return false;
-                }
+                unexpect_eof();
 
                 // code from RFC 7049, Appendix D, Figure 3:
                 // As half-precision floating-point numbers were only added
@@ -6374,59 +5239,51 @@ class binary_reader
                 // half-precision floating-point numbers in the C language
                 // is shown in Fig. 3.
                 const int half = (byte1 << 8) + byte2;
-                const double val = [&half]
+                const int exp = (half >> 10) & 0x1F;
+                const int mant = half & 0x3FF;
+                double val;
+                if (exp == 0)
                 {
-                    const int exp = (half >> 10) & 0x1F;
-                    const int mant = half & 0x3FF;
-                    assert(0 <= exp and exp <= 32);
-                    assert(0 <= mant and mant <= 1024);
-                    switch (exp)
-                    {
-                        case 0:
-                            return std::ldexp(mant, -24);
-                        case 31:
-                            return (mant == 0)
-                            ? std::numeric_limits<double>::infinity()
-                            : std::numeric_limits<double>::quiet_NaN();
-                        default:
-                            return std::ldexp(mant + 1024, exp - 25);
-                    }
-                }();
-                return sax->number_float((half & 0x8000) != 0
-                                         ? static_cast<number_float_t>(-val)
-                                         : static_cast<number_float_t>(val), "");
+                    val = std::ldexp(mant, -24);
+                }
+                else if (exp != 31)
+                {
+                    val = std::ldexp(mant + 1024, exp - 25);
+                }
+                else
+                {
+                    val = (mant == 0) ? std::numeric_limits<double>::infinity()
+                          : std::numeric_limits<double>::quiet_NaN();
+                }
+                return (half & 0x8000) != 0 ? -val : val;
             }
 
             case 0xFA: // Single-Precision Float (four-byte IEEE 754)
             {
-                float number;
-                return get_number(number) and sax->number_float(static_cast<number_float_t>(number), "");
+                return get_number<float>();
             }
 
             case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
             {
-                double number;
-                return get_number(number) and sax->number_float(static_cast<number_float_t>(number), "");
+                return get_number<double>();
             }
 
             default: // anything else (0xFF is handled inside the other types)
             {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, "error reading CBOR; last byte: 0x" + last_token));
+                std::stringstream ss;
+                ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+                JSON_THROW(parse_error::create(112, chars_read, "error reading CBOR; last byte: 0x" + ss.str()));
             }
         }
     }
 
-    /*!
-    @return whether a valid MessagePack value was passed to the SAX parser
-    */
-    bool parse_msgpack_internal()
+    BasicJsonType parse_msgpack_internal()
     {
         switch (get())
         {
             // EOF
             case std::char_traits<char>::eof():
-                return unexpect_eof();
+                JSON_THROW(parse_error::create(110, chars_read, "unexpected end of input"));
 
             // positive fixint
             case 0x00:
@@ -6557,7 +5414,7 @@ class binary_reader
             case 0x7D:
             case 0x7E:
             case 0x7F:
-                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+                return static_cast<number_unsigned_t>(current);
 
             // fixmap
             case 0x80:
@@ -6576,7 +5433,9 @@ class binary_reader
             case 0x8D:
             case 0x8E:
             case 0x8F:
-                return get_msgpack_object(static_cast<std::size_t>(current & 0x0F));
+            {
+                return get_msgpack_object(current & 0x0F);
+            }
 
             // fixarray
             case 0x90:
@@ -6595,7 +5454,9 @@ class binary_reader
             case 0x9D:
             case 0x9E:
             case 0x9F:
-                return get_msgpack_array(static_cast<std::size_t>(current & 0x0F));
+            {
+                return get_msgpack_array(current & 0x0F);
+            }
 
             // fixstr
             case 0xA0:
@@ -6630,113 +5491,73 @@ class binary_reader
             case 0xBD:
             case 0xBE:
             case 0xBF:
-            {
-                string_t s;
-                return get_msgpack_string(s) and sax->string(s);
-            }
+                return get_msgpack_string();
 
             case 0xC0: // nil
-                return sax->null();
+                return value_t::null;
 
             case 0xC2: // false
-                return sax->boolean(false);
+                return false;
 
             case 0xC3: // true
-                return sax->boolean(true);
+                return true;
 
             case 0xCA: // float 32
-            {
-                float number;
-                return get_number(number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
+                return get_number<float>();
 
             case 0xCB: // float 64
-            {
-                double number;
-                return get_number(number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
+                return get_number<double>();
 
             case 0xCC: // uint 8
-            {
-                uint8_t number;
-                return get_number(number) and sax->number_unsigned(number);
-            }
+                return get_number<uint8_t>();
 
             case 0xCD: // uint 16
-            {
-                uint16_t number;
-                return get_number(number) and sax->number_unsigned(number);
-            }
+                return get_number<uint16_t>();
 
             case 0xCE: // uint 32
-            {
-                uint32_t number;
-                return get_number(number) and sax->number_unsigned(number);
-            }
+                return get_number<uint32_t>();
 
             case 0xCF: // uint 64
-            {
-                uint64_t number;
-                return get_number(number) and sax->number_unsigned(number);
-            }
+                return get_number<uint64_t>();
 
             case 0xD0: // int 8
-            {
-                int8_t number;
-                return get_number(number) and sax->number_integer(number);
-            }
+                return get_number<int8_t>();
 
             case 0xD1: // int 16
-            {
-                int16_t number;
-                return get_number(number) and sax->number_integer(number);
-            }
+                return get_number<int16_t>();
 
             case 0xD2: // int 32
-            {
-                int32_t number;
-                return get_number(number) and sax->number_integer(number);
-            }
+                return get_number<int32_t>();
 
             case 0xD3: // int 64
-            {
-                int64_t number;
-                return get_number(number) and sax->number_integer(number);
-            }
+                return get_number<int64_t>();
 
             case 0xD9: // str 8
             case 0xDA: // str 16
             case 0xDB: // str 32
-            {
-                string_t s;
-                return get_msgpack_string(s) and sax->string(s);
-            }
+                return get_msgpack_string();
 
             case 0xDC: // array 16
             {
-                uint16_t len;
-                return get_number(len) and get_msgpack_array(static_cast<std::size_t>(len));
+                return get_msgpack_array(get_number<uint16_t>());
             }
 
             case 0xDD: // array 32
             {
-                uint32_t len;
-                return get_number(len) and get_msgpack_array(static_cast<std::size_t>(len));
+                return get_msgpack_array(get_number<uint32_t>());
             }
 
             case 0xDE: // map 16
             {
-                uint16_t len;
-                return get_number(len) and get_msgpack_object(static_cast<std::size_t>(len));
+                return get_msgpack_object(get_number<uint16_t>());
             }
 
             case 0xDF: // map 32
             {
-                uint32_t len;
-                return get_number(len) and get_msgpack_object(static_cast<std::size_t>(len));
+                return get_msgpack_object(get_number<uint32_t>());
             }
 
-            // negative fixint
+            // positive fixint
             case 0xE0:
             case 0xE1:
             case 0xE2:
@@ -6769,12 +5590,14 @@ class binary_reader
             case 0xFD:
             case 0xFE:
             case 0xFF:
-                return sax->number_integer(static_cast<int8_t>(current));
+                return static_cast<int8_t>(current);
 
             default: // anything else
             {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, "error reading MessagePack; last byte: 0x" + last_token));
+                std::stringstream ss;
+                ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+                JSON_THROW(parse_error::create(112, chars_read,
+                                               "error reading MessagePack; last byte: 0x" + ss.str()));
             }
         }
     }
@@ -6783,10 +5606,8 @@ class binary_reader
     @param[in] get_char  whether a new character should be retrieved from the
                          input (true, default) or whether the last read
                          character should be considered instead
-
-    @return whether a valid UBJSON value was passed to the SAX parser
     */
-    bool parse_ubjson_internal(const bool get_char = true)
+    BasicJsonType parse_ubjson_internal(const bool get_char = true)
     {
         return get_ubjson_value(get_char ? get_ignore_noop() : current);
     }
@@ -6824,26 +5645,23 @@ class binary_reader
     @brief read a number from the input
 
     @tparam NumberType the type of the number
-    @param[out] result  number of type @a NumberType
 
-    @return whether conversion completed
+    @return number of type @a NumberType
 
     @note This function needs to respect the system's endianess, because
-          bytes in CBOR, MessagePack, and UBJSON are stored in network order
-          (big endian) and therefore need reordering on little endian systems.
+          bytes in CBOR and MessagePack are stored in network order (big
+          endian) and therefore need reordering on little endian systems.
+
+    @throw parse_error.110 if input has less than `sizeof(NumberType)` bytes
     */
-    template<typename NumberType>
-    bool get_number(NumberType& result)
+    template<typename NumberType> NumberType get_number()
     {
         // step 1: read input into array with system's byte order
         std::array<uint8_t, sizeof(NumberType)> vec;
         for (std::size_t i = 0; i < sizeof(NumberType); ++i)
         {
             get();
-            if (JSON_UNLIKELY(not unexpect_eof()))
-            {
-                return false;
-            }
+            unexpect_eof();
 
             // reverse byte order prior to conversion if necessary
             if (is_little_endian)
@@ -6857,37 +5675,35 @@ class binary_reader
         }
 
         // step 2: convert array into number of type T and return
+        NumberType result;
         std::memcpy(&result, vec.data(), sizeof(NumberType));
-        return true;
+        return result;
     }
 
     /*!
     @brief create a string by reading characters from the input
 
-    @tparam NumberType the type of the number
-    @param[in] len number of characters to read
-    @param[out] string created by reading @a len bytes
-
-    @return whether string creation completed
+    @param[in] len number of bytes to read
 
     @note We can not reserve @a len bytes for the result, because @a len
           may be too large. Usually, @ref unexpect_eof() detects the end of
           the input before we run out of string memory.
+
+    @return string created by reading @a len bytes
+
+    @throw parse_error.110 if input has less than @a len bytes
     */
     template<typename NumberType>
-    bool get_string(const NumberType len, string_t& result)
+    string_t get_string(const NumberType len)
     {
-        bool success = true;
-        std::generate_n(std::back_inserter(result), len, [this, &success]()
+        string_t result;
+        std::generate_n(std::back_inserter(result), len, [this]()
         {
             get();
-            if (JSON_UNLIKELY(not unexpect_eof()))
-            {
-                success = false;
-            }
+            unexpect_eof();
             return static_cast<char>(current);
         });
-        return success;
+        return result;
     }
 
     /*!
@@ -6897,16 +5713,14 @@ class binary_reader
     string length and then copies this number of bytes into a string.
     Additionally, CBOR's strings with indefinite lengths are supported.
 
-    @param[out] result  created string
+    @return string
 
-    @return whether string creation completed
+    @throw parse_error.110 if input ended
+    @throw parse_error.113 if an unexpected byte is read
     */
-    bool get_cbor_string(string_t& result)
+    string_t get_cbor_string()
     {
-        if (JSON_UNLIKELY(not unexpect_eof()))
-        {
-            return false;
-        }
+        unexpect_eof();
 
         switch (current)
         {
@@ -6936,137 +5750,73 @@ class binary_reader
             case 0x76:
             case 0x77:
             {
-                return get_string(current & 0x1F, result);
+                return get_string(current & 0x1F);
             }
 
             case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
             {
-                uint8_t len;
-                return get_number(len) and get_string(len, result);
+                return get_string(get_number<uint8_t>());
             }
 
             case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
             {
-                uint16_t len;
-                return get_number(len) and get_string(len, result);
+                return get_string(get_number<uint16_t>());
             }
 
             case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
             {
-                uint32_t len;
-                return get_number(len) and get_string(len, result);
-            }
-
-            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
-            {
-                uint64_t len;
-                return get_number(len) and get_string(len, result);
-            }
-
-            case 0x7F: // UTF-8 string (indefinite length)
-            {
-                while (get() != 0xFF)
-                {
-                    string_t chunk;
-                    if (not get_cbor_string(chunk))
-                    {
-                        return false;
-                    }
-                    result.append(chunk);
-                }
-                return true;
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "expected a CBOR string; last byte: 0x" + last_token));
+                return get_string(get_number<uint32_t>());
             }
-        }
-    }
 
-    /*!
-    @param[in] len  the length of the array or std::size_t(-1) for an
-                    array of indefinite size
-    @return whether array creation completed
-    */
-    bool get_cbor_array(const std::size_t len)
-    {
-        if (JSON_UNLIKELY(not sax->start_array(len)))
-        {
-            return false;
-        }
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            {
+                return get_string(get_number<uint64_t>());
+            }
 
-        if (len != std::size_t(-1))
-            for (std::size_t i = 0; i < len; ++i)
+            case 0x7F: // UTF-8 string (indefinite length)
             {
-                if (JSON_UNLIKELY(not parse_cbor_internal()))
+                string_t result;
+                while (get() != 0xFF)
                 {
-                    return false;
+                    result.append(get_cbor_string());
                 }
+                return result;
             }
-        else
-        {
-            while (get() != 0xFF)
+
+            default:
             {
-                if (JSON_UNLIKELY(not parse_cbor_internal(false)))
-                {
-                    return false;
-                }
+                std::stringstream ss;
+                ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+                JSON_THROW(parse_error::create(113, chars_read, "expected a CBOR string; last byte: 0x" + ss.str()));
             }
         }
-
-        return sax->end_array();
     }
 
-    /*!
-    @param[in] len  the length of the object or std::size_t(-1) for an
-                    object of indefinite size
-    @return whether object creation completed
-    */
-    bool get_cbor_object(const std::size_t len)
+    template<typename NumberType>
+    BasicJsonType get_cbor_array(const NumberType len)
     {
-        if (not JSON_UNLIKELY(sax->start_object(len)))
-        {
-            return false;
-        }
-
-        string_t key;
-        if (len != std::size_t(-1))
+        BasicJsonType result = value_t::array;
+        std::generate_n(std::back_inserter(*result.m_value.array), len, [this]()
         {
-            for (std::size_t i = 0; i < len; ++i)
-            {
-                get();
-                if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key)))
-                {
-                    return false;
-                }
+            return parse_cbor_internal();
+        });
+        return result;
+    }
 
-                if (JSON_UNLIKELY(not parse_cbor_internal()))
-                {
-                    return false;
-                }
-                key.clear();
-            }
-        }
-        else
+    template<typename NumberType>
+    BasicJsonType get_cbor_object(const NumberType len)
+    {
+        BasicJsonType result = value_t::object;
+        std::generate_n(std::inserter(*result.m_value.object,
+                                      result.m_value.object->end()),
+                        len, [this]()
         {
-            while (get() != 0xFF)
-            {
-                if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key)))
-                {
-                    return false;
-                }
-
-                if (JSON_UNLIKELY(not parse_cbor_internal()))
-                {
-                    return false;
-                }
-                key.clear();
-            }
-        }
-
-        return sax->end_object();
+            get();
+            auto key = get_cbor_string();
+            auto val = parse_cbor_internal();
+            return std::make_pair(std::move(key), std::move(val));
+        });
+        return result;
     }
 
     /*!
@@ -7075,16 +5825,14 @@ class binary_reader
     This function first reads starting bytes to determine the expected
     string length and then copies this number of bytes into a string.
 
-    @param[out] result  created string
+    @return string
 
-    @return whether string creation completed
+    @throw parse_error.110 if input ended
+    @throw parse_error.113 if an unexpected byte is read
     */
-    bool get_msgpack_string(string_t& result)
+    string_t get_msgpack_string()
     {
-        if (JSON_UNLIKELY(not unexpect_eof()))
-        {
-            return false;
-        }
+        unexpect_eof();
 
         switch (current)
         {
@@ -7122,85 +5870,59 @@ class binary_reader
             case 0xBE:
             case 0xBF:
             {
-                return get_string(current & 0x1F, result);
+                return get_string(current & 0x1F);
             }
 
             case 0xD9: // str 8
             {
-                uint8_t len;
-                return get_number(len) and get_string(len, result);
+                return get_string(get_number<uint8_t>());
             }
 
             case 0xDA: // str 16
             {
-                uint16_t len;
-                return get_number(len) and get_string(len, result);
+                return get_string(get_number<uint16_t>());
             }
 
             case 0xDB: // str 32
             {
-                uint32_t len;
-                return get_number(len) and get_string(len, result);
+                return get_string(get_number<uint32_t>());
             }
 
             default:
             {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "expected a MessagePack string; last byte: 0x" + last_token));
+                std::stringstream ss;
+                ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+                JSON_THROW(parse_error::create(113, chars_read,
+                                               "expected a MessagePack string; last byte: 0x" + ss.str()));
             }
         }
     }
 
-    /*!
-    @param[in] len  the length of the array
-    @return whether array creation completed
-    */
-    bool get_msgpack_array(const std::size_t len)
+    template<typename NumberType>
+    BasicJsonType get_msgpack_array(const NumberType len)
     {
-        if (JSON_UNLIKELY(not sax->start_array(len)))
-        {
-            return false;
-        }
-
-        for (std::size_t i = 0; i < len; ++i)
+        BasicJsonType result = value_t::array;
+        std::generate_n(std::back_inserter(*result.m_value.array), len, [this]()
         {
-            if (JSON_UNLIKELY(not parse_msgpack_internal()))
-            {
-                return false;
-            }
-        }
-
-        return sax->end_array();
+            return parse_msgpack_internal();
+        });
+        return result;
     }
 
-    /*!
-    @param[in] len  the length of the object
-    @return whether object creation completed
-    */
-    bool get_msgpack_object(const std::size_t len)
+    template<typename NumberType>
+    BasicJsonType get_msgpack_object(const NumberType len)
     {
-        if (JSON_UNLIKELY(not sax->start_object(len)))
-        {
-            return false;
-        }
-
-        string_t key;
-        for (std::size_t i = 0; i < len; ++i)
+        BasicJsonType result = value_t::object;
+        std::generate_n(std::inserter(*result.m_value.object,
+                                      result.m_value.object->end()),
+                        len, [this]()
         {
             get();
-            if (JSON_UNLIKELY(not get_msgpack_string(key) or not sax->key(key)))
-            {
-                return false;
-            }
-
-            if (JSON_UNLIKELY(not parse_msgpack_internal()))
-            {
-                return false;
-            }
-            key.clear();
-        }
-
-        return sax->end_object();
+            auto key = get_msgpack_string();
+            auto val = parse_msgpack_internal();
+            return std::make_pair(std::move(key), std::move(val));
+        });
+        return result;
     }
 
     /*!
@@ -7210,131 +5932,41 @@ class binary_reader
     indicating a string, or in case of an object key where the 'S' byte can be
     left out.
 
-    @param[out] result   created string
     @param[in] get_char  whether a new character should be retrieved from the
                          input (true, default) or whether the last read
                          character should be considered instead
 
-    @return whether string creation completed
+    @return string
+
+    @throw parse_error.110 if input ended
+    @throw parse_error.113 if an unexpected byte is read
     */
-    bool get_ubjson_string(string_t& result, const bool get_char = true)
+    string_t get_ubjson_string(const bool get_char = true)
     {
         if (get_char)
         {
             get();  // TODO: may we ignore N here?
         }
 
-        if (JSON_UNLIKELY(not unexpect_eof()))
-        {
-            return false;
-        }
+        unexpect_eof();
 
         switch (current)
         {
             case 'U':
-            {
-                uint8_t len;
-                return get_number(len) and get_string(len, result);
-            }
-
-            case 'i':
-            {
-                int8_t len;
-                return get_number(len) and get_string(len, result);
-            }
-
-            case 'I':
-            {
-                int16_t len;
-                return get_number(len) and get_string(len, result);
-            }
-
-            case 'l':
-            {
-                int32_t len;
-                return get_number(len) and get_string(len, result);
-            }
-
-            case 'L':
-            {
-                int64_t len;
-                return get_number(len) and get_string(len, result);
-            }
-
-            default:
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "expected a UBJSON string; last byte: 0x" + last_token));
-        }
-    }
-
-    /*!
-    @param[out] result  determined size
-    @return whether size determination completed
-    */
-    bool get_ubjson_size_value(std::size_t& result)
-    {
-        switch (get_ignore_noop())
-        {
-            case 'U':
-            {
-                uint8_t number;
-                if (JSON_UNLIKELY(not get_number(number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
+                return get_string(get_number<uint8_t>());
             case 'i':
-            {
-                int8_t number;
-                if (JSON_UNLIKELY(not get_number(number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
+                return get_string(get_number<int8_t>());
             case 'I':
-            {
-                int16_t number;
-                if (JSON_UNLIKELY(not get_number(number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
+                return get_string(get_number<int16_t>());
             case 'l':
-            {
-                int32_t number;
-                if (JSON_UNLIKELY(not get_number(number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
+                return get_string(get_number<int32_t>());
             case 'L':
-            {
-                int64_t number;
-                if (JSON_UNLIKELY(not get_number(number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
+                return get_string(get_number<int64_t>());
             default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "byte after '#' must denote a number type; last byte: 0x" + last_token));
-            }
+                std::stringstream ss;
+                ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+                JSON_THROW(parse_error::create(113, chars_read,
+                                               "expected a UBJSON string; last byte: 0x" + ss.str()));
         }
     }
 
@@ -7344,127 +5976,84 @@ class binary_reader
     In the optimized UBJSON format, a type and a size can be provided to allow
     for a more compact representation.
 
-    @param[out] result  pair of the size and the type
-
-    @return whether pair creation completed
+    @return pair of the size and the type
     */
-    bool get_ubjson_size_type(std::pair<std::size_t, int>& result)
+    std::pair<std::size_t, int> get_ubjson_size_type()
     {
-        result.first = string_t::npos; // size
-        result.second = 0; // type
+        std::size_t sz = string_t::npos;
+        int tc = 0;
 
         get_ignore_noop();
 
         if (current == '$')
         {
-            result.second = get();  // must not ignore 'N', because 'N' maybe the type
-            if (JSON_UNLIKELY(not unexpect_eof()))
-            {
-                return false;
-            }
+            tc = get();  // must not ignore 'N', because 'N' maybe the type
+            unexpect_eof();
 
             get_ignore_noop();
-            if (JSON_UNLIKELY(current != '#'))
+            if (current != '#')
             {
-                if (JSON_UNLIKELY(not unexpect_eof()))
-                {
-                    return false;
-                }
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, "expected '#' after UBJSON type information; last byte: 0x" + last_token));
+                std::stringstream ss;
+                ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+                JSON_THROW(parse_error::create(112, chars_read,
+                                               "expected '#' after UBJSON type information; last byte: 0x" + ss.str()));
             }
-
-            return get_ubjson_size_value(result.first);
+            sz = parse_ubjson_internal();
         }
         else if (current == '#')
         {
-            return get_ubjson_size_value(result.first);
+            sz = parse_ubjson_internal();
         }
-        return true;
+
+        return std::make_pair(sz, tc);
     }
 
-    /*!
-    @param prefix  the previously read or set type prefix
-    @return whether value creation completed
-    */
-    bool get_ubjson_value(const int prefix)
+    BasicJsonType get_ubjson_value(const int prefix)
     {
         switch (prefix)
         {
             case std::char_traits<char>::eof():  // EOF
-                return unexpect_eof();
+                JSON_THROW(parse_error::create(110, chars_read, "unexpected end of input"));
 
             case 'T':  // true
-                return sax->boolean(true);
+                return true;
             case 'F':  // false
-                return sax->boolean(false);
+                return false;
 
             case 'Z':  // null
-                return sax->null();
+                return nullptr;
 
             case 'U':
-            {
-                uint8_t number;
-                return get_number(number) and sax->number_unsigned(number);
-            }
-
+                return get_number<uint8_t>();
             case 'i':
-            {
-                int8_t number;
-                return get_number(number) and sax->number_integer(number);
-            }
-
+                return get_number<int8_t>();
             case 'I':
-            {
-                int16_t number;
-                return get_number(number) and sax->number_integer(number);
-            }
-
+                return get_number<int16_t>();
             case 'l':
-            {
-                int32_t number;
-                return get_number(number) and sax->number_integer(number);
-            }
-
+                return get_number<int32_t>();
             case 'L':
-            {
-                int64_t number;
-                return get_number(number) and sax->number_integer(number);
-            }
-
+                return get_number<int64_t>();
             case 'd':
-            {
-                float number;
-                return get_number(number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
+                return get_number<float>();
             case 'D':
-            {
-                double number;
-                return get_number(number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
+                return get_number<double>();
 
             case 'C':  // char
             {
                 get();
-                if (JSON_UNLIKELY(not unexpect_eof()))
-                {
-                    return false;
-                }
+                unexpect_eof();
                 if (JSON_UNLIKELY(current > 127))
                 {
-                    auto last_token = get_token_string();
-                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token));
+                    std::stringstream ss;
+                    ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+                    JSON_THROW(parse_error::create(113, chars_read,
+                                                   "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + ss.str()));
                 }
-                string_t s(1, static_cast<char>(current));
-                return sax->string(s);
+                return string_t(1, static_cast<char>(current));
             }
 
             case 'S':  // string
-            {
-                string_t s;
-                return get_ubjson_string(s) and sax->string(s);
-            }
+                return get_ubjson_string();
 
             case '[':  // array
                 return get_ubjson_array();
@@ -7473,170 +6062,129 @@ class binary_reader
                 return get_ubjson_object();
 
             default: // anything else
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, "error reading UBJSON; last byte: 0x" + last_token));
-            }
+                std::stringstream ss;
+                ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+                JSON_THROW(parse_error::create(112, chars_read,
+                                               "error reading UBJSON; last byte: 0x" + ss.str()));
         }
     }
 
-    /*!
-    @return whether array creation completed
-    */
-    bool get_ubjson_array()
+    BasicJsonType get_ubjson_array()
     {
-        std::pair<std::size_t, int> size_and_type;
-        if (JSON_UNLIKELY(not get_ubjson_size_type(size_and_type)))
-        {
-            return false;
-        }
+        BasicJsonType result = value_t::array;
+        const auto size_and_type = get_ubjson_size_type();
 
         if (size_and_type.first != string_t::npos)
         {
-            if (JSON_UNLIKELY(not sax->start_array(size_and_type.first)))
+            if (JSON_UNLIKELY(size_and_type.first > result.max_size()))
             {
-                return false;
+                JSON_THROW(out_of_range::create(408,
+                                                "excessive array size: " + std::to_string(size_and_type.first)));
             }
 
             if (size_and_type.second != 0)
             {
                 if (size_and_type.second != 'N')
                 {
-                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    std::generate_n(std::back_inserter(*result.m_value.array),
+                                    size_and_type.first, [this, size_and_type]()
                     {
-                        if (JSON_UNLIKELY(not get_ubjson_value(size_and_type.second)))
-                        {
-                            return false;
-                        }
-                    }
+                        return get_ubjson_value(size_and_type.second);
+                    });
                 }
             }
             else
             {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                std::generate_n(std::back_inserter(*result.m_value.array),
+                                size_and_type.first, [this]()
                 {
-                    if (JSON_UNLIKELY(not parse_ubjson_internal()))
-                    {
-                        return false;
-                    }
-                }
+                    return parse_ubjson_internal();
+                });
             }
         }
         else
         {
-            if (JSON_UNLIKELY(not sax->start_array(std::size_t(-1))))
-            {
-                return false;
-            }
-
             while (current != ']')
             {
-                if (JSON_UNLIKELY(not parse_ubjson_internal(false)))
-                {
-                    return false;
-                }
+                result.push_back(parse_ubjson_internal(false));
                 get_ignore_noop();
             }
         }
 
-        return sax->end_array();
+        return result;
     }
 
-    /*!
-    @return whether object creation completed
-    */
-    bool get_ubjson_object()
+    BasicJsonType get_ubjson_object()
     {
-        std::pair<std::size_t, int> size_and_type;
-        if (JSON_UNLIKELY(not get_ubjson_size_type(size_and_type)))
-        {
-            return false;
-        }
+        BasicJsonType result = value_t::object;
+        const auto size_and_type = get_ubjson_size_type();
 
-        string_t key;
         if (size_and_type.first != string_t::npos)
         {
-            if (JSON_UNLIKELY(not sax->start_object(size_and_type.first)))
+            if (JSON_UNLIKELY(size_and_type.first > result.max_size()))
             {
-                return false;
+                JSON_THROW(out_of_range::create(408,
+                                                "excessive object size: " + std::to_string(size_and_type.first)));
             }
 
             if (size_and_type.second != 0)
             {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                std::generate_n(std::inserter(*result.m_value.object,
+                                              result.m_value.object->end()),
+                                size_and_type.first, [this, size_and_type]()
                 {
-                    if (JSON_UNLIKELY(not get_ubjson_string(key) or not sax->key(key)))
-                    {
-                        return false;
-                    }
-                    if (JSON_UNLIKELY(not get_ubjson_value(size_and_type.second)))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
+                    auto key = get_ubjson_string();
+                    auto val = get_ubjson_value(size_and_type.second);
+                    return std::make_pair(std::move(key), std::move(val));
+                });
             }
             else
             {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                std::generate_n(std::inserter(*result.m_value.object,
+                                              result.m_value.object->end()),
+                                size_and_type.first, [this]()
                 {
-                    if (JSON_UNLIKELY(not get_ubjson_string(key) or not sax->key(key)))
-                    {
-                        return false;
-                    }
-                    if (JSON_UNLIKELY(not parse_ubjson_internal()))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
+                    auto key = get_ubjson_string();
+                    auto val = parse_ubjson_internal();
+                    return std::make_pair(std::move(key), std::move(val));
+                });
             }
         }
         else
-        {
-            if (JSON_UNLIKELY(not sax->start_object(std::size_t(-1))))
-            {
-                return false;
-            }
-
-            while (current != '}')
-            {
-                if (JSON_UNLIKELY(not get_ubjson_string(key, false) or not sax->key(key)))
-                {
-                    return false;
-                }
-                if (JSON_UNLIKELY(not parse_ubjson_internal()))
-                {
-                    return false;
-                }
+        {
+            while (current != '}')
+            {
+                auto key = get_ubjson_string(false);
+                result[std::move(key)] = parse_ubjson_internal();
                 get_ignore_noop();
-                key.clear();
             }
         }
 
-        return sax->end_object();
+        return result;
     }
 
     /*!
-    @return whether the last read character is not EOF
+    @brief throw if end of input is not reached
+    @throw parse_error.110 if input not ended
     */
-    bool unexpect_eof() const
+    void expect_eof() const
     {
-        if (JSON_UNLIKELY(current == std::char_traits<char>::eof()))
+        if (JSON_UNLIKELY(current != std::char_traits<char>::eof()))
         {
-            return sax->parse_error(chars_read, "<end of file>", parse_error::create(110, chars_read, "unexpected end of input"));
+            JSON_THROW(parse_error::create(110, chars_read, "expected end of input"));
         }
-        return true;
     }
 
     /*!
-    @return a string representation of the last read byte
+    @briefthrow if end of input is reached
+    @throw parse_error.110 if input ended
     */
-    std::string get_token_string() const
+    void unexpect_eof() const
     {
-        char cr[3];
-        snprintf(cr, 3, "%.2hhX", static_cast<unsigned char>(current));
-        return std::string{cr};
+        if (JSON_UNLIKELY(current == std::char_traits<char>::eof()))
+        {
+            JSON_THROW(parse_error::create(110, chars_read, "unexpected end of input"));
+        }
     }
 
   private:
@@ -7651,9 +6199,6 @@ class binary_reader
 
     /// whether we can assume little endianess
     const bool is_little_endian = little_endianess();
-
-    /// the SAX parser
-    json_sax_t* sax = nullptr;
 };
 }
 }
@@ -7812,9 +6357,9 @@ class binary_writer
                 break;
             }
 
-            case value_t::number_float:
+            case value_t::number_float: // Double-Precision Float
             {
-                oa->write_character(get_cbor_float_prefix(j.m_value.number_float));
+                oa->write_character(static_cast<CharType>(0xFB));
                 write_number(j.m_value.number_float);
                 break;
             }
@@ -8072,9 +6617,9 @@ class binary_writer
                 break;
             }
 
-            case value_t::number_float:
+            case value_t::number_float: // float 64
             {
-                oa->write_character(get_msgpack_float_prefix(j.m_value.number_float));
+                oa->write_character(static_cast<CharType>(0xCB));
                 write_number(j.m_value.number_float);
                 break;
             }
@@ -8251,7 +6796,7 @@ class binary_writer
                 if (use_type and not j.m_value.array->empty())
                 {
                     assert(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const char first_prefix = ubjson_prefix(j.front());
                     const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
                                                          [this, first_prefix](const BasicJsonType & v)
                     {
@@ -8262,7 +6807,7 @@ class binary_writer
                     {
                         prefix_required = false;
                         oa->write_character(static_cast<CharType>('$'));
-                        oa->write_character(first_prefix);
+                        oa->write_character(static_cast<CharType>(first_prefix));
                     }
                 }
 
@@ -8296,7 +6841,7 @@ class binary_writer
                 if (use_type and not j.m_value.object->empty())
                 {
                     assert(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const char first_prefix = ubjson_prefix(j.front());
                     const bool same_prefix = std::all_of(j.begin(), j.end(),
                                                          [this, first_prefix](const BasicJsonType & v)
                     {
@@ -8307,7 +6852,7 @@ class binary_writer
                     {
                         prefix_required = false;
                         oa->write_character(static_cast<CharType>('$'));
-                        oa->write_character(first_prefix);
+                        oa->write_character(static_cast<CharType>(first_prefix));
                     }
                 }
 
@@ -8375,7 +6920,7 @@ class binary_writer
     {
         if (add_prefix)
         {
-            oa->write_character(get_ubjson_float_prefix(n));
+            oa->write_character(static_cast<CharType>('D'));  // float64
         }
         write_number(n);
     }
@@ -8496,7 +7041,7 @@ class binary_writer
           write_number_with_ubjson_prefix. Therefore, we return 'L' for any
           value that does not fit the previous limits.
     */
-    CharType ubjson_prefix(const BasicJsonType& j) const noexcept
+    char ubjson_prefix(const BasicJsonType& j) const noexcept
     {
         switch (j.type())
         {
@@ -8555,7 +7100,7 @@ class binary_writer
             }
 
             case value_t::number_float:
-                return get_ubjson_float_prefix(j.m_value.number_float);
+                return 'D';
 
             case value_t::string:
                 return 'S';
@@ -8571,36 +7116,6 @@ class binary_writer
         }
     }
 
-    static constexpr CharType get_cbor_float_prefix(float)
-    {
-        return static_cast<CharType>(0xFA);  // Single-Precision Float
-    }
-
-    static constexpr CharType get_cbor_float_prefix(double)
-    {
-        return static_cast<CharType>(0xFB);  // Double-Precision Float
-    }
-
-    static constexpr CharType get_msgpack_float_prefix(float)
-    {
-        return static_cast<CharType>(0xCA);  // float 32
-    }
-
-    static constexpr CharType get_msgpack_float_prefix(double)
-    {
-        return static_cast<CharType>(0xCB);  // float 64
-    }
-
-    static constexpr CharType get_ubjson_float_prefix(float)
-    {
-        return 'd';  // float 32
-    }
-
-    static constexpr CharType get_ubjson_float_prefix(double)
-    {
-        return 'D';  // float 64
-    }
-
   private:
     /// whether we can assume little endianess
     const bool is_little_endian = binary_reader<BasicJsonType>::little_endianess();
@@ -8623,8 +7138,11 @@ class binary_writer
 #include <cstddef> // size_t, ptrdiff_t
 #include <cstdint> // uint8_t
 #include <cstdio> // snprintf
+#include <iomanip> // setfill
+#include <iterator> // next
 #include <limits> // numeric_limits
 #include <string> // string
+#include <sstream> // stringstream
 #include <type_traits> // is_same
 
 // #include <nlohmann/detail/exceptions.hpp>
@@ -9519,7 +8037,7 @@ void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
     // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
     // decimal representations are not exactly "short".
     //
-    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
+    // The documentation for 'std::to_chars' (http://en.cppreference.com/w/cpp/utility/to_chars)
     // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
     // and since sprintf promotes float's to double's, I think this is exactly what 'std::to_chars'
     // does.
@@ -9728,7 +8246,7 @@ char* to_chars(char* first, char* last, FloatType value)
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
-// #include <nlohmann/detail/meta/cpp_future.hpp>
+// #include <nlohmann/detail/meta.hpp>
 
 // #include <nlohmann/detail/output/output_adapters.hpp>
 
@@ -10101,9 +8619,9 @@ class serializer
 
                 case UTF8_REJECT:  // decode found invalid UTF-8 byte
                 {
-                    std::string sn(3, '\0');
-                    snprintf(&sn[0], sn.size(), "%.2X", byte);
-                    JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn));
+                    std::stringstream ss;
+                    ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << static_cast<int>(byte);
+                    JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + ss.str()));
                 }
 
                 default:  // decode found yet incomplete multi-byte code point
@@ -10129,9 +8647,9 @@ class serializer
         else
         {
             // we finish reading, but do not accept: string was incomplete
-            std::string sn(3, '\0');
-            snprintf(&sn[0], sn.size(), "%.2X", static_cast<uint8_t>(s.back()));
-            JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn));
+            std::stringstream ss;
+            ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << static_cast<int>(static_cast<uint8_t>(s.back()));
+            JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + ss.str()));
         }
     }
 
@@ -10157,7 +8675,7 @@ class serializer
             return;
         }
 
-        const bool is_negative = not (x >= 0);  // see issue #755
+        const bool is_negative = (x <= 0) and (x != 0);  // see issue #755
         std::size_t i = 0;
 
         while (x != 0)
@@ -11136,10 +9654,8 @@ struct adl_serializer
     @param[in,out] val  value to write to
     */
     template<typename BasicJsonType, typename ValueType>
-    static auto from_json(BasicJsonType&& j, ValueType& val) noexcept(
-        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val))) -> decltype(
-            ::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void()
-        )
+    static void from_json(BasicJsonType&& j, ValueType& val) noexcept(
+        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
     {
         ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
     }
@@ -11153,11 +9669,9 @@ struct adl_serializer
     @param[in,out] j  JSON value to write to
     @param[in] val     value to read from
     */
-    template <typename BasicJsonType, typename ValueType>
-    static auto to_json(BasicJsonType& j, ValueType&& val) noexcept(
+    template<typename BasicJsonType, typename ValueType>
+    static void to_json(BasicJsonType& j, ValueType&& val) noexcept(
         noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
-    -> decltype(::nlohmann::to_json(j, std::forward<ValueType>(val)),
-                void())
     {
         ::nlohmann::to_json(j, std::forward<ValueType>(val));
     }
@@ -11197,42 +9711,42 @@ and `from_json()` (@ref adl_serializer by default)
 
 @requirement The class satisfies the following concept requirements:
 - Basic
- - [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible):
+ - [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible):
    JSON values can be default constructed. The result will be a JSON null
    value.
- - [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible):
+ - [MoveConstructible](http://en.cppreference.com/w/cpp/concept/MoveConstructible):
    A JSON value can be constructed from an rvalue argument.
- - [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible):
+ - [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible):
    A JSON value can be copy-constructed from an lvalue expression.
- - [MoveAssignable](https://en.cppreference.com/w/cpp/named_req/MoveAssignable):
+ - [MoveAssignable](http://en.cppreference.com/w/cpp/concept/MoveAssignable):
    A JSON value van be assigned from an rvalue argument.
- - [CopyAssignable](https://en.cppreference.com/w/cpp/named_req/CopyAssignable):
+ - [CopyAssignable](http://en.cppreference.com/w/cpp/concept/CopyAssignable):
    A JSON value can be copy-assigned from an lvalue expression.
- - [Destructible](https://en.cppreference.com/w/cpp/named_req/Destructible):
+ - [Destructible](http://en.cppreference.com/w/cpp/concept/Destructible):
    JSON values can be destructed.
 - Layout
- - [StandardLayoutType](https://en.cppreference.com/w/cpp/named_req/StandardLayoutType):
+ - [StandardLayoutType](http://en.cppreference.com/w/cpp/concept/StandardLayoutType):
    JSON values have
-   [standard layout](https://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
+   [standard layout](http://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
    All non-static data members are private and standard layout types, the
    class has no virtual functions or (virtual) base classes.
 - Library-wide
- - [EqualityComparable](https://en.cppreference.com/w/cpp/named_req/EqualityComparable):
+ - [EqualityComparable](http://en.cppreference.com/w/cpp/concept/EqualityComparable):
    JSON values can be compared with `==`, see @ref
    operator==(const_reference,const_reference).
- - [LessThanComparable](https://en.cppreference.com/w/cpp/named_req/LessThanComparable):
+ - [LessThanComparable](http://en.cppreference.com/w/cpp/concept/LessThanComparable):
    JSON values can be compared with `<`, see @ref
    operator<(const_reference,const_reference).
- - [Swappable](https://en.cppreference.com/w/cpp/named_req/Swappable):
+ - [Swappable](http://en.cppreference.com/w/cpp/concept/Swappable):
    Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of
    other compatible types, using unqualified function call @ref swap().
- - [NullablePointer](https://en.cppreference.com/w/cpp/named_req/NullablePointer):
+ - [NullablePointer](http://en.cppreference.com/w/cpp/concept/NullablePointer):
    JSON values can be compared against `std::nullptr_t` objects which are used
    to model the `null` value.
 - Container
- - [Container](https://en.cppreference.com/w/cpp/named_req/Container):
+ - [Container](http://en.cppreference.com/w/cpp/concept/Container):
    JSON values can be used like STL containers and provide iterator access.
- - [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer);
+ - [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer);
    JSON values can be used like STL containers and provide reverse iterator
    access.
 
@@ -11266,12 +9780,8 @@ class basic_json
     friend class ::nlohmann::detail::iter_impl;
     template<typename BasicJsonType, typename CharType>
     friend class ::nlohmann::detail::binary_writer;
-    template<typename BasicJsonType, typename SAX>
-    friend class ::nlohmann::detail::binary_reader;
-    template<typename BasicJsonType>
-    friend class ::nlohmann::detail::json_sax_dom_parser;
     template<typename BasicJsonType>
-    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
+    friend class ::nlohmann::detail::binary_reader;
 
     /// workaround type for MSVC
     using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
@@ -11299,17 +9809,13 @@ class basic_json
 
   public:
     using value_t = detail::value_t;
-    /// JSON Pointer, see @ref nlohmann::json_pointer
+    /// @copydoc nlohmann::json_pointer
     using json_pointer = ::nlohmann::json_pointer<basic_json>;
     template<typename T, typename SFINAE>
     using json_serializer = JSONSerializer<T, SFINAE>;
     /// helper type for initializer lists of basic_json values
     using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
 
-    using input_format_t = detail::input_format_t;
-    /// SAX interface type, see @ref nlohmann::json_sax
-    using json_sax_t = json_sax<basic_json>;
-
     ////////////////
     // exceptions //
     ////////////////
@@ -12042,7 +10548,7 @@ class basic_json
                     object = nullptr;  // silence warning, see #821
                     if (JSON_UNLIKELY(t == value_t::null))
                     {
-                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.3.0")); // LCOV_EXCL_LINE
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.1.2")); // LCOV_EXCL_LINE
                     }
                     break;
                 }
@@ -12210,6 +10716,7 @@ class basic_json
     */
     using parser_callback_t = typename parser::parser_callback_t;
 
+
     //////////////////
     // constructors //
     //////////////////
@@ -12338,7 +10845,7 @@ class basic_json
     template <typename CompatibleType,
               typename U = detail::uncvref_t<CompatibleType>,
               detail::enable_if_t<
-                  not detail::is_basic_json<U>::value and detail::is_compatible_type<basic_json_t, U>::value, int> = 0>
+                  detail::is_compatible_type<basic_json_t, U>::value, int> = 0>
     basic_json(CompatibleType && val) noexcept(noexcept(
                 JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
                                            std::forward<CompatibleType>(val))))
@@ -12371,7 +10878,7 @@ class basic_json
     was provided), strong guarantee holds: if an exception is thrown, there are
     no changes to any JSON value.
 
-    @since version 3.2.0
+    @since version 3.1.2
     */
     template <typename BasicJsonType,
               detail::enable_if_t<
@@ -12691,7 +11198,7 @@ class basic_json
     @warning A precondition is enforced with a runtime assertion that will
              result in calling `std::abort` if this precondition is not met.
              Assertions can be disabled by defining `NDEBUG` at compile time.
-             See https://en.cppreference.com/w/cpp/error/assert for more
+             See http://en.cppreference.com/w/cpp/error/assert for more
              information.
 
     @throw invalid_iterator.201 if iterators @a first and @a last are not
@@ -12831,7 +11338,7 @@ class basic_json
     changes to any JSON value.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
     requirements:
     - The complexity is linear.
     - As postcondition, it holds: `other == basic_json(other)`.
@@ -12916,7 +11423,7 @@ class basic_json
     exceptions.
 
     @requirement This function helps `basic_json` satisfying the
-    [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible)
+    [MoveConstructible](http://en.cppreference.com/w/cpp/concept/MoveConstructible)
     requirements.
 
     @liveexample{The code below shows the move constructor explicitly called
@@ -12950,7 +11457,7 @@ class basic_json
     @complexity Linear.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
     requirements:
     - The complexity is linear.
 
@@ -12987,7 +11494,7 @@ class basic_json
     @complexity Linear.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
     requirements:
     - The complexity is linear.
     - All stored elements are destroyed and all memory is freed.
@@ -13604,7 +12111,7 @@ class basic_json
     @complexity Depending on the implementation of the called `from_json()`
                 method.
 
-    @since version 3.2.0
+    @since version 3.1.2
     */
     template<typename BasicJsonType, detail::enable_if_t<
                  not std::is_same<BasicJsonType, basic_json>::value and
@@ -13618,8 +12125,8 @@ class basic_json
     @brief get a value (explicit)
 
     Explicit type conversion between the JSON value and a compatible value
-    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
-    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    which is [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible)
+    and [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible).
     The value is converted by calling the @ref json_serializer<ValueType>
     `from_json()` method.
 
@@ -13679,8 +12186,8 @@ class basic_json
     @brief get a value (explicit); special case
 
     Explicit type conversion between the JSON value and a compatible value
-    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
-    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    which is **not** [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible)
+    and **not** [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible).
     The value is converted by calling the @ref json_serializer<ValueType>
     `from_json()` method.
 
@@ -13719,64 +12226,17 @@ class basic_json
     }
 
     /*!
-    @brief get a value (explicit)
-
-    Explicit type conversion between the JSON value and a compatible value.
-    The value is filled into the input parameter by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    ValueType v;
-    JSONSerializer<ValueType>::from_json(*this, v);
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json,
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `void from_json(const basic_json&, ValueType&)`, and
-
-    @tparam ValueType the input parameter type.
-
-    @return the input parameter, allowing chaining calls.
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
-
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,get_to}
-
-    @since version 3.3.0
-    */
-    template<typename ValueType,
-             detail::enable_if_t <
-                 not detail::is_basic_json<ValueType>::value and
-                 detail::has_from_json<basic_json_t, ValueType>::value,
-                 int> = 0>
-    ValueType & get_to(ValueType& v) const noexcept(noexcept(
-                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
-    {
-        JSONSerializer<ValueType>::from_json(*this, v);
-        return v;
-    }
-
-
-    /*!
-    @brief get a pointer value (implicit)
+    @brief get a pointer value (explicit)
 
-    Implicit pointer access to the internally stored JSON value. No copies are
+    Explicit pointer access to the internally stored JSON value. No copies are
     made.
 
-    @warning Writing data to the pointee of the result yields an undefined
-    state.
+    @warning The pointer becomes invalid if the underlying JSON object
+    changes.
 
     @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
     object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
-    @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
-    assertion.
+    @ref number_unsigned_t, or @ref number_float_t.
 
     @return pointer to the internally stored JSON value if the requested
     pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
@@ -13786,43 +12246,45 @@ class basic_json
     @liveexample{The example below shows how pointers to internal values of a
     JSON value can be requested. Note that no type conversions are made and a
     `nullptr` is returned if the value and the requested pointer type does not
-    match.,get_ptr}
+    match.,get__PointerType}
+
+    @sa @ref get_ptr() for explicit pointer-member access
 
     @since version 1.0.0
     */
     template<typename PointerType, typename std::enable_if<
                  std::is_pointer<PointerType>::value, int>::type = 0>
-    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    PointerType get() noexcept
     {
-        // delegate the call to get_impl_ptr<>()
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
     }
 
     /*!
-    @brief get a pointer value (implicit)
-    @copydoc get_ptr()
+    @brief get a pointer value (explicit)
+    @copydoc get()
     */
     template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value and
-                 std::is_const<typename std::remove_pointer<PointerType>::type>::value, int>::type = 0>
-    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    constexpr const PointerType get() const noexcept
     {
-        // delegate the call to get_impl_ptr<>() const
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
     }
 
     /*!
-    @brief get a pointer value (explicit)
+    @brief get a pointer value (implicit)
 
-    Explicit pointer access to the internally stored JSON value. No copies are
+    Implicit pointer access to the internally stored JSON value. No copies are
     made.
 
-    @warning The pointer becomes invalid if the underlying JSON object
-    changes.
+    @warning Writing data to the pointee of the result yields an undefined
+    state.
 
     @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
     object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
-    @ref number_unsigned_t, or @ref number_float_t.
+    @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
+    assertion.
 
     @return pointer to the internally stored JSON value if the requested
     pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
@@ -13832,30 +12294,59 @@ class basic_json
     @liveexample{The example below shows how pointers to internal values of a
     JSON value can be requested. Note that no type conversions are made and a
     `nullptr` is returned if the value and the requested pointer type does not
-    match.,get__PointerType}
-
-    @sa @ref get_ptr() for explicit pointer-member access
+    match.,get_ptr}
 
     @since version 1.0.0
     */
     template<typename PointerType, typename std::enable_if<
                  std::is_pointer<PointerType>::value, int>::type = 0>
-    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
+    PointerType get_ptr() noexcept
     {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
+        // get the type of the PointerType (remove pointer and const)
+        using pointee_t = typename std::remove_const<typename
+                          std::remove_pointer<typename
+                          std::remove_const<PointerType>::type>::type>::type;
+        // make sure the type matches the allowed types
+        static_assert(
+            std::is_same<object_t, pointee_t>::value
+            or std::is_same<array_t, pointee_t>::value
+            or std::is_same<string_t, pointee_t>::value
+            or std::is_same<boolean_t, pointee_t>::value
+            or std::is_same<number_integer_t, pointee_t>::value
+            or std::is_same<number_unsigned_t, pointee_t>::value
+            or std::is_same<number_float_t, pointee_t>::value
+            , "incompatible pointer type");
+
+        // delegate the call to get_impl_ptr<>()
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
     }
 
     /*!
-    @brief get a pointer value (explicit)
-    @copydoc get()
+    @brief get a pointer value (implicit)
+    @copydoc get_ptr()
     */
     template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    constexpr auto get() const noexcept -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
+                 std::is_pointer<PointerType>::value and
+                 std::is_const<typename std::remove_pointer<PointerType>::type>::value, int>::type = 0>
+    constexpr const PointerType get_ptr() const noexcept
     {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
+        // get the type of the PointerType (remove pointer and const)
+        using pointee_t = typename std::remove_const<typename
+                          std::remove_pointer<typename
+                          std::remove_const<PointerType>::type>::type>::type;
+        // make sure the type matches the allowed types
+        static_assert(
+            std::is_same<object_t, pointee_t>::value
+            or std::is_same<array_t, pointee_t>::value
+            or std::is_same<string_t, pointee_t>::value
+            or std::is_same<boolean_t, pointee_t>::value
+            or std::is_same<number_integer_t, pointee_t>::value
+            or std::is_same<number_unsigned_t, pointee_t>::value
+            or std::is_same<number_float_t, pointee_t>::value
+            , "incompatible pointer type");
+
+        // delegate the call to get_impl_ptr<>() const
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
     }
 
     /*!
@@ -13939,14 +12430,12 @@ class basic_json
                    not std::is_same<ValueType, detail::json_ref<basic_json>>::value and
                    not std::is_same<ValueType, typename string_t::value_type>::value and
                    not detail::is_basic_json<ValueType>::value
-
 #ifndef _MSC_VER  // fix for issue #167 operator<< ambiguity under VS2015
                    and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
-#if defined(JSON_HAS_CPP_17) && defined(_MSC_VER) and _MSC_VER <= 1914
-                   and not std::is_same<ValueType, typename std::string_view>::value
 #endif
+#if defined(JSON_HAS_CPP_17)
+                   and not std::is_same<ValueType, typename std::string_view>::value
 #endif
-                   and detail::is_detected<detail::get_template_function, const basic_json_t&, ValueType>::value
                    , int >::type = 0 >
     operator ValueType() const
     {
@@ -14210,7 +12699,7 @@ class basic_json
             return m_value.array->operator[](idx);
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name())));
+        JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
     }
 
     /*!
@@ -14240,7 +12729,7 @@ class basic_json
             return m_value.array->operator[](idx);
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name())));
+        JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
     }
 
     /*!
@@ -14286,7 +12775,7 @@ class basic_json
             return m_value.object->operator[](key);
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+        JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
     }
 
     /*!
@@ -14328,7 +12817,7 @@ class basic_json
             return m_value.object->find(key)->second;
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+        JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
     }
 
     /*!
@@ -14375,7 +12864,7 @@ class basic_json
             return m_value.object->operator[](key);
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+        JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
     }
 
     /*!
@@ -14413,12 +12902,12 @@ class basic_json
     {
         // at only works for objects
         if (JSON_LIKELY(is_object()))
-        {
-            assert(m_value.object->find(key) != m_value.object->end());
+        {            
+			assert(m_value.object->find(key) != m_value.object->end());
             return m_value.object->find(key)->second;
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+        JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
     }
 
     /*!
@@ -14527,7 +13016,7 @@ class basic_json
     @return copy of the element at key @a key or @a default_value if @a key
     is not found
 
-    @throw type_error.306 if the JSON value is not an object; in that case,
+    @throw type_error.306 if the JSON value is not an objec; in that case,
     using `value()` with a key makes no sense.
 
     @complexity Logarithmic in the size of the container.
@@ -14551,7 +13040,7 @@ class basic_json
             {
                 return ptr.get_checked(this);
             }
-            JSON_INTERNAL_CATCH (out_of_range&)
+            JSON_CATCH (out_of_range&)
             {
                 return default_value;
             }
@@ -15062,7 +13551,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
     requirements:
     - The complexity is constant.
 
@@ -15101,7 +13590,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
     requirements:
     - The complexity is constant.
     - Has the semantics of `const_cast<const basic_json&>(*this).begin()`.
@@ -15133,7 +13622,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
     requirements:
     - The complexity is constant.
 
@@ -15172,7 +13661,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
     requirements:
     - The complexity is constant.
     - Has the semantics of `const_cast<const basic_json&>(*this).end()`.
@@ -15202,7 +13691,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
     requirements:
     - The complexity is constant.
     - Has the semantics of `reverse_iterator(end())`.
@@ -15239,7 +13728,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
     requirements:
     - The complexity is constant.
     - Has the semantics of `reverse_iterator(begin())`.
@@ -15276,7 +13765,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
     requirements:
     - The complexity is constant.
     - Has the semantics of `const_cast<const basic_json&>(*this).rbegin()`.
@@ -15305,7 +13794,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
     requirements:
     - The complexity is constant.
     - Has the semantics of `const_cast<const basic_json&>(*this).rend()`.
@@ -15446,7 +13935,7 @@ class basic_json
 
     @complexity Constant.
 
-    @since version 3.1.0.
+    @since version 3.x.x.
     */
     iteration_proxy<iterator> items() noexcept
     {
@@ -15503,7 +13992,7 @@ class basic_json
     false in the case of a string.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
     requirements:
     - The complexity is constant.
     - Has the semantics of `begin() == end()`.
@@ -15574,7 +14063,7 @@ class basic_json
     the case of a string.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
     requirements:
     - The complexity is constant.
     - Has the semantics of `std::distance(begin(), end())`.
@@ -15644,7 +14133,7 @@ class basic_json
     @exceptionsafety No-throw guarantee: this function never throws exceptions.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
     requirements:
     - The complexity is constant.
     - Has the semantics of returning `b.size()` where `b` is the largest
@@ -16056,26 +14545,6 @@ class basic_json
         return {it, res.second};
     }
 
-    /// Helper for insertion of an iterator
-    /// @note: This uses std::distance to support GCC 4.8,
-    ///        see https://github.com/nlohmann/json/pull/1257
-    template<typename... Args>
-    iterator insert_iterator(const_iterator pos, Args&& ... args)
-    {
-        iterator result(this);
-        assert(m_value.array != nullptr);
-
-        auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
-        m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
-        result.m_it.array_iterator = m_value.array->begin() + insert_pos;
-
-        // This could have been written as:
-        // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
-        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
-
-        return result;
-    }
-
     /*!
     @brief inserts element
 
@@ -16110,7 +14579,9 @@ class basic_json
             }
 
             // insert to array and return iterator
-            return insert_iterator(pos, val);
+            iterator result(this);
+            result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, val);
+            return result;
         }
 
         JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
@@ -16161,7 +14632,9 @@ class basic_json
             }
 
             // insert to array and return iterator
-            return insert_iterator(pos, cnt, val);
+            iterator result(this);
+            result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+            return result;
         }
 
         JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
@@ -16223,7 +14696,12 @@ class basic_json
         }
 
         // insert to array and return iterator
-        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
+        iterator result(this);
+        result.m_it.array_iterator = m_value.array->insert(
+                                         pos.m_it.array_iterator,
+                                         first.m_it.array_iterator,
+                                         last.m_it.array_iterator);
+        return result;
     }
 
     /*!
@@ -16265,7 +14743,9 @@ class basic_json
         }
 
         // insert to array and return iterator
-        return insert_iterator(pos, ilist.begin(), ilist.end());
+        iterator result(this);
+        result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, ilist.begin(), ilist.end());
+        return result;
     }
 
     /*!
@@ -17122,7 +15602,7 @@ class basic_json
 
     @since version 2.0.3 (contiguous containers)
     */
-    static basic_json parse(detail::input_adapter&& i,
+    static basic_json parse(detail::input_adapter i,
                             const parser_callback_t cb = nullptr,
                             const bool allow_exceptions = true)
     {
@@ -17131,80 +15611,26 @@ class basic_json
         return result;
     }
 
-    static bool accept(detail::input_adapter&& i)
+    /*!
+    @copydoc basic_json parse(detail::input_adapter, const parser_callback_t)
+    */
+    static basic_json parse(detail::input_adapter& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true)
     {
-        return parser(i).accept(true);
+        basic_json result;
+        parser(i, cb, allow_exceptions).parse(true, result);
+        return result;
     }
 
-    /*!
-    @brief generate SAX events
-
-    The SAX event lister must follow the interface of @ref json_sax.
-
-    This function reads from a compatible input. Examples are:
-    - an array of 1-byte values
-    - strings with character/literal type with size of 1 byte
-    - input streams
-    - container with contiguous storage of 1-byte values. Compatible container
-      types include `std::vector`, `std::string`, `std::array`,
-      `std::valarray`, and `std::initializer_list`. Furthermore, C-style
-      arrays can be used with `std::begin()`/`std::end()`. User-defined
-      containers can be used as long as they implement random-access iterators
-      and a contiguous storage.
-
-    @pre Each element of the container has a size of 1 byte. Violating this
-    precondition yields undefined behavior. **This precondition is enforced
-    with a static assertion.**
-
-    @pre The container storage is contiguous. Violating this precondition
-    yields undefined behavior. **This precondition is enforced with an
-    assertion.**
-    @pre Each element of the container has a size of 1 byte. Violating this
-    precondition yields undefined behavior. **This precondition is enforced
-    with a static assertion.**
-
-    @warning There is no way to enforce all preconditions at compile-time. If
-             the function is called with a noncompliant container and with
-             assertions switched off, the behavior is undefined and will most
-             likely yield segmentation violation.
-
-    @param[in] i  input to read from
-    @param[in,out] sax  SAX event listener
-    @param[in] format  the format to parse (JSON, CBOR, MessagePack, or UBJSON)
-    @param[in] strict  whether the input has to be consumed completely
-
-    @return return value of the last processed SAX event
-
-    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
-    of input; expected string literal""`
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the SAX consumer @a sax has
-    a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `sax_parse()` function
-    reading from string and processing the events with a user-defined SAX
-    event consumer.,sax_parse}
+    static bool accept(detail::input_adapter i)
+    {
+        return parser(i).accept(true);
+    }
 
-    @since version 3.2.0
-    */
-    template <typename SAX>
-    static bool sax_parse(detail::input_adapter&& i, SAX* sax,
-                          input_format_t format = input_format_t::json,
-                          const bool strict = true)
+    static bool accept(detail::input_adapter& i)
     {
-        assert(sax);
-        switch (format)
-        {
-            case input_format_t::json:
-                return parser(std::move(i)).sax_parse(sax, strict);
-            default:
-                return detail::binary_reader<basic_json, SAX>(std::move(i)).sax_parse(format, sax, strict);
-        }
+        return parser(i).accept(true);
     }
 
     /*!
@@ -17276,15 +15702,6 @@ class basic_json
         return parser(detail::input_adapter(first, last)).accept(true);
     }
 
-    template<class IteratorType, class SAX, typename std::enable_if<
-                 std::is_base_of<
-                     std::random_access_iterator_tag,
-                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
-    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax)
-    {
-        return parser(detail::input_adapter(first, last)).sax_parse(sax);
-    }
-
     /*!
     @brief deserialize from stream
     @deprecated This stream operator is deprecated and will be removed in
@@ -17781,9 +16198,6 @@ class basic_json
     @param[in] i  an input in CBOR format convertible to an input adapter
     @param[in] strict  whether to expect the input to be consumed until EOF
                        (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
     @return deserialized JSON value
 
     @throw parse_error.110 if the given input ends prematurely or the end of
@@ -17799,39 +16213,29 @@ class basic_json
 
     @sa http://cbor.io
     @sa @ref to_cbor(const basic_json&) for the analogous serialization
-    @sa @ref from_msgpack(detail::input_adapter, const bool, const bool) for the
+    @sa @ref from_msgpack(detail::input_adapter, const bool) for the
         related MessagePack format
-    @sa @ref from_ubjson(detail::input_adapter, const bool, const bool) for the
-        related UBJSON format
+    @sa @ref from_ubjson(detail::input_adapter, const bool) for the related
+        UBJSON format
 
     @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
            consume input adapters, removed start_index parameter, and added
-           @a strict parameter since 3.0.0; added @allow_exceptions parameter
-           since 3.2.0
+           @a strict parameter since 3.0.0
     */
-    static basic_json from_cbor(detail::input_adapter&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
+    static basic_json from_cbor(detail::input_adapter i,
+                                const bool strict = true)
     {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::cbor, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
+        return binary_reader(i).parse_cbor(strict);
     }
 
     /*!
-    @copydoc from_cbor(detail::input_adapter, const bool, const bool)
+    @copydoc from_cbor(detail::input_adapter, const bool)
     */
     template<typename A1, typename A2,
              detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
-    static basic_json from_cbor(A1 && a1, A2 && a2,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
+    static basic_json from_cbor(A1 && a1, A2 && a2, const bool strict = true)
     {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::cbor, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
+        return binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).parse_cbor(strict);
     }
 
     /*!
@@ -17884,10 +16288,6 @@ class basic_json
                   adapter
     @param[in] strict  whether to expect the input to be consumed until EOF
                        (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value
 
     @throw parse_error.110 if the given input ends prematurely or the end of
     file was not reached when @a strict was set to true
@@ -17902,39 +16302,29 @@ class basic_json
 
     @sa http://msgpack.org
     @sa @ref to_msgpack(const basic_json&) for the analogous serialization
-    @sa @ref from_cbor(detail::input_adapter, const bool, const bool) for the
-        related CBOR format
-    @sa @ref from_ubjson(detail::input_adapter, const bool, const bool) for
-        the related UBJSON format
+    @sa @ref from_cbor(detail::input_adapter, const bool) for the related CBOR
+        format
+    @sa @ref from_ubjson(detail::input_adapter, const bool) for the related
+        UBJSON format
 
     @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
            consume input adapters, removed start_index parameter, and added
-           @a strict parameter since 3.0.0; added @allow_exceptions parameter
-           since 3.2.0
+           @a strict parameter since 3.0.0
     */
-    static basic_json from_msgpack(detail::input_adapter&& i,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
+    static basic_json from_msgpack(detail::input_adapter i,
+                                   const bool strict = true)
     {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::msgpack, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
+        return binary_reader(i).parse_msgpack(strict);
     }
 
     /*!
-    @copydoc from_msgpack(detail::input_adapter, const bool, const bool)
+    @copydoc from_msgpack(detail::input_adapter, const bool)
     */
     template<typename A1, typename A2,
              detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
-    static basic_json from_msgpack(A1 && a1, A2 && a2,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
+    static basic_json from_msgpack(A1 && a1, A2 && a2, const bool strict = true)
     {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::msgpack, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
+        return binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).parse_msgpack(strict);
     }
 
     /*!
@@ -17969,10 +16359,6 @@ class basic_json
     @param[in] i  an input in UBJSON format convertible to an input adapter
     @param[in] strict  whether to expect the input to be consumed until EOF
                        (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value
 
     @throw parse_error.110 if the given input ends prematurely or the end of
     file was not reached when @a strict was set to true
@@ -17987,36 +16373,24 @@ class basic_json
     @sa http://ubjson.org
     @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
              analogous serialization
-    @sa @ref from_cbor(detail::input_adapter, const bool, const bool) for the
-        related CBOR format
-    @sa @ref from_msgpack(detail::input_adapter, const bool, const bool) for
-        the related MessagePack format
+    @sa @ref from_cbor(detail::input_adapter, const bool) for the related CBOR
+        format
+    @sa @ref from_msgpack(detail::input_adapter, const bool) for the related
+        MessagePack format
 
-    @since version 3.1.0; added @allow_exceptions parameter since 3.2.0
+    @since version 3.1.0
     */
-    static basic_json from_ubjson(detail::input_adapter&& i,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
+    static basic_json from_ubjson(detail::input_adapter i,
+                                  const bool strict = true)
     {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::ubjson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
+        return binary_reader(i).parse_ubjson(strict);
     }
 
-    /*!
-    @copydoc from_ubjson(detail::input_adapter, const bool, const bool)
-    */
     template<typename A1, typename A2,
              detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
-    static basic_json from_ubjson(A1 && a1, A2 && a2,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
+    static basic_json from_ubjson(A1 && a1, A2 && a2, const bool strict = true)
     {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::ubjson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
+        return binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).parse_ubjson(strict);
     }
 
     /// @}
@@ -18393,13 +16767,11 @@ class basic_json
                         break;
                     }
 
-                    // LCOV_EXCL_START
                     default:
                     {
                         // if there exists a parent it cannot be primitive
-                        assert(false);
+                        assert(false);  // LCOV_EXCL_LINE
                     }
-                        // LCOV_EXCL_STOP
                 }
             }
         };
@@ -18541,7 +16913,7 @@ class basic_json
                         // the "path" location must exist - use at()
                         success = (result.at(ptr) == get_value("test", "value", false));
                     }
-                    JSON_INTERNAL_CATCH (out_of_range&)
+                    JSON_CATCH (out_of_range&)
                     {
                         // ignore out of range errors: success remains false
                     }
@@ -18813,6 +17185,20 @@ class basic_json
 // specialization of std::swap, and std::hash
 namespace std
 {
+/*!
+@brief exchanges the values of two JSON objects
+
+@since version 1.0.0
+*/
+template<>
+inline void swap(nlohmann::json& j1,
+                 nlohmann::json& j2) noexcept(
+                     is_nothrow_move_constructible<nlohmann::json>::value and
+                     is_nothrow_move_assignable<nlohmann::json>::value
+                 )
+{
+    j1.swap(j2);
+}
 
 /// hash value for JSON objects
 template<>
@@ -18848,20 +17234,6 @@ struct less< ::nlohmann::detail::value_t>
     }
 };
 
-/*!
-@brief exchanges the values of two JSON objects
-
-@since version 1.0.0
-*/
-template<>
-inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept(
-    is_nothrow_move_constructible<nlohmann::json>::value and
-    is_nothrow_move_assignable<nlohmann::json>::value
-)
-{
-    j1.swap(j2);
-}
-
 } // namespace std
 
 /*!
@@ -18912,7 +17284,6 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
 #endif
 
 // clean up
-#undef JSON_INTERNAL_CATCH
 #undef JSON_CATCH
 #undef JSON_THROW
 #undef JSON_TRY
@@ -18923,6 +17294,7 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
 #undef JSON_HAS_CPP_17
 #undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
 #undef NLOHMANN_BASIC_JSON_TPL
+#undef NLOHMANN_JSON_HAS_HELPER
 
 
 #endif
diff --git a/src/nlohmann/json_fwd.hpp b/src/nlohmann/json_fwd.hpp
index 5ff0d753..750adb64 100644
--- a/src/nlohmann/json_fwd.hpp
+++ b/src/nlohmann/json_fwd.hpp
@@ -18,10 +18,10 @@ namespace nlohmann
 @brief default JSONSerializer template argument
 
 This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+([argument-dependent lookup](http://en.cppreference.com/w/cpp/language/adl))
 for serialization.
 */
-template<typename T = void, typename SFINAE = void>
+template<typename = void, typename = void>
 struct adl_serializer;
 
 template<template<typename U, typename V, typename... Args> class ObjectType =
diff --git a/src/sioclient/.gitignore b/src/sioclient/.gitignore
deleted file mode 100644
index 989bd14a..00000000
--- a/src/sioclient/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build/
-**/*.user
\ No newline at end of file
diff --git a/src/sioclient/.gitmodules b/src/sioclient/.gitmodules
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/sioclient/.travis.yml b/src/sioclient/.travis.yml
deleted file mode 100644
index 9c865bac..00000000
--- a/src/sioclient/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-language: cpp
-
-compiler:
-  - clang
-
-before_install:
-  - sudo apt-get install clang git libssl-dev
-  - sudo add-apt-repository -y ppa:boost-latest/ppa
-  - sudo add-apt-repository -y ppa:kubuntu-ppa/backports
-  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test -y
-  - sudo apt-get update -yqq
-  - sudo apt-get install -y libboost1.55-dev libboost-system1.55-dev libboost-date-time1.55-dev libboost-random1.55-dev
-  - sudo apt-get install -y cmake g++-4.8
-  - sed -i -e 's/cmake_minimum_required(VERSION 3.1.0/cmake_minimum_required(VERSION 2.8.12/' ./CMakeLists.txt
-script:
-  - cmake -D CMAKE_CXX_FLAGS=-std=c++11 .
-  - make
-  - make install
diff --git a/src/sioclient/API.md b/src/sioclient/API.md
deleted file mode 100644
index 1061fc74..00000000
--- a/src/sioclient/API.md
+++ /dev/null
@@ -1,196 +0,0 @@
-## API
-### *Overview*
-There're just 3 roles in this library - `socket`, `client` and `message`.
-
-`client` is for physical connection while `socket` is for "namespace" (which is like a logical channel), which means one `socket` paired with one namespace, and one `client` paired with one physical connection.
-
-Since a physical connection can have multiple namespaces (which is called multiplex), a `client` object may have multiple `socket` objects, each of which is bound to a distinct `namespace`.
-
-Use `client` to setup the connection to the server, manange the connection status, also session id for the connection.
-
-Use `socket` to send messages under namespace and receives messages in the namespace, also handle special types of message.
-
-The `message` is just about the content you want to send, with text, binary or structured combinations.
-
-### *Socket*
-#### Constructors
-Sockets are all managed by `client`, no public constructors.
-
-You can get it's pointer by `client.socket(namespace)`.
-
-#### Event Emitter
-`void emit(std::string const& name, message::list const& msglist, std::function<void (message::ptr const&)> const& ack)`
-
-Universal event emition interface, by applying implicit conversion magic, it is backward compatible with all previous `emit` interfaces.
-
-#### Event Bindings
-`void on(std::string const& event_name,event_listener const& func)`
-
-`void on(std::string const& event_name,event_listener_aux const& func)`
-
-Bind a callback to specified event name. Same as `socket.on()` function in JS, `event_listener` is for full content event object, `event_listener_aux` is for convenience.
-
-`void off(std::string const& event_name)`
-
-Unbind the event callback with specified name.
-
-`void off_all()`
-
-Clear all event bindings (not including the error listener).
-
-`void on_error(error_listener const& l)`
-
-Bind the error handler for socket.io error messages.
-
-`void off_error()`
-
-Unbind the error handler.
-
-```C++
-//event object:
-class event
-{
-public:
-    const std::string& get_nsp() const;
-
-    const std::string& get_name() const;
-
-    const message::ptr& get_message() const;
-
-    bool need_ack() const;
-
-    void put_ack_message(message::ptr const& ack_message);
-
-    message::ptr const& get_ack_message() const;
-   ...
-};
-//event listener declare:
-typedef std::function<void(const std::string& name,message::ptr const& message,bool need_ack, message::ptr& ack_message)> event_listener_aux;
-
-typedef std::function<void(event& event)> event_listener;
-
-typedef std::function<void(message::ptr const& message)> error_listener;
-
-```
-
-#### Connect and close socket
-`connect` will happen for existing `socket`s automatically when `client` have opened up the physical connection.
-
-`socket` opened with connected `client` will connect to its namespace immediately.
-
-`void close()`
-
-Positively disconnect from namespace.
-
-#### Get name of namespace
-`std::string const& get_namespace() const`
-
-Get current namespace name which the client is inside.
-
-### *Client*
-#### Constructors
-`client()` default constructor.
-
-#### Connection Listeners
-`void set_open_listener(con_listener const& l)`
-
-Call when websocket is open, especially means good connectivity.
-
-`void set_fail_listener(con_listener const& l)`
-
-Call when failed in connecting.
-
-`void set_close_listener(close_listener const& l)`
-
-Call when closed or drop. See `client::close_reason`
-
-```C++
-//connection listener declare:
-enum close_reason
-{
-    close_reason_normal,
-    close_reason_drop
-};
-typedef std::function<void(void)> con_listener;
-
-typedef std::function<void(close_reason const& reason)> close_listener;
-```
-#### Socket listeners
-`void set_socket_open_listener(socket_listener const& l)`
-
-Set listener for socket connect event, called when any sockets being ready to send message.
-
-`void set_socket_close_listener(socket_listener const& l)`
-
-Set listener for socket close event, called when any sockets being closed, afterward, corresponding `socket` object will be cleared from client.
-
-```C++
-    //socket_listener declare:
-    typedef std::function<void(std::string const& nsp)> socket_listener;
-```
-
-#### Connect and Close
-`void connect(const std::string& uri)`
-
-Connect to socket.io server, e.g., `client.connect("ws://localhost:3000");`
-
-`void close()`
-
-Close the client, return immediately.
-
-`void sync_close()`
-
-Close the client, return until it is really closed.
-
-`bool opened() const`
-
-Check if client's connection is opened.
-
-#### Transparent reconnecting
-`void set_reconnect_attempts(int attempts)`
-
-Set max reconnect attempts, set to 0 to disable transparent reconnecting.
-
-`void set_reconnect_delay(unsigned millis)`
-
-Set minimum delay for reconnecting, this is the delay for 1st reconnecting attempt,
-then the delay duration grows by attempts made.
-
-`void set_reconnect_delay_max(unsigned millis)`
-
-Set maximum delay for reconnecting.
-
-`void set_reconnecting_listener(con_listener const& l)`
-
-Set listener for reconnecting is in process.
-
-`void set_reconnect_listener(reconnect_listener const& l)`
-
-Set listener for reconnecting event, called once a delayed connecting is scheduled.
-
-#### Namespace
-`socket::ptr socket(std::string const& nsp)`
-
-Get a pointer to a socket which is paired with the specified namespace.
-
-#### Session ID
-`std::string const& get_sessionid() const`
-
-Get socket.io session id.
-
-### *Message*
-`message` Base class of all message object.
-
-`int_message` message contains a 64-bit integer.
-
-`double_message` message contains a double.
-
-`string_message` message contains a string.
-
-`array_message` message contains a `vector<message::ptr>`.
-
-`object_message` message contains a `map<string,message::ptr>`.
-
-`message::ptr` pointer to `message` object, it will be one of its derived classes, judge by `message.get_flag()`.
-
-All designated constructor of `message` objects is hidden, you need to create message and get the `message::ptr` by `[derived]_message:create()`.
diff --git a/src/sioclient/BOOST.md b/src/sioclient/BOOST.md
deleted file mode 100644
index d9c46460..00000000
--- a/src/sioclient/BOOST.md
+++ /dev/null
@@ -1,21 +0,0 @@
-## Boost setup
-
-1. Download boost from [boost.org](http://www.boost.org/).
-1. Unpack boost to some place.
-1. Run either .\bootstrap.bat (on Windows), or ./bootstrap.sh (on other operating systems) under boost folder.
-
-## Boost build (Build the necessary subset only)
-
-#### Windows (or other mainstream desktop platforms shall work too):
-Run with following script will build the necessary subset:
-
-```bash
-bjam install --prefix="<your boost install folder>" --with-system --with-date_time --with-random link=static runtime-link=shared threading=multi
-```
-Optionally You can merge all output .lib files into a fat one,especially if you're not using cmake.
-
-In output folder, run:
-
-```bash
-lib.exe /OUT:boost.lib *
-```
diff --git a/src/sioclient/CMakeLists.txt b/src/sioclient/CMakeLists.txt
deleted file mode 100644
index 5a5256fb..00000000
--- a/src/sioclient/CMakeLists.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
-PROJECT(sioclient
-        VERSION 1.6.0
-        LANGUAGES CXX)
-
-include(CMakePackageConfigHelpers)
-
-set(CMAKE_DEBUG_POSTFIX d)
-
-option(BUILD_SHARED_LIBS "Build the shared library" OFF)
-
-set(Boost_USE_MULTITHREADED ON) 
-find_package(Boost ${BOOST_VER} REQUIRED COMPONENTS system date_time random exception)
-
-aux_source_directory(${CMAKE_CURRENT_LIST_DIR}/src ALL_SRC)
-aux_source_directory(${CMAKE_CURRENT_LIST_DIR}/src/internal ALL_SRC)
-file(GLOB ALL_HEADERS ${CMAKE_CURRENT_LIST_DIR}/include/*.h )
-set(SIO_INCLUDEDIR ${CMAKE_CURRENT_LIST_DIR})
-
-# Fix MSVC build (https://github.com/Nelson-numerical-software/socket.io-client-cpp)
-if(MSVC_VERSION EQUAL 1900 OR MSVC_VERSION GREATER 1900)
-add_definitions(-D__STDC_LIMIT_MACROS -D_WEBSOCKETPP_NOEXCEPT_ -D_WEBSOCKETPP_CPP11_CHRONO_)
-endif()
-
-add_library(sioclient ${ALL_SRC})
-set_property(TARGET sioclient PROPERTY CXX_STANDARD 11)
-set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON)
-set_target_properties(sioclient
-	PROPERTIES
-		SOVERSION ${PROJECT_VERSION_MAJOR}
-		VERSION ${PROJECT_VERSION}
-	)
-
-target_include_directories(sioclient PRIVATE ${Boost_INCLUDE_DIRS} 
-    ${CMAKE_CURRENT_LIST_DIR}/src 
-    ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp 
-    ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include
-)
-target_link_libraries(sioclient PUBLIC ${Boost_LIBRARIES})
-target_include_directories(sioclient PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>)
-
-find_package(OpenSSL)
-if(OPENSSL_FOUND)
-add_library(sioclient_tls ${ALL_SRC})
-target_include_directories(sioclient_tls PRIVATE ${Boost_INCLUDE_DIRS} 
-    ${CMAKE_CURRENT_LIST_DIR}/src 
-    ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp 
-    ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include
-    ${OPENSSL_INCLUDE_DIR}
-)
-
-set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD 11)
-set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(sioclient_tls PUBLIC ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} )
-target_include_directories(sioclient_tls PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>)
-target_compile_definitions(sioclient_tls PRIVATE -DSIO_TLS)
-set_target_properties(sioclient_tls
-	PROPERTIES
-		SOVERSION ${PROJECT_VERSION_MAJOR}
-		VERSION ${PROJECT_VERSION}
-	)
-endif()
-
-write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/sioclient-config-version.cmake
-                                 COMPATIBILITY AnyNewerVersion)
-
-install(FILES ${ALL_HEADERS} DESTINATION include)
-install(TARGETS sioclient
-        EXPORT sioclient
-        ARCHIVE
-          DESTINATION lib
-        LIBRARY
-          DESTINATION lib)
-install(TARGETS sioclient_tls
-        EXPORT sioclient
-        ARCHIVE
-          DESTINATION lib
-        LIBRARY
-          DESTINATION lib)
-install(EXPORT sioclient
-        DESTINATION lib/cmake/sioclient
-        FILE sioclient-config.cmake)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sioclient-config-version.cmake
-        DESTINATION lib/cmake/sioclient)
-
diff --git a/src/sioclient/INSTALL.md b/src/sioclient/INSTALL.md
deleted file mode 100644
index 614280df..00000000
--- a/src/sioclient/INSTALL.md
+++ /dev/null
@@ -1,48 +0,0 @@
-## Install
-
-### With CMake
-1. Install boost, see [Boost setup](#boost_setup) section.
-2. Use `git clone --recurse-submodules https://github.com/socketio/socket.io-client-cpp.git` to clone your local repo.
-3. Run `cmake -DBOOST_ROOT:STRING=<your boost install folder> -DBOOST_VER:STRING=<your boost version> ./`
-4. Run `make install`(if makefile generated) or open generated project (if project file generated) to build.
-5. Outputs is under `./build`, link with the all static libs under `./build/lib` and  include headers under `./build/include` in your client code where you want to use it.
-
-* If you're using boost without install,you can specify `boost include dir` and `boost lib dir` separately by:
-```bash
-cmake
--DBOOST_INCLUDEDIR=<your boost include folder>
--DBOOST_LIBRARYDIR=<your boost lib folder>
--DBOOST_VER:STRING=<your boost version>
-./
-```
-* CMake didn't allow merging static libraries,but they're all copied to `./build/lib`, you can DIY if you like.
-
-### Without CMake
-1. Install boost, see [Boost setup](#boost_setup) section.
-2. Use `git clone --recurse-submodules https://github.com/socketio/socket.io-client-cpp.git` to clone your local repo.
-3. Add `<your boost install folder>/include`,`./lib/websocketpp` and `./lib/rapidjson/include` to headers search path.
-4. Include all files under `./src` in your project, add `sio_client.cpp`,`sio_socket.cpp`,`internal/sio_client_impl.cpp`, `internal/sio_packet.cpp` to source list.
-5. Add `<your boost install folder>/lib` to library search path, add `boost.lib`(Win32) or `-lboost`(Other) link option.
-6. Include `sio_client.h` in your client code where you want to use it.
-
-## Boost setup
-
-1. Download boost from [boost.org](http://www.boost.org/).
-1. Unpack boost to some place.
-1. Run either .\bootstrap.bat (on Windows), or ./bootstrap.sh (on other operating systems) under boost folder.
-
-## Boost build (Build the necessary subset only)
-Windows (or other mainstream desktop platforms shall work too):
-
-The following script will build the necessary subset:
-
-```bash
-bjam install --prefix="<your boost install folder>" --with-system --with-date_time --with-random link=static runtime-link=shared threading=multi
-```
-Optionally You can merge all output .lib files into a fat one, especially if you're not using cmake.
-
-In output folder, run:
-
-```bash
-lib.exe /OUT:boost.lib *
-```
diff --git a/src/sioclient/INSTALL_IOS.md b/src/sioclient/INSTALL_IOS.md
deleted file mode 100644
index 881b2085..00000000
--- a/src/sioclient/INSTALL_IOS.md
+++ /dev/null
@@ -1,33 +0,0 @@
-## iOS
-
-### Option 1: Cocoapods
-
-```
-pod 'SocketIO-Client-CPP'
-```
-
-### Option 2: Create a static library
-
-1. Create a static library
-1. Copy the header files into xcode
-
-Use the static libraries generated by the example project [iOS example project](examples/iOS)
-
-Create one for
-- release iphoneos
-- release simulator
-- debug iphoneos
-- debug simulator
-
-Join the debug libraries and the release libraries with e.g.
-```
-libtool -static -o libUniversalRelease.a Release-iphoneos/libsioclient.a Release-iphonesimulator/libsioclient.a
-libtool -static -o libUniversalDebug.a Debug-iphoneos/libsioclient.a Debug-iphonesimulator/libsioclient.a
-```
-
-
-### Option 3: Manual integration
-
-Use this [shell](https://gist.github.com/melode11/a90114a2abf009ca22ea) to download and build boost completely automattically. It installs boost to `<shell folder>/prefix`.
-
-See the [iOS example project](examples/iOS) for how to integrate the rest.
diff --git a/src/sioclient/LICENSE b/src/sioclient/LICENSE
deleted file mode 100755
index fe9aa3b5..00000000
--- a/src/sioclient/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2015, Melo Yao
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to all conditions.
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/src/sioclient/README.md b/src/sioclient/README.md
deleted file mode 100755
index b30c7d8f..00000000
--- a/src/sioclient/README.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# Socket.IO C++ Client
-[![Build Status](https://travis-ci.org/socketio/socket.io-client-cpp.svg)](https://travis-ci.org/socketio/socket.io-client-cpp)
-
-By virtue of being written in C++, this client works in several different platforms. The [examples](https://github.com/socketio/socket.io-client-cpp/tree/master/examples) folder contains an iPhone, QT and Console example chat client! It depends on [websocket++](https://github.com/zaphoyd/websocketpp) and is inspired by [socket.io-clientpp](https://github.com/ebshimizu/socket.io-clientpp).
-
-[![Clients with iPhone, QT, Console and web](https://cldup.com/ukvVVZmvYV.png)](https://github.com/socketio/socket.io-client-cpp/tree/master/examples)
-
-## Features
-
-- 100% written in modern C++11
-- Compatible with socket.io 1.0+ protocol
-- Binary support
-- Automatic JSON encoding
-- Multiplex support
-- Similar API to the Socket.IO JS client
-- Cross platform
-
-## Installation alternatives
-
-* [With CMAKE](./INSTALL.md#with-cmake)
-* [Without CMAKE](./INSTALL.md#without-cmake)
-* [iOS and OS X](./INSTALL_IOS.md)
- * Option 1: Cocoapods
- * Option 2: Create a static library
- * Option 3: Manual integration
-
-
-## Quickstart
-
-** [Full overview of API can be seen here](./API.md) **
-
-
-The APIs are similar to the JS client.
-
-#### Connect to a server
-```C++
-sio::client h;
-h.connect("http://127.0.0.1:3000");
-```
-
-#### Emit an event
-
-```C++
-// emit event name only:
-h.socket()->emit("login");
-
-// emit text
-h.socket()->emit("add user", username);
-
-// emit binary
-char buf[100];
-h.socket()->emit("add user", std::make_shared<std::string>(buf,100));
-
-// emit message object with lambda ack handler
-h.socket()->emit("add user", string_message::create(username), [&](message::list const& msg) {
-});
-
-// emit multiple arguments
-message::list li("sports");
-li.push(string_message::create("economics"));
-socket->emit("categories", li);
-```
-Items in `message::list` will be expanded in server side event callback function as function arguments.
-
-#### Bind an event
-
-##### Bind with function pointer
-```C++
-void OnMessage(sio::event &)
-{
-
-}
-h.socket()->on("new message", &OnMessage);
-```
-
-##### Bind with lambda
-```C++
-h.socket()->on("login", [&](sio::event& ev)
-{
-    //handle login message
-    //post to UI thread if any UI updating.
-});
-```
-
-##### Bind with member function
-```C++
-class MessageHandler
-{
-public:
-    void OnMessage(sio::event &);
-};
-MessageHandler mh;
-h.socket()->on("new message",std::bind( &MessageHandler::OnMessage,&mh,std::placeholders::_1));
-```
-
-#### Using namespace
-```C++
-h.socket("/chat")->emit("add user", username);
-```
-** [Full overview of API can be seen here](./API.md) **
-
-## License
-
-MIT
diff --git a/src/sioclient/examples/Console/CMakeLists.txt b/src/sioclient/examples/Console/CMakeLists.txt
deleted file mode 100644
index 907c5d18..00000000
--- a/src/sioclient/examples/Console/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
-include(${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeLists.txt)
-add_executable(sio_console_demo main.cpp)
-set_property(TARGET sio_console_demo PROPERTY CXX_STANDARD 11)
-set_property(TARGET sio_console_demo PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(sio_console_demo sioclient)
-target_link_libraries(sio_console_demo pthread )
-message(STATUS ${Boost_INCLUDE_DIRS} )
-#target_include_directories(sio_console_demo PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../src" ${Boost_INCLUDE_DIRS} )
-
diff --git a/src/sioclient/examples/Console/README.md b/src/sioclient/examples/Console/README.md
deleted file mode 100644
index 95bc4db4..00000000
--- a/src/sioclient/examples/Console/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-#SioChatDemo setup
-This Demo is create with `Visual Studio 2012 Update 4` , It is a simple console app, connect to official [socket.io chatroom example](https://github.com/Automattic/socket.io/tree/master/examples/chat) as a chat client.
-
-You can choose a nickname, send/receive message in the chat room, and see join/left information as well.
-##boost for windows
-Please download boost package from [boost.org](www.boost.org), and unpack to `boost` folder.
-Please make sure there's no redundent folder levels under it (by check if `bootstrap.bat` is directly under `boost` folder).
-
-cd to `boost` folder, and run `bootstrap.bat`
-
-Then run:
-
- ```shell
- bjam stage --toolset=msvc --with-system --with-date_time --with-random --stagedir="release" link=static runtime-link=shared threading=multi release
- bjam stage --toolset=msvc --with-system --with-date_time --with-random --stagedir="debug" link=static runtime-link=shared threading=multi debug
- ```
-After done this, use Visual studio command line tool, go to `boost\release` folder, run
-
-```shell
-lib.exe /OUT:boost.lib *
-```
-
-And do then same thing in `boost\debug` folder.
-
-then you can open the VS project `SioChatDemo.sln` to build and run.
-
-##Visual studio version
-Microsoft start to support c++11 after `Visual studio 2012 Update 4`. Please make sure you're using up-to-date version.
diff --git a/src/sioclient/examples/Console/SioChatDemo/SioChatDemo.sln b/src/sioclient/examples/Console/SioChatDemo/SioChatDemo.sln
deleted file mode 100644
index 8f760649..00000000
--- a/src/sioclient/examples/Console/SioChatDemo/SioChatDemo.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SioChatDemo", "SioChatDemo.vcxproj", "{3503FCEB-2C8E-441A-A57C-B9DEE9171CF4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3503FCEB-2C8E-441A-A57C-B9DEE9171CF4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3503FCEB-2C8E-441A-A57C-B9DEE9171CF4}.Debug|Win32.Build.0 = Debug|Win32
-		{3503FCEB-2C8E-441A-A57C-B9DEE9171CF4}.Release|Win32.ActiveCfg = Release|Win32
-		{3503FCEB-2C8E-441A-A57C-B9DEE9171CF4}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/sioclient/examples/Console/SioChatDemo/SioChatDemo.vcxproj b/src/sioclient/examples/Console/SioChatDemo/SioChatDemo.vcxproj
deleted file mode 100644
index 470e82f4..00000000
--- a/src/sioclient/examples/Console/SioChatDemo/SioChatDemo.vcxproj
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3503FCEB-2C8E-441A-A57C-B9DEE9171CF4}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>SioChatDemo</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>D:\BoostRoot\include\boost-1_55;$(SolutionDir)..\..\..\lib\websocketpp;$(SolutionDir)..\..\..\lib\rapidjson\include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\boost_1_55_0\boost_build\debug\lib;$(SolutionDir)boost\$(Configuration)\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)boost;$(SolutionDir)..\..\..\lib\websocketpp;$(SolutionDir)..\..\..\lib\rapidjson\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)boost\$(Configuration)\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>boost.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>boost.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\src\internal\sio_client_impl.h" />
-    <ClInclude Include="..\..\..\src\internal\sio_packet.h" />
-    <ClInclude Include="..\..\..\src\sio_client.h" />
-    <ClInclude Include="..\..\..\src\sio_message.h" />
-    <ClInclude Include="..\..\..\src\sio_socket.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\src\internal\sio_client_impl.cpp" />
-    <ClCompile Include="..\..\..\src\internal\sio_packet.cpp" />
-    <ClCompile Include="..\..\..\src\sio_client.cpp" />
-    <ClCompile Include="..\..\..\src\sio_socket.cpp" />
-    <ClCompile Include="..\main.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/sioclient/examples/Console/main.cpp b/src/sioclient/examples/Console/main.cpp
deleted file mode 100755
index 9a95dfb2..00000000
--- a/src/sioclient/examples/Console/main.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-//
-//  sio_test_sample.cpp
-//
-//  Created by Melo Yao on 3/24/15.
-//
-
-#include "../../src/sio_client.h"
-
-#include <functional>
-#include <iostream>
-#include <thread>
-#include <mutex>
-#include <condition_variable>
-#include <string>
-#ifdef WIN32
-#define HIGHLIGHT(__O__) std::cout<<__O__<<std::endl
-#define EM(__O__) std::cout<<__O__<<std::endl
-
-#include <stdio.h>
-#include <tchar.h>
-#define MAIN_FUNC int _tmain(int argc, _TCHAR* argv[])
-#else
-#define HIGHLIGHT(__O__) std::cout<<"\e[1;31m"<<__O__<<"\e[0m"<<std::endl
-#define EM(__O__) std::cout<<"\e[1;30;1m"<<__O__<<"\e[0m"<<std::endl
-
-#define MAIN_FUNC int main(int argc ,const char* args[])
-#endif
-
-using namespace sio;
-using namespace std;
-std::mutex _lock;
-
-std::condition_variable_any _cond;
-bool connect_finish = false;
-
-class connection_listener
-{
-    sio::client &handler;
-
-public:
-    
-    connection_listener(sio::client& h):
-    handler(h)
-    {
-    }
-    
-
-    void on_connected()
-    {
-        _lock.lock();
-        _cond.notify_all();
-        connect_finish = true;
-        _lock.unlock();
-    }
-    void on_close(client::close_reason const& reason)
-    {
-        std::cout<<"sio closed "<<std::endl;
-        exit(0);
-    }
-    
-    void on_fail()
-    {
-        std::cout<<"sio failed "<<std::endl;
-        exit(0);
-    }
-};
-
-int participants = -1;
-
-socket::ptr current_socket;
-
-void bind_events()
-{
-	current_socket->on("new message", sio::socket::event_listener_aux([&](string const& name, message::ptr const& data, bool isAck,message::list &ack_resp)
-                       {
-                           _lock.lock();
-                           string user = data->get_map()["username"]->get_string();
-                           string message = data->get_map()["message"]->get_string();
-                           EM(user<<":"<<message);
-                           _lock.unlock();
-                       }));
-    
-    current_socket->on("user joined",sio::socket::event_listener_aux([&](string const& name, message::ptr const& data, bool isAck,message::list &ack_resp)
-                       {
-                           _lock.lock();
-                           string user = data->get_map()["username"]->get_string();
-                           participants  = data->get_map()["numUsers"]->get_int();
-                           bool plural = participants !=1;
-                           
-                           //     abc "
-                           HIGHLIGHT(user<<" joined"<<"\nthere"<<(plural?" are ":"'s ")<< participants<<(plural?" participants":" participant"));
-                           _lock.unlock();
-                       }));
-    current_socket->on("user left", sio::socket::event_listener_aux([&](string const& name, message::ptr const& data, bool isAck,message::list &ack_resp)
-                       {
-                           _lock.lock();
-                           string user = data->get_map()["username"]->get_string();
-                           participants  = data->get_map()["numUsers"]->get_int();
-                           bool plural = participants !=1;
-                           HIGHLIGHT(user<<" left"<<"\nthere"<<(plural?" are ":"'s ")<< participants<<(plural?" participants":" participant"));
-                           _lock.unlock();
-                       }));
-}
-
-MAIN_FUNC
-{
-
-    sio::client h;
-    connection_listener l(h);
-    
-    h.set_open_listener(std::bind(&connection_listener::on_connected, &l));
-    h.set_close_listener(std::bind(&connection_listener::on_close, &l,std::placeholders::_1));
-    h.set_fail_listener(std::bind(&connection_listener::on_fail, &l));
-    h.connect("http://127.0.0.1:3000");
-    _lock.lock();
-    if(!connect_finish)
-    {
-        _cond.wait(_lock);
-    }
-    _lock.unlock();
-	current_socket = h.socket();
-Login:
-    string nickname;
-    while (nickname.length() == 0) {
-        HIGHLIGHT("Type your nickname:");
-        
-        getline(cin, nickname);
-    }
-	current_socket->on("login", sio::socket::event_listener_aux([&](string const& name, message::ptr const& data, bool isAck,message::list &ack_resp){
-        _lock.lock();
-        participants = data->get_map()["numUsers"]->get_int();
-        bool plural = participants !=1;
-        HIGHLIGHT("Welcome to Socket.IO Chat-\nthere"<<(plural?" are ":"'s ")<< participants<<(plural?" participants":" participant"));
-        _cond.notify_all();
-        _lock.unlock();
-        current_socket->off("login");
-    }));
-    current_socket->emit("add user", nickname);
-    _lock.lock();
-    if (participants<0) {
-        _cond.wait(_lock);
-    }
-    _lock.unlock();
-    bind_events();
-    
-    HIGHLIGHT("Start to chat,commands:\n'$exit' : exit chat\n'$nsp <namespace>' : change namespace");
-    for (std::string line; std::getline(std::cin, line);) {
-        if(line.length()>0)
-        {
-            if(line == "$exit")
-            {
-                break;
-            }
-            else if(line.length() > 5&&line.substr(0,5) == "$nsp ")
-            {
-                string new_nsp = line.substr(5);
-                if(new_nsp == current_socket->get_namespace())
-                {
-                    continue;
-                }
-                current_socket->off_all();
-                current_socket->off_error();
-                //per socket.io, default nsp should never been closed.
-                if(current_socket->get_namespace() != "/")
-                {
-                    current_socket->close();
-                }
-                current_socket = h.socket(new_nsp);
-                bind_events();
-                //if change to default nsp, we do not need to login again (since it is not closed).
-                if(current_socket->get_namespace() == "/")
-                {
-                    continue;
-                }
-                goto Login;
-            }
-            current_socket->emit("new message", line);
-            _lock.lock();
-            EM("\t\t\t"<<line<<":"<<"You");
-            _lock.unlock();
-        }
-    }
-    HIGHLIGHT("Closing...");
-    h.sync_close();
-    h.clear_con_listeners();
-	return 0;
-}
-
diff --git a/src/sioclient/examples/QT/.gitignore b/src/sioclient/examples/QT/.gitignore
deleted file mode 100644
index dd07bff2..00000000
--- a/src/sioclient/examples/QT/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build-*
diff --git a/src/sioclient/examples/QT/README.md b/src/sioclient/examples/QT/README.md
deleted file mode 100644
index 03ccb8ec..00000000
--- a/src/sioclient/examples/QT/README.md
+++ /dev/null
@@ -1,307 +0,0 @@
-![Demo shot](https://cldup.com/98tHyoJJE7.gif)
-
-In this tutorial we’ll learn how to create a QT chat application that communicates with a [Socket.IO Node.JS chat server](https://github.com/Automattic/socket.io/tree/master/examples/chat).
-
-###Introduction
-To follow along, start by cloning the repository: [socket.io-client-cpp](https://github.com/socketio/socket.io-client-cpp).
-Using:
-
-```bash
-git clone --recurse-submodules https://github.com/socketio/socket.io-client-cpp.git
-```
-
-The app has the following features:
-
-* Sending a message to all users joining to the room.
-
-* Notifies when each user joins or leaves.
-
-* Notifies when an user start typing a message.
-
-###Install QT community
-Visit [QT community download link](http://www.qt.io/download-open-source/#section-2) to get the install package.
-Just install it with default installation option.
-
-###Create a QT GUI application.
-Launch QT Creator.
-In welcome page, select `New Project`, create a `QT Widget Application`, named it `SioChatDemo`
-The project structure is like:
-
-```
-SioChatDemo
-    |__ SioChatDemo.pro
-    |__Headers
-    |   |__mainwindow.h
-    |__Sources
-    |   |__main.cpp
-    |   |__mainwindow.cpp
-    |__Forms
-        |__mainwindow.ui
-```
-
-###Import SioClient and config compile options.
-Let's copy the SioClient into the QT project as a subfolder `sioclient`.
-
-Edit `SioChatDemo.pro` to config paths and compile options, simply add:
-
-```bash
-SOURCES += ./sioclient/src/sio_client.cpp \
-           ./sioclient/src/sio_packet.cpp 
-
-HEADERS  += ./sioclient/src/sio_client.h \
-            ./sioclient/src/sio_message.h
-
-INCLUDEPATH += $$PWD/sioclient/lib/rapidjson/include
-INCLUDEPATH += $$PWD/sioclient/lib/websocketpp
-```
-
-Also add two additional compile option
-
-```bash
-CONFIG+=no_keywords
-CONFIG+=c++11
-```
-
-`no_keywords` is for preventing qmake treat some function's name `emit` as the keyword of signal-slot mechanism.
-`c++11` ask for C++11 support.
-
-##Import boost
-Suppose we now have our boost `headers` and a fat boost `static lib` named `libboost.a`(non-win32) or `boost.lib`(win32) ready.
-
-To import them we need to edit `SioChatDemo.pro` again,add header include:
-
-```bash
-INCLUDEPATH += `our boost headers folder`
-```
-
-also linker options:
-
-```bash
-win32:CONFIG(release, debug|release): LIBS += -L`our Win32 boost static lib folder` -lboost
-else:win32:CONFIG(debug, debug|release): LIBS += -L`our Win32 boost static lib folder` -lboost
-else:unix: LIBS += -L`our osx boost static lib folder` -lboost
-```
-
-###Make up mainwindow ui.
-Make up a simple ui by drag and drop widget from `Widget box` in left side.
-
-We finally end up with this:
-
-![QT mainwindow](https://cldup.com/RI98CYpYL5.png)
-
-It contains:
-
-* a `QLineEdit` at the top for nickname inputing, named `nickNameEdit`
-
-* a `QPushButton` at the topright for login, named `loginBtn`
-
-* a `QListWidget` at the center for showing messages, named `listView`
-
-* a `QLineEdit` at the bottom for typing message, named `messageEdit`
-
-* a `QPushButton` at the bottomright for sending message, named `sendBtn`
-
-###Add Slots in mainwindow
-Slots need to be added in `mainwindow` class to handle UI events.They are
-
-* click login button
-
-* click send message button
-
-* text change in messageEdit(for typing status)
-
-* message editing is returned (for sending message by return)
-
-Insert following code into `MainWindow` class in `mainwindow.h` 
-
-```C++
-public Q_SLOTS:
-    void SendBtnClicked();
-    void TypingChanged();
-    void LoginClicked();
-    void OnMessageReturn();
-```
-
-###Connect UI event signal and slots together
-Open `mainwindow.ui` in Design mode. switch to `signals/slots` mode by check `Menu->Edit->Edit Signals/Slots`
-
-By press left mouse on widget and drag on to the window (cursor will become a sign of electrical ground), to open the connection editor.
-
-In the connection editor, edit the slots of MainWindow at the right side, add Those slots function name added in `mainwindow.h` before.
-
-Then we'll be able to connect the event signal from widget with our own slots.
-
-We finally end up with this:
-
-![QT signals&slots](https://cldup.com/Vsb-UXG3FC.jpg)
-
-###Adding UI refresh Signals/Slots
-`sio::client`'s callbacks are not in UI thread. However, UI is required to be updated by those callbacks, so we need some `Signal` for non-UI thread to "request" `Slots` functions been called in UI thread. Say if we want to signal `QListWidgetItem` being added, add:
-
-```C++
-//In mainwindow.h
-Q_SIGNALS:
-    void RequestAddListItem(QListWidgetItem *item);
-private Q_SLOTS:
-    void AddListItem(QListWidgetItem *item);
-```
-
-```C++
-//In mainwindow.cpp
-void MainWindow::AddListItem(QListWidgetItem* item)
-{
-    this->findChild<QListWidget*>("listView")->addItem(item);
-}
-```
-
-Then connect them in `MainWindow` constructor.
-
-```C++
-    connect(this,SIGNAL(RequestAddListItem(QListWidgetItem*)),this,SLOT(AddListItem(QListWidgetItem*)));
-```
-
-###Init sio::client in MainWindow
-For single window applications, simply let `MainWindow` class holding the `sio::client` object:
-
-declare a `unique_ptr` member of `sio::client` and Several event handling functions in `mainwindow.h`
-
-```C++
-private:
-    void OnNewMessage(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp);
-    void OnUserJoined(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp);
-    void OnUserLeft(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp);
-    void OnTyping(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp);
-    void OnStopTyping(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp);
-    void OnLogin(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp);
-    void OnConnected();
-    void OnClosed(client::close_reason const& reason);
-    void OnFailed();
-
-    std::unique_ptr<client> _io;
-```
-
-Init `sio::client` and setup event bindings for default `socket` in `MainWindow` constructor.
-
-And we also need to handle the connectivity events, handle the connect and disconnect events.
-
-Now the `MainWindow` constructor:
-
-```C++
-MainWindow::MainWindow(QWidget *parent) :
-    QMainWindow(parent),
-    ui(new Ui::MainWindow),
-    _io(new client())
-{
-    ui->setupUi(this);
-    using std::placeholders::_1;
-    using std::placeholders::_2;
-    using std::placeholders::_3;
-    using std::placeholders::_4;
-    socket::ptr sock = _io->socket();
-    sock->on("new message",std::bind(&MainWindow::OnNewMessage,this,_1,_2,_3,_4));
-    sock->on("user joined",std::bind(&MainWindow::OnUserJoined,this,_1,_2,_3,_4));
-    sock->on("user left",std::bind(&MainWindow::OnUserLeft,this,_1,_2,_3,_4));
-    sock->on("typing",std::bind(&MainWindow::OnTyping,this,_1,_2,_3,_4));
-    sock->on("stop typing",std::bind(&MainWindow::OnStopTyping,this,_1,_2,_3,_4));
-    sock->on("login",std::bind(&MainWindow::OnLogin,this,_1,_2,_3,_4));
-    //default socket opened, also we have "set_open_listener" for monitoring physical connection opened.
-    _io->set_socket_open_listener(std::bind(&MainWindow::OnConnected,this,std::placeholders::_1));
-    //physical connection closed or drop.
-    _io->set_close_listener(std::bind(&MainWindow::OnClosed,this,_1));
-    //physical connection fail to establish.
-    _io->set_fail_listener(std::bind(&MainWindow::OnFailed,this));
-    connect(this,SIGNAL(RequestAddListItem(QListWidgetItem*)),this,SLOT(AddListItem(QListWidgetItem*)));
-}
-```
-
-###Managing connection state
-We have several connection listeners for connection events.
-
-First we want to send login message once we're connected, get the default `socket` from `client` to do that.
-
-```C++
-void MainWindow::OnConnected()
-{
-    QByteArray bytes = m_name.toUtf8();
-    std::string nickName(bytes.data(),bytes.length());
-    _io->socket()->emit("add user", nickName);
-}
-```
-
-Then if connection is closed or failed, we need to restore to the UI before connect.
-
-```C++
-void MainWindow::OnClosed(client::close_reason const& reason)
-{
-    //restore UI to pre-login state
-}
-
-void MainWindow::OnFailed()
-{
-    //restore UI to pre-login state
-}
-
-```
-
-If `MainWindow` is exit, we need to clear event bindings and listeners.
-
-the `sio::client` object will be destruct by `unique_ptr`
-
-```C++
-MainWindow::~MainWindow()
-{
-    _io->socket()->off_all();
-    _io->socket()->off_error();
-    delete ui;
-}
-```
-
-###Handle socket.io events
-We'll need to handle socket.io events in our functions bind to socket.io events.
-For example, we need to show received messages to the `listView`
-
-```C++
-void MainWindow::OnNewMessage(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)
-{
-    if(data->get_flag() == message::flag_object)
-    {
-        std::string msg = data->get_map()["message"]->get_string();
-        std::string name = data->get_map()["username"]->get_string();
-        QString label = QString::fromUtf8(name.data(),name.length());
-        label.append(':');
-        label.append(QString::fromUtf8(msg.data(),msg.length()));
-        QListWidgetItem *item= new QListWidgetItem(label);
-        //emit RequestAddListItem signal
-        //so that 'AddListItem' will be executed in UI thread.
-        Q_EMIT RequestAddListItem(item);
-    }
-}
-```
-
-###Sending chat message
-When `sendBtn` is clicked, we need to send the text in `messageEdit` to chatroom.
-Add code to `SendBtnClicked()`:
-
-```C++
-void MainWindow::SendBtnClicked()
-{
-    QLineEdit* messageEdit = this->findChild<QLineEdit*>("messageEdit");
-    QString text = messageEdit->text();
-    if(text.length()>0)
-    {
-        QByteArray bytes = text.toUtf8();
-        std::string msg(bytes.data(),bytes.length());
-        _io->socket()->emit("new message",msg);//emit new message
-        text.append(":You");
-        QListWidgetItem *item = new QListWidgetItem(text);
-        item->setTextAlignment(Qt::AlignRight);
-        Q_EMIT RequestAddListItem(item);
-        messageEdit->clear();
-    }
-}
-```
-
-###Further reading
-You can run [Demo project](https://github.com/socketio/socket.io-client-cpp/tree/master/examples/QT/SioChatDemo) to have a closer look. 
-Before running, please follow the [instructions](../../README.md#with_cmake) to make the sioclient library.
-
diff --git a/src/sioclient/examples/QT/SioChatDemo/.gitignore b/src/sioclient/examples/QT/SioChatDemo/.gitignore
deleted file mode 100644
index adead72f..00000000
--- a/src/sioclient/examples/QT/SioChatDemo/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-SioChatDemo.pro.user
diff --git a/src/sioclient/examples/QT/SioChatDemo/SioChatDemo.pro b/src/sioclient/examples/QT/SioChatDemo/SioChatDemo.pro
deleted file mode 100644
index ff292878..00000000
--- a/src/sioclient/examples/QT/SioChatDemo/SioChatDemo.pro
+++ /dev/null
@@ -1,44 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2015-03-30T19:25:23
-#
-#-------------------------------------------------
-
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-TARGET = SioChatDemo
-TEMPLATE = app
-
-CONFIG+=no_keywords
-CONFIG+=c++11
-
-SOURCES += main.cpp\
-        mainwindow.cpp \
-    nicknamedialog.cpp
-
-HEADERS  += mainwindow.h \
-    nicknamedialog.h
-
-FORMS    += mainwindow.ui \
-    nicknamedialog.ui
-
-CONFIG(debug, debug|release):DEFINES +=DEBUG=1
-
-
-INCLUDEPATH += $$PWD/../../../build/include
-DEPENDPATH += $$PWD/../../../build/lib
-
-CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/Release/ -lsioclient
-else:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/Debug/ -lsioclient
-
-
-CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/Release/ -lboost_random
-else:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/Debug/ -lboost_random
-
-CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/Release/ -lboost_system
-else:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/Debug/ -lboost_system
-
-CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/Release/ -lboost_date_time
-else:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/Debug/ -lboost_date_time
diff --git a/src/sioclient/examples/QT/SioChatDemo/boost/.gitignore b/src/sioclient/examples/QT/SioChatDemo/boost/.gitignore
deleted file mode 100644
index d594dec5..00000000
--- a/src/sioclient/examples/QT/SioChatDemo/boost/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-osx/*
-src/*
-src
-osx
diff --git a/src/sioclient/examples/QT/SioChatDemo/boost/boost.sh b/src/sioclient/examples/QT/SioChatDemo/boost/boost.sh
deleted file mode 100644
index 808430f2..00000000
--- a/src/sioclient/examples/QT/SioChatDemo/boost/boost.sh
+++ /dev/null
@@ -1,378 +0,0 @@
-#===============================================================================
-# Filename:  boost.sh
-# Author:    Pete Goodliffe
-# Copyright: (c) Copyright 2009 Pete Goodliffe
-# Licence:   Please feel free to use this, with attribution
-# Modified version
-#===============================================================================
-#
-# Builds a Boost framework for the iPhone.
-# Creates a set of universal libraries that can be used on an iPhone and in the
-# iPhone simulator. Then creates a pseudo-framework to make using boost in Xcode
-# less painful.
-#
-# To configure the script, define:
-#    BOOST_LIBS:        which libraries to build
-#    IPHONE_SDKVERSION: iPhone SDK version (e.g. 5.1)
-#
-# Then go get the source tar.bz of the boost you want to build, shove it in the
-# same directory as this script, and run "./boost.sh". Grab a cuppa. And voila.
-#===============================================================================
-
-: ${BOOST_LIBS:="random regex graph random chrono thread signals filesystem system date_time"}
-: ${IPHONE_SDKVERSION:=`xcodebuild -showsdks | grep iphoneos | egrep "[[:digit:]]+\.[[:digit:]]+" -o | tail -1`}
-: ${OSX_SDKVERSION:=10.8}
-: ${XCODE_ROOT:=`xcode-select -print-path`}
-: ${EXTRA_CPPFLAGS:="-DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS -std=c++11 -stdlib=libc++"}
-
-# The EXTRA_CPPFLAGS definition works around a thread race issue in
-# shared_ptr. I encountered this historically and have not verified that
-# the fix is no longer required. Without using the posix thread primitives
-# an invalid compare-and-swap ARM instruction (non-thread-safe) was used for the
-# shared_ptr use count causing nasty and subtle bugs.
-#
-# Should perhaps also consider/use instead: -BOOST_SP_USE_PTHREADS
-
-: ${TARBALLDIR:=`pwd`}
-: ${SRCDIR:=`pwd`/src}
-: ${IOSBUILDDIR:=`pwd`/ios/build}
-: ${OSXBUILDDIR:=`pwd`/osx/build}
-: ${PREFIXDIR:=`pwd`/ios/prefix}
-: ${IOSFRAMEWORKDIR:=`pwd`/ios/framework}
-: ${OSXFRAMEWORKDIR:=`pwd`/osx/framework}
-: ${COMPILER:="clang++"}
-
-: ${BOOST_VERSION:=1.55.0}
-: ${BOOST_VERSION2:=1_55_0}
-
-BOOST_TARBALL=$TARBALLDIR/boost_$BOOST_VERSION2.tar.bz2
-BOOST_SRC=$SRCDIR/boost_${BOOST_VERSION2}
-
-#===============================================================================
-ARM_DEV_CMD="xcrun --sdk iphoneos"
-SIM_DEV_CMD="xcrun --sdk iphonesimulator"
-OSX_DEV_CMD="xcrun --sdk macosx"
-
-ARM_COMBINED_LIB=$IOSBUILDDIR/lib_boost_arm.a
-SIM_COMBINED_LIB=$IOSBUILDDIR/lib_boost_x86.a
-
-#===============================================================================
-
-
-#===============================================================================
-# Functions
-#===============================================================================
-
-abort()
-{
-    echo
-    echo "Aborted: $@"
-    exit 1
-}
-
-doneSection()
-{
-    echo
-    echo "================================================================="
-    echo "Done"
-    echo
-}
-
-#===============================================================================
-
-cleanEverythingReadyToStart()
-{
-    echo Cleaning everything before we start to build...
-
-    rm -rf iphone-build iphonesim-build osx-build
-    rm -rf $IOSBUILDDIR
-    rm -rf $OSXBUILDDIR
-    rm -rf $PREFIXDIR
-    rm -rf $IOSFRAMEWORKDIR/$FRAMEWORK_NAME.framework
-    rm -rf $OSXFRAMEWORKDIR/$FRAMEWORK_NAME.framework
-
-    doneSection
-}
-
-#===============================================================================
-
-downloadBoost()
-{
-    if [ ! -s $TARBALLDIR/boost_${BOOST_VERSION2}.tar.bz2 ]; then
-        echo "Downloading boost ${BOOST_VERSION}"
-        curl -L -o $TARBALLDIR/boost_${BOOST_VERSION2}.tar.bz2 http://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION2}.tar.bz2/download
-    fi
-
-    doneSection
-}
-
-#===============================================================================
-
-unpackBoost()
-{
-    [ -f "$BOOST_TARBALL" ] || abort "Source tarball missing."
-
-    echo Unpacking boost into $SRCDIR...
-
-    [ -d $SRCDIR ]    || mkdir -p $SRCDIR
-    [ -d $BOOST_SRC ] || ( cd $SRCDIR; tar xfj $BOOST_TARBALL )
-    [ -d $BOOST_SRC ] && echo "    ...unpacked as $BOOST_SRC"
-
-    doneSection
-}
-
-#===============================================================================
-
-restoreBoost()
-{
-    cp $BOOST_SRC/tools/build/v2/user-config.jam-bk $BOOST_SRC/tools/build/v2/user-config.jam
-}
-
-#===============================================================================
-
-updateBoost()
-{
-    echo Updating boost into $BOOST_SRC...
-
-    cp $BOOST_SRC/tools/build/v2/user-config.jam $BOOST_SRC/tools/build/v2/user-config.jam-bk
-
-    cat >> $BOOST_SRC/tools/build/v2/user-config.jam <<EOF
-using darwin : ${IPHONE_SDKVERSION}~iphone
-: $XCODE_ROOT/Toolchains/XcodeDefault.xctoolchain/usr/bin/$COMPILER -arch armv6 -arch armv7 -arch armv7s -arch arm64 -fvisibility=hidden -fvisibility-inlines-hidden $EXTRA_CPPFLAGS
-: <striper> <root>$XCODE_ROOT/Platforms/iPhoneOS.platform/Developer
-: <architecture>arm <target-os>iphone
-;
-using darwin : ${IPHONE_SDKVERSION}~iphonesim
-: $XCODE_ROOT/Toolchains/XcodeDefault.xctoolchain/usr/bin/$COMPILER -arch i386 -arch x86_64 -fvisibility=hidden -fvisibility-inlines-hidden $EXTRA_CPPFLAGS
-: <striper> <root>$XCODE_ROOT/Platforms/iPhoneSimulator.platform/Developer
-: <architecture>x86 <target-os>iphone
-;
-EOF
-
-    doneSection
-}
-
-#===============================================================================
-
-inventMissingHeaders()
-{
-    # These files are missing in the ARM iPhoneOS SDK, but they are in the simulator.
-    # They are supported on the device, so we copy them from x86 SDK to a staging area
-    # to use them on ARM, too.
-    echo Invent missing headers
-
-    cp $XCODE_ROOT/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_SDKVERSION}.sdk/usr/include/{crt_externs,bzlib}.h $BOOST_SRC
-}
-
-#===============================================================================
-
-bootstrapBoost()
-{
-    cd $BOOST_SRC
-
-    BOOST_LIBS_COMMA=$(echo $BOOST_LIBS | sed -e "s/ /,/g")
-    echo "Bootstrapping (with libs $BOOST_LIBS_COMMA)"
-    ./bootstrap.sh --with-libraries=$BOOST_LIBS_COMMA
-
-    doneSection
-}
-
-#===============================================================================
-
-buildBoostForIPhoneOS()
-{
-    cd $BOOST_SRC
-
-    # Install this one so we can copy the includes for the frameworks...
-    ./bjam -j16 --build-dir=iphone-build --stagedir=iphone-build/stage --prefix=$PREFIXDIR toolset=darwin architecture=arm target-os=iphone macosx-version=iphone-${IPHONE_SDKVERSION} define=_LITTLE_ENDIAN link=static stage
-    ./bjam -j16 --build-dir=iphone-build --stagedir=iphone-build/stage --prefix=$PREFIXDIR toolset=darwin architecture=arm target-os=iphone macosx-version=iphone-${IPHONE_SDKVERSION} define=_LITTLE_ENDIAN link=static install
-    doneSection
-
-    ./bjam -j16 --build-dir=iphonesim-build --stagedir=iphonesim-build/stage --toolset=darwin-${IPHONE_SDKVERSION}~iphonesim architecture=x86 target-os=iphone macosx-version=iphonesim-${IPHONE_SDKVERSION} link=static stage
-    doneSection
-
-  #  ./b2 -j16 --build-dir=osx-build --stagedir=osx-build/stage toolset=clang cxxflags="-std=c++11 -stdlib=libc++ -arch i386 -arch x86_64" linkflags="-stdlib=libc++" link=static threading=multi stage
-    doneSection
-}
-
-#===============================================================================
-
-scrunchAllLibsTogetherInOneLibPerPlatform()
-{
-    cd $BOOST_SRC
-
-    mkdir -p $IOSBUILDDIR/armv6/obj
-    mkdir -p $IOSBUILDDIR/armv7/obj
-    mkdir -p $IOSBUILDDIR/armv7s/obj
-	mkdir -p $IOSBUILDDIR/arm64/obj
-    mkdir -p $IOSBUILDDIR/i386/obj
-	mkdir -p $IOSBUILDDIR/x86_64/obj
-
-    mkdir -p $OSXBUILDDIR/i386/obj
-    mkdir -p $OSXBUILDDIR/x86_64/obj
-
-    ALL_LIBS=""
-
-    echo Splitting all existing fat binaries...
-
-    for NAME in $BOOST_LIBS; do
-        ALL_LIBS="$ALL_LIBS libboost_$NAME.a"
-
-        $ARM_DEV_CMD lipo "iphone-build/stage/lib/libboost_$NAME.a" -thin armv6 -o $IOSBUILDDIR/armv6/libboost_$NAME.a
-        $ARM_DEV_CMD lipo "iphone-build/stage/lib/libboost_$NAME.a" -thin armv7 -o $IOSBUILDDIR/armv7/libboost_$NAME.a
-        $ARM_DEV_CMD lipo "iphone-build/stage/lib/libboost_$NAME.a" -thin armv7s -o $IOSBUILDDIR/armv7s/libboost_$NAME.a
-		$ARM_DEV_CMD lipo "iphone-build/stage/lib/libboost_$NAME.a" -thin arm64 -o $IOSBUILDDIR/arm64/libboost_$NAME.a
-
-		$ARM_DEV_CMD lipo "iphonesim-build/stage/lib/libboost_$NAME.a" -thin i386 -o $IOSBUILDDIR/i386/libboost_$NAME.a
-		$ARM_DEV_CMD lipo "iphonesim-build/stage/lib/libboost_$NAME.a" -thin x86_64 -o $IOSBUILDDIR/x86_64/libboost_$NAME.a
-
-        $ARM_DEV_CMD lipo "osx-build/stage/lib/libboost_$NAME.a" -thin i386 -o $OSXBUILDDIR/i386/libboost_$NAME.a
-        $ARM_DEV_CMD lipo "osx-build/stage/lib/libboost_$NAME.a" -thin x86_64 -o $OSXBUILDDIR/x86_64/libboost_$NAME.a
-    done
-
-    echo "Decomposing each architecture's .a files"
-
-    for NAME in $ALL_LIBS; do
-        echo Decomposing $NAME...
-        (cd $IOSBUILDDIR/armv6/obj; ar -x ../$NAME );
-        (cd $IOSBUILDDIR/armv7/obj; ar -x ../$NAME );
-        (cd $IOSBUILDDIR/armv7s/obj; ar -x ../$NAME );
-		(cd $IOSBUILDDIR/arm64/obj; ar -x ../$NAME );
-        (cd $IOSBUILDDIR/i386/obj; ar -x ../$NAME );
-		(cd $IOSBUILDDIR/x86_64/obj; ar -x ../$NAME );
-
-        (cd $OSXBUILDDIR/i386/obj; ar -x ../$NAME );
-        (cd $OSXBUILDDIR/x86_64/obj; ar -x ../$NAME );
-    done
-
-    echo "Linking each architecture into an uberlib ($ALL_LIBS => libboost.a )"
-
-    rm $IOSBUILDDIR/*/libboost.a
-    
-    echo ...armv6
-    (cd $IOSBUILDDIR/armv6; $ARM_DEV_CMD ar crus libboost.a obj/*.o; )
-    echo ...armv7
-    (cd $IOSBUILDDIR/armv7; $ARM_DEV_CMD ar crus libboost.a obj/*.o; )
-    echo ...armv7s
-    (cd $IOSBUILDDIR/armv7s; $ARM_DEV_CMD ar crus libboost.a obj/*.o; )
-    echo ...arm64
-    (cd $IOSBUILDDIR/arm64; $ARM_DEV_CMD ar crus libboost.a obj/*.o; )
-    echo ...i386
-    (cd $IOSBUILDDIR/i386;  $SIM_DEV_CMD ar crus libboost.a obj/*.o; )
-    echo ...x86_64
-    (cd $IOSBUILDDIR/x86_64;  $SIM_DEV_CMD ar crus libboost.a obj/*.o; )
-
-    rm $OSXBUILDDIR/*/libboost.a
-    echo ...osx-i386
-    (cd $OSXBUILDDIR/i386;  $SIM_DEV_CMD ar crus libboost.a obj/*.o; )
-
-    echo ...x86_64
-    (cd $OSXBUILDDIR/x86_64;  $SIM_DEV_CMD ar crus libboost.a obj/*.o; )
-}
-
-#===============================================================================
-buildFramework()
-{
-    : ${1:?}
-    FRAMEWORKDIR=$1
-    BUILDDIR=$2
-
-    VERSION_TYPE=Alpha
-    FRAMEWORK_NAME=boost
-    FRAMEWORK_VERSION=A
-
-    FRAMEWORK_CURRENT_VERSION=$BOOST_VERSION
-    FRAMEWORK_COMPATIBILITY_VERSION=$BOOST_VERSION
-
-    FRAMEWORK_BUNDLE=$FRAMEWORKDIR/$FRAMEWORK_NAME.framework
-    echo "Framework: Building $FRAMEWORK_BUNDLE from $BUILDDIR..."
-
-    rm -rf $FRAMEWORK_BUNDLE
-
-    echo "Framework: Setting up directories..."
-    mkdir -p $FRAMEWORK_BUNDLE
-    mkdir -p $FRAMEWORK_BUNDLE/Versions
-    mkdir -p $FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION
-    mkdir -p $FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/Resources
-    mkdir -p $FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/Headers
-    mkdir -p $FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/Documentation
-
-    echo "Framework: Creating symlinks..."
-    ln -s $FRAMEWORK_VERSION               $FRAMEWORK_BUNDLE/Versions/Current
-    ln -s Versions/Current/Headers         $FRAMEWORK_BUNDLE/Headers
-    ln -s Versions/Current/Resources       $FRAMEWORK_BUNDLE/Resources
-    ln -s Versions/Current/Documentation   $FRAMEWORK_BUNDLE/Documentation
-    ln -s Versions/Current/$FRAMEWORK_NAME $FRAMEWORK_BUNDLE/$FRAMEWORK_NAME
-
-    FRAMEWORK_INSTALL_NAME=$FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/$FRAMEWORK_NAME
-
-    echo "Lipoing library into $FRAMEWORK_INSTALL_NAME..."
-    $ARM_DEV_CMD lipo -create $BUILDDIR/*/libboost.a -o "$FRAMEWORK_INSTALL_NAME" || abort "Lipo $1 failed"
-
-    echo "Framework: Copying includes..."
-    cp -r $PREFIXDIR/include/boost/*  $FRAMEWORK_BUNDLE/Headers/
-
-    echo "Framework: Creating plist..."
-    cat > $FRAMEWORK_BUNDLE/Resources/Info.plist <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-<key>CFBundleDevelopmentRegion</key>
-<string>English</string>
-<key>CFBundleExecutable</key>
-<string>${FRAMEWORK_NAME}</string>
-<key>CFBundleIdentifier</key>
-<string>org.boost</string>
-<key>CFBundleInfoDictionaryVersion</key>
-<string>6.0</string>
-<key>CFBundlePackageType</key>
-<string>FMWK</string>
-<key>CFBundleSignature</key>
-<string>????</string>
-<key>CFBundleVersion</key>
-<string>${FRAMEWORK_CURRENT_VERSION}</string>
-</dict>
-</plist>
-EOF
-
-    doneSection
-}
-
-#===============================================================================
-# Execution starts here
-#===============================================================================
-
-mkdir -p $IOSBUILDDIR
-
-cleanEverythingReadyToStart #may want to comment if repeatedly running during dev
-restoreBoost
-
-echo "BOOST_VERSION:     $BOOST_VERSION"
-echo "BOOST_LIBS:        $BOOST_LIBS"
-echo "BOOST_SRC:         $BOOST_SRC"
-echo "IOSBUILDDIR:       $IOSBUILDDIR"
-echo "OSXBUILDDIR:       $OSXBUILDDIR"
-echo "PREFIXDIR:         $PREFIXDIR"
-echo "IOSFRAMEWORKDIR:   $IOSFRAMEWORKDIR"
-echo "OSXFRAMEWORKDIR:   $OSXFRAMEWORKDIR"
-echo "IPHONE_SDKVERSION: $IPHONE_SDKVERSION"
-echo "XCODE_ROOT:        $XCODE_ROOT"
-echo "COMPILER:          $COMPILER"
-echo
-
-downloadBoost
-unpackBoost
-inventMissingHeaders
-bootstrapBoost
-updateBoost
-buildBoostForIPhoneOS
-scrunchAllLibsTogetherInOneLibPerPlatform
-buildFramework $IOSFRAMEWORKDIR $IOSBUILDDIR
-buildFramework $OSXFRAMEWORKDIR $OSXBUILDDIR
-
-restoreBoost
-
-echo "Completed successfully"
-
-#===============================================================================
diff --git a/src/sioclient/examples/QT/SioChatDemo/main.cpp b/src/sioclient/examples/QT/SioChatDemo/main.cpp
deleted file mode 100644
index b48f94ec..00000000
--- a/src/sioclient/examples/QT/SioChatDemo/main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "mainwindow.h"
-#include <QApplication>
-
-int main(int argc, char *argv[])
-{
-    QApplication a(argc, argv);
-    MainWindow w;
-    w.show();
-
-    return a.exec();
-}
diff --git a/src/sioclient/examples/QT/SioChatDemo/mainwindow.cpp b/src/sioclient/examples/QT/SioChatDemo/mainwindow.cpp
deleted file mode 100644
index 83a41652..00000000
--- a/src/sioclient/examples/QT/SioChatDemo/mainwindow.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
-#include <functional>
-#include <mutex>
-#include <cstdlib>
-
-#define kURL "ws://localhost:3000"
-#ifdef WIN32
-#define BIND_EVENT(IO,EV,FN) \
-    do{ \
-        socket::event_listener_aux l = FN;\
-        IO->on(EV,l);\
-    } while(0)
-
-#else
-#define BIND_EVENT(IO,EV,FN) \
-    IO->on(EV,FN)
-#endif
-
-MainWindow::MainWindow(QWidget *parent) :
-    QMainWindow(parent),
-    ui(new Ui::MainWindow),
-    _io(new client()),
-    m_typingItem(NULL),
-    m_dialog()
-{
-    ui->setupUi(this);
-    using std::placeholders::_1;
-    using std::placeholders::_2;
-    using std::placeholders::_3;
-    using std::placeholders::_4;
-    socket::ptr sock = _io->socket();
-    BIND_EVENT(sock,"new message",std::bind(&MainWindow::OnNewMessage,this,_1,_2,_3,_4));
-    BIND_EVENT(sock,"user joined",std::bind(&MainWindow::OnUserJoined,this,_1,_2,_3,_4));
-    BIND_EVENT(sock,"user left",std::bind(&MainWindow::OnUserLeft,this,_1,_2,_3,_4));
-    BIND_EVENT(sock,"typing",std::bind(&MainWindow::OnTyping,this,_1,_2,_3,_4));
-    BIND_EVENT(sock,"stop typing",std::bind(&MainWindow::OnStopTyping,this,_1,_2,_3,_4));
-    BIND_EVENT(sock,"login",std::bind(&MainWindow::OnLogin,this,_1,_2,_3,_4));
-    _io->set_socket_open_listener(std::bind(&MainWindow::OnConnected,this,std::placeholders::_1));
-    _io->set_close_listener(std::bind(&MainWindow::OnClosed,this,_1));
-    _io->set_fail_listener(std::bind(&MainWindow::OnFailed,this));
-
-    connect(this,SIGNAL(RequestAddListItem(QListWidgetItem*)),this,SLOT(AddListItem(QListWidgetItem*)));
-    connect(this,SIGNAL(RequestRemoveListItem(QListWidgetItem*)),this,SLOT(RemoveListItem(QListWidgetItem*)));
-    connect(this,SIGNAL(RequestToggleInputs(bool)),this,SLOT(ToggleInputs(bool)));
-}
-
-MainWindow::~MainWindow()
-{
-    _io->socket()->off_all();
-    _io->socket()->off_error();
-    delete ui;
-}
-
-void MainWindow::SendBtnClicked()
-{
-    QLineEdit* messageEdit = this->findChild<QLineEdit*>("messageEdit");
-    QString text = messageEdit->text();
-    if(text.length()>0)
-    {
-        QByteArray bytes = text.toUtf8();
-        std::string msg(bytes.data(),bytes.length());
-        _io->socket()->emit("new message",msg);
-        text.append(" : You");
-        QListWidgetItem *item = new QListWidgetItem(text);
-        item->setTextAlignment(Qt::AlignRight);
-        Q_EMIT RequestAddListItem(item);
-        messageEdit->clear();
-    }
-}
-
-void MainWindow::OnMessageReturn()
-{
-    this->SendBtnClicked();
-}
-
-void MainWindow::ShowLoginDialog()
-{
-    m_dialog.reset(new NicknameDialog(this));
-    connect(m_dialog.get(),SIGNAL(accepted()),this,SLOT(NicknameAccept()));
-    connect(m_dialog.get(),SIGNAL(rejected()),this,SLOT(NicknameCancelled()));
-    m_dialog->exec();
-}
-
-void MainWindow::showEvent(QShowEvent *event)
-{
-    ShowLoginDialog();
-}
-
-
-void MainWindow::TypingStop()
-{
-    m_timer.reset();
-    _io->socket()->emit("stop typing");
-}
-
-void MainWindow::TypingChanged()
-{
-    if(m_timer&&m_timer->isActive())
-    {
-        m_timer->stop();
-    }
-    else
-    {
-        _io->socket()->emit("typing");
-    }
-    m_timer.reset(new QTimer(this));
-    connect(m_timer.get(),SIGNAL(timeout()),this,SLOT(TypingStop()));
-    m_timer->setSingleShot(true);
-    m_timer->start(1000);
-}
-
-void MainWindow::NicknameAccept()
-{
-    m_name = m_dialog->getNickname();
-    if(m_name.length()>0)
-    {
-        _io->connect(kURL);
-    }
-}
-
-void MainWindow::NicknameCancelled()
-{
-    QApplication::exit();
-}
-
-void MainWindow::AddListItem(QListWidgetItem* item)
-{
-    this->findChild<QListWidget*>("listView")->addItem(item);
-}
-
-void MainWindow::RemoveListItem(QListWidgetItem* item)
-{
-    QListWidget* list = this->findChild<QListWidget*>("listView");
-    int row = list->row(item);
-    delete list->takeItem(row);
-}
-
-
-void MainWindow::OnNewMessage(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)
-{
-
-    if(data->get_flag() == message::flag_object)
-    {
-        std::string msg = data->get_map()["message"]->get_string();
-        std::string username = data->get_map()["username"]->get_string();
-        QString label = QString::fromUtf8(username.data(),username.length());
-        label.append(" : ");
-        label.append(QString::fromUtf8(msg.data(),msg.length()));
-        QListWidgetItem *item= new QListWidgetItem(label);
-        Q_EMIT RequestAddListItem(item);
-    }
-}
-
-void MainWindow::OnUserJoined(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)
-{
-    if(data->get_flag() == message::flag_object)
-    {
-        std::string name = data->get_map()["username"]->get_string();
-        int numUser = data->get_map()["numUsers"]->get_int();
-        QString label = QString::fromUtf8(name.data(),name.length());
-        bool plural = numUser != 1;
-        label.append(" joined\n");
-        label.append(plural?"there are ":"there's ");
-        QString digits;
-        while(numUser>=10)
-        {
-            digits.insert(0,QChar((numUser%10)+'0'));
-            numUser/=10;
-        }
-        digits.insert(0,QChar(numUser+'0'));
-        label.append(digits);
-        label.append(plural?" participants":" participant");
-        QListWidgetItem *item= new QListWidgetItem(label);
-        item->setTextAlignment(Qt::AlignHCenter);
-        QFont font;
-        font.setPointSize(9);
-        item->setFont(font);
-        Q_EMIT RequestAddListItem(item);
-    }
-
-}
-
-void MainWindow::OnUserLeft(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)
-{
-    if(data->get_flag() == message::flag_object)
-    {
-        std::string name = data->get_map()["username"]->get_string();
-        int numUser = data->get_map()["numUsers"]->get_int();
-        QString label = QString::fromUtf8(name.data(),name.length());
-        bool plural = numUser != 1;
-        label.append(" left\n");
-        label.append(plural?"there are ":"there's ");
-        QString digits;
-        while(numUser>=10)
-        {
-            digits.insert(0,QChar((numUser%10)+'0'));
-            numUser/=10;
-        }
-        digits.insert(0,QChar(numUser+'0'));
-        label.append(digits);
-        label.append(plural?" participants":" participant");
-        QListWidgetItem *item= new QListWidgetItem(label);
-        item->setTextAlignment(Qt::AlignHCenter);
-        QFont font;
-        font.setPointSize(9);
-        item->setFont(font);
-        Q_EMIT RequestAddListItem(item);
-    }
-}
-
-void MainWindow::OnTyping(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)
-{
-    if(m_typingItem == NULL)
-    {
-        std::string name = data->get_map()["username"]->get_string();
-        QString label = QString::fromUtf8(name.data(),name.length());
-        label.append("  is typing...");
-        QListWidgetItem *item = new QListWidgetItem(label);
-        item->setTextColor(QColor(200,200,200,255));
-        m_typingItem = item;
-        Q_EMIT RequestAddListItem(item);
-    }
-}
-
-void MainWindow::OnStopTyping(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)
-{
-    if(m_typingItem != NULL)
-    {
-        Q_EMIT RequestRemoveListItem(m_typingItem);
-        m_typingItem = NULL;
-    }
-}
-
-void MainWindow::OnLogin(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)
-{
-    Q_EMIT RequestToggleInputs(true);
-    int numUser = data->get_map()["numUsers"]->get_int();
-
-    QString digits;
-    bool plural = numUser !=1;
-    while(numUser>=10)
-    {
-        digits.insert(0,QChar((numUser%10)+'0'));
-        numUser/=10;
-    }
-
-    digits.insert(0,QChar(numUser+'0'));
-    digits.insert(0,plural?"there are ":"there's ");
-    digits.append(plural? " participants":" participant");
-    QListWidgetItem *item = new QListWidgetItem(digits);
-    item->setTextAlignment(Qt::AlignHCenter);
-    QFont font;
-    font.setPointSize(9);
-    item->setFont(font);
-    Q_EMIT RequestAddListItem(item);
-}
-
-void MainWindow::OnConnected(std::string const& nsp)
-{
-    QByteArray bytes = m_name.toUtf8();
-    std::string nickName(bytes.data(),bytes.length());
-    _io->socket()->emit("add user", nickName);
-}
-
-void MainWindow::OnClosed(client::close_reason const& reason)
-{
-    Q_EMIT RequestToggleInputs(false);
-}
-
-void MainWindow::OnFailed()
-{
-    Q_EMIT RequestToggleInputs(false);
-}
-
-void MainWindow::ToggleInputs(bool loginOrNot)
-{
-    if(loginOrNot)//already login
-    {
-        this->findChild<QWidget*>("messageEdit")->setEnabled(true);
-        this->findChild<QWidget*>("listView")->setEnabled(true);
-//        this->findChild<QWidget*>("sendBtn")->setEnabled(true);
-    }
-    else
-    {
-        this->findChild<QWidget*>("messageEdit")->setEnabled(false);
-        this->findChild<QWidget*>("listView")->setEnabled(false);
-//        this->findChild<QWidget*>("sendBtn")->setEnabled(false);
-        ShowLoginDialog();
-    }
-}
diff --git a/src/sioclient/examples/QT/SioChatDemo/mainwindow.h b/src/sioclient/examples/QT/SioChatDemo/mainwindow.h
deleted file mode 100644
index df32afe8..00000000
--- a/src/sioclient/examples/QT/SioChatDemo/mainwindow.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QMainWindow>
-#include <QListWidget>
-#include <QPushButton>
-#include <QPlainTextEdit>
-#include <QTimer>
-#include <sio_client.h>
-#include "nicknamedialog.h"
-namespace Ui {
-class MainWindow;
-}
-
-using namespace sio;
-
-class MainWindow : public QMainWindow
-{
-    Q_OBJECT
-
-public:
-    explicit MainWindow(QWidget *parent = 0);
-    ~MainWindow();
-
-public Q_SLOTS:
-    void SendBtnClicked();
-    void TypingChanged();
-    void OnMessageReturn();
-protected:
-    void showEvent(QShowEvent* event);
-
-Q_SIGNALS:
-    void RequestAddListItem(QListWidgetItem *item);
-    void RequestRemoveListItem(QListWidgetItem *item);
-    void RequestToggleInputs(bool loginOrNot);
-private Q_SLOTS:
-    void AddListItem(QListWidgetItem *item);
-    void RemoveListItem(QListWidgetItem *item);
-    void ToggleInputs(bool loginOrNot);
-    void TypingStop();
-    void NicknameAccept();
-    void NicknameCancelled();
-private:
-    void OnNewMessage(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp);
-    void OnUserJoined(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp);
-    void OnUserLeft(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp);
-    void OnTyping(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp);
-    void OnStopTyping(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp);
-    void OnLogin(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp);
-    void OnConnected(std::string const& nsp);
-    void OnClosed(client::close_reason const& reason);
-    void OnFailed();
-    void ShowLoginDialog();
-
-    Ui::MainWindow *ui;
-
-    std::unique_ptr<client> _io;
-
-    std::unique_ptr<NicknameDialog> m_dialog;
-
-    QString m_name;
-
-    std::unique_ptr<QTimer> m_timer;
-
-    QListWidgetItem *m_typingItem;
-};
-
-#endif // MAINWINDOW_H
diff --git a/src/sioclient/examples/QT/SioChatDemo/mainwindow.ui b/src/sioclient/examples/QT/SioChatDemo/mainwindow.ui
deleted file mode 100644
index 205cf770..00000000
--- a/src/sioclient/examples/QT/SioChatDemo/mainwindow.ui
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>366</width>
-    <height>549</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Socket.IO Chat</string>
-  </property>
-  <property name="unifiedTitleAndToolBarOnMac">
-   <bool>false</bool>
-  </property>
-  <widget class="QWidget" name="centralWidget">
-   <widget class="QListWidget" name="listView">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>8</x>
-      <y>11</y>
-      <width>350</width>
-      <height>461</height>
-     </rect>
-    </property>
-    <property name="sizePolicy">
-     <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-      <horstretch>0</horstretch>
-      <verstretch>0</verstretch>
-     </sizepolicy>
-    </property>
-    <property name="sizeIncrement">
-     <size>
-      <width>0</width>
-      <height>0</height>
-     </size>
-    </property>
-   </widget>
-   <widget class="QLineEdit" name="messageEdit">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>8</x>
-      <y>480</y>
-      <width>350</width>
-      <height>21</height>
-     </rect>
-    </property>
-    <property name="placeholderText">
-     <string>Type here...</string>
-    </property>
-   </widget>
-  </widget>
-  <widget class="QMenuBar" name="menuBar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>366</width>
-     <height>22</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QToolBar" name="mainToolBar">
-   <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-  </widget>
-  <widget class="QStatusBar" name="statusBar"/>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <resources/>
- <connections>
-  <connection>
-   <sender>messageEdit</sender>
-   <signal>returnPressed()</signal>
-   <receiver>MainWindow</receiver>
-   <slot>OnMessageReturn()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>116</x>
-     <y>524</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>30</x>
-     <y>545</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>messageEdit</sender>
-   <signal>textChanged(QString)</signal>
-   <receiver>MainWindow</receiver>
-   <slot>TypingChanged()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>73</x>
-     <y>531</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>70</x>
-     <y>510</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
- <slots>
-  <slot>SendBtnClicked(bool)</slot>
-  <slot>TypingChanged()</slot>
-  <slot>LoginClicked()</slot>
-  <slot>OnMessageReturn()</slot>
-  <slot>SendBtnClicked()</slot>
- </slots>
-</ui>
diff --git a/src/sioclient/examples/QT/SioChatDemo/nicknamedialog.cpp b/src/sioclient/examples/QT/SioChatDemo/nicknamedialog.cpp
deleted file mode 100644
index 7b9a2742..00000000
--- a/src/sioclient/examples/QT/SioChatDemo/nicknamedialog.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "nicknamedialog.h"
-#include "ui_nicknamedialog.h"
-#include <QTimer>
-NicknameDialog::NicknameDialog(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::NicknameDialog)
-{
-    ui->setupUi(this);
-}
-
-NicknameDialog::~NicknameDialog()
-{
-    delete ui;
-}
-
-const QString& NicknameDialog::getNickname() const
-{
-    return m_nickName;
-}
-
-void NicknameDialog::exitApp()
-{
-    QApplication::quit();
-}
-
-void NicknameDialog::closeEvent(QCloseEvent *event)
-{
-    QTimer::singleShot(0,this,SLOT(exitApp()));
-}
-
-void NicknameDialog::accept()
-{
-    if(this->findChild<QLineEdit*>("nicknameEdit")->text().length()>0)
-    {
-        m_nickName = this->findChild<QLineEdit*>("nicknameEdit")->text();
-        done(QDialog::Accepted);
-    }
-}
diff --git a/src/sioclient/examples/QT/SioChatDemo/nicknamedialog.h b/src/sioclient/examples/QT/SioChatDemo/nicknamedialog.h
deleted file mode 100644
index 6eda6a6e..00000000
--- a/src/sioclient/examples/QT/SioChatDemo/nicknamedialog.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef NICKNAMEDIALOG_H
-#define NICKNAMEDIALOG_H
-
-#include <QDialog>
-
-namespace Ui {
-class NicknameDialog;
-}
-
-class NicknameDialog : public QDialog
-{
-    Q_OBJECT
-
-public Q_SLOTS:
-    void accept();
-    void exitApp();
-public:
-    explicit NicknameDialog(QWidget *parent = 0);
-    ~NicknameDialog();
-
-    const QString& getNickname() const;
-    void closeEvent(QCloseEvent *);
-private:
-    Ui::NicknameDialog *ui;
-    QString m_nickName;
-};
-
-#endif // NICKNAMEDIALOG_H
diff --git a/src/sioclient/examples/QT/SioChatDemo/nicknamedialog.ui b/src/sioclient/examples/QT/SioChatDemo/nicknamedialog.ui
deleted file mode 100644
index 1ed85b4a..00000000
--- a/src/sioclient/examples/QT/SioChatDemo/nicknamedialog.ui
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>NicknameDialog</class>
- <widget class="QDialog" name="NicknameDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>366</width>
-    <height>151</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Login</string>
-  </property>
-  <widget class="QDialogButtonBox" name="buttonBox">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>99</y>
-     <width>311</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="nicknameEdit">
-   <property name="geometry">
-    <rect>
-     <x>27</x>
-     <y>60</y>
-     <width>311</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="placeholderText">
-    <string>Type nickname here...</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>44</x>
-     <y>23</y>
-     <width>271</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>15</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>What's your nickname?</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-  </widget>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>NicknameDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>298</x>
-     <y>97</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>298</x>
-     <y>108</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>NicknameDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>210</x>
-     <y>125</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>202</x>
-     <y>84</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
- <slots>
-  <slot>checkAccept()</slot>
-  <slot>checkAcc()</slot>
- </slots>
-</ui>
diff --git a/src/sioclient/examples/iOS/README.md b/src/sioclient/examples/iOS/README.md
deleted file mode 100644
index 21efc10f..00000000
--- a/src/sioclient/examples/iOS/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-#SIOClient iOS chat room demo
-## What is this
-This is a iOS project run on xcode 6, you can use this single view application chatting in the official [chat room demo](https://github.com/Automattic/socket.io/tree/master/examples/chat).
-
-## How to setup
-Suppose you're using your Mac's shell, under your workspace folder, run
-```shell
-git clone --recurse-submodules https://github.com/socketio/socket.io-client-cpp.git
-```
-Step in the demo folder
-```shell
-cd ./socket.io-client-cpp/examples/iOS/SioChatDemo
-```
-you will see a shell script named `boost.sh` under folder `boost`,Run
-```shell
-cd ./boost
-bash ./boost.sh
-```
-Please stand by with patient, this step will take about one or two hours depends on your network.
-When done, open `SioChatDemo.xcodeproj` file in the parent folder with xcode.
-Just compile and run the `SioChatDemo` target.
-Now, if you have your chat room server run on your local machine, you can chat with device to device or device to web.
-
-## Use sioclient as static lib on iOS
-There's a target named `sioclient` in the Demo project, That is the exactly right config for buiding the `sioclient` as a static library on iOS. 
-With the static library file `libsioclient.a` and two exported headers `sio_client.h` and `sio_message.h`, you won't need to config anything again and again in your integrating projects.
-
-## About the `boost.sh`
-The `boost.sh` is copied from [boostmake_ios](https://github.com/alist/boostmake_ios),it is worked on my machine for boost 1.55.0
-there're lot's versions of boost build shells, you can choose what you like.
-
diff --git a/src/sioclient/examples/iOS/SioChatDemo/.gitignore b/src/sioclient/examples/iOS/SioChatDemo/.gitignore
deleted file mode 100644
index 9af90769..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/**/xcuserdata/
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo.xcodeproj/project.pbxproj b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo.xcodeproj/project.pbxproj
deleted file mode 100644
index f4c9ee49..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,722 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		CE1D31A01AD5087800895150 /* sio_packet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE1D319E1AD5087800895150 /* sio_packet.cpp */; };
-		CE1D31A11AD5087800895150 /* sio_packet.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1D319F1AD5087800895150 /* sio_packet.h */; };
-		CE2958691ACE4589000ABD30 /* sio_client_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE2958671ACE442F000ABD30 /* sio_client_impl.cpp */; };
-		CE29586A1ACE4592000ABD30 /* sio_socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE2958621ACE2CD6000ABD30 /* sio_socket.cpp */; };
-		CE3B3B401AC8F365003CEB94 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CE3B3B3F1AC8F365003CEB94 /* main.m */; };
-		CE3B3B431AC8F365003CEB94 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE3B3B421AC8F365003CEB94 /* AppDelegate.m */; };
-		CE3B3B4B1AC8F365003CEB94 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CE3B3B4A1AC8F365003CEB94 /* Images.xcassets */; };
-		CE3B3B4E1AC8F365003CEB94 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE3B3B4C1AC8F365003CEB94 /* LaunchScreen.xib */; };
-		CE3B3B5A1AC8F365003CEB94 /* SioChatDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CE3B3B591AC8F365003CEB94 /* SioChatDemoTests.m */; };
-		CE3B3B651AC8F385003CEB94 /* CRViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CE3B3B641AC8F385003CEB94 /* CRViewController.mm */; };
-		CE3B3B751AC8F438003CEB94 /* libsioclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CE3B3B6A1AC8F438003CEB94 /* libsioclient.a */; };
-		CE3B3E6D1AC8FE59003CEB94 /* libsioclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CE3B3B6A1AC8F438003CEB94 /* libsioclient.a */; };
-		CE3B3E6F1AC9139B003CEB94 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CE3B3E6E1AC9139B003CEB94 /* Main.storyboard */; };
-		CE3B3E8C1ACA5446003CEB94 /* sio_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE3B3E871ACA5446003CEB94 /* sio_client.cpp */; };
-		CE3B3E8D1ACA5446003CEB94 /* sio_client.h in Headers */ = {isa = PBXBuildFile; fileRef = CE3B3E881ACA5446003CEB94 /* sio_client.h */; };
-		CE3B3E8E1ACA5446003CEB94 /* sio_message.h in Headers */ = {isa = PBXBuildFile; fileRef = CE3B3E891ACA5446003CEB94 /* sio_message.h */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		CE3B3B541AC8F365003CEB94 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CE3B3B321AC8F365003CEB94 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = CE3B3B391AC8F365003CEB94;
-			remoteInfo = SioChatDemo;
-		};
-		CE3B3B761AC8F438003CEB94 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CE3B3B321AC8F365003CEB94 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = CE3B3B691AC8F438003CEB94;
-			remoteInfo = sioclient;
-		};
-		CE3B3E6B1AC8FE54003CEB94 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CE3B3B321AC8F365003CEB94 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = CE3B3B691AC8F438003CEB94;
-			remoteInfo = sioclient;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		CE3B3B681AC8F438003CEB94 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "include/$(PRODUCT_NAME)";
-			dstSubfolderSpec = 16;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		CE1D319E1AD5087800895150 /* sio_packet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sio_packet.cpp; sourceTree = "<group>"; };
-		CE1D319F1AD5087800895150 /* sio_packet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio_packet.h; sourceTree = "<group>"; };
-		CE2958621ACE2CD6000ABD30 /* sio_socket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sio_socket.cpp; sourceTree = "<group>"; };
-		CE2958631ACE2CD6000ABD30 /* sio_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio_socket.h; sourceTree = "<group>"; };
-		CE2958661ACE2CDD000ABD30 /* sio_client_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio_client_impl.h; sourceTree = "<group>"; };
-		CE2958671ACE442F000ABD30 /* sio_client_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sio_client_impl.cpp; sourceTree = "<group>"; };
-		CE3B3B3A1AC8F365003CEB94 /* SioChatDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SioChatDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		CE3B3B3E1AC8F365003CEB94 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		CE3B3B3F1AC8F365003CEB94 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		CE3B3B411AC8F365003CEB94 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-		CE3B3B421AC8F365003CEB94 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		CE3B3B4A1AC8F365003CEB94 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
-		CE3B3B4D1AC8F365003CEB94 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
-		CE3B3B531AC8F365003CEB94 /* SioChatDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SioChatDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		CE3B3B581AC8F365003CEB94 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		CE3B3B591AC8F365003CEB94 /* SioChatDemoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SioChatDemoTests.m; sourceTree = "<group>"; };
-		CE3B3B631AC8F385003CEB94 /* CRViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CRViewController.h; sourceTree = "<group>"; };
-		CE3B3B641AC8F385003CEB94 /* CRViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CRViewController.mm; sourceTree = "<group>"; };
-		CE3B3B6A1AC8F438003CEB94 /* libsioclient.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsioclient.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		CE3B3B741AC8F438003CEB94 /* sioclientTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = sioclientTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		CE3B3B7A1AC8F438003CEB94 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		CE3B3E6E1AC9139B003CEB94 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
-		CE3B3E871ACA5446003CEB94 /* sio_client.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sio_client.cpp; sourceTree = "<group>"; };
-		CE3B3E881ACA5446003CEB94 /* sio_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio_client.h; sourceTree = "<group>"; };
-		CE3B3E891ACA5446003CEB94 /* sio_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio_message.h; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		CE3B3B371AC8F365003CEB94 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				CE3B3E6D1AC8FE59003CEB94 /* libsioclient.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CE3B3B501AC8F365003CEB94 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CE3B3B671AC8F438003CEB94 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CE3B3B711AC8F438003CEB94 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				CE3B3B751AC8F438003CEB94 /* libsioclient.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		CE2958651ACE2CDD000ABD30 /* internal */ = {
-			isa = PBXGroup;
-			children = (
-				CE1D319E1AD5087800895150 /* sio_packet.cpp */,
-				CE1D319F1AD5087800895150 /* sio_packet.h */,
-				CE2958661ACE2CDD000ABD30 /* sio_client_impl.h */,
-				CE2958671ACE442F000ABD30 /* sio_client_impl.cpp */,
-			);
-			path = internal;
-			sourceTree = "<group>";
-		};
-		CE3B3B311AC8F365003CEB94 = {
-			isa = PBXGroup;
-			children = (
-				CE3B3E861ACA5446003CEB94 /* src */,
-				CE3B3B3C1AC8F365003CEB94 /* SioChatDemo */,
-				CE3B3B561AC8F365003CEB94 /* SioChatDemoTests */,
-				CE3B3B6B1AC8F438003CEB94 /* sioclient */,
-				CE3B3B781AC8F438003CEB94 /* sioclientTests */,
-				CE3B3B3B1AC8F365003CEB94 /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		CE3B3B3B1AC8F365003CEB94 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				CE3B3B3A1AC8F365003CEB94 /* SioChatDemo.app */,
-				CE3B3B531AC8F365003CEB94 /* SioChatDemoTests.xctest */,
-				CE3B3B6A1AC8F438003CEB94 /* libsioclient.a */,
-				CE3B3B741AC8F438003CEB94 /* sioclientTests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		CE3B3B3C1AC8F365003CEB94 /* SioChatDemo */ = {
-			isa = PBXGroup;
-			children = (
-				CE3B3E6E1AC9139B003CEB94 /* Main.storyboard */,
-				CE3B3B411AC8F365003CEB94 /* AppDelegate.h */,
-				CE3B3B421AC8F365003CEB94 /* AppDelegate.m */,
-				CE3B3B631AC8F385003CEB94 /* CRViewController.h */,
-				CE3B3B641AC8F385003CEB94 /* CRViewController.mm */,
-				CE3B3B4A1AC8F365003CEB94 /* Images.xcassets */,
-				CE3B3B4C1AC8F365003CEB94 /* LaunchScreen.xib */,
-				CE3B3B3D1AC8F365003CEB94 /* Supporting Files */,
-			);
-			path = SioChatDemo;
-			sourceTree = "<group>";
-		};
-		CE3B3B3D1AC8F365003CEB94 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				CE3B3B3E1AC8F365003CEB94 /* Info.plist */,
-				CE3B3B3F1AC8F365003CEB94 /* main.m */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		CE3B3B561AC8F365003CEB94 /* SioChatDemoTests */ = {
-			isa = PBXGroup;
-			children = (
-				CE3B3B591AC8F365003CEB94 /* SioChatDemoTests.m */,
-				CE3B3B571AC8F365003CEB94 /* Supporting Files */,
-			);
-			path = SioChatDemoTests;
-			sourceTree = "<group>";
-		};
-		CE3B3B571AC8F365003CEB94 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				CE3B3B581AC8F365003CEB94 /* Info.plist */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		CE3B3B6B1AC8F438003CEB94 /* sioclient */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = sioclient;
-			sourceTree = "<group>";
-		};
-		CE3B3B781AC8F438003CEB94 /* sioclientTests */ = {
-			isa = PBXGroup;
-			children = (
-				CE3B3B791AC8F438003CEB94 /* Supporting Files */,
-			);
-			path = sioclientTests;
-			sourceTree = "<group>";
-		};
-		CE3B3B791AC8F438003CEB94 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				CE3B3B7A1AC8F438003CEB94 /* Info.plist */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		CE3B3E861ACA5446003CEB94 /* src */ = {
-			isa = PBXGroup;
-			children = (
-				CE2958651ACE2CDD000ABD30 /* internal */,
-				CE2958621ACE2CD6000ABD30 /* sio_socket.cpp */,
-				CE2958631ACE2CD6000ABD30 /* sio_socket.h */,
-				CE3B3E871ACA5446003CEB94 /* sio_client.cpp */,
-				CE3B3E881ACA5446003CEB94 /* sio_client.h */,
-				CE3B3E891ACA5446003CEB94 /* sio_message.h */,
-			);
-			name = src;
-			path = ../../../src;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		CE3B3E681AC8F511003CEB94 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				CE3B3E8E1ACA5446003CEB94 /* sio_message.h in Headers */,
-				CE1D31A11AD5087800895150 /* sio_packet.h in Headers */,
-				CE3B3E8D1ACA5446003CEB94 /* sio_client.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		CE3B3B391AC8F365003CEB94 /* SioChatDemo */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = CE3B3B5D1AC8F365003CEB94 /* Build configuration list for PBXNativeTarget "SioChatDemo" */;
-			buildPhases = (
-				CE3B3B361AC8F365003CEB94 /* Sources */,
-				CE3B3B371AC8F365003CEB94 /* Frameworks */,
-				CE3B3B381AC8F365003CEB94 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				CE3B3E6C1AC8FE54003CEB94 /* PBXTargetDependency */,
-			);
-			name = SioChatDemo;
-			productName = SioChatDemo;
-			productReference = CE3B3B3A1AC8F365003CEB94 /* SioChatDemo.app */;
-			productType = "com.apple.product-type.application";
-		};
-		CE3B3B521AC8F365003CEB94 /* SioChatDemoTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = CE3B3B601AC8F365003CEB94 /* Build configuration list for PBXNativeTarget "SioChatDemoTests" */;
-			buildPhases = (
-				CE3B3B4F1AC8F365003CEB94 /* Sources */,
-				CE3B3B501AC8F365003CEB94 /* Frameworks */,
-				CE3B3B511AC8F365003CEB94 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				CE3B3B551AC8F365003CEB94 /* PBXTargetDependency */,
-			);
-			name = SioChatDemoTests;
-			productName = SioChatDemoTests;
-			productReference = CE3B3B531AC8F365003CEB94 /* SioChatDemoTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		CE3B3B691AC8F438003CEB94 /* sioclient */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = CE3B3B7B1AC8F438003CEB94 /* Build configuration list for PBXNativeTarget "sioclient" */;
-			buildPhases = (
-				CE3B3B661AC8F438003CEB94 /* Sources */,
-				CE3B3B671AC8F438003CEB94 /* Frameworks */,
-				CE3B3B681AC8F438003CEB94 /* CopyFiles */,
-				CE3B3E681AC8F511003CEB94 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = sioclient;
-			productName = sioclient;
-			productReference = CE3B3B6A1AC8F438003CEB94 /* libsioclient.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		CE3B3B731AC8F438003CEB94 /* sioclientTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = CE3B3B7E1AC8F438003CEB94 /* Build configuration list for PBXNativeTarget "sioclientTests" */;
-			buildPhases = (
-				CE3B3B701AC8F438003CEB94 /* Sources */,
-				CE3B3B711AC8F438003CEB94 /* Frameworks */,
-				CE3B3B721AC8F438003CEB94 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				CE3B3B771AC8F438003CEB94 /* PBXTargetDependency */,
-			);
-			name = sioclientTests;
-			productName = sioclientTests;
-			productReference = CE3B3B741AC8F438003CEB94 /* sioclientTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		CE3B3B321AC8F365003CEB94 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0610;
-				ORGANIZATIONNAME = "Melo Yao";
-				TargetAttributes = {
-					CE3B3B391AC8F365003CEB94 = {
-						CreatedOnToolsVersion = 6.1.1;
-					};
-					CE3B3B521AC8F365003CEB94 = {
-						CreatedOnToolsVersion = 6.1.1;
-						TestTargetID = CE3B3B391AC8F365003CEB94;
-					};
-					CE3B3B691AC8F438003CEB94 = {
-						CreatedOnToolsVersion = 6.1.1;
-					};
-					CE3B3B731AC8F438003CEB94 = {
-						CreatedOnToolsVersion = 6.1.1;
-					};
-				};
-			};
-			buildConfigurationList = CE3B3B351AC8F365003CEB94 /* Build configuration list for PBXProject "SioChatDemo" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = CE3B3B311AC8F365003CEB94;
-			productRefGroup = CE3B3B3B1AC8F365003CEB94 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				CE3B3B391AC8F365003CEB94 /* SioChatDemo */,
-				CE3B3B521AC8F365003CEB94 /* SioChatDemoTests */,
-				CE3B3B691AC8F438003CEB94 /* sioclient */,
-				CE3B3B731AC8F438003CEB94 /* sioclientTests */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		CE3B3B381AC8F365003CEB94 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				CE3B3E6F1AC9139B003CEB94 /* Main.storyboard in Resources */,
-				CE3B3B4E1AC8F365003CEB94 /* LaunchScreen.xib in Resources */,
-				CE3B3B4B1AC8F365003CEB94 /* Images.xcassets in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CE3B3B511AC8F365003CEB94 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CE3B3B721AC8F438003CEB94 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		CE3B3B361AC8F365003CEB94 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				CE3B3B431AC8F365003CEB94 /* AppDelegate.m in Sources */,
-				CE3B3B401AC8F365003CEB94 /* main.m in Sources */,
-				CE3B3B651AC8F385003CEB94 /* CRViewController.mm in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CE3B3B4F1AC8F365003CEB94 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				CE3B3B5A1AC8F365003CEB94 /* SioChatDemoTests.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CE3B3B661AC8F438003CEB94 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				CE29586A1ACE4592000ABD30 /* sio_socket.cpp in Sources */,
-				CE1D31A01AD5087800895150 /* sio_packet.cpp in Sources */,
-				CE2958691ACE4589000ABD30 /* sio_client_impl.cpp in Sources */,
-				CE3B3E8C1ACA5446003CEB94 /* sio_client.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CE3B3B701AC8F438003CEB94 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		CE3B3B551AC8F365003CEB94 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = CE3B3B391AC8F365003CEB94 /* SioChatDemo */;
-			targetProxy = CE3B3B541AC8F365003CEB94 /* PBXContainerItemProxy */;
-		};
-		CE3B3B771AC8F438003CEB94 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = CE3B3B691AC8F438003CEB94 /* sioclient */;
-			targetProxy = CE3B3B761AC8F438003CEB94 /* PBXContainerItemProxy */;
-		};
-		CE3B3E6C1AC8FE54003CEB94 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = CE3B3B691AC8F438003CEB94 /* sioclient */;
-			targetProxy = CE3B3E6B1AC8FE54003CEB94 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		CE3B3B4C1AC8F365003CEB94 /* LaunchScreen.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CE3B3B4D1AC8F365003CEB94 /* Base */,
-			);
-			name = LaunchScreen.xib;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		CE3B3B5B1AC8F365003CEB94 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		CE3B3B5C1AC8F365003CEB94 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		CE3B3B5E1AC8F365003CEB94 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				INFOPLIST_FILE = SioChatDemo/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		CE3B3B5F1AC8F365003CEB94 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				INFOPLIST_FILE = SioChatDemo/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-		CE3B3B611AC8F365003CEB94 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = SioChatDemoTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SioChatDemo.app/SioChatDemo";
-			};
-			name = Debug;
-		};
-		CE3B3B621AC8F365003CEB94 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = SioChatDemoTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SioChatDemo.app/SioChatDemo";
-			};
-			name = Release;
-		};
-		CE3B3B7C1AC8F438003CEB94 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SIOROOT)/lib/websocketpp",
-					"$(SIOROOT)/lib/rapidjson/include",
-					"$(SRCROOT)/boost/ios/prefix/include",
-				);
-				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/boost/ios/build/$(CURRENT_ARCH)/";
-				OTHER_LDFLAGS = "-ObjC";
-				OTHER_LIBTOOLFLAGS = "-lboost_random -lboost_date_time -lboost_system";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SIOROOT = "$(SRCROOT)/../../../";
-				SKIP_INSTALL = YES;
-			};
-			name = Debug;
-		};
-		CE3B3B7D1AC8F438003CEB94 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SIOROOT)/lib/websocketpp",
-					"$(SIOROOT)/lib/rapidjson/include",
-					"$(SRCROOT)/boost/ios/prefix/include",
-				);
-				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/boost/ios/build/$(CURRENT_ARCH)/";
-				OTHER_LDFLAGS = "-ObjC";
-				OTHER_LIBTOOLFLAGS = "-lboost_random -lboost_date_time -lboost_system";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SIOROOT = "$(SRCROOT)/../../../";
-				SKIP_INSTALL = YES;
-			};
-			name = Release;
-		};
-		CE3B3B7F1AC8F438003CEB94 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = sioclientTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		CE3B3B801AC8F438003CEB94 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = sioclientTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		CE3B3B351AC8F365003CEB94 /* Build configuration list for PBXProject "SioChatDemo" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CE3B3B5B1AC8F365003CEB94 /* Debug */,
-				CE3B3B5C1AC8F365003CEB94 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		CE3B3B5D1AC8F365003CEB94 /* Build configuration list for PBXNativeTarget "SioChatDemo" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CE3B3B5E1AC8F365003CEB94 /* Debug */,
-				CE3B3B5F1AC8F365003CEB94 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		CE3B3B601AC8F365003CEB94 /* Build configuration list for PBXNativeTarget "SioChatDemoTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CE3B3B611AC8F365003CEB94 /* Debug */,
-				CE3B3B621AC8F365003CEB94 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		CE3B3B7B1AC8F438003CEB94 /* Build configuration list for PBXNativeTarget "sioclient" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CE3B3B7C1AC8F438003CEB94 /* Debug */,
-				CE3B3B7D1AC8F438003CEB94 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		CE3B3B7E1AC8F438003CEB94 /* Build configuration list for PBXNativeTarget "sioclientTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CE3B3B7F1AC8F438003CEB94 /* Debug */,
-				CE3B3B801AC8F438003CEB94 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = CE3B3B321AC8F365003CEB94 /* Project object */;
-}
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index bda55db1..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:SioChatDemo.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo.xcodeproj/project.xcworkspace/xcshareddata/SioChatDemo.xccheckout b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo.xcodeproj/project.xcworkspace/xcshareddata/SioChatDemo.xccheckout
deleted file mode 100644
index 08b50da6..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo.xcodeproj/project.xcworkspace/xcshareddata/SioChatDemo.xccheckout
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
-	<false/>
-	<key>IDESourceControlProjectIdentifier</key>
-	<string>F1CE472E-3AF3-4EDA-9B64-F9DD83C665BC</string>
-	<key>IDESourceControlProjectName</key>
-	<string>SioChatDemo</string>
-	<key>IDESourceControlProjectOriginsDictionary</key>
-	<dict>
-		<key>21C71CD5ED4B8C77974DDBAF056104F039A3B593</key>
-		<string>https://github.com/socketio/socket.io-client-cpp.git</string>
-		<key>7448E718372DB7A4B0D01E27524ED3F8AE51A902</key>
-		<string>https://github.com/miloyip/rapidjson.git</string>
-		<key>995AABD49A028E610D29FFC44D560D9DAC1EAC0B</key>
-		<string>https://github.com/zaphoyd/websocketpp.git</string>
-	</dict>
-	<key>IDESourceControlProjectPath</key>
-	<string>examples/iOS/SioChatDemo/SioChatDemo.xcodeproj</string>
-	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
-	<dict>
-		<key>21C71CD5ED4B8C77974DDBAF056104F039A3B593</key>
-		<string>../../../../..</string>
-		<key>7448E718372DB7A4B0D01E27524ED3F8AE51A902</key>
-		<string>../../../../..lib/rapidjson</string>
-		<key>995AABD49A028E610D29FFC44D560D9DAC1EAC0B</key>
-		<string>../../../../..lib/websocketpp</string>
-	</dict>
-	<key>IDESourceControlProjectURL</key>
-	<string>https://github.com/socketio/socket.io-client-cpp.git</string>
-	<key>IDESourceControlProjectVersion</key>
-	<integer>111</integer>
-	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>21C71CD5ED4B8C77974DDBAF056104F039A3B593</string>
-	<key>IDESourceControlProjectWCConfigurations</key>
-	<array>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>7448E718372DB7A4B0D01E27524ED3F8AE51A902</string>
-			<key>IDESourceControlWCCName</key>
-			<string>rapidjson</string>
-		</dict>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>21C71CD5ED4B8C77974DDBAF056104F039A3B593</string>
-			<key>IDESourceControlWCCName</key>
-			<string>sioclient</string>
-		</dict>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>995AABD49A028E610D29FFC44D560D9DAC1EAC0B</string>
-			<key>IDESourceControlWCCName</key>
-			<string>websocketpp</string>
-		</dict>
-	</array>
-</dict>
-</plist>
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/AppDelegate.h b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/AppDelegate.h
deleted file mode 100644
index 98c3992d..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/AppDelegate.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  AppDelegate.h
-//  SioChatDemo
-//
-//  Created by Melo Yao on 3/30/15.
-//  Copyright (c) 2015 Melo Yao. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-
-@end
-
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/AppDelegate.m b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/AppDelegate.m
deleted file mode 100644
index 7409e0b2..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/AppDelegate.m
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  AppDelegate.m
-//  SioChatDemo
-//
-//  Created by Melo Yao on 3/30/15.
-//  Copyright (c) 2015 Melo Yao. All rights reserved.
-//
-
-#import "AppDelegate.h"
-
-@interface AppDelegate ()
-
-@end
-
-@implementation AppDelegate
-
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    // Override point for customization after application launch.
-    return YES;
-}
-
-- (void)applicationWillResignActive:(UIApplication *)application {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-}
-
-- (void)applicationWillEnterForeground:(UIApplication *)application {
-    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-}
-
-@end
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/Base.lproj/LaunchScreen.xib b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/Base.lproj/LaunchScreen.xib
deleted file mode 100644
index 7a4f7d6d..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/Base.lproj/LaunchScreen.xib
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 Melo Yao. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SioChatDemo" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="140" width="441" height="43"/>
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-            <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
-            </constraints>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="548" y="455"/>
-        </view>
-    </objects>
-</document>
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/CRViewController.h b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/CRViewController.h
deleted file mode 100644
index 901296ce..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/CRViewController.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-//  CRViewController.h
-//  ChatRoom
-//
-//  Created by Melo Yao on 3/30/15.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface CRViewController : UIViewController
-
-@end
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/CRViewController.mm b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/CRViewController.mm
deleted file mode 100644
index 6bac43da..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/CRViewController.mm
+++ /dev/null
@@ -1,453 +0,0 @@
-//
-//  CRViewController.m
-//  ChatRoom
-//
-//  Created by Melo Yao on 3/30/15.
-//
-
-#import "CRViewController.h"
-#include "sio_client.h"
-
-typedef enum MessageFlag
-{
-    Message_System,
-    Message_Other,
-    Message_You
-};
-
-@interface MessageItem : NSObject
-@property NSString* message;
-@property MessageFlag flag; //0 system info, 1 other message, 2 your message
-@end
-
-@implementation MessageItem
-
-@end
-
-@interface CRViewController ()<UITableViewDataSource,UITableViewDelegate,NSURLConnectionDelegate,NSURLConnectionDataDelegate,UITextFieldDelegate>
-{
-    sio::client *_io;
-    NSMutableArray *_receivedMessage;
-    NSMutableSet *_typingUsers;
-    NSString* _name;
-    NSInteger _userCount;
-    NSTimer* _inputTimer;
-}
-@property (weak, nonatomic) IBOutlet UILabel *infoLabel;
-@property (weak, nonatomic) IBOutlet UILabel *typingLabel;
-
-@property (strong, nonatomic) IBOutlet UIView *loginPage;
-@property (weak, nonatomic) IBOutlet UITextField *nickName;
-- (IBAction)onSend:(id)sender;
-
-@property (weak, nonatomic) IBOutlet UITableView *tableView;
-@property (weak, nonatomic) IBOutlet UIButton *sendBtn;
-@property (weak, nonatomic) IBOutlet UITextField *messageField;
-@property (weak, nonatomic) IBOutlet UIView *messageArea;
-
--(void)onNewMessage:(NSString*) message from:(NSString*) name;
-
--(void)onUserJoined:(NSString*)user participants:(NSInteger) num;
-
--(void)onUserLeft:(NSString*) user participants:(NSInteger) num;
-
--(void)onUserTyping:(NSString*) user;
-
--(void)onUserStopTyping:(NSString*) user;
-
--(void)onLogin:(NSInteger) numParticipants;
-
--(void)onConnected;
-
--(void)onDisconnected;
-
--(void) updateUser:(NSString*)user count:(NSInteger) num joinOrLeft:(BOOL) isJoin;
-
-@end
-
-using namespace std;
-
-using namespace sio;
-
-void OnNewMessage(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::list ackResp)
-{
-    if(data->get_flag() == message::flag_object)
-    {
-        NSString* msg = [NSString stringWithUTF8String:data->get_map()["message"]->get_string().data()];
-        NSString* user = [NSString stringWithUTF8String:data->get_map()["username"]->get_string().data()];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [((__bridge CRViewController*)ctrl) onNewMessage:msg from:user];
-        });
-    }
-   
-}
-
-void OnTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::list ackResp)
-{
-    if(data->get_flag() == message::flag_object)
-    {
-        NSString* user = [NSString stringWithUTF8String:data->get_map()["username"]->get_string().data()];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [((__bridge CRViewController*)ctrl) onUserTyping:user];
-        });
-    }
-}
-
-void OnStopTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::list ackResp)
-{
-    if(data->get_flag() == message::flag_object)
-    {
-        NSString* user = [NSString stringWithUTF8String:data->get_map()["username"]->get_string().data()];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [((__bridge CRViewController*)ctrl) onUserStopTyping:user];
-        });
-    }
-}
-
-void OnUserJoined(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::list ackResp)
-{
-    if(data->get_flag() == message::flag_object)
-    {
-        NSString* user = [NSString stringWithUTF8String:data->get_map()["username"]->get_string().data()];
-        NSInteger num = data->get_map()["numUsers"]->get_int();
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [((__bridge CRViewController*)ctrl) onUserJoined:user participants:num];
-        });
-    }
-}
-
-void OnUserLeft(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::list ackResp)
-{
-    if(data->get_flag() == message::flag_object)
-    {
-        NSString* user = [NSString stringWithUTF8String:data->get_map()["username"]->get_string().data()];
-        NSInteger num = data->get_map()["numUsers"]->get_int();
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [((__bridge CRViewController*)ctrl) onUserLeft:user participants:num];
-        });
-    }
-}
-
-
-void OnLogin(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::list ackResp)
-{
-    if(data->get_flag() == message::flag_object)
-    {
-        NSInteger num = data->get_map()["numUsers"]->get_int();
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [((__bridge CRViewController*)ctrl) onLogin:num];
-        });
-    }
-}
-
-void OnConnected(CFTypeRef ctrl,std::string nsp)
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [((__bridge CRViewController*)ctrl) onConnected];
-    });
-}
-
-void OnFailed(CFTypeRef ctrl)
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [((__bridge CRViewController*)ctrl) onDisconnected];
-    });
-}
-
-void OnClose(CFTypeRef ctrl,sio::client::close_reason const& reason)
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [((__bridge CRViewController*)ctrl) onDisconnected];
-    });
-}
-
-
-@implementation CRViewController
-
--(void)awakeFromNib
-{
-    _receivedMessage = [NSMutableArray array];
-    _typingUsers = [NSMutableSet set];
-    _io = new sio::client();
-    [self.loginPage setFrame:self.view.bounds];
-    [self.view addSubview:self.loginPage];
-    self.nickName.enabled = YES;
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-	// Do any additional setup after loading the view, typically from a nib.
-}
-
--(void)viewWillAppear:(BOOL)animated
-{
-    _io->set_socket_open_listener(std::bind(&OnConnected, (__bridge CFTypeRef)self,std::placeholders::_1));
-    _io->set_close_listener(std::bind(&OnClose, (__bridge CFTypeRef)self, std::placeholders::_1));
-    _io->set_fail_listener(std::bind(&OnFailed, (__bridge CFTypeRef)self));
-}
-
--(void)keyboardWillShow:(NSNotification*)notification
-{
-    CGFloat height = [[notification.userInfo objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue].size.height;
-    // Animate the current view out of the way
-    [UIView animateWithDuration:0.35 animations:^{
-        self.messageArea.transform = CGAffineTransformMakeTranslation(0, -height);
-    }];
-}
-
-
--(void)keyboardWillHide {
-    [UIView animateWithDuration:0.35 animations:^{
-         self.messageArea.transform = CGAffineTransformIdentity;
-    }];
-}
-
--(void)viewDidDisappear:(BOOL)animated
-{
-    _io->socket()->off_all();
-    _io->set_open_listener(nullptr);
-    _io->set_close_listener(nullptr);
-    _io->close();
-}
-
--(void)onNewMessage:(NSString*) message from:(NSString*) name
-{
-    MessageItem *item = [[MessageItem alloc] init];
-
-    item.flag = [name isEqualToString:_name]?Message_You:Message_Other;
-    item.message = item.flag == Message_You? [NSString stringWithFormat:@"%@:%@",message,name]:[NSString stringWithFormat:@"%@:%@",name,message];
-    [_receivedMessage addObject:item];
-    [_tableView reloadData];
-    
-    if(![_messageField isFirstResponder])
-    {
-        [_tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:[_receivedMessage count]-1 inSection:0] atScrollPosition:UITableViewScrollPositionBottom animated:YES];
-    }
-}
-
--(void)onUserJoined:(NSString*)user participants:(NSInteger) num
-{
-    _userCount = num;
-    [self updateUser:user count:num joinOrLeft:YES];
-}
-
--(void)onUserLeft:(NSString*) user participants:(NSInteger) num
-{
-    [_typingUsers removeObject:user];//protective removal.
-    [self updateTyping];
-    _userCount = num;
-    [self updateUser:user count:num joinOrLeft:NO];
-}
-
--(void)onUserTyping:(NSString*) user
-{
-    [_typingUsers addObject:user];
-    [self updateTyping];
-}
-
--(void)onUserStopTyping:(NSString*) user
-{
-    [_typingUsers removeObject:user];
-    [self updateTyping];
-}
-
--(void)onLogin:(NSInteger) numParticipants
-{
-    _name = _nickName.text;
-    _userCount = numParticipants;
-    [self.loginPage removeFromSuperview];
-    
-    [self updateUser:nil count:_userCount joinOrLeft:YES];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(keyboardWillShow:)
-                                                 name:UIKeyboardWillShowNotification
-                                               object:nil];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(keyboardWillHide)
-                                                 name:UIKeyboardWillHideNotification
-                                               object:nil];
-    
-}
-
-- (void)didReceiveMemoryWarning
-{
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-- (IBAction)onSend:(id)sender {
-    if ([_messageField.text length]>0 && [_name length]>0) {
-        _io->socket()->emit("new message",[_messageField.text UTF8String]);
-        MessageItem *item = [[MessageItem alloc] init];
-        
-        item.flag = Message_You;
-        item.message = [NSString stringWithFormat:@"%@:You",_messageField.text];
-        [_receivedMessage addObject:item];
-        [_tableView reloadData];
-        [_tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:[_receivedMessage count]-1 inSection:0] atScrollPosition:UITableViewScrollPositionBottom animated:YES];
-    }
-    
-    self.messageField.text = nil;
-    [self.messageField resignFirstResponder];
-}
-
--(void)onConnected
-{
-    _io->socket()->emit("add user", [self.nickName.text UTF8String]);
-}
-
--(void)onDisconnected
-{
-    if([self.loginPage superview] == nil)
-    {
-        [self.view addSubview:self.loginPage];
-    }
-    self.nickName.enabled = YES;
-    
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:UIKeyboardWillShowNotification
-                                                  object:nil];
-    
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:UIKeyboardWillHideNotification
-                                                  object:nil];
-}
-
--(void) updateUser:(NSString*)user count:(NSInteger) num joinOrLeft:(BOOL) isJoin
-{
-    _userCount = num;
-    MessageItem *item = [[MessageItem alloc] init];
-    
-    item.flag = Message_System;
-    if (user) {
-        item.message = [NSString stringWithFormat:@"%@ %@\n%@",user,isJoin?@"joined":@"left",num==1?@"there's 1 participant":[NSString stringWithFormat:@"there are %ld participants",num]];
-    }
-    else
-    {
-        item.message = [NSString stringWithFormat:@"Welcome to Socket.IO Chat-\n%@",num==1?@"there's 1 participant":[NSString stringWithFormat:@"there are %ld participants",num]];
-    }
-
-    [_receivedMessage addObject:item];
-    [_tableView reloadData];
-    if(![_messageField isFirstResponder])
-    {
-        [_tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:[_receivedMessage count]-1 inSection:0] atScrollPosition:UITableViewScrollPositionBottom animated:YES];
-    }
-}
-
--(void) inputTimeout
-{
-    _inputTimer = nil;
-    _io->socket()->emit("stop typing", "");
-}
-
--(BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
-{
-    if(textField == self.messageField)
-    {
-        if(_inputTimer.valid)
-        {
-            [_inputTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:1.0]];
-        }
-        else
-        {
-            _io->socket()->emit("typing", "");
-            _inputTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(inputTimeout) userInfo:nil repeats:NO];
-        }
-    }
-    return YES;
-}
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
-    return [_receivedMessage count];
-}
-
-// Row display. Implementers should *always* try to reuse cells by setting each cell's reuseIdentifier and querying for available reusable cells with dequeueReusableCellWithIdentifier:
-// Cell gets various attributes set automatically based on table (separators) and data source (accessory views, editing controls)
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:@"Msg"];
-    MessageItem* item = [_receivedMessage objectAtIndex:indexPath.row];
-    cell.textLabel.text = item.message;
-    switch (item.flag) {
-        case Message_System:
-            cell.textLabel.textAlignment = NSTextAlignmentCenter;
-            [cell.textLabel setFont:[UIFont fontWithName:[cell.textLabel.font fontName] size:12]];
-            break;
-        case Message_Other:
-            [cell.textLabel setFont:[UIFont fontWithName:[cell.textLabel.font fontName] size:15]];
-            cell.textLabel.textAlignment = NSTextAlignmentLeft;
-            break;
-        case Message_You:
-            [cell.textLabel setFont:[UIFont fontWithName:[cell.textLabel.font fontName] size:15]];
-            cell.textLabel.textAlignment = NSTextAlignmentRight;
-            break;
-        default:
-            break;
-    }
-    return cell;
-}
-
--(void)scrollViewDidScroll:(UIScrollView *)scrollView
-{
-    if ([self.messageField isFirstResponder]) {
-        [self.messageField resignFirstResponder];
-    }
-}
-
--(BOOL)textFieldShouldReturn:(UITextField *)textField
-{
-    if (textField == self.nickName) {
-        if ([self.nickName.text length] > 0) {
-            
-            using std::placeholders::_1;
-            using std::placeholders::_2;
-            using std::placeholders::_3;
-            using std::placeholders::_4;
-            socket::ptr socket = _io->socket();
-            
-            socket->on("new message", std::bind(&OnNewMessage, (__bridge CFTypeRef)self, _1,_2,_3,_4));
-            socket->on("typing", std::bind(&OnTyping, (__bridge CFTypeRef)self, _1,_2,_3,_4));
-            socket->on("stop typing", std::bind(&OnStopTyping, (__bridge CFTypeRef)self, _1,_2,_3,_4));
-            socket->on("user joined", std::bind(&OnUserJoined, (__bridge CFTypeRef)self, _1,_2,_3,_4));
-            socket->on("user left", std::bind(&OnUserLeft, (__bridge CFTypeRef)self, _1,_2,_3,_4));
-            socket->on("login", std::bind(&OnLogin, (__bridge CFTypeRef)self, _1,_2,_3,_4));
-            _io->connect("ws://localhost:3000");
-            self.nickName.enabled = NO;
-        }
-    }
-    else if(textField == self.messageField)
-    {
-        [self onSend:textField];
-    }
-    return YES;
-}
-
--(void)updateTyping
-{
-    NSString* typingMsg = nil;
-    NSString* name = [_typingUsers anyObject];
-    if (name) {
-        if([_typingUsers count]>1)
-        {
-            typingMsg = [NSString stringWithFormat:@"%@ and %ld more are typing",name,[_typingUsers count]];
-        }
-        else
-        {
-            typingMsg =[NSString stringWithFormat:@"%@ is typing",name];
-        }
-    }
-    self.typingLabel.text = typingMsg;
-}
-
-- (void)dealloc
-{
-    delete _io;
-}
-
-@end
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/Images.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 36d2c80d..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/Images.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/Info.plist b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/Info.plist
deleted file mode 100644
index 2ea7aa0c..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/Info.plist
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.socketio.melode.$(PRODUCT_NAME:rfc1034identifier)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/Main.storyboard b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/Main.storyboard
deleted file mode 100644
index 498284ac..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/Main.storyboard
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="FVA-Ip-uIE">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="4B5-FI-8YR">
-            <objects>
-                <viewController id="FVA-Ip-uIE" customClass="CRViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="j56-Sc-Uve">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Zd9-dA-z1N">
-                                <rect key="frame" x="0.0" y="20" width="320" height="396"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <prototypes>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Msg" textLabel="c7q-ly-Hf0" style="IBUITableViewCellStyleDefault" id="13Y-SW-wci">
-                                        <rect key="frame" x="0.0" y="22" width="320" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="13Y-SW-wci" id="CkG-vX-yh5">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="c7q-ly-Hf0">
-                                                    <rect key="frame" x="15" y="0.0" width="290" height="43"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="18"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </prototypes>
-                                <connections>
-                                    <outlet property="dataSource" destination="FVA-Ip-uIE" id="gbf-ws-uXu"/>
-                                    <outlet property="delegate" destination="FVA-Ip-uIE" id="Y5j-aM-c5q"/>
-                                </connections>
-                            </tableView>
-                            <view contentMode="scaleToFill" id="yh5-ME-DKM">
-                                <rect key="frame" x="0.0" y="416" width="320" height="64"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                <subviews>
-                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Type here..." minimumFontSize="17" id="Eq9-78-qhY">
-                                        <rect key="frame" x="8" y="26" width="250" height="30"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="14"/>
-                                        <textInputTraits key="textInputTraits" returnKeyType="send"/>
-                                        <connections>
-                                            <outlet property="delegate" destination="FVA-Ip-uIE" id="tUP-2R-seQ"/>
-                                        </connections>
-                                    </textField>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wwz-tj-MLo">
-                                        <rect key="frame" x="8" y="3" width="250" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="14"/>
-                                        <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="WZS-UQ-rXy">
-                                        <rect key="frame" x="266" y="30" width="46" height="22"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="18"/>
-                                        <state key="normal" title="Send">
-                                            <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                        </state>
-                                        <connections>
-                                            <action selector="onSend:" destination="FVA-Ip-uIE" eventType="touchUpInside" id="0VT-Nd-fdz"/>
-                                        </connections>
-                                    </button>
-                                </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <color key="tintColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                    </view>
-                    <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
-                    <connections>
-                        <outlet property="loginPage" destination="FDy-KL-ozA" id="zBO-Gk-9OU"/>
-                        <outlet property="messageArea" destination="yh5-ME-DKM" id="nFQ-Zd-Gmx"/>
-                        <outlet property="messageField" destination="Eq9-78-qhY" id="HDE-p4-jGM"/>
-                        <outlet property="nickName" destination="Xat-ec-Oga" id="xyE-A7-aZ5"/>
-                        <outlet property="sendBtn" destination="WZS-UQ-rXy" id="nbZ-e0-RoK"/>
-                        <outlet property="tableView" destination="Zd9-dA-z1N" id="Ekd-Is-nd5"/>
-                        <outlet property="typingLabel" destination="wwz-tj-MLo" id="GxR-Bb-TGT"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="X4s-OP-QGg" userLabel="First Responder" sceneMemberID="firstResponder"/>
-                <view contentMode="scaleToFill" id="FDy-KL-ozA">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your Nickname:" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Vbn-qK-OOg">
-                            <rect key="frame" x="40" y="200" width="240" height="50"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" id="Xat-ec-Oga">
-                            <rect key="frame" x="40" y="269" width="240" height="30"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                            <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="16"/>
-                            <textInputTraits key="textInputTraits" returnKeyType="done"/>
-                            <connections>
-                                <outlet property="delegate" destination="FVA-Ip-uIE" id="fDd-Hi-o32"/>
-                            </connections>
-                        </textField>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                </view>
-            </objects>
-            <point key="canvasLocation" x="99" y="-451"/>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
-</document>
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/main.m b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/main.m
deleted file mode 100644
index e25aff05..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemo/main.m
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  main.m
-//  SioChatDemo
-//
-//  Created by Melo Yao on 3/30/15.
-//  Copyright (c) 2015 Melo Yao. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[]) {
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-    }
-}
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemoTests/Info.plist b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemoTests/Info.plist
deleted file mode 100644
index dc26a158..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemoTests/Info.plist
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.socketio.melode.$(PRODUCT_NAME:rfc1034identifier)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemoTests/SioChatDemoTests.m b/src/sioclient/examples/iOS/SioChatDemo/SioChatDemoTests/SioChatDemoTests.m
deleted file mode 100644
index b3edc098..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/SioChatDemoTests/SioChatDemoTests.m
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-//  SioChatDemoTests.m
-//  SioChatDemoTests
-//
-//  Created by Melo Yao on 3/30/15.
-//  Copyright (c) 2015 Melo Yao. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <XCTest/XCTest.h>
-
-@interface SioChatDemoTests : XCTestCase
-
-@end
-
-@implementation SioChatDemoTests
-
-- (void)setUp {
-    [super setUp];
-    // Put setup code here. This method is called before the invocation of each test method in the class.
-}
-
-- (void)tearDown {
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    [super tearDown];
-}
-
-- (void)testExample {
-    // This is an example of a functional test case.
-    XCTAssert(YES, @"Pass");
-}
-
-- (void)testPerformanceExample {
-    // This is an example of a performance test case.
-    [self measureBlock:^{
-        // Put the code you want to measure the time of here.
-    }];
-}
-
-@end
diff --git a/src/sioclient/examples/iOS/SioChatDemo/boost/.gitignore b/src/sioclient/examples/iOS/SioChatDemo/boost/.gitignore
deleted file mode 100644
index 5cf83bfb..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/boost/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-ios/*
-osx/*
-src/*
-boost_*
diff --git a/src/sioclient/examples/iOS/SioChatDemo/boost/boost.sh b/src/sioclient/examples/iOS/SioChatDemo/boost/boost.sh
deleted file mode 100644
index 808430f2..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/boost/boost.sh
+++ /dev/null
@@ -1,378 +0,0 @@
-#===============================================================================
-# Filename:  boost.sh
-# Author:    Pete Goodliffe
-# Copyright: (c) Copyright 2009 Pete Goodliffe
-# Licence:   Please feel free to use this, with attribution
-# Modified version
-#===============================================================================
-#
-# Builds a Boost framework for the iPhone.
-# Creates a set of universal libraries that can be used on an iPhone and in the
-# iPhone simulator. Then creates a pseudo-framework to make using boost in Xcode
-# less painful.
-#
-# To configure the script, define:
-#    BOOST_LIBS:        which libraries to build
-#    IPHONE_SDKVERSION: iPhone SDK version (e.g. 5.1)
-#
-# Then go get the source tar.bz of the boost you want to build, shove it in the
-# same directory as this script, and run "./boost.sh". Grab a cuppa. And voila.
-#===============================================================================
-
-: ${BOOST_LIBS:="random regex graph random chrono thread signals filesystem system date_time"}
-: ${IPHONE_SDKVERSION:=`xcodebuild -showsdks | grep iphoneos | egrep "[[:digit:]]+\.[[:digit:]]+" -o | tail -1`}
-: ${OSX_SDKVERSION:=10.8}
-: ${XCODE_ROOT:=`xcode-select -print-path`}
-: ${EXTRA_CPPFLAGS:="-DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS -std=c++11 -stdlib=libc++"}
-
-# The EXTRA_CPPFLAGS definition works around a thread race issue in
-# shared_ptr. I encountered this historically and have not verified that
-# the fix is no longer required. Without using the posix thread primitives
-# an invalid compare-and-swap ARM instruction (non-thread-safe) was used for the
-# shared_ptr use count causing nasty and subtle bugs.
-#
-# Should perhaps also consider/use instead: -BOOST_SP_USE_PTHREADS
-
-: ${TARBALLDIR:=`pwd`}
-: ${SRCDIR:=`pwd`/src}
-: ${IOSBUILDDIR:=`pwd`/ios/build}
-: ${OSXBUILDDIR:=`pwd`/osx/build}
-: ${PREFIXDIR:=`pwd`/ios/prefix}
-: ${IOSFRAMEWORKDIR:=`pwd`/ios/framework}
-: ${OSXFRAMEWORKDIR:=`pwd`/osx/framework}
-: ${COMPILER:="clang++"}
-
-: ${BOOST_VERSION:=1.55.0}
-: ${BOOST_VERSION2:=1_55_0}
-
-BOOST_TARBALL=$TARBALLDIR/boost_$BOOST_VERSION2.tar.bz2
-BOOST_SRC=$SRCDIR/boost_${BOOST_VERSION2}
-
-#===============================================================================
-ARM_DEV_CMD="xcrun --sdk iphoneos"
-SIM_DEV_CMD="xcrun --sdk iphonesimulator"
-OSX_DEV_CMD="xcrun --sdk macosx"
-
-ARM_COMBINED_LIB=$IOSBUILDDIR/lib_boost_arm.a
-SIM_COMBINED_LIB=$IOSBUILDDIR/lib_boost_x86.a
-
-#===============================================================================
-
-
-#===============================================================================
-# Functions
-#===============================================================================
-
-abort()
-{
-    echo
-    echo "Aborted: $@"
-    exit 1
-}
-
-doneSection()
-{
-    echo
-    echo "================================================================="
-    echo "Done"
-    echo
-}
-
-#===============================================================================
-
-cleanEverythingReadyToStart()
-{
-    echo Cleaning everything before we start to build...
-
-    rm -rf iphone-build iphonesim-build osx-build
-    rm -rf $IOSBUILDDIR
-    rm -rf $OSXBUILDDIR
-    rm -rf $PREFIXDIR
-    rm -rf $IOSFRAMEWORKDIR/$FRAMEWORK_NAME.framework
-    rm -rf $OSXFRAMEWORKDIR/$FRAMEWORK_NAME.framework
-
-    doneSection
-}
-
-#===============================================================================
-
-downloadBoost()
-{
-    if [ ! -s $TARBALLDIR/boost_${BOOST_VERSION2}.tar.bz2 ]; then
-        echo "Downloading boost ${BOOST_VERSION}"
-        curl -L -o $TARBALLDIR/boost_${BOOST_VERSION2}.tar.bz2 http://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION2}.tar.bz2/download
-    fi
-
-    doneSection
-}
-
-#===============================================================================
-
-unpackBoost()
-{
-    [ -f "$BOOST_TARBALL" ] || abort "Source tarball missing."
-
-    echo Unpacking boost into $SRCDIR...
-
-    [ -d $SRCDIR ]    || mkdir -p $SRCDIR
-    [ -d $BOOST_SRC ] || ( cd $SRCDIR; tar xfj $BOOST_TARBALL )
-    [ -d $BOOST_SRC ] && echo "    ...unpacked as $BOOST_SRC"
-
-    doneSection
-}
-
-#===============================================================================
-
-restoreBoost()
-{
-    cp $BOOST_SRC/tools/build/v2/user-config.jam-bk $BOOST_SRC/tools/build/v2/user-config.jam
-}
-
-#===============================================================================
-
-updateBoost()
-{
-    echo Updating boost into $BOOST_SRC...
-
-    cp $BOOST_SRC/tools/build/v2/user-config.jam $BOOST_SRC/tools/build/v2/user-config.jam-bk
-
-    cat >> $BOOST_SRC/tools/build/v2/user-config.jam <<EOF
-using darwin : ${IPHONE_SDKVERSION}~iphone
-: $XCODE_ROOT/Toolchains/XcodeDefault.xctoolchain/usr/bin/$COMPILER -arch armv6 -arch armv7 -arch armv7s -arch arm64 -fvisibility=hidden -fvisibility-inlines-hidden $EXTRA_CPPFLAGS
-: <striper> <root>$XCODE_ROOT/Platforms/iPhoneOS.platform/Developer
-: <architecture>arm <target-os>iphone
-;
-using darwin : ${IPHONE_SDKVERSION}~iphonesim
-: $XCODE_ROOT/Toolchains/XcodeDefault.xctoolchain/usr/bin/$COMPILER -arch i386 -arch x86_64 -fvisibility=hidden -fvisibility-inlines-hidden $EXTRA_CPPFLAGS
-: <striper> <root>$XCODE_ROOT/Platforms/iPhoneSimulator.platform/Developer
-: <architecture>x86 <target-os>iphone
-;
-EOF
-
-    doneSection
-}
-
-#===============================================================================
-
-inventMissingHeaders()
-{
-    # These files are missing in the ARM iPhoneOS SDK, but they are in the simulator.
-    # They are supported on the device, so we copy them from x86 SDK to a staging area
-    # to use them on ARM, too.
-    echo Invent missing headers
-
-    cp $XCODE_ROOT/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_SDKVERSION}.sdk/usr/include/{crt_externs,bzlib}.h $BOOST_SRC
-}
-
-#===============================================================================
-
-bootstrapBoost()
-{
-    cd $BOOST_SRC
-
-    BOOST_LIBS_COMMA=$(echo $BOOST_LIBS | sed -e "s/ /,/g")
-    echo "Bootstrapping (with libs $BOOST_LIBS_COMMA)"
-    ./bootstrap.sh --with-libraries=$BOOST_LIBS_COMMA
-
-    doneSection
-}
-
-#===============================================================================
-
-buildBoostForIPhoneOS()
-{
-    cd $BOOST_SRC
-
-    # Install this one so we can copy the includes for the frameworks...
-    ./bjam -j16 --build-dir=iphone-build --stagedir=iphone-build/stage --prefix=$PREFIXDIR toolset=darwin architecture=arm target-os=iphone macosx-version=iphone-${IPHONE_SDKVERSION} define=_LITTLE_ENDIAN link=static stage
-    ./bjam -j16 --build-dir=iphone-build --stagedir=iphone-build/stage --prefix=$PREFIXDIR toolset=darwin architecture=arm target-os=iphone macosx-version=iphone-${IPHONE_SDKVERSION} define=_LITTLE_ENDIAN link=static install
-    doneSection
-
-    ./bjam -j16 --build-dir=iphonesim-build --stagedir=iphonesim-build/stage --toolset=darwin-${IPHONE_SDKVERSION}~iphonesim architecture=x86 target-os=iphone macosx-version=iphonesim-${IPHONE_SDKVERSION} link=static stage
-    doneSection
-
-  #  ./b2 -j16 --build-dir=osx-build --stagedir=osx-build/stage toolset=clang cxxflags="-std=c++11 -stdlib=libc++ -arch i386 -arch x86_64" linkflags="-stdlib=libc++" link=static threading=multi stage
-    doneSection
-}
-
-#===============================================================================
-
-scrunchAllLibsTogetherInOneLibPerPlatform()
-{
-    cd $BOOST_SRC
-
-    mkdir -p $IOSBUILDDIR/armv6/obj
-    mkdir -p $IOSBUILDDIR/armv7/obj
-    mkdir -p $IOSBUILDDIR/armv7s/obj
-	mkdir -p $IOSBUILDDIR/arm64/obj
-    mkdir -p $IOSBUILDDIR/i386/obj
-	mkdir -p $IOSBUILDDIR/x86_64/obj
-
-    mkdir -p $OSXBUILDDIR/i386/obj
-    mkdir -p $OSXBUILDDIR/x86_64/obj
-
-    ALL_LIBS=""
-
-    echo Splitting all existing fat binaries...
-
-    for NAME in $BOOST_LIBS; do
-        ALL_LIBS="$ALL_LIBS libboost_$NAME.a"
-
-        $ARM_DEV_CMD lipo "iphone-build/stage/lib/libboost_$NAME.a" -thin armv6 -o $IOSBUILDDIR/armv6/libboost_$NAME.a
-        $ARM_DEV_CMD lipo "iphone-build/stage/lib/libboost_$NAME.a" -thin armv7 -o $IOSBUILDDIR/armv7/libboost_$NAME.a
-        $ARM_DEV_CMD lipo "iphone-build/stage/lib/libboost_$NAME.a" -thin armv7s -o $IOSBUILDDIR/armv7s/libboost_$NAME.a
-		$ARM_DEV_CMD lipo "iphone-build/stage/lib/libboost_$NAME.a" -thin arm64 -o $IOSBUILDDIR/arm64/libboost_$NAME.a
-
-		$ARM_DEV_CMD lipo "iphonesim-build/stage/lib/libboost_$NAME.a" -thin i386 -o $IOSBUILDDIR/i386/libboost_$NAME.a
-		$ARM_DEV_CMD lipo "iphonesim-build/stage/lib/libboost_$NAME.a" -thin x86_64 -o $IOSBUILDDIR/x86_64/libboost_$NAME.a
-
-        $ARM_DEV_CMD lipo "osx-build/stage/lib/libboost_$NAME.a" -thin i386 -o $OSXBUILDDIR/i386/libboost_$NAME.a
-        $ARM_DEV_CMD lipo "osx-build/stage/lib/libboost_$NAME.a" -thin x86_64 -o $OSXBUILDDIR/x86_64/libboost_$NAME.a
-    done
-
-    echo "Decomposing each architecture's .a files"
-
-    for NAME in $ALL_LIBS; do
-        echo Decomposing $NAME...
-        (cd $IOSBUILDDIR/armv6/obj; ar -x ../$NAME );
-        (cd $IOSBUILDDIR/armv7/obj; ar -x ../$NAME );
-        (cd $IOSBUILDDIR/armv7s/obj; ar -x ../$NAME );
-		(cd $IOSBUILDDIR/arm64/obj; ar -x ../$NAME );
-        (cd $IOSBUILDDIR/i386/obj; ar -x ../$NAME );
-		(cd $IOSBUILDDIR/x86_64/obj; ar -x ../$NAME );
-
-        (cd $OSXBUILDDIR/i386/obj; ar -x ../$NAME );
-        (cd $OSXBUILDDIR/x86_64/obj; ar -x ../$NAME );
-    done
-
-    echo "Linking each architecture into an uberlib ($ALL_LIBS => libboost.a )"
-
-    rm $IOSBUILDDIR/*/libboost.a
-    
-    echo ...armv6
-    (cd $IOSBUILDDIR/armv6; $ARM_DEV_CMD ar crus libboost.a obj/*.o; )
-    echo ...armv7
-    (cd $IOSBUILDDIR/armv7; $ARM_DEV_CMD ar crus libboost.a obj/*.o; )
-    echo ...armv7s
-    (cd $IOSBUILDDIR/armv7s; $ARM_DEV_CMD ar crus libboost.a obj/*.o; )
-    echo ...arm64
-    (cd $IOSBUILDDIR/arm64; $ARM_DEV_CMD ar crus libboost.a obj/*.o; )
-    echo ...i386
-    (cd $IOSBUILDDIR/i386;  $SIM_DEV_CMD ar crus libboost.a obj/*.o; )
-    echo ...x86_64
-    (cd $IOSBUILDDIR/x86_64;  $SIM_DEV_CMD ar crus libboost.a obj/*.o; )
-
-    rm $OSXBUILDDIR/*/libboost.a
-    echo ...osx-i386
-    (cd $OSXBUILDDIR/i386;  $SIM_DEV_CMD ar crus libboost.a obj/*.o; )
-
-    echo ...x86_64
-    (cd $OSXBUILDDIR/x86_64;  $SIM_DEV_CMD ar crus libboost.a obj/*.o; )
-}
-
-#===============================================================================
-buildFramework()
-{
-    : ${1:?}
-    FRAMEWORKDIR=$1
-    BUILDDIR=$2
-
-    VERSION_TYPE=Alpha
-    FRAMEWORK_NAME=boost
-    FRAMEWORK_VERSION=A
-
-    FRAMEWORK_CURRENT_VERSION=$BOOST_VERSION
-    FRAMEWORK_COMPATIBILITY_VERSION=$BOOST_VERSION
-
-    FRAMEWORK_BUNDLE=$FRAMEWORKDIR/$FRAMEWORK_NAME.framework
-    echo "Framework: Building $FRAMEWORK_BUNDLE from $BUILDDIR..."
-
-    rm -rf $FRAMEWORK_BUNDLE
-
-    echo "Framework: Setting up directories..."
-    mkdir -p $FRAMEWORK_BUNDLE
-    mkdir -p $FRAMEWORK_BUNDLE/Versions
-    mkdir -p $FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION
-    mkdir -p $FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/Resources
-    mkdir -p $FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/Headers
-    mkdir -p $FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/Documentation
-
-    echo "Framework: Creating symlinks..."
-    ln -s $FRAMEWORK_VERSION               $FRAMEWORK_BUNDLE/Versions/Current
-    ln -s Versions/Current/Headers         $FRAMEWORK_BUNDLE/Headers
-    ln -s Versions/Current/Resources       $FRAMEWORK_BUNDLE/Resources
-    ln -s Versions/Current/Documentation   $FRAMEWORK_BUNDLE/Documentation
-    ln -s Versions/Current/$FRAMEWORK_NAME $FRAMEWORK_BUNDLE/$FRAMEWORK_NAME
-
-    FRAMEWORK_INSTALL_NAME=$FRAMEWORK_BUNDLE/Versions/$FRAMEWORK_VERSION/$FRAMEWORK_NAME
-
-    echo "Lipoing library into $FRAMEWORK_INSTALL_NAME..."
-    $ARM_DEV_CMD lipo -create $BUILDDIR/*/libboost.a -o "$FRAMEWORK_INSTALL_NAME" || abort "Lipo $1 failed"
-
-    echo "Framework: Copying includes..."
-    cp -r $PREFIXDIR/include/boost/*  $FRAMEWORK_BUNDLE/Headers/
-
-    echo "Framework: Creating plist..."
-    cat > $FRAMEWORK_BUNDLE/Resources/Info.plist <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-<key>CFBundleDevelopmentRegion</key>
-<string>English</string>
-<key>CFBundleExecutable</key>
-<string>${FRAMEWORK_NAME}</string>
-<key>CFBundleIdentifier</key>
-<string>org.boost</string>
-<key>CFBundleInfoDictionaryVersion</key>
-<string>6.0</string>
-<key>CFBundlePackageType</key>
-<string>FMWK</string>
-<key>CFBundleSignature</key>
-<string>????</string>
-<key>CFBundleVersion</key>
-<string>${FRAMEWORK_CURRENT_VERSION}</string>
-</dict>
-</plist>
-EOF
-
-    doneSection
-}
-
-#===============================================================================
-# Execution starts here
-#===============================================================================
-
-mkdir -p $IOSBUILDDIR
-
-cleanEverythingReadyToStart #may want to comment if repeatedly running during dev
-restoreBoost
-
-echo "BOOST_VERSION:     $BOOST_VERSION"
-echo "BOOST_LIBS:        $BOOST_LIBS"
-echo "BOOST_SRC:         $BOOST_SRC"
-echo "IOSBUILDDIR:       $IOSBUILDDIR"
-echo "OSXBUILDDIR:       $OSXBUILDDIR"
-echo "PREFIXDIR:         $PREFIXDIR"
-echo "IOSFRAMEWORKDIR:   $IOSFRAMEWORKDIR"
-echo "OSXFRAMEWORKDIR:   $OSXFRAMEWORKDIR"
-echo "IPHONE_SDKVERSION: $IPHONE_SDKVERSION"
-echo "XCODE_ROOT:        $XCODE_ROOT"
-echo "COMPILER:          $COMPILER"
-echo
-
-downloadBoost
-unpackBoost
-inventMissingHeaders
-bootstrapBoost
-updateBoost
-buildBoostForIPhoneOS
-scrunchAllLibsTogetherInOneLibPerPlatform
-buildFramework $IOSFRAMEWORKDIR $IOSBUILDDIR
-buildFramework $OSXFRAMEWORKDIR $OSXBUILDDIR
-
-restoreBoost
-
-echo "Completed successfully"
-
-#===============================================================================
diff --git a/src/sioclient/examples/iOS/SioChatDemo/sioclientTests/Info.plist b/src/sioclient/examples/iOS/SioChatDemo/sioclientTests/Info.plist
deleted file mode 100644
index dc26a158..00000000
--- a/src/sioclient/examples/iOS/SioChatDemo/sioclientTests/Info.plist
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.socketio.melode.$(PRODUCT_NAME:rfc1034identifier)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/src/sioclient/include/sio_client.h b/src/sioclient/include/sio_client.h
deleted file mode 100644
index 77be0a2d..00000000
--- a/src/sioclient/include/sio_client.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//  sio_client.h
-//
-//  Created by Melo Yao on 3/25/15.
-//
-
-#ifndef SIO_CLIENT_H
-#define SIO_CLIENT_H
-#include <string>
-#include <functional>
-#include "sio_message.h"
-#include "sio_socket.h"
-
-namespace sio
-{
-    class client_impl;
-    
-    class client {
-    public:
-        enum close_reason
-        {
-            close_reason_normal,
-            close_reason_drop
-        };
-        
-        typedef std::function<void(void)> con_listener;
-        
-        typedef std::function<void(close_reason const& reason)> close_listener;
-
-        typedef std::function<void(unsigned, unsigned)> reconnect_listener;
-        
-        typedef std::function<void(std::string const& nsp)> socket_listener;
-        
-        client();
-        ~client();
-        
-        //set listeners and event bindings.
-        void set_open_listener(con_listener const& l);
-        
-        void set_fail_listener(con_listener const& l);
-        
-        void set_reconnecting_listener(con_listener const& l);
-
-        void set_reconnect_listener(reconnect_listener const& l);
-
-        void set_close_listener(close_listener const& l);
-        
-        void set_socket_open_listener(socket_listener const& l);
-        
-        void set_socket_close_listener(socket_listener const& l);
-        
-        void clear_con_listeners();
-        
-        void clear_socket_listeners();
-        
-        // Client Functions - such as send, etc.
-        void connect(const std::string& uri);
-
-        void connect(const std::string& uri, const std::map<std::string,std::string>& query);
-
-        void connect(const std::string& uri, const std::map<std::string,std::string>& query,
-                     const std::map<std::string,std::string>& http_extra_headers);
-
-        void set_reconnect_attempts(int attempts);
-
-        void set_reconnect_delay(unsigned millis);
-
-        void set_reconnect_delay_max(unsigned millis);
-        
-        sio::socket::ptr const& socket(const std::string& nsp = "");
-        
-        // Closes the connection
-        void close();
-        
-        void sync_close();
-        
-        bool opened() const;
-        
-        std::string const& get_sessionid() const;
-        
-    private:
-        //disable copy constructor and assign operator.
-        client(client const&){}
-        void operator=(client const&){}
-        
-        client_impl* m_impl;
-    };
-    
-}
-
-
-#endif // __SIO_CLIENT__H__
diff --git a/src/sioclient/include/sio_message.h b/src/sioclient/include/sio_message.h
deleted file mode 100755
index 6ad0d9b9..00000000
--- a/src/sioclient/include/sio_message.h
+++ /dev/null
@@ -1,569 +0,0 @@
-//
-//  sio_message.h
-//
-//  Created by Melo Yao on 3/25/15.
-//
-
-#ifndef __SIO_MESSAGE_H__
-#define __SIO_MESSAGE_H__
-#include <string>
-#include <memory>
-#include <vector>
-#include <map>
-#include <cassert>
-#include <type_traits>
-namespace sio
-{
-    class message
-    {
-    public:
-        enum flag
-        {
-            flag_integer,
-            flag_double,
-            flag_string,
-            flag_binary,
-            flag_array,
-            flag_object,
-            flag_boolean,
-            flag_null
-        };
-
-        virtual ~message(){};
-
-        class list;
-
-        flag get_flag() const
-        {
-            return _flag;
-        }
-
-        typedef std::shared_ptr<message> ptr;
-
-        virtual bool get_bool() const
-        {
-            assert(false);
-            return false;
-        }
-
-        virtual int64_t get_int() const
-        {
-            assert(false);
-            return 0;
-        }
-
-        virtual double get_double() const
-        {
-            assert(false);
-            return 0;
-        }
-
-        virtual std::string const& get_string() const
-        {
-            assert(false);
-            static std::string s_empty_string;
-            s_empty_string.clear();
-            return s_empty_string;
-        }
-
-        virtual std::shared_ptr<const std::string> const& get_binary() const
-        {
-            assert(false);
-            static std::shared_ptr<const std::string> s_empty_binary;
-            s_empty_binary = nullptr;
-            return s_empty_binary;
-        }
-
-        virtual const std::vector<ptr>& get_vector() const
-        {
-            assert(false);
-            static std::vector<ptr> s_empty_vector;
-            s_empty_vector.clear();
-            return s_empty_vector;
-        }
-
-        virtual std::vector<ptr>& get_vector()
-        {
-            assert(false);
-            static std::vector<ptr> s_empty_vector;
-            s_empty_vector.clear();
-            return s_empty_vector;
-        }
-
-        virtual const std::map<std::string,message::ptr>& get_map() const
-        {
-            assert(false);
-            static std::map<std::string,message::ptr> s_empty_map;
-            s_empty_map.clear();
-            return s_empty_map;
-        }
-
-        virtual std::map<std::string,message::ptr>& get_map()
-        {
-            assert(false);
-            static std::map<std::string,message::ptr> s_empty_map;
-            s_empty_map.clear();
-            return s_empty_map;
-        }
-    private:
-        flag _flag;
-
-    protected:
-        message(flag f):_flag(f){}
-    };
-
-    class null_message : public message
-    {
-    protected:
-        null_message()
-            :message(flag_null)
-        {
-        }
-
-    public:
-        static message::ptr create()
-        {
-            return ptr(new null_message());
-        }
-    };
-
-    class bool_message : public message
-    {
-        bool _v;
-
-    protected:
-        bool_message(bool v)
-            :message(flag_boolean),_v(v)
-        {
-        }
-
-    public:
-        static message::ptr create(bool v)
-        {
-            return ptr(new bool_message(v));
-        }
-
-        bool get_bool() const
-        {
-            return _v;
-        }
-    };
-
-    class int_message : public message
-    {
-        int64_t _v;
-    protected:
-        int_message(int64_t v)
-            :message(flag_integer),_v(v)
-        {
-        }
-
-    public:
-        static message::ptr create(int64_t v)
-        {
-            return ptr(new int_message(v));
-        }
-
-        int64_t get_int() const
-        {
-            return _v;
-        }
-
-        double get_double() const//add double accessor for integer.
-        {
-            return static_cast<double>(_v);
-        }
-    };
-
-    class double_message : public message
-    {
-        double _v;
-        double_message(double v)
-            :message(flag_double),_v(v)
-        {
-        }
-
-    public:
-        static message::ptr create(double v)
-        {
-            return ptr(new double_message(v));
-        }
-
-        double get_double() const
-        {
-            return _v;
-        }
-    };
-
-    class string_message : public message
-    {
-        std::string _v;
-        string_message(std::string const& v)
-            :message(flag_string),_v(v)
-        {
-        }
-
-        string_message(std::string&& v)
-            :message(flag_string),_v(move(v))
-        {
-        }
-    public:
-        static message::ptr create(std::string const& v)
-        {
-            return ptr(new string_message(v));
-        }
-
-        static message::ptr create(std::string&& v)
-        {
-            return ptr(new string_message(move(v)));
-        }
-
-        std::string const& get_string() const
-        {
-            return _v;
-        }
-    };
-
-    class binary_message : public message
-    {
-        std::shared_ptr<const std::string> _v;
-        binary_message(std::shared_ptr<const std::string> const& v)
-            :message(flag_binary),_v(v)
-        {
-        }
-    public:
-        static message::ptr create(std::shared_ptr<const std::string> const& v)
-        {
-            return ptr(new binary_message(v));
-        }
-
-        std::shared_ptr<const std::string> const& get_binary() const
-        {
-            return _v;
-        }
-    };
-
-    class array_message : public message
-    {
-        std::vector<message::ptr> _v;
-        array_message():message(flag_array)
-        {
-        }
-
-    public:
-        static message::ptr create()
-        {
-            return ptr(new array_message());
-        }
-
-        void push(message::ptr const& message)
-        {
-            if(message)
-                _v.push_back(message);
-        }
-
-        void push(const std::string& text)
-        {
-            _v.push_back(string_message::create(text));
-        }
-
-        void push(std::string&& text)
-        {
-            _v.push_back(string_message::create(move(text)));
-        }
-
-        void push(std::shared_ptr<std::string> const& binary)
-        {
-            if(binary)
-                _v.push_back(binary_message::create(binary));
-        }
-
-        void push(std::shared_ptr<const std::string> const& binary)
-        {
-            if(binary)
-                _v.push_back(binary_message::create(binary));
-        }
-
-        void insert(size_t pos,message::ptr const& message)
-        {
-            _v.insert(_v.begin()+pos, message);
-        }
-
-        void insert(size_t pos,const std::string& text)
-        {
-            _v.insert(_v.begin()+pos, string_message::create(text));
-        }
-
-        void insert(size_t pos,std::string&& text)
-        {
-            _v.insert(_v.begin()+pos, string_message::create(move(text)));
-        }
-
-        void insert(size_t pos,std::shared_ptr<std::string> const& binary)
-        {
-            if(binary)
-                _v.insert(_v.begin()+pos, binary_message::create(binary));
-        }
-
-        void insert(size_t pos,std::shared_ptr<const std::string> const& binary)
-        {
-            if(binary)
-                _v.insert(_v.begin()+pos, binary_message::create(binary));
-        }
-
-        size_t size() const
-        {
-            return _v.size();
-        }
-
-        const message::ptr& at(size_t i) const
-        {
-            return _v[i];
-        }
-
-        const message::ptr& operator[] (size_t i) const
-        {
-            return _v[i];
-        }
-
-        std::vector<ptr>& get_vector()
-        {
-            return _v;
-        }
-
-        const std::vector<ptr>& get_vector() const
-        {
-            return _v;
-        }
-    };
-
-    class object_message : public message
-    {
-        std::map<std::string,message::ptr> _v;
-        object_message() : message(flag_object)
-        {
-        }
-    public:
-        static message::ptr create()
-        {
-            return ptr(new object_message());
-        }
-
-        void insert(const std::string & key,message::ptr const& message)
-        {
-            _v[key] = message;
-        }
-
-        void insert(const std::string & key,const std::string& text)
-        {
-            _v[key] = string_message::create(text);
-        }
-
-        void insert(const std::string & key,std::string&& text)
-        {
-            _v[key] = string_message::create(move(text));
-        }
-
-        void insert(const std::string & key,std::shared_ptr<std::string> const& binary)
-        {
-            if(binary)
-                _v[key] = binary_message::create(binary);
-        }
-
-        void insert(const std::string & key,std::shared_ptr<const std::string> const& binary)
-        {
-            if(binary)
-                _v[key] = binary_message::create(binary);
-        }
-
-        bool has(const std::string & key)
-        {
-            return _v.find(key) != _v.end();
-        }
-
-        const message::ptr& at(const std::string & key) const
-        {
-            static std::shared_ptr<message> not_found;
-
-            std::map<std::string,message::ptr>::const_iterator it = _v.find(key);
-            if (it != _v.cend()) return it->second;
-            return not_found;
-        }
-
-        const message::ptr& operator[] (const std::string & key) const
-        {
-            return at(key);
-        }
-
-        bool has(const std::string & key) const
-        {
-            return _v.find(key) != _v.end();
-        }
-
-        std::map<std::string,message::ptr>& get_map()
-        {
-            return _v;
-        }
-
-        const std::map<std::string,message::ptr>& get_map() const
-        {
-            return _v;
-        }
-    };
-
-    class message::list
-    {
-    public:
-        list()
-        {
-        }
-
-        list(std::nullptr_t)
-        {
-        }
-
-        list(message::list&& rhs):
-            m_vector(std::move(rhs.m_vector))
-        {
-
-        }
-
-        list & operator= (const message::list && rhs)
-        {
-            m_vector = std::move(rhs.m_vector);
-            return *this;
-        }
-
-        template <typename T>
-        list(T&& content,
-            typename std::enable_if<std::is_same<std::vector<message::ptr>,typename std::remove_reference<T>::type>::value>::type* = 0):
-            m_vector(std::forward<T>(content))
-        {
-        }
-
-        list(message::list const& rhs):
-            m_vector(rhs.m_vector)
-        {
-
-        }
-
-        list(message::ptr const& message)
-        {
-            if(message)
-                m_vector.push_back(message);
-
-        }
-
-        list(const std::string& text)
-        {
-            m_vector.push_back(string_message::create(text));
-        }
-
-        list(std::string&& text)
-        {
-            m_vector.push_back(string_message::create(move(text)));
-        }
-
-        list(std::shared_ptr<std::string> const& binary)
-        {
-            if(binary)
-                m_vector.push_back(binary_message::create(binary));
-        }
-
-        list(std::shared_ptr<const std::string> const& binary)
-        {
-            if(binary)
-                m_vector.push_back(binary_message::create(binary));
-        }
-
-        void push(message::ptr const& message)
-        {
-            if(message)
-                m_vector.push_back(message);
-        }
-
-        void push(const std::string& text)
-        {
-            m_vector.push_back(string_message::create(text));
-        }
-
-        void push(std::string&& text)
-        {
-            m_vector.push_back(string_message::create(move(text)));
-        }
-
-        void push(std::shared_ptr<std::string> const& binary)
-        {
-            if(binary)
-                m_vector.push_back(binary_message::create(binary));
-        }
-
-        void push(std::shared_ptr<const std::string> const& binary)
-        {
-            if(binary)
-                m_vector.push_back(binary_message::create(binary));
-        }
-
-        void insert(size_t pos,message::ptr const& message)
-        {
-            m_vector.insert(m_vector.begin()+pos, message);
-        }
-
-        void insert(size_t pos,const std::string& text)
-        {
-            m_vector.insert(m_vector.begin()+pos, string_message::create(text));
-        }
-
-        void insert(size_t pos,std::string&& text)
-        {
-            m_vector.insert(m_vector.begin()+pos, string_message::create(move(text)));
-        }
-
-        void insert(size_t pos,std::shared_ptr<std::string> const& binary)
-        {
-            if(binary)
-                m_vector.insert(m_vector.begin()+pos, binary_message::create(binary));
-        }
-
-        void insert(size_t pos,std::shared_ptr<const std::string> const& binary)
-        {
-            if(binary)
-                m_vector.insert(m_vector.begin()+pos, binary_message::create(binary));
-        }
-
-        size_t size() const
-        {
-            return m_vector.size();
-        }
-
-        const message::ptr& at(size_t i) const
-        {
-            return m_vector[i];
-        }
-
-        const message::ptr& operator[] (size_t i) const
-        {
-            return m_vector[i];
-        }
-
-        message::ptr to_array_message(std::string const& event_name) const
-        {
-            message::ptr arr = array_message::create();
-            arr->get_vector().push_back(string_message::create(event_name));
-            arr->get_vector().insert(arr->get_vector().end(),m_vector.begin(),m_vector.end());
-            return arr;
-        }
-
-        message::ptr to_array_message() const
-        {
-            message::ptr arr = array_message::create();
-            arr->get_vector().insert(arr->get_vector().end(),m_vector.begin(),m_vector.end());
-            return arr;
-        }
-
-    private:
-        std::vector<message::ptr> m_vector;
-    };
-}
-
-#endif
diff --git a/src/sioclient/include/sio_socket.h b/src/sioclient/include/sio_socket.h
deleted file mode 100644
index 69ef1f47..00000000
--- a/src/sioclient/include/sio_socket.h
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifndef SIO_SOCKET_H
-#define SIO_SOCKET_H
-#include "sio_message.h"
-#include <functional>
-namespace sio
-{
-    class event_adapter;
-    
-    class event
-    {
-    public:
-        const std::string& get_nsp() const;
-        
-        const std::string& get_name() const;
-        
-        const message::ptr& get_message() const;
-
-        const message::list& get_messages() const;
-        
-        bool need_ack() const;
-        
-        void put_ack_message(message::list const& ack_message);
-        
-        message::list const& get_ack_message() const;
-        
-    protected:
-        event(std::string const& nsp,std::string const& name,message::list const& messages,bool need_ack);
-        event(std::string const& nsp,std::string const& name,message::list&& messages,bool need_ack);
-
-        message::list& get_ack_message_impl();
-        
-    private:
-        const std::string m_nsp;
-        const std::string m_name;
-        const message::list m_messages;
-        const bool m_need_ack;
-        message::list m_ack_message;
-        
-        friend class event_adapter;
-    };
-    
-    class client_impl;
-    class packet;
-    
-    //The name 'socket' is taken from concept of official socket.io.
-    class socket
-    {
-    public:
-        typedef std::function<void(const std::string& name,message::ptr const& message,bool need_ack, message::list& ack_message)> event_listener_aux;
-        
-        typedef std::function<void(event& event)> event_listener;
-        
-        typedef std::function<void(message::ptr const& message)> error_listener;
-        
-        typedef std::shared_ptr<socket> ptr;
-        
-        ~socket();
-        
-        void on(std::string const& event_name,event_listener const& func);
-        
-        void on(std::string const& event_name,event_listener_aux const& func);
-        
-        void off(std::string const& event_name);
-        
-        void off_all();
-        
-        void close();
-        
-        void on_error(error_listener const& l);
-        
-        void off_error();
-
-        void emit(std::string const& name, message::list const& msglist = nullptr, std::function<void (message::list const&)> const& ack = nullptr);
-        
-        std::string const& get_namespace() const;
-        
-    protected:
-        socket(client_impl*,std::string const&);
-
-        void on_connected();
-        
-        void on_close();
-        
-        void on_open();
-        
-        void on_disconnect();
-        
-        void on_message_packet(packet const& p);
-        
-        friend class client_impl;
-        
-    private:
-        //disable copy constructor and assign operator.
-        socket(socket const&){}
-        void operator=(socket const&){}
-
-        class impl;
-        impl *m_impl;
-    };
-}
-#endif // SIO_SOCKET_H
diff --git a/src/sioclient/lib/rapidjson/.gitattributes b/src/sioclient/lib/rapidjson/.gitattributes
deleted file mode 100644
index 6f598bb7..00000000
--- a/src/sioclient/lib/rapidjson/.gitattributes
+++ /dev/null
@@ -1,22 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.cpp text
-*.h text
-*.txt text
-*.md text
-*.cmake text
-*.svg text
-*.dot text
-*.yml text
-*.in text
-*.sh text
-*.autopkg text
-Dockerfile text
-
-# Denote all files that are truly binary and should not be modified.
-*.png binary
-*.jpg binary
-*.json binary
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/.gitignore b/src/sioclient/lib/rapidjson/.gitignore
deleted file mode 100644
index 1d3073f7..00000000
--- a/src/sioclient/lib/rapidjson/.gitignore
+++ /dev/null
@@ -1,28 +0,0 @@
-/bin/*
-!/bin/data
-!/bin/encodings
-!/bin/jsonchecker
-!/bin/types
-/build
-/doc/html
-/doc/doxygen_*.db
-*.a
-
-# Temporary files created during CMake build
-CMakeCache.txt
-CMakeFiles
-cmake_install.cmake
-CTestTestfile.cmake
-Makefile
-RapidJSON*.cmake
-RapidJSON.pc
-Testing
-/googletest
-install_manifest.txt
-Doxyfile
-Doxyfile.zh-cn
-DartConfiguration.tcl
-*.nupkg
-
-# Files created by OS
-*.DS_Store
diff --git a/src/sioclient/lib/rapidjson/.gitmodules b/src/sioclient/lib/rapidjson/.gitmodules
deleted file mode 100644
index 5e41f7c9..00000000
--- a/src/sioclient/lib/rapidjson/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "thirdparty/gtest"]
-	path = thirdparty/gtest
-	url = https://github.com/google/googletest.git
diff --git a/src/sioclient/lib/rapidjson/.travis.yml b/src/sioclient/lib/rapidjson/.travis.yml
deleted file mode 100644
index df821a70..00000000
--- a/src/sioclient/lib/rapidjson/.travis.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-sudo: required
-dist: trusty
-group: edge
-
-language: cpp
-cache:
-  - ccache
-
-env:
-  global:
-    - USE_CCACHE=1
-    - CCACHE_SLOPPINESS=pch_defines,time_macros
-    - CCACHE_COMPRESS=1
-    - CCACHE_MAXSIZE=100M
-    - ARCH_FLAGS_x86='-m32'        # #266: don't use SSE on 32-bit
-    - ARCH_FLAGS_x86_64='-msse4.2' #       use SSE4.2 on 64-bit
-    - GITHUB_REPO='Tencent/rapidjson'
-    - secure: "HrsaCb+N66EG1HR+LWH1u51SjaJyRwJEDzqJGYMB7LJ/bfqb9mWKF1fLvZGk46W5t7TVaXRDD5KHFx9DPWvKn4gRUVkwTHEy262ah5ORh8M6n/6VVVajeV/AYt2C0sswdkDBDO4Xq+xy5gdw3G8s1A4Inbm73pUh+6vx+7ltBbk="
-
-before_install:
-    - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
-    - sudo apt-get update -qq
-    - sudo apt-get install -y cmake valgrind g++-multilib libc6-dbg:i386
-
-matrix:
-  include:
-    # gcc
-    - env: CONF=release ARCH=x86    CXX11=ON
-      compiler: gcc
-    - env: CONF=release ARCH=x86_64 CXX11=ON
-      compiler: gcc
-    - env: CONF=debug   ARCH=x86    CXX11=OFF
-      compiler: gcc
-    - env: CONF=debug   ARCH=x86_64 CXX11=OFF
-      compiler: gcc
-    # clang
-    - env: CONF=debug   ARCH=x86    CXX11=ON CCACHE_CPP2=yes
-      compiler: clang
-    - env: CONF=debug   ARCH=x86_64 CXX11=ON CCACHE_CPP2=yes
-      compiler: clang
-    - env: CONF=debug   ARCH=x86    CXX11=OFF CCACHE_CPP2=yes
-      compiler: clang
-    - env: CONF=debug   ARCH=x86_64 CXX11=OFF CCACHE_CPP2=yes
-      compiler: clang
-    - env: CONF=release ARCH=x86    CXX11=ON CCACHE_CPP2=yes
-      compiler: clang
-    - env: CONF=release ARCH=x86_64 CXX11=ON CCACHE_CPP2=yes
-      compiler: clang
-    # coverage report
-    - env: CONF=debug   ARCH=x86    CXX11=ON GCOV_FLAGS='--coverage'
-      compiler: gcc
-      cache:
-        - ccache
-        - pip
-      after_success:
-        - pip install --user cpp-coveralls
-        - coveralls -r .. --gcov-options '\-lp' -e thirdparty -e example -e test -e build/CMakeFiles -e include/rapidjson/msinttypes -e include/rapidjson/internal/meta.h -e include/rapidjson/error/en.h
-    - env: CONF=debug   ARCH=x86_64 GCOV_FLAGS='--coverage'
-      compiler: gcc
-      cache:
-        - ccache
-        - pip
-      after_success:
-        - pip install --user cpp-coveralls
-        - coveralls -r .. --gcov-options '\-lp' -e thirdparty -e example -e test -e build/CMakeFiles -e include/rapidjson/msinttypes -e include/rapidjson/internal/meta.h -e include/rapidjson/error/en.h
-    - script: # Documentation task
-      - cd build
-      - cmake .. -DRAPIDJSON_HAS_STDSTRING=ON -DCMAKE_VERBOSE_MAKEFILE=ON
-      - make travis_doc
-      cache: false
-      addons:
-        apt:
-          packages:
-            - doxygen
-
-before_script:
-    - ccache -s
-      #   hack to avoid Valgrind bug (https://bugs.kde.org/show_bug.cgi?id=326469),
-      #   exposed by merging PR#163 (using -march=native)
-      #   TODO: Since this bug is already fixed. Remove this when valgrind can be upgraded.
-    - sed -i "s/-march=native//" CMakeLists.txt
-    - mkdir build
-
-script:
-  - if [ "$CXX" = "clang++" ]; then export CXXFLAGS="-stdlib=libc++ ${CXXFLAGS}"; fi
-  - >
-      eval "ARCH_FLAGS=\${ARCH_FLAGS_${ARCH}}" ;
-      (cd build && cmake
-      -DRAPIDJSON_HAS_STDSTRING=ON
-      -DRAPIDJSON_BUILD_CXX11=$CXX11
-      -DCMAKE_VERBOSE_MAKEFILE=ON
-      -DCMAKE_BUILD_TYPE=$CONF
-      -DCMAKE_CXX_FLAGS="$ARCH_FLAGS $GCOV_FLAGS"
-      -DCMAKE_EXE_LINKER_FLAGS=$GCOV_FLAGS
-      ..)
-  - cd build
-  - make tests -j 2
-  - make examples -j 2
-  - ctest -j 2 -V `[ "$CONF" = "release" ] || echo "-E perftest"`
diff --git a/src/sioclient/lib/rapidjson/CHANGELOG.md b/src/sioclient/lib/rapidjson/CHANGELOG.md
deleted file mode 100644
index 1c580bd1..00000000
--- a/src/sioclient/lib/rapidjson/CHANGELOG.md
+++ /dev/null
@@ -1,158 +0,0 @@
-# Change Log
-All notable changes to this project will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
-
-## [Unreleased]
-
-## 1.1.0 - 2016-08-25
-
-### Added
-* Add GenericDocument ctor overload to specify JSON type (#369)
-* Add FAQ (#372, #373, #374, #376)
-* Add forward declaration header `fwd.h`
-* Add @PlatformIO Library Registry manifest file (#400)
-* Implement assignment operator for BigInteger (#404)
-* Add comments support (#443)
-* Adding coapp definition (#460)
-* documenttest.cpp: EXPECT_THROW when checking empty allocator (470)
-* GenericDocument: add implicit conversion to ParseResult (#480)
-* Use <wchar.h> with C++ linkage on Windows ARM (#485)
-* Detect little endian for Microsoft ARM targets 
-* Check Nan/Inf when writing a double (#510)
-* Add JSON Schema Implementation (#522)
-* Add iostream wrapper (#530)
-* Add Jsonx example for converting JSON into JSONx (a XML format) (#531)
-* Add optional unresolvedTokenIndex parameter to Pointer::Get() (#532)
-* Add encoding validation option for Writer/PrettyWriter (#534)
-* Add Writer::SetMaxDecimalPlaces() (#536)
-* Support {0, } and {0, m} in Regex (#539)
-* Add Value::Get/SetFloat(), Value::IsLossLessFloat/Double() (#540)
-* Add stream position check to reader unit tests (#541)
-* Add Templated accessors and range-based for (#542)
-* Add (Pretty)Writer::RawValue() (#543)
-* Add Document::Parse(std::string), Document::Parse(const char*, size_t length) and related APIs. (#553)
-* Add move constructor for GenericSchemaDocument (#554)
-* Add VS2010 and VS2015 to AppVeyor CI (#555)
-* Add parse-by-parts example (#556, #562)
-* Support parse number as string (#564, #589)
-* Add kFormatSingleLineArray for PrettyWriter (#577)
-* Added optional support for trailing commas (#584)
-* Added filterkey and filterkeydom examples (#615)
-* Added npm docs (#639)
-* Allow options for writing and parsing NaN/Infinity (#641)
-* Add std::string overload to PrettyWriter::Key() when RAPIDJSON_HAS_STDSTRING is defined (#698)
-
-### Fixed
-* Fix gcc/clang/vc warnings (#350, #394, #397, #444, #447, #473, #515, #582, #589, #595, #667)
-* Fix documentation (#482, #511, #550, #557, #614, #635, #660)
-* Fix emscripten alignment issue (#535)
-* Fix missing allocator to uses of AddMember in document (#365)
-* CMake will no longer complain that the minimum CMake version is not specified (#501)
-* Make it usable with old VC8 (VS2005) (#383)
-* Prohibit C++11 move from Document to Value (#391)
-* Try to fix incorrect 64-bit alignment (#419)
-* Check return of fwrite to avoid warn_unused_result build failures (#421)
-* Fix UB in GenericDocument::ParseStream (#426)
-* Keep Document value unchanged on parse error (#439)
-* Add missing return statement (#450)
-* Fix Document::Parse(const Ch*) for transcoding (#478)
-* encodings.h: fix typo in preprocessor condition (#495)
-* Custom Microsoft headers are necessary only for Visual Studio 2012 and lower (#559)
-* Fix memory leak for invalid regex (26e69ffde95ba4773ab06db6457b78f308716f4b)
-* Fix a bug in schema minimum/maximum keywords for 64-bit integer (e7149d665941068ccf8c565e77495521331cf390)
-* Fix a crash bug in regex (#605)
-* Fix schema "required" keyword cannot handle duplicated keys (#609)
-* Fix cmake CMP0054 warning (#612)
-* Added missing include guards in istreamwrapper.h and ostreamwrapper.h (#634)
-* Fix undefined behaviour (#646)
-* Fix buffer overrun using PutN (#673)
-* Fix rapidjson::value::Get<std::string>() may returns wrong data (#681)
-* Add Flush() for all value types (#689)
-* Handle malloc() fail in PoolAllocator (#691)
-* Fix builds on x32 platform. #703
-
-### Changed
-* Clarify problematic JSON license (#392)
-* Move Travis to container based infrastructure (#504, #558)
-* Make whitespace array more compact (#513)
-* Optimize Writer::WriteString() with SIMD (#544)
-* x86-64 48-bit pointer optimization for GenericValue (#546)
-* Define RAPIDJSON_HAS_CXX11_RVALUE_REFS directly in clang (#617)
-* Make GenericSchemaDocument constructor explicit (#674)
-* Optimize FindMember when use std::string (#690)
-
-## [1.0.2] - 2015-05-14
-
-### Added
-* Add Value::XXXMember(...) overloads for std::string (#335)
-
-### Fixed
-* Include rapidjson.h for all internal/error headers.
-* Parsing some numbers incorrectly in full-precision mode (`kFullPrecisionParseFlag`) (#342)
-* Fix some numbers parsed incorrectly (#336)
-* Fix alignment of 64bit platforms (#328)
-* Fix MemoryPoolAllocator::Clear() to clear user-buffer (0691502573f1afd3341073dd24b12c3db20fbde4)
-
-### Changed
-* CMakeLists for include as a thirdparty in projects (#334, #337)
-* Change Document::ParseStream() to use stack allocator for Reader (ffbe38614732af8e0b3abdc8b50071f386a4a685) 
-
-## [1.0.1] - 2015-04-25
-
-### Added
-* Changelog following [Keep a CHANGELOG](https://github.com/olivierlacan/keep-a-changelog) suggestions.
-
-### Fixed
-* Parsing of some numbers (e.g. "1e-00011111111111") causing assertion (#314).
-* Visual C++ 32-bit compilation error in `diyfp.h` (#317).
-
-## [1.0.0] - 2015-04-22
-
-### Added
-* 100% [Coverall](https://coveralls.io/r/Tencent/rapidjson?branch=master) coverage.
-* Version macros (#311)
-
-### Fixed
-* A bug in trimming long number sequence (4824f12efbf01af72b8cb6fc96fae7b097b73015).
-* Double quote in unicode escape (#288).
-* Negative zero roundtrip (double only) (#289).
-* Standardize behavior of `memcpy()` and `malloc()` (0c5c1538dcfc7f160e5a4aa208ddf092c787be5a, #305, 0e8bbe5e3ef375e7f052f556878be0bd79e9062d).
-
-### Removed
-* Remove an invalid `Document::ParseInsitu()` API (e7f1c6dd08b522cfcf9aed58a333bd9a0c0ccbeb).
-
-## 1.0-beta - 2015-04-8
-
-### Added
-* RFC 7159 (#101)
-* Optional Iterative Parser (#76)
-* Deep-copy values (#20)
-* Error code and message (#27)
-* ASCII Encoding (#70)
-* `kParseStopWhenDoneFlag` (#83)
-* `kParseFullPrecisionFlag` (881c91d696f06b7f302af6d04ec14dd08db66ceb)
-* Add `Key()` to handler concept (#134)
-* C++11 compatibility and support (#128)
-* Optimized number-to-string and vice versa conversions (#137, #80)
-* Short-String Optimization (#131)
-* Local stream optimization by traits (#32)
-* Travis & Appveyor Continuous Integration, with Valgrind verification (#24, #242)
-* Redo all documentation (English, Simplified Chinese)
-
-### Changed
-* Copyright ownership transferred to THL A29 Limited (a Tencent company).
-* Migrating from Premake to CMAKE (#192)
-* Resolve all warning reports
-
-### Removed
-* Remove other JSON libraries for performance comparison (#180)
-
-## 0.11 - 2012-11-16
-
-## 0.1 - 2011-11-18
-
-[Unreleased]: https://github.com/Tencent/rapidjson/compare/v1.1.0...HEAD
-[1.1.0]: https://github.com/Tencent/rapidjson/compare/v1.0.2...v1.1.0
-[1.0.2]: https://github.com/Tencent/rapidjson/compare/v1.0.1...v1.0.2
-[1.0.1]: https://github.com/Tencent/rapidjson/compare/v1.0.0...v1.0.1
-[1.0.0]: https://github.com/Tencent/rapidjson/compare/v1.0-beta...v1.0.0
diff --git a/src/sioclient/lib/rapidjson/CMakeLists.txt b/src/sioclient/lib/rapidjson/CMakeLists.txt
deleted file mode 100644
index 7c604076..00000000
--- a/src/sioclient/lib/rapidjson/CMakeLists.txt
+++ /dev/null
@@ -1,221 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-if(POLICY CMP0025)
-  # detect Apple's Clang
-  cmake_policy(SET CMP0025 NEW)
-endif()
-if(POLICY CMP0054)
-  cmake_policy(SET CMP0054 NEW)
-endif()
-
-SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
-
-PROJECT(RapidJSON CXX)
-
-set(LIB_MAJOR_VERSION "1")
-set(LIB_MINOR_VERSION "1")
-set(LIB_PATCH_VERSION "0")
-set(LIB_VERSION_STRING "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_PATCH_VERSION}")
-
-# compile in release with debug info mode by default
-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
-endif()
-
-# Build all binaries in a separate directory
-SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-option(RAPIDJSON_BUILD_DOC "Build rapidjson documentation." ON)
-option(RAPIDJSON_BUILD_EXAMPLES "Build rapidjson examples." ON)
-option(RAPIDJSON_BUILD_TESTS "Build rapidjson perftests and unittests." ON)
-option(RAPIDJSON_BUILD_THIRDPARTY_GTEST
-    "Use gtest installation in `thirdparty/gtest` by default if available" OFF)
-
-option(RAPIDJSON_BUILD_CXX11 "Build rapidjson with C++11 (gcc/clang)" ON)
-if(RAPIDJSON_BUILD_CXX11)
-    set(CMAKE_CXX_STANDARD 11)
-    set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
-endif()
-
-option(RAPIDJSON_BUILD_ASAN "Build rapidjson with address sanitizer (gcc/clang)" OFF)
-option(RAPIDJSON_BUILD_UBSAN "Build rapidjson with undefined behavior sanitizer (gcc/clang)" OFF)
-
-option(RAPIDJSON_ENABLE_INSTRUMENTATION_OPT "Build rapidjson with -march or -mcpu options" ON)
-
-option(RAPIDJSON_HAS_STDSTRING "" OFF)
-if(RAPIDJSON_HAS_STDSTRING)
-    add_definitions(-DRAPIDJSON_HAS_STDSTRING)
-endif()
-
-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
-    endif()
-endif(CCACHE_FOUND)
-
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    if(RAPIDJSON_ENABLE_INSTRUMENTATION_OPT AND NOT CMAKE_CROSSCOMPILING)
-        if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
-          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
-        else()
-          #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
-          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-        endif()
-    endif()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
-    set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion)
-    if (RAPIDJSON_BUILD_CXX11 AND CMAKE_VERSION VERSION_LESS 3.1)
-        if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0")
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-        else()
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-        endif()
-    endif()
-    if (RAPIDJSON_BUILD_ASAN)
-        if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8.0")
-            message(FATAL_ERROR "GCC < 4.8 doesn't support the address sanitizer")
-        else()
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
-        endif()
-    endif()
-    if (RAPIDJSON_BUILD_UBSAN)
-        if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.0")
-            message(FATAL_ERROR "GCC < 4.9 doesn't support the undefined behavior sanitizer")
-        else()
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
-        endif()
-    endif()
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(NOT CMAKE_CROSSCOMPILING)
-      if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
-      else()
-        #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-      endif()
-    endif()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers")
-    set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough)
-    if (RAPIDJSON_BUILD_CXX11 AND CMAKE_VERSION VERSION_LESS 3.1)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    endif()
-    if (RAPIDJSON_BUILD_ASAN)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
-    endif()
-    if (RAPIDJSON_BUILD_UBSAN)
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined-trap -fsanitize-undefined-trap-on-error")
-        else()
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
-        endif()
-    endif()
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "XL")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -qarch=auto")
-endif()
-
-#add extra search paths for libraries and includes
-SET(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in")
-SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "Directory where lib will install")
-SET(DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}" CACHE PATH "Path to the documentation")
-
-IF(UNIX OR CYGWIN)
-    SET(_CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}")
-ELSEIF(WIN32)
-    SET(_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/cmake")
-ENDIF()
-SET(CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" CACHE PATH "The directory cmake files are installed in")
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-if(RAPIDJSON_BUILD_DOC)
-    add_subdirectory(doc)
-endif()
-
-add_custom_target(travis_doc)
-add_custom_command(TARGET travis_doc
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/travis-doxygen.sh)
-
-if(RAPIDJSON_BUILD_EXAMPLES)
-    add_subdirectory(example)
-endif()
-
-if(RAPIDJSON_BUILD_TESTS)
-    if(MSVC11)
-        # required for VS2012 due to missing support for variadic templates
-        add_definitions(-D_VARIADIC_MAX=10)
-    endif(MSVC11)
-    add_subdirectory(test)
-    include(CTest)
-endif()
-
-# pkg-config
-IF (UNIX OR CYGWIN)
-  CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.in
-                  ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
-                  @ONLY)
-  INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
-      DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
-      COMPONENT pkgconfig)
-ENDIF()
-
-install(FILES readme.md
-        DESTINATION "${DOC_INSTALL_DIR}"
-        COMPONENT doc)
-
-install(DIRECTORY include/rapidjson
-    DESTINATION "${INCLUDE_INSTALL_DIR}"
-    COMPONENT dev)
-
-install(DIRECTORY example/
-    DESTINATION "${DOC_INSTALL_DIR}/examples"
-    COMPONENT examples
-    # Following patterns are for excluding the intermediate/object files
-    # from an install of in-source CMake build.
-    PATTERN "CMakeFiles" EXCLUDE
-    PATTERN "Makefile" EXCLUDE
-    PATTERN "cmake_install.cmake" EXCLUDE)
-
-# Provide config and version files to be used by other applications
-# ===============================
-
-################################################################################
-# Export package for use from the build tree
-EXPORT( PACKAGE ${PROJECT_NAME} )
-
-# Create the RapidJSONConfig.cmake file for other cmake projects.
-# ... for the build tree
-SET( CONFIG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-SET( CONFIG_DIR ${CMAKE_CURRENT_BINARY_DIR})
-SET( ${PROJECT_NAME}_INCLUDE_DIR "\${${PROJECT_NAME}_SOURCE_DIR}/include" )
-
-CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake @ONLY )
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}ConfigVersion.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake @ONLY)
-
-# ... for the install tree
-SET( CMAKECONFIG_INSTALL_DIR lib/cmake/${PROJECT_NAME} )
-FILE( RELATIVE_PATH REL_INCLUDE_DIR
-    "${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR}"
-    "${CMAKE_INSTALL_PREFIX}/include" )
-
-SET( ${PROJECT_NAME}_INCLUDE_DIR "\${${PROJECT_NAME}_CMAKE_DIR}/${REL_INCLUDE_DIR}" )
-SET( CONFIG_SOURCE_DIR )
-SET( CONFIG_DIR )
-CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAME}Config.cmake @ONLY )
-
-INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAME}Config.cmake"
-        DESTINATION ${CMAKECONFIG_INSTALL_DIR} )
-
-# Install files
-INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-    DESTINATION "${CMAKE_INSTALL_DIR}"
-    COMPONENT dev)
diff --git a/src/sioclient/lib/rapidjson/CMakeModules/FindGTestSrc.cmake b/src/sioclient/lib/rapidjson/CMakeModules/FindGTestSrc.cmake
deleted file mode 100644
index f3cb8c99..00000000
--- a/src/sioclient/lib/rapidjson/CMakeModules/FindGTestSrc.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-
-SET(GTEST_SEARCH_PATH
-    "${GTEST_SOURCE_DIR}"
-    "${CMAKE_CURRENT_LIST_DIR}/../thirdparty/gtest/googletest")
-
-IF(UNIX)
-    IF(RAPIDJSON_BUILD_THIRDPARTY_GTEST)
-        LIST(APPEND GTEST_SEARCH_PATH "/usr/src/gtest")
-    ELSE()
-        LIST(INSERT GTEST_SEARCH_PATH 1 "/usr/src/gtest")
-    ENDIF()
-ENDIF()
-
-FIND_PATH(GTEST_SOURCE_DIR
-    NAMES CMakeLists.txt src/gtest_main.cc
-    PATHS ${GTEST_SEARCH_PATH})
-
-
-# Debian installs gtest include directory in /usr/include, thus need to look
-# for include directory separately from source directory.
-FIND_PATH(GTEST_INCLUDE_DIR
-    NAMES gtest/gtest.h
-    PATH_SUFFIXES include
-    HINTS ${GTEST_SOURCE_DIR}
-    PATHS ${GTEST_SEARCH_PATH})
-
-INCLUDE(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GTestSrc DEFAULT_MSG
-    GTEST_SOURCE_DIR
-    GTEST_INCLUDE_DIR)
diff --git a/src/sioclient/lib/rapidjson/RapidJSON.pc.in b/src/sioclient/lib/rapidjson/RapidJSON.pc.in
deleted file mode 100644
index 6afb079f..00000000
--- a/src/sioclient/lib/rapidjson/RapidJSON.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-includedir=@INCLUDE_INSTALL_DIR@
-
-Name: @PROJECT_NAME@
-Description: A fast JSON parser/generator for C++ with both SAX/DOM style API
-Version: @LIB_VERSION_STRING@
-URL: https://github.com/Tencent/rapidjson
-Cflags: -I${includedir}
diff --git a/src/sioclient/lib/rapidjson/RapidJSONConfig.cmake.in b/src/sioclient/lib/rapidjson/RapidJSONConfig.cmake.in
deleted file mode 100644
index e3c65a54..00000000
--- a/src/sioclient/lib/rapidjson/RapidJSONConfig.cmake.in
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-# RapidJSON source dir
-set( RapidJSON_SOURCE_DIR "@CONFIG_SOURCE_DIR@")
-
-################################################################################
-# RapidJSON build dir
-set( RapidJSON_DIR "@CONFIG_DIR@")
-
-################################################################################
-# Compute paths
-get_filename_component(RapidJSON_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-
-set( RapidJSON_INCLUDE_DIR  "@RapidJSON_INCLUDE_DIR@" )
-set( RapidJSON_INCLUDE_DIRS  "@RapidJSON_INCLUDE_DIR@" )
-message(STATUS "RapidJSON found. Headers: ${RapidJSON_INCLUDE_DIRS}")
diff --git a/src/sioclient/lib/rapidjson/RapidJSONConfigVersion.cmake.in b/src/sioclient/lib/rapidjson/RapidJSONConfigVersion.cmake.in
deleted file mode 100644
index 25741fc0..00000000
--- a/src/sioclient/lib/rapidjson/RapidJSONConfigVersion.cmake.in
+++ /dev/null
@@ -1,10 +0,0 @@
-SET(PACKAGE_VERSION "@LIB_VERSION_STRING@")
-
-IF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
-  SET(PACKAGE_VERSION_EXACT "true")
-ENDIF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
-IF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
-  SET(PACKAGE_VERSION_COMPATIBLE "true")
-ELSE (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
-  SET(PACKAGE_VERSION_UNSUITABLE "true")
-ENDIF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
diff --git a/src/sioclient/lib/rapidjson/appveyor.yml b/src/sioclient/lib/rapidjson/appveyor.yml
deleted file mode 100644
index dfedf9c2..00000000
--- a/src/sioclient/lib/rapidjson/appveyor.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-os: Visual Studio 2015 CTP  
-version: 1.1.0.{build}
-
-configuration:
-- Debug
-- Release
-
-environment:
-  matrix:
-  # - VS_VERSION: 9 2008
-  #   VS_PLATFORM: win32
-  # - VS_VERSION: 9 2008
-  #   VS_PLATFORM: x64
-  - VS_VERSION: 10 2010
-    VS_PLATFORM: win32
-  - VS_VERSION: 10 2010
-    VS_PLATFORM: x64
-  - VS_VERSION: 11 2012
-    VS_PLATFORM: win32
-  - VS_VERSION: 11 2012
-    VS_PLATFORM: x64
-  - VS_VERSION: 12 2013
-    VS_PLATFORM: win32
-  - VS_VERSION: 12 2013
-    VS_PLATFORM: x64
-  - VS_VERSION: 14 2015
-    VS_PLATFORM: win32
-  - VS_VERSION: 14 2015
-    VS_PLATFORM: x64
-
-before_build:
-- git submodule update --init --recursive
-- cmake -H. -BBuild/VS -G "Visual Studio %VS_VERSION%" -DCMAKE_GENERATOR_PLATFORM=%VS_PLATFORM% -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_SHARED_LIBS=true -Wno-dev
-
-build:
-  project: Build\VS\RapidJSON.sln
-  parallel: true
-  verbosity: minimal
-
-test_script:
-- cd Build\VS && if %CONFIGURATION%==Debug (ctest --verbose -E perftest --build-config %CONFIGURATION%) else (ctest --verbose --build-config %CONFIGURATION%)
diff --git a/src/sioclient/lib/rapidjson/bin/data/glossary.json b/src/sioclient/lib/rapidjson/bin/data/glossary.json
deleted file mode 100644
index d6e6ca15..00000000
--- a/src/sioclient/lib/rapidjson/bin/data/glossary.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "glossary": {
-        "title": "example glossary",
-		"GlossDiv": {
-            "title": "S",
-			"GlossList": {
-                "GlossEntry": {
-                    "ID": "SGML",
-					"SortAs": "SGML",
-					"GlossTerm": "Standard Generalized Markup Language",
-					"Acronym": "SGML",
-					"Abbrev": "ISO 8879:1986",
-					"GlossDef": {
-                        "para": "A meta-markup language, used to create markup languages such as DocBook.",
-						"GlossSeeAlso": ["GML", "XML"]
-                    },
-					"GlossSee": "markup"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/data/menu.json b/src/sioclient/lib/rapidjson/bin/data/menu.json
deleted file mode 100644
index 539c3af2..00000000
--- a/src/sioclient/lib/rapidjson/bin/data/menu.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{"menu": {
-    "header": "SVG Viewer",
-    "items": [
-        {"id": "Open"},
-        {"id": "OpenNew", "label": "Open New"},
-        null,
-        {"id": "ZoomIn", "label": "Zoom In"},
-        {"id": "ZoomOut", "label": "Zoom Out"},
-        {"id": "OriginalView", "label": "Original View"},
-        null,
-        {"id": "Quality"},
-        {"id": "Pause"},
-        {"id": "Mute"},
-        null,
-        {"id": "Find", "label": "Find..."},
-        {"id": "FindAgain", "label": "Find Again"},
-        {"id": "Copy"},
-        {"id": "CopyAgain", "label": "Copy Again"},
-        {"id": "CopySVG", "label": "Copy SVG"},
-        {"id": "ViewSVG", "label": "View SVG"},
-        {"id": "ViewSource", "label": "View Source"},
-        {"id": "SaveAs", "label": "Save As"},
-        null,
-        {"id": "Help"},
-        {"id": "About", "label": "About Adobe CVG Viewer..."}
-    ]
-}}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/data/readme.txt b/src/sioclient/lib/rapidjson/bin/data/readme.txt
deleted file mode 100644
index c53bfb8b..00000000
--- a/src/sioclient/lib/rapidjson/bin/data/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-sample.json is obtained from http://code.google.com/p/json-test-suite/downloads/detail?name=sample.zip
diff --git a/src/sioclient/lib/rapidjson/bin/data/sample.json b/src/sioclient/lib/rapidjson/bin/data/sample.json
deleted file mode 100644
index 30930e76..00000000
--- a/src/sioclient/lib/rapidjson/bin/data/sample.json
+++ /dev/null
@@ -1,3315 +0,0 @@
-{
- "a": {
-  "6U閆崬밺뀫颒myj츥휘:$薈mY햚#rz飏+玭V㭢뾿愴YꖚX亥ᮉ푊\u0006垡㐭룝\"厓ᔧḅ^Sqpv媫\"⤽걒\"˽Ἆ?ꇆ䬔未tv{DV鯀Tἆl凸g\\㈭ĭ즿UH㽤": null,
-  "b茤z\\.N": [[
-   "ZL:ￄዎ*Y|猫劁櫕荾Oj为1糕쪥泏S룂w࡛Ᏺ⸥蚙)",
-   {
-    "\"䬰ỐwD捾V`邀⠕VD㺝sH6[칑.:醥葹*뻵倻aD\"": true,
-    "e浱up蔽Cr෠JK軵xCʨ<뜡癙Y獩ｹ齈X/螗唻?<蘡+뷄㩤쳖3偑犾&\\첊xz坍崦ݻ鍴\"嵥B3㰃詤豺嚼aqJ⑆∥韼@\u000b㢊\u0015L臯.샥": false,
-    "l?Ǩ喳e6㔡$M꼄I,(3᝝縢,䊀疅뉲B㴔傳䂴\u0088㮰钘ꜵ!ᅛ韽>": -5514085325291784739,
-    "o㮚?\"춛㵉<\/﬊ࠃ䃪䝣wp6ἀ䱄[s*S嬈貒pᛥ㰉'돀": [{
-     "(QP윤懊FI<ꃣ『䕷[\"珒嶮?%Ḭ壍಻䇟0荤!藲끹bd浶tl\u2049#쯀@僞": {"i妾8홫": {
-      ",M맃䞛K5nAㆴVN㒊햬$n꩑&ꎝ椞阫?/ṏ세뉪1x쥼㻤㪙`\"$쟒薟B煌܀쨝ଢ଼2掳7㙟鴙X婢\u0002": "Vዉ菈᧷⦌kﮞఈnz*<?੃'ahhCFX(\u0007⮊E㭍䱾Gxꥩr❣.洎",
-      "뻴5bDD큯O傆盓왻U?ꞅꐊN鐭᧢τ\"迳豲8\u001b䃥ꂻ䴺ྸH筴,": {
-       "\"L鸔SE㬡XV&~͎'놅蔞눶l匛?'.K氁\\ƢẨ疇mΊ'꽳&!鹠m'|{P痊 秄쒿u\u00111䋧gϩx7t丗D䊨䠻z0.A0": -1.50139930144708198E18,
-       "8鋂뛷?첒B☚>﷜FM\"荭7ꍀ-VR<\/';䁙E9$䩉\f @s?퍪o3^衴cඎ䧪aK鼟ｑ䆨c{䳠5mᒲՙ蘹ᮩ": {
-        "F㲷JGo⯍P덵x뒳p䘧☔\"+ꨲ吿JfR㔹)4n紬G练Q፞!C|": true,
-        "p^㫮솎oc.೚A㤠??r\u000f)⾽⌲們M2.䴘䩳:⫭胃\\፾@Fᭌ\\K": false,
-        "蟌Tk愙潦伩": {
-         "a<\/@ᾛ慂侇瘎": -7271305752851720826,
-         "艓藬/>၄ṯ,XW~㲆w": {"E痧郶)㜓ha朗!N赻瞉駠uC\u20ad辠<Ve?폱!Im䁎搄:*s 9諚Prᵾ뒰髶B̌qWA8梸vS⫊⢳{t㺲q㺈랊뮣RqK밢쳪": [
-          false,
-          {
-           "\u000b=>x퓮⣫P1ࠫLMMX'M刼唳됤": null,
-           "P쓫晥%k覛ዩIUᇸ滨:噐혲lMR5䋈V梗>%幽u頖\\)쟟": null,
-           "eg+昉~矠䧞难\b?gQ쭷筝\\eꮠNl{ಢ哭|]Mn銌╥zꖘzⱷ⭤ᮜ^": [
-            -1.30142114406914976E17,
-            -1.7555215491128452E-19,
-            null,
-            "渾㨝ߏ牄귛r?돌?w[⚞ӻ~廩輫㼧/",
-            -4.5737191805302129E18,
-            null,
-            "xy࿑M[oc셒竓Ⓔx?뜓y䊦>-D켍(&&?XKkc꩖ﺸᏋ뵞K伕6ী)딀P朁yW揙?훻魢傎EG碸9類៌g踲C⟌aEX舲:z꒸许",
-            3808159498143417627,
-            null,
-            {"m試\u20df1{G8&뚈h홯J<\/": {
-             "3ஸ厠zs#1K7:rᥞoꅔꯧ&띇鵼鞫6跜#赿5l'8{7㕳(b/j\"厢aq籀ꏚ\u0015厼稥": [
-              -2226135764510113982,
-              true,
-              null,
-              {
-               "h%'맞S싅Hs&dl슾W0j鿏MםD놯L~S-㇡R쭬%": null,
-               "⟓咔謡칲\u0000孺ꛭx旑檉㶆?": null,
-               "恇I転;￸B2Y`z\\獓w,놏濐撐埵䂄)!䶢D=ഭ㴟jyY": {
-                "$ࡘt厛毣ൢI芁<겿骫⫦6tr惺a": [
-                 6.385779736989334E-20,
-                 false,
-                 true,
-                 true,
-                 [
-                  -6.891946211462334E-19,
-                  null,
-                  {
-                   "]-\\Ꟑ1/薓❧Ὂ\\l牑\u0007A郃)阜ᇒᓌ-塯`W峬G}SDb㬨Q臉⮻빌O鞟톴첂B㺱<ƈmu챑J㴹㷳픷Oㆩs": {
-                    "\"◉B\"pᶉt骔J꩸ᄇᛐi╰栛K쉷㉯鐩!㈐n칍䟅難>盥y铿e୔蒏M貹ヅ8嘋퀯䉶ጥ㏢殊뻳\"絧╿ꉑ䠥?∃蓊{}㣣Gk긔H1哵峱": false,
-                    "6.瀫cN䇮F㧺?\\椯=ڈT䘆4␘8qv": -3.5687501019676885E-19,
-                    "Q?yऴr혴{஀䳘p惭f1ﹸ䅷䕋贲<ྃᄊ繲hq\\b|#QSTs1c-7(䵢\u2069匏絘ꯉ:l毴汞t戀oෟᵶ뮱፣-醇Jx䙬䐁햢0࣫ᡁgrㄛ": "\u0011_xM/蘇Chv;dhA5.嗀绱V爤ﰦi뵲M",
-                    "⏑[\"ugoy^儣횎~U\\섯겜論l2jw஌yD腅̂\u0019": true,
-                    "ⵯɇ䐲᫿࢚!㯢l샅笶戮1꣖0Xe": null,
-                    "劅f넀識b宁焊E찓橵G!ʱ獓뭔雩괛": [{"p⹣켙[q>燣䍃㞽ᩲx:쓤삘7玑퇼0<\/q璂ᑁ[Z\\3䅵䧳\u0011㤧|妱緒C['췓Yꞟ3Z鳱雼P錻BU씧U`ᢶg蓱>.1ӧ譫'L_5V䏵Ц": [
-                     false,
-                     false,
-                     {"22䂍盥N霂얢<F8꼵7Gసyh뀍g᦭ꄢx硴嬢\u001a?E괆T|;7犟\"Wt%䐩O⨵t&#ᬋK'蜍Ძ揔⾠鲂T멷靃\u0018䓞cE": {"f=䏏츜瞾zw?孡鏣\\铀᫞yẆg(\u0011M6(s2]`ਫ": [[[{
-                      "'y몱纣4S@\\,i㷯럹Ua充Tᣢ9躘Zଞ쥿䐊s<\/刎\\\"뉦-8/": "蜑.X0꭛낢륹i젨ꚁ<8?s볕蝡|Q✬᯦@\\G㑢屿Mn졾J굤⥟JW뤵苑r쁕툄嵵?⾥O",
-                      "^1挲~[n귆誈央碠멪gI洷": -8214236471236116548,
-                      "sሣ%娌暡clr蟜㑓2\u000bS❟_X㨔⚴5~蔷ꀇ|Xu㬖,꤭卹r(g믇쩍%췸앙|栣U\\2]䤉+啠菡ꯎT鉹m\n/`SzDᅼ鞶": 1.1217523390167132E-19,
-                      "u톇=黚\\ ꂮ췵L>躰e9⑩_뵜斌n@B}$괻Yᐱ@䧋V\"☒-諯cV돯ʠ": true,
-                      "Ű螧ᔼ檍鍎땒딜qꄃH뜣<獧ूCY吓⸏>XQ㵡趌o끬k픀빯a(ܵ甏끆୯/6Nᪧ}搚ᆚ짌P牰泱鈷^d꣟#L삀\"㕹襻;k㸊\\f+": true,
-                      "쎣\",|⫝̸阊x庿k잣v庅$鈏괎炔k쬪O_": [
-                       "잩AzZGz3v愠ꉈⵎ?㊱}S尳௏p\r2>췝IP䘈M)w|\u000eE",
-                       -9222726055990423201,
-                       null,
-                       [
-                        false,
-                        {"´킮'뮤쯽Wx讐V,6ᩪ1紲aႈ\u205czD": [
-                         -930994432421097536,
-                         3157232031581030121,
-                         "l貚PY䃛5@䭄<nW\u001e",
-                         [
-                          3.801747732605161E18,
-                          [
-                           null,
-                           false,
-                           {
-                            "": 4.0442013775147072E16,
-                            "2J[sᡪ㞿|n'#廲꯬乞": true,
-                            "B[繰`\\㏏a̼㨀偛㽓<\/꥖ᵈO让\r43⡩徑ﬓ๨ﮕx:㣜o玐ꉟぢC珵὆ᓞ쇓Qs氯였9駵q혃Ljꂔ<\/昺+t䐋༻猙c沪~櫆bpJ9UᏐ:칣妙!皗F4㑄탎䕀櫳振讓": 7.3924182188256287E18,
-                            "H磵ai委曷n柋T<\/勿F&:ꣴfU@㿗榻Lb+?퍄sp\"᪟~>귻m㎮琸f": 1.0318894506812084E-19,
-                            "࢜⩢Ш䧔1肽씮+༎ᣰ闺馺窃䕨8Mƶq腽xc(៯夐J5굄䕁Qj_훨/~価.䢵慯틠퇱豠㼇Qﵘ$DuSp(8Uญ<\/ಟ룴𥳐ݩ$": 8350772684161555590,
-                            "ㆎQ䄾\u001bpᩭ${[諟^^骴᤮b^ㅥI┧T㉇⾞\"绦<AYJ⒃-oF<\/蛎mm;obh婃ᦢ": false,
-                            "䔤䣈?汝.p襟&d㱅\\Jᚠ@?O첁ࢽ휔VR蔩|㒢柺": [[
-                             "-ꕨ岓棻r@鿆^3~䪤Ѐ狼︌ﹲ\\᝸MlE쵠Q+",
-                             null,
-                             false,
-                             3346674396990536343,
-                             null,
-                             {
-                              "": null,
-                              "/䏨S쨑,&繷㉥8C엮赸3馢|뇲{鄎ꗇqFﶉ雕UD躢?Ꟛအ꽡[hᕱᗅ㦋쭞Mユ茍?L槽암V#성唐%㣕嘵\\ڹ(嘏躿&q": [
-                               -1364715155337673920,
-                               false,
-                               -8197733031775379251,
-                               "E팗鮲JwH\\觡܈᜝\"+뉞娂N휗v噙၂깼\u001dD帒l%-斔N",
-                               -3.844267973858711E-20,
-                               [{"쬯(褈Q 蟚뿢 /ⱖ㻥\u0017/?v邘䃡0U.Z1x?鯔V尠8Em<": [[[
-                                null,
-                                [
-                                 null,
-                                 -5841406347577698873,
-                                 "킷\"S⋄籞繗솸ᵣ浵w쑿ퟗ7nᎏx3앙z㘌쿸I葥覯㬏0ᆝb汆狺뷘ႀnꋋ",
-                                 -1227911573141158702,
-                                 {
-                                  "u㉮PᾺV鵸A\\g*ࡗ9슟晭+ͧↀ쿅H\u001c꾣犓}癇恛ᗬ黩䟘X梑鐆e>r䰂f矩'-7䡭桥Dz兔V9谶居㺍ᔊ䩯덲.\u001eL0ὅㅷ釣": [{
-                                   "<쯬J卷^숞u࠯䌗艞R9닪g㐾볎a䂈歖意:%鐔|ﵤ|y}>;2,覂⶚啵tb*仛8乒㓶B࿠㯉戩oX 貘5V嗆렽낁߼4h䧛ꍺM空\\b꿋貼": 8478577078537189402,
-                                   "VD*|吝z~h譺aᯒ": {
-                                    "YI췢K<\/濳xNne玗rJo쾘3핰鴊\"↱AR:ࢷ\"9?\"臁說)?誚ꊏe)_D翾W?&F6J@뺾ꍰNZ醊Z쾈വH嶿?炫㷱鬰M겈<bS}㎥l|刖k": {"H7鷮퇢_k": [
-                                     true,
-                                     "s㟑瀭좾쮀⑁Y찺k맢戲쀸俻ກ6儮끗扖puߖꜻ馶rꈞ痘?3ྚ畊惘䎗\"vv)*臔웅鿈䧲^v,껛㰙J <ᚶ5",
-                                     7950276470944656796,
-                                     4.9392301536234746E17,
-                                     -4796050478201554639,
-                                     "yꬴc<3㻚",
-                                     "o塁\u20a4蒵鮬裢CᴧnB㭱f.",
-                                     false,
-                                     [
-                                      false,
-                                      "㡐弑V?瀆䰺q!출㇞yᘪ꼼(IS~Ka 烿ꟿ샕桤\u0005HQҹ㯪罂q萾⚇懋⦕둡v",
-                                      1862560050083946970,
-                                      "\u20b6[|(뭹gꍒ펉O轄Dl묽]ﯨ髯QEbA㒾m@롴礠㕓2땫n6ْ엘঵篳R잷꙲m색摪|@㿫5aK设f胭r8/NI4춫栵\\꯬2]",
-                                      false,
-                                      {
-                                       "\u000b7*㙛燏.~?䔊p搕e_拺艿뷍f{ꔻ1s驙`$Ė戧?q⋬沭?塷᭚蹀unoa5": {
-                                        "S귯o紞㾕ᅶ侏銇12|ʟ畴iNAo?|Sw$M拲գ㭄紧螆+,梔": null,
-                                        "㭚0?xB疱敻ேBPwv뾃熉(ӠpJ]갢\"Bj'\u0016GE椱<\/zgៅx黢礇h},M9ﴦ?LḨ": "Si B%~㬒E",
-                                        "핇㉊살㍢숨~ȪRo䦅D桺0z]﬽蠆c9ᣨyPP㿷U~㞐?쯟퍸宒뉆U|}㉓郾ࣻ*櫎꼪䁗s?~7\u001e㘔h9{aឋ}:㶒P8": [{"\\R囡쐬nN柋琍؛7칾 :㶃衇徜V 深f1淍♠i?3S角폞^ᆞ\u20e8ṰD\u0007秡+躒臔&-6": {
-                                         "䨑g.fh㔗=8!\"狿ൻLU^뻱g䲚㻐'W}k欤?๒鲇S꧗䫾$ĥ피": -794055816303360636,
-                                         "外頮詋~텡竆繃䏩苨뾺朁꼃瘹f*㉀枙NH/\u2027ꢁ}j묎vペq︉식뜡Od5 N顯ି烅仟Qfㆤ嚢(i䬅c;맧?嶰㩼츱獡?-": {
-                                          "e݆㍡⬬'2㻒?U篲鿄\"隻Ҭ5NꭰꤺBꀈ拾᩺[刯5곑Na램ﴦ዆]㝓qw钄\u001b\"Y洊䗿祏塥迵[⼞⠳P$꠱5먃0轢`": [{"獰E賝﫚b먭N긆Ⰹ史2逶ꜛ?H짉~?P}jj}侷珿_T>᭨b,⻁鈵P䕡䀠८ⱄ홎鄣": {
-                                           "@?k2鶖㋮\"Oರ K㨇廪儲\u0017䍾J?);\b*묀㗠섳햭1MC V": null,
-                                           "UIICP!BUA`ᢈ㋸~袩㗪⾒=fB﮴l1ꡛ죘R辂여ҳ7쮡<䩲`熕8頁": 4481809488267626463,
-                                           "Y?+8먙ᚔ鋳蜩럶1㥔y璜౩`": [
-                                            null,
-                                            1.2850335807501874E-19,
-                                            "~V2",
-                                            2035406654801997866,
-                                            {
-                                             "<숻1>\"": -8062468865199390827,
-                                             "M㿣E]}qwG莎Gn᝶(ꔙ\\D⬲iꇲs寢t駇S뀡ꢜ": false,
-                                             "pꝤ㎏9W%>M;-U璏f(^j1?&RB隧 忓b똊E": "#G?C8.躬ꥯ'?냪#< 渟&헿란zpo왓Kj}鷧XﻘMツb䕖;㪻",
-                                             "vE풤幉xz뱕쫥Ug㦲aH} ᣟp:鬼Yᰟ<Fɋ잣緂頒⺏䉲瑑䅂,C~ޅG!f熢-B7~9Pqࡢ[츑#3ꕎ,Öඳ聁⩅㵧춀뿍xy䌏͂tdj!箧᳆|9蚡돬": -2.54467378964089632E17,
-                                             "䵈䅦5빖,궆-:໿댾仫0ᙚyᦝhqᚄ": null,
-                                             "侯Y\"湛졯劇U셎YX灍ⅸ2伴|筧\\䁒㶶᷏쁑Waᦵᗱ㜏늾膠<Jc63<G\u20fe䇹66僣k0O\"_@U": null,
-                                             "姪y$#s漴JH璌Ӊ脛J㝾펔ﹴoꈶ㚸PD:薠쏖%說ថ蹂1］⾕5튄": {
-                                              "᝾Huw3䮅如쿺䍟嫝]<鰨ݷ?꯯䫓傩|ᐶස媽\\澒≡闢": "Mm\"쏇ᯄ졽\"楇<\/ꥆ흭局n隴@鿣w⠊4P贈徎W㊋;䤞'.팇蒁䡴egpx嗎wஅ獗堮ᛐnˁ︖䀤4噙?໚郝᱋ޘॎt恑姫籕殥陃\"4[ꝬqL4Wꠎx",
-                                              "ℇj遌5B뒚\" U": "硄ꏘ{憠굏:&t䌨m Cઌ쿣鞛XFꠟs䝭ﶃ\"格a0x闊昵吲L\\杚聈aꁸj싹獅\"灟ﱡ馆*굖糠<ꔏ躎",
-                                              "톌賠弳ꟍb\"螖X50sĶ晠3f秂坯Iⓟ:萘": 5.573183333596288E18,
-                                              "%䴺": [[[[
-                                               -6957233336860166165,
-                                               false,
-                                               null,
-                                               {
-                                                "\"\\௮茒袀ᕥ23ୃ괶?䕎.嚲◉㏞L+ᵡ艱hL콇붆@": null,
-                                                "%螥9ꭌ<\/-t": true,
-                                                ",9|耢椸䁓Xk죱\u0015$Ώ鲞[?엢ᝲ혪즈ⴂ▂ℴ㗯\"g뺘\\ꍜ#\u0002ヮ}ሎ芲P[鹮轧@냲䃦=#(": 2.78562909315899616E17,
-                                                "R?H䧰ⵇ<,憰쮼Q總iR>H3镔ᴚ斦\\鏑r*2橱G⼔F/.j": true,
-                                                "RK좬뎂a홠f*f㱉ᮍ⦋潙㨋Gu곌SGI3I뿐\\F',)t`荁蘯囯ﮉ裲뇟쥼_ገ驪▵撏ᕤV": 1.52738225997956557E18,
-                                                "^k굲䪿꠹B逤%F㱢漥O披M㽯镞竇霒i꼂焅륓\u00059=皫之눃\u2047娤閍銤唫ၕb<\/w踲䔼u솆맚,䝒ᝳ'/it": "B餹饴is権ꖪ怯ꦂẉဎt\"!凢谵⧿0\\<=(uL䷍刨쑪>俆揓Cy襸Q힆䆭涷<\/ᐱ0ɧ䗾䚹\\ኜ?ꄢᇘ`䴢{囇}᠈䴥X4퓪檄]ꥷ/3謒ሴn+g騍X",
-                                                "GgG꽬[(嫓몍6\u0004궍宩㙻/>\u0011^辍dT腪hxǑ%ꊇk,8(W⧂結P鬜O": [{
-                                                 "M㴾c>\\ᓲ\u0019V{>ꤩ혙넪㭪躂TS-痴໸闓⍵/徯O.M㏥ʷD囎⧔쁳휤T??鉬뇙=#ꢫ숣BX䭼<\/d똬졬g榿)eꨋﯪ좇첻<?2K)": null,
-                                                 "Z17縬z]愀䖌 ᾋBCg5딒국憍꾓aⲷ턷u:U촳驿?雺楶\u0001\u001c{q*ᰗ苑B@k揰z.*蓗7ረIm\"Oᱍ@7?_": true,
-                                                 "㺃Z<": -4349275766673120695,
-                                                 "휃䠂fa塆ffixKe'덬鏗੄뺾w࠾鑎k땢m*႑햞鐮6攊&虜h黚,Y䱳Sﭼ둺pN6": [
-                                                  false,
-                                                  "IΎ䣲,\"ᬮ˪癘P~Qlnx喁Sᮔ༬˨I珌m䜛酛\u0003iꐸ㦧cQ帲晼D' \\(粋wQcN\\뵰跈",
-                                                  [
-                                                   "D0\\L?M1쥍Kaꏌsd+盌귤憊tz䌣댐בO坂wϢ%ὒgp,Ai⎧ᶆI餾ꦍ棩嘅᳉怴%m]ၶis纖D凜镧o심b U",
-                                                   {
-                                                    "?଼\u0011Rv&^[+匚I趈T媫\u0010.䥤ᆯ1q僤HydⲰl㒽K'ᅾiౕ豲초딨@\u0013J'쪪VD౼P4Ezg#8*㋤W馓]c쿯8": false,
-                                                    "c/擯X5~JmK䵶^쐎ച|B|u[솝(X뚤6v}W㤘⠛aR弌臌쾭諦eⒷ僡-;㩩⭖ⷴ徆龄갬{䱓ᥩ!﯏⊚ᇨ<v燡露`:볉癮꨽り★Ax7Ꮀ譥~舑\\Vꍋ\"$)v": "e&sFF쬘OBd슊寮f蠛জ봞mn~锆竒G脁\"趵G刕䕳&L唽붵<\/I,X팚B⍥X,kԇҗ眄_慡:U附ᓚA蕧>\u001a\u0011\";~쓆BH4坋攊7힪",
-                                                    "iT:L闞椕윚*滛gI≀Wਟඊ'ꢆ縺뱹鮚Nꩁ᧬蕼21줧\\䋯``⍐\\㏱鳨": 1927052677739832894,
-                                                    "쮁缦腃g]礿Y㬙 fヺSɪ꾾N㞈": [
-                                                     null,
-                                                     null,
-                                                     {
-                                                      "!t,灝Y 1䗉罵?c饃호䉂Cᐭ쒘z(즽sZG㬣sഖE4뢜㓕䏞丮Qp簍6EZឪ겛fx'ꩱQ0罣i{k锩*㤴㯞r迎jTⲤ渔m炅肳": [
-                                                       -3.3325685522591933E18,
-                                                       [{"㓁5]A䢕1룥BC?Ꙍ`r룔Ⳛ䙡u伲+\u0001്o": [
-                                                        null,
-                                                        4975309147809803991,
-                                                        null,
-                                                        null,
-                                                        {"T팘8Dﯲ稟MM☻㧚䥧/8ﻥ⥯aXLaH\"顾S☟耲ît7fS෉놁뮔/ꕼ䓈쁺4\\霶䠴ᩢ<\/t4?죵>uD5➶༆쉌럮⢀秙䘥\u20972ETR3濡恆vB? ~鸆\u0005": {
-                                                         "`閖m璝㥉b뜴?Wf;?DV콜\u2020퍉౓擝宏ZMj3mJ먡-傷뱙yח㸷꥿ ໘u=M읝!5吭L4v\\?ǎ7C홫": null,
-                                                         "|": false,
-                                                         "~Ztᛋ䚘\\擭㗝傪W陖+㗶qᵿ蘥ᙄp%䫎)}=⠔6ᮢS湟-螾-mXH?cp": 448751162044282216,
-                                                         "\u209fad놹j檋䇌ᶾ梕㉝bוּ<d䗱:줰M酄\u0000X#_r獢A饓ꍗُKo_跔?ᪧ嵜鼲<": null,
-                                                         "ꆘ)ubI@h@洭Ai㜎䏱k\u0003?T䉐3间%j6j棍j=❁\\U毮ᬹ*8䀔v6cpj⭬~Q꿾뺶펵悡!쩭厝l六㽫6퇓ޭ2>": {"?苴ꩠD䋓帘5騱qﱖPF?☸珗顒yU ᡫcb䫎 S@㥚gꮒ쎘泴멖\\:I鮱TZ듒ᶨQ3+f7캙\"?\f풾\\o杞紟﻽M.⏎靑OP": [
-                                                          -2.6990368911551596E18,
-                                                          [{"䒖@<᰿<\/⽬tTr腞&G%᳊秩蜰擻f㎳?S㵧\r*k뎾-乢겹隷j軛겷0룁鮁": {")DO0腦:춍逿:1㥨่!蛍樋2": [{
-                                                           ",ꌣf侴笾m๫ꆽ?1?U?\u0011ꌈꂇ": {
-                                                            "x捗甠nVq䅦w`CD⦂惺嘴0I#vỵ} \\귂S끴D얾?Ԓj溯\"v餄a": {
-                                                             "@翙c⢃趚痋i\u0015OQ⍝lq돆Y0pࢥ3쉨䜩^<8g懥0w)]䊑n洺o5쭝QL댊랖L镈Qnt⪟㒅십q헎鳒⮤眉ᔹ梠@O縠u泌ㄘb榚癸XޔFtj;iC": false,
-                                                             "I&뱋゘|蓔䔕측瓯%6ᗻHW\\N1貇#?僐ᗜgh᭪o'䗈꽹Rc욏/蔳迄༝!0邔䨷푪8疩)[쭶緄㇈୧ፐ": {
-                                                              "B+:ꉰ`s쾭)빼C羍A䫊pMgjdx䐝Hf9᥸W0!C樃'蘿f䫤סи\u0017Jve? 覝f둀⬣퓉Whk\"஼=չﳐ皆笁BIW虨쫓F廰饞": -642906201042308791,
-                                                              "sb,XcZ<\/m㉹ ;䑷@c䵀s奤⬷7`ꘖ蕘戚?Feb#輜}p4nH⬮eKL트}": [
-                                                               "RK鳗z=袤Pf|[,u욺",
-                                                               "Ẏᏻ罯뉋⺖锅젯㷻{H䰞쬙-쩓D]~\u0013O㳢gb@揶蔉|kᦂ❗!\u001ebM褐sca쨜襒y⺉룓",
-                                                               null,
-                                                               null,
-                                                               true,
-                                                               -1.650777344339075E-19,
-                                                               false,
-                                                               "☑lꄆs힨꤇]'uTന⌳농].1⋔괁沰\"IWഩ\u0019氜8쟇䔻;3衲恋,窌z펏喁횗?4?C넁问?ᥙ橭{稻Ⴗ_썔",
-                                                               "n?]讇빽嗁}1孅9#ꭨ靶v\u0014喈)vw祔}룼쮿I",
-                                                               -2.7033457331882025E18,
-                                                               {
-                                                                ";⚃^㱋x:饬ኡj'꧵T☽O㔬RO婎?향ᒭ搩$渣y4i;(Q>꿘e8q": "j~錘}0g;L萺*;ᕭꄮ0l潛烢5H▄쳂ꏒוֹꙶT犘≫x閦웧v",
-                                                                "~揯\u2018c4職렁E~ᑅቚꈂ?nq뎤.:慹`F햘+%鉎O瀜쟏敛菮⍌浢<\/㮺紿P鳆ࠉ8I-o?#jﮨ7v3Dt赻J9": null,
-                                                                "ࣝW䌈0ꍎqC逖,횅c၃swj;jJS櫍5槗OaB>D踾Y": {"㒰䵝F%?59.㍈cᕨ흕틎ḏ㋩B=9IېⓌ{:9.yw｝呰ㆮ肒᎒tI㾴62\"ዃ抡C﹬B<\/<EO꽓ᇕu&鋫\\禞퐹u꒍.7훯ಶ2䩦͉ᶱf깵ᷣ늎": [
-                                                                 5.5099570884646902E18,
-                                                                 "uQN濿m臇<%?谣鮢s]]x0躩慌闋<;( 鋤.0ᠵd1#벘a:Gs?햷'.)ㅴ䞟琯崈FS@O㌛ᓬ抢큌ើ냷쿟툥IZn[惵ꐧ3뙍[&v憙J>촋jo朣",
-                                                                 [
-                                                                  -7675533242647793366,
-                                                                  {"ᙧ呃:[㒺쳀쌡쏂H稈㢤\u001dᶗGG-{GHྻຊꡃ哸䵬;$?&d\\⥬こN圴됤挨-'ꕮ$PU%?冕눖i魁q騎Q": [
-                                                                   false,
-                                                                   [[
-                                                                    7929823049157504248,
-                                                                    [[
-                                                                     true,
-                                                                     "Z菙\u0017'eꕤ᱕l,0\\X\u001c[=雿8蠬L<\/낲긯W99g톉4ퟋb㝺\u0007劁'!麕Q궈oW:@X၎z蘻m絙璩귓죉+3柚怫tS捇蒣䝠-擶D[0=퉿8)q0ٟ",
-                                                                     "唉\nFA椭穒巯\\䥴䅺鿤S#b迅獘 ﶗ꬘\\?q1qN犠pX꜅^䤊⛤㢌[⬛휖岺q唻ⳡ틍\"㙙Eh@oA賑㗠y必Nꊑᗘ",
-                                                                     -2154220236962890773,
-                                                                     -3.2442003245397908E18,
-                                                                     "Wᄿ筠:瘫퀩?o貸q⊻(᎞KWf宛尨h^残3[U(='橄",
-                                                                     -7857990034281549164,
-                                                                     1.44283696979059942E18,
-                                                                     null,
-                                                                     {"ꫯAw跭喀 ?_9\"Aty背F=9缉ྦྷ@;?^鞀w:uN㘢Rỏ": [
-                                                                      7.393662029337442E15,
-                                                                      3564680942654233068,
-                                                                      [
-                                                                       false,
-                                                                       -5253931502642112194,
-                                                                       "煉\\辎ೆ罍5⒭1䪁䃑s䎢:[e5}峳ﴱn騎3?腳Hyꏃ膼N潭錖,Yᝋ˜YAၓ㬠bG렣䰣:",
-                                                                       true,
-                                                                       null,
-                                                                       {
-                                                                        "⒛'P&%죮|:⫶춞": -3818336746965687085,
-                                                                        "钖m<\/0ݎMtF2Pk=瓰୮洽겎.": [[
-                                                                         -8757574841556350607,
-                                                                         -3045234949333270161,
-                                                                         null,
-                                                                         {
-                                                                          "Ꮬr輳>⫇9hU##w@귪A\\C 鋺㘓ꖐ梒뒬묹㹻+郸嬏윤'+g<\/碴,}ꙫ>손;情d齆J䬁ຩ撛챝탹/R澡7剌tꤼ?ặ!`⏲睤\u00002똥଴⟏": null,
-                                                                          "\u20f2ܹe\\tAꥍư\\x当뿖렉禛;G檳ﯪS૰3~㘠#[J<}{奲 5箉⨔{놁<\/釿抋,嚠/曳m&WaOvT赋皺璑텁": [[
-                                                                           false,
-                                                                           null,
-                                                                           true,
-                                                                           -5.7131445659795661E18,
-                                                                           "萭m䓪D5|3婁ఞ>蠇晼6nﴺPp禽羱DS<睓닫屚삏姿",
-                                                                           true,
-                                                                           [
-                                                                            -8759747687917306831,
-                                                                            {
-                                                                             ">ⓛ\t,odKr{䘠?b퓸C嶈=DyEᙬ@ᴔ쨺芛髿UT퓻春<\/yꏸ>豚W釺N뜨^?꽴﨟5殺ᗃ翐%>퍂ဿ䄸沂Ea;A_\u0005閹殀W+窊?Ꭼd\u0013P汴G5썓揘": 4.342729067882445E-18,
-                                                                             "Q^즾眆@AN\u0011Kb榰냎Y#䝀ꀒᳺ'q暇睵s\"!3#I⊆畼寤@HxJ9": false,
-                                                                             "⿾D[)袨㇩i]웪䀤ᛰMvR<蟏㣨": {"v퇓L㪱ꖣ豛톤\\곱#kDTN": [{
-                                                                              "(쾴䡣,寴ph(C\"㳶w\"憳2s馆E!n!&柄<\/0Pꈗſ?㿳Qd鵔": {"娇堰孹L錮h嵅⛤躏顒?CglN束+쨣ﺜ\\MrH": {"獞䎇둃ቲ弭팭^ꄞ踦涟XK錆쳞ឌ`;੶S炥騞ଋ褂B៎{ڒ䭷ᶼ靜pI荗虶K$": [{"◖S~躘蒉꫿輜譝Q㽙闐@ᢗ¥E榁iء5┄^B[絮跉ᰥ遙PWi3wㄾⵀDJ9!w㞣ᄎ{듒ꓓb6\\篴??c⼰鶹⟧\\鮇ꮇ": [[
-                                                                               654120831325413520,
-                                                                               -1.9562073916357608E-19,
-                                                                               {
-                                                                                "DC(昐衵ἡ긙갵姭|֛[t": 7.6979110359897907E18,
-                                                                                "J␅))嫼❳9Xfd飉j7猬ᩉ+⤻眗벎E鰉Zﾶ63zၝ69}ZᶐL崭ᦥ⡦靚⋛ꎨ~i㨃咊ꧭo䰠阀3C(": -3.5844809362512589E17,
-                                                                                "p꣑팱쒬ꎑ뛡Ꙩ挴恍胔&7ᔈ묒4Hd硶훐㎖zꢼ豍㿢aሃ=<\/湉鵲EӅ%$F!퍶棌孼{O駍਺geu+": ")\u001b잓kŀX쩫A밁®ڣ癦狢)扔弒p}k縕ꩋ,䃉tࣼi",
-                                                                                "ァF肿輸<솄G-䢹䛸ꊏl`Tqꕗ蒞a氷⸅ᴉ蠰]S/{J왲m5{9.uέ~㕚㣹u>x8U讁B덺襪盎QhVS맅킃i识{벂磄Iහ䙅xZy/抍૭Z鲁-霳V据挦ℒ": null,
-                                                                                "㯛|Nꐸb7ⵐb?拠O\u0014ކ?-(EꞨ4ꕷᄤYᯕOW瞺~螸\"욿ќ<u鵵઎⸊倾쑷෻rT⪄牤銱;W殆͢芄ਰ嚝훚샢⊿+㲽": null,
-                                                                                "単逆ົ%_맛d)zJ%3칧_릟#95䌨怡\u001ci턠ॣi冘4赖'ਐ䧐_栔!": {
-                                                                                 "*?2~4㲌᭳쯁ftႷ1#oJ\b䊇镇됔 \u2079x䛁㊝ᮂN;穽跖s휇ᣄ홄傷z⸷(霸!3y뺏M쒿햏۽v㳉tở心3黎v쭻 Rp཮Vr~T?&˴k糒븥쩩r*D": null,
-                                                                                 "8@~홟ꔘk1[": -5570970366240640754,
-                                                                                 "BZt鏦ꡬc餖  s(mᛴ\u0000◄d腑t84C⟐坯VṊ뉙'噱Ꝕ珽GC顀?허0ꞹ&돇䛭C䷫](": 2.4303828213012387E-20,
-                                                                                 "y撔Z외放+}ḑ骈ᙝ&\u0016`G便2|-e]঳?QF㜹YF\"㿒緄햷㈟塚䷦ୀጤlM蘸N㾆▛럪㞂tᕬ镈쇝喠l amcxPnm\u001a᱋<\/]_]ﻹ瞧?H": false,
-                                                                                 "ፏ氏묢뜚I[♺뽛x?0H봬Wpn꨹Ra䝿쌑{㴂ni祻윸A'y|⺴ᚘ庌9{$恲{톽=m#@6ᨧfgs44陎J#<Ễ쨓瀵❩a୛㷉㙉ܸ◠냔嬯~呄籁羥镳": false,
-                                                                                 "㘱{<頬22?IF@곊I겂嶻L᝛D{@r쒂?IAᣧ洪惒誸b徂z췺꾍㠭\\刊%禨쌐ⶣ仵\\P[:47;<ᇅ<\/": {
-                                                                                  "^U釳-v㢈ꗝ◄菘rᜨi;起kR犺䵫\u0000锍쁙m-ԙ!lḃ꛸뻾F(W귛y": "#ᠺH㸢5v8_洑C",
-                                                                                  "䔵໳$ᙠ6菞\u206e摎q圩P|慍sV4:㜾(I溞I?": -6569206717947549676,
-                                                                                  "透Ꞃ緵퇝8 >e㺰\"'㌢ƐW\u0004瞕>0?V鷵엳": true,
-                                                                                  "뤥G\\迋䠿[庩'꼡\u001aiᩮV쯁ᳪ䦪Ô;倱ନ뛁誈": null,
-                                                                                  "쥹䄆䚟Q榁䎐᢭<\/2㕣p}HW蟔|䃏꿈ꚉ锳2Pb7㙑Tⅹᵅ": {
-                                                                                   "Y?֭$>#cVBꩨ:>eL蒁務": {
-                                                                                    "86柡0po 䏚&-捑Ћ祌<\/휃-G*㶢הּ쩍s㶟餇c걺yu꽎還5*턧簕Og婥SꝐ": null,
-                                                                                    "a+葞h٥ࠆ裈嗫ﵢ5輙퀟ᛜ,QDﹼ⟶Y騠锪E_|x죗j侵;m蜫轘趥?븅w5+mi콛L": {
-                                                                                     ";⯭ﱢ!买F⽍柤鶂n䵣V㫚墱2렾ELEl⣆": [
-                                                                                      true,
-                                                                                      -3.6479311868339015E-18,
-                                                                                      -7270785619461995400,
-                                                                                      3.334081886177621E18,
-                                                                                      2.581457786298155E18,
-                                                                                      -6.605252412954115E-20,
-                                                                                      -3.9232347037744167E-20,
-                                                                                      {
-                                                                                       "B6㊕.k1": null,
-                                                                                       "ZAꄮJ鮷ᳱo갘硥鈠䠒츼": {
-                                                                                        "ᕅ}럡}.@y陪鶁r業'援퀉x䉴ﵴl퍘):씭脴ᥞhiꃰblﲂ䡲엕8߇M㶭0燋標挝-?PCwe⾕J碻Ᾱ䬈䈥뷰憵賣뵓痬+": {"a췩v礗X⋈耓ፊf罅靮!㔽YYᣓw澍33⎔芲F|\"䜏T↮輦挑6ᓘL侘?ￆ]덆1R௯✎餘6ꏽ<\/௨\\?q喷ꁫj~@ulq": {"嗫欆뾔Xꆹ4H㌋F嵧]ࠎ]㠖1ꞤT<$m뫏O i댳0䲝i": {"?෩?\u20cd슮|ꯆjs{?d7?eNs⢚嫥氂䡮쎱:鑵롟2hJꎒﯭ鱢3춲亄:뼣v䊭諱Yj択cVmR䩃㘬T\"N홝*ै%x^F\\_s9보zz4淗?q": [
-                                                                                         null,
-                                                                                         "?",
-                                                                                         2941869570821073737,
-                                                                                         "{5{殇0䝾g6밖퍋臩綹R$䖭j紋釰7sXI繳漪행y",
-                                                                                         false,
-                                                                                         "aH磂?뛡#惇d婅?Fe,쐘+늵䍘\"3r瘆唊勐j⳧࠴ꇓ<\/唕윈x⬌讣䋵%拗ᛆⰿ妴᝔M2㳗必꧂淲?ゥ젯檢<8끒MidX䏒3᳻Q▮佐UT|⤪봦靏⊏",
-                                                                                         [[{
-                                                                                          "颉(&뜸귙{y^\"P퟉춝Ჟ䮭D顡9=?}Y誱<$b뱣RvO8cH煉＠tk~4ǂ⤧⩝屋SS;J{vV#剤餓ᯅc?#a6D,s": [
-                                                                                           -7.8781018564821536E16,
-                                                                                           true,
-                                                                                           [
-                                                                                            -2.28770899315832371E18,
-                                                                                            false,
-                                                                                            -1.0863912140143876E-20,
-                                                                                            -6282721572097446995,
-                                                                                            6767121921199223078,
-                                                                                            -2545487755405567831,
-                                                                                            false,
-                                                                                            null,
-                                                                                            -9065970397975641765,
-                                                                                            [
-                                                                                             -5.928721243413937E-20,
-                                                                                             {"6촊\u001a홯kB0w撨燠룉{绎6⳹!턍贑y▾鱧ժ[;7ᨷ∀*땒䪮1x霆Hᩭ☔\"r䝐7毟ᝰr惃3ꉭE+>僒澐": [
-                                                                                              "Ta쎩aƝt쵯ⰪVb",
-                                                                                              [
-                                                                                               -5222472249213580702,
-                                                                                               null,
-                                                                                               -2851641861541559595,
-                                                                                               null,
-                                                                                               4808804630502809099,
-                                                                                               5657671602244269874,
-                                                                                               "5犲﨣4mᥣ?yf젫꾯|䋬잁$`Iⳉﴷ扳兝,'c",
-                                                                                               false,
-                                                                                               [
-                                                                                                null,
-                                                                                                {
-                                                                                                 "DyUIN쎾M仼惀⮥裎岶泭lh扠\u001e礼.tEC癯튻@_Qd4c5S熯A<\/＼6U윲蹴Q=%푫汹\\\u20614b[௒C⒥Xe⊇囙b,服3ss땊뢍i~逇PA쇸1": -2.63273619193485312E17,
-                                                                                                 "Mq꺋貘k휕=nK硍뫞輩>㾆~἞ࡹ긐榵l⋙Hw뮢帋M엳뢯v⅃^": 1877913476688465125,
-                                                                                                 "ᶴ뻗`~筗免⚽টW˃⽝b犳䓺Iz篤p;乨A\u20ef쩏?疊m㝀컩뫡b탔鄃ᾈV(遢珳=뎲ିeF仢䆡谨8t0醄7㭧瘵⻰컆r厡궥d)a阄፷Ed&c﯄伮1p": null,
-                                                                                                 "⯁w4曢\"(欷輡": "\"M᭫]䣒頳B\\燧ࠃN㡇j姈g⊸⺌忉ꡥF矉স%^",
-                                                                                                 "㣡Oᄦ昵⫮Y祎S쐐級㭻撥>{I$": -378474210562741663,
-                                                                                                 "䛒掷留Q%쓗1*1J*끓헩ᦢ﫫哉쩧EↅIcꅡ\\?ⴊl귛顮4": false,
-                                                                                                 "寔愆샠5]䗄IH贈=d﯊/偶?ॊn%晥D視N򗘈'᫂⚦|X쵩넽z질tskxDQ莮Aoﱻ뛓": true,
-                                                                                                 "钣xp?&\u001e侉/y䴼~?U篔蘚缣/I畚?Q绊": -3034854258736382234,
-                                                                                                 "꺲໣眀)⿷J暘pИfAV삕쳭Nꯗ4々'唄ⶑ伻㷯騑倭D*Ok꧁3b␽_<\/챣Xm톰ၕ䆄`*fl㭀暮滠毡?": [
-                                                                                                  "D男p`V뙸擨忝븪9c麺`淂⢦Yw⡢+kzܖ\fY1䬡H歁)벾Z♤溊-혰셢?1<-\u0005;搢Tᐁle\\ᛵߓﭩ榩<QF;t=?Qꀞ",
-                                                                                                  [
-                                                                                                   null,
-                                                                                                   [{"-췫揲ᬨ墊臸<ࠒH跥 㔭쥃㫯W=z[wধ╌<~yW楄S!⑻h즓lĖN￧篌W듷튗乵᪪템먵Pf悥ᘀk䷭焼\\讄r擁鐬y6VF<\/6랿p)麡ꁠ㪁\"pழe": [
-                                                                                                    "#幎杴颒嶈)ㄛJ.嶤26_⋌东챯ꠉ⤋ؚ/⏚%秼Q룠QGztﾺ㎷អI翰Xp睔鍜ꨍ",
-                                                                                                    {",T?": [
-                                                                                                     false,
-                                                                                                     [[
-                                                                                                      true,
-                                                                                                      7974824014498027996,
-                                                                                                      false,
-                                                                                                      [
-                                                                                                       4.3305464880956252E18,
-                                                                                                       {
-                                                                                                        "᱿W^A]'rᮢ)鏥z餝;Hu\\Fk?ﴺ?IG浅-䙧>訝-xJ;巡8깊蠝ﻓU$K": {
-                                                                                                         "Vꕡ諅搓W=斸s︪vﲜ츧$)iꡟ싉e寳?ጭムVથ嵬i楝Fg<\/Z|៪ꩆ-5'@ꃱ80!燱R쇤t糳]罛逇dṌ֣XHiͦ{": true,
-                                                                                                         "Ya矲C멗Q9膲墅携휻c\\딶G甔<\/.齵휴": -1.1456247877031811E-19,
-                                                                                                         "z#.OO￝J": -8263224695871959017,
-                                                                                                         "崍_3夼ᮟ1F븍뽯ᦓ鴭V豈Ь": [{
-                                                                                                          "N蒬74": null,
-                                                                                                          "yuB?厅vK笗!ᔸcXQ旦컶P-녫mﾵ麟_": "1R@ 톘xa_|﩯遘s槞d!d껀筤⬫薐焵먑D{\\6k共倌☀G~AS_D\"딟쬚뮥馲렓쓠攥WTMܭ8nX㩴䕅檹E\u0007ﭨN 2 ℆涐ꥏ꠵3▙玽|됨_\u2048",
-                                                                                                          "恐A C䧩G": {":M큣5e들\\ꍀ恼ᔄ靸|I﨏$)n": {
-                                                                                                           "|U䬫㟯SKV6ꛤ㗮\bn봻䲄fＸT:㾯쳤'笓0b/ೢC쳖?2浓uO.䰴": "ཐ꼋e?``,ᚇ慐^8ꜙNM䂱\u0001IᖙꝧM'vKdꌊH牮r\\O@䊷ᓵ쀆(fy聻i툺\"?<\/峧ࣞ⓺ᤤ쵒߯ꎺ騬?)刦\u2072l慪y꺜ﲖTj+u",
-                                                                                                           "뽫<G;稳UL⸙q2n쵿C396炿J蓡z⣁zဩSOU?<\/뙍oE큸O鿅෴ꍈEm#\"[瑦⤫ᝆgl⡗q8\"큘덥係@ᆤ=\u0001爖羝췀㸩b9\\jeqt㟿㮸龾m㳳긄": {
-                                                                                                            "9\"V霟釜{/o0嫲C咀-饷䈍[녩)\r䤴tMW\\龟ϣ^ي㪙忩䞞N湆Y笕)萨ꖤ誥煽:14⫻57U$擒䲐薡Qvↇ櫲현誧?nஷ6": {"l웾䌵.䅋䦝ic碳g[糲Ƿ-ឈᚱ4쑧\u0004C࿼\u0018&쬑?멲<\/fD_檼픃pd쪼n㕊渪V䛉m揈W儅톳뗳䓆7㭽諤T煠Ney?0᪵鈑&": [
-                                                                                                             false,
-                                                                                                             null,
-                                                                                                             {
-                                                                                                              "\r;鼶j᠂꼍RLz~♔9gf?ӡ浐": -1.4843072575250897E-19,
-                                                                                                              "&ꊒ\"ꋟ䝭E诮ﯚO?SW뒁훪mb旙⎕ᗕ⶙|ᷤ5y4甥": "j5|庠t铱?v 횋0\"'rxz䃢杺Ɜ!\u0002",
-                                                                                                              "Q ၩ㟧": {"Hﬔ\u2058䪠틙izZㅛ탟H^ﶲA??R6呠Z솋R.࿶g8": [
-                                                                                                               -8762672252886298799,
-                                                                                                               -1.9486830507000208E17,
-                                                                                                               null,
-                                                                                                               -7157359405410123024,
-                                                                                                               null,
-                                                                                                               null,
-                                                                                                               -995856734219489233,
-                                                                                                               "呧㫹A4!",
-                                                                                                               null,
-                                                                                                               -1.9105609358624648E-19,
-                                                                                                               5888184370445333848,
-                                                                                                               2.25460605078245E-19,
-                                                                                                               2.5302739297121987E18,
-                                                                                                               "뢹sbEf捵2丯?뗾耸(Wd띙SବꭖrtU?筤P똙QpbbKqaE$来V웰3i/lK퉜,8︸e= g螓t竦컼?.寋8鵗",
-                                                                                                               7377742975895263424,
-                                                                                                               2.4218442017790503E-19,
-                                                                                                               {
-                                                                                                                "y꒚ཫ쨘醬킃糟}yTSt䡀⇂뿽4ൢ戰U": [[
-                                                                                                                 3600537227234741875,
-                                                                                                                 4435474101760273035,
-                                                                                                                 -1.42274517007951795E18,
-                                                                                                                 -5567915915496026866,
-                                                                                                                 null,
-                                                                                                                 null,
-                                                                                                                 [
-                                                                                                                  -3204084299154861161,
-                                                                                                                  {
-                                                                                                                   "7梧慸憏.a瘎\u00041U鵮Ck֨d惥耍ⳡY,⭏써E垁FFI鱑ⳬ줢7⧵Bﴠ耘줕햸q컴~*瑍W.떛ࡆ@'᐀+轳": -961121410259132975,
-                                                                                                                   "⥅]l黭㣓绶;!!⎃=朼㐿e&ἂ繤C﯀l䝣㌀6TM쑮w懃ꡡ#ᤆ䰓,墼湼゙뽸㲿䧽쫨xᵖ듨<\/ T0峸iQ:溫脐\\\"쎪ὴ砇宖^M泼큥➅鈫@ᄟ༩\u2008⥼": true,
-                                                                                                                   "⩐\"籽汎P싯鲘蟼sRᐯ䅩\u0019R(kRᖁ&ಌ 0\"鳶!馼YH": null,
-                                                                                                                   "鮼ꚇ싋։刟\rRLd步Nⴗ5Eࡆ訛갚[I醵NC(郴ṉy5D뤺౳QY壯5苴y훨(W\\Cଇ姚C艄깹\u001c歷㋵ZC᥂": [
-                                                                                                                    -6806235313106257498,
-                                                                                                                    null,
-                                                                                                                    "}N⸿讽sꚪ;\\p繇j苄䫨\u20e7%5x?t#",
-                                                                                                                    {
-                                                                                                                     "O〗k<墻yV$ఁrs-c1ఌ唪.C7_Yobᦜ褷'b帰mㄑl⌅": {"qB뗗擄3隂5뺍櫂䱟e촸P/鏩,3掁ꗩ=冉棓㑉|˞F襴뿴,:㞦<퓂⧙礞♗g뚎ᛩ<\/뉽ⶳ⸻A?_x2I㽝勒*I홱鍧粿~曟㤙2绥Ly6+썃uu鿜בf큘|歍ࣖÉ": [
-                                                                                                                      ">hh䈵w>1ⲏ쐭V[ⅎ\\헑벑F_㖝⠗㫇h恽;῝汰ᱼ瀖J옆9RR셏vsZ柺鶶툤r뢱橾/ꉇ囦FGm\"謗ꉦ⨶쒿⥡%]鵩#ᖣ_蹎 u5|祥?O",
-                                                                                                                      null,
-                                                                                                                      2.0150326776036215E-19,
-                                                                                                                      null,
-                                                                                                                      true,
-                                                                                                                      false,
-                                                                                                                      true,
-                                                                                                                      {"\fa᭶P捤WWc᠟f뚉ᬏ퓗ⳀW睹5:HXH=q7x찙X$)모r뚥ᆟ!Jﳸf": [
-                                                                                                                       -2995806398034583407,
-                                                                                                                       [
-                                                                                                                        6441377066589744683,
-                                                                                                                        "Mﶒ醹i)Gἦ廃s6몞 KJ౹礎VZ螺费힀\u0000冺업{谥'꡾뱻:.ꘘ굄奉攼Di᷑K鶲y繈욊阓v㻘}枭캗e矮1c?휐\"4\u0005厑莔뀾墓낝⽴洗ṹ䇃糞@b1\u0016즽Y轹",
-                                                                                                                        {
-                                                                                                                         "1⽕⌰鉟픏M㤭n⧴ỼD#%鐘⊯쿼稁븣몐紧ᅇ㓕ᛖcw嬀~ഌ㖓(0r⧦Q䑕髍ര铂㓻R儮\"@ꇱm❈௿᦯頌8}㿹犴?xn잆꥽R": 2.07321075750427366E18,
-                                                                                                                         "˳b18㗈䃟柵Z曆VTAu7+㛂cb0﯑Wp執<\/臋뭡뚋刼틮荋벲TLP预庰܈G\\O@VD'鱃#乖끺*鑪ꬳ?Mޞdﭹ{␇圯쇜㼞顄︖Y홡g": [{
-                                                                                                                          "0a,FZ": true,
-                                                                                                                          "2z̬蝣ꧦ驸\u0006L↛Ḣ4๚뿀'?lcwᄧ㐮!蓚䃦-|7.飑挴.樵*+1ﮊ\u0010ꛌ%貨啺/JdM:똍!FBe?鰴㨗0O财I藻ʔWA᫓G쳛u`<\/I": [{
-                                                                                                                           "$τ5V鴐a뾆両環iZp頻යn븃v": -4869131188151215571,
-                                                                                                                           "*즢[⦃b礞R◚nΰꕢH=귰燙[yc誘g䆌?ଜ臛": {
-                                                                                                                            "洤湌鲒)⟻\\䥳va}PeAMnＮ[": "㐳ɪ/(軆lZR,Cp殍ȮN啷\"3B婴?i=r$펽ᤐ쀸",
-                                                                                                                            "阄R4㒿㯔ڀ69ZᲦ2癁핌噗P崜#\\-쭍袛&鐑/$4童V꩑_ZHA澢fZ3": {"x;P{긳:G閉:9?活H": [
-                                                                                                                             "繺漮6?z犞焃슳\">ỏ[Ⳛ䌜녏䂹>聵⼶煜Y桥[泥뚩MvK$4jtﾛ",
-                                                                                                                             "E#갶霠좭㦻ୗ먵F+䪀o蝒ba쮎4X㣵 h",
-                                                                                                                             -335836610224228782,
-                                                                                                                             null,
-                                                                                                                             null,
-                                                                                                                             [
-                                                                                                                              "r1᫩0>danjY짿bs{",
-                                                                                                                              [
-                                                                                                                               -9.594464059325631E-23,
-                                                                                                                               1.0456894622831624E-20,
-                                                                                                                               null,
-                                                                                                                               5.803973284253454E-20,
-                                                                                                                               -8141787905188892123,
-                                                                                                                               true,
-                                                                                                                               -4735305442504973382,
-                                                                                                                               9.513150514479281E-20,
-                                                                                                                               "7넳$螔忷㶪}䪪l짴\u0007鹁P鰚HF銏ZJﳴ/⍎1ᷓ忉睇ᜋ쓈x뵠m䷐窥Ꮤ^\u0019ᶌ偭#ヂt☆၃pᎍ臶䟱5$䰵&๵分숝]䝈뉍♂坎\u0011<>",
-                                                                                                                               "C蒑貑藁lﰰ}X喇몛;t밿O7/᯹f\u0015kI嘦<ዴ㟮ᗎZ`GWퟩ瑹࡮ᅴB꿊칈??R校s脚",
-                                                                                                                               {
-                                                                                                                                "9珵戬+AU^洘拻ቒy柭床'粙XG鞕᠜繀伪%]hC,$輙?Ut乖Qm떚W8઼}~q⠪rU䤶CQ痗ig@#≲t샌f㈥酧l;y闥ZH斦e⸬]j⸗?ঢ拻퀆滌": null,
-                                                                                                                                "畯}㧢J罚帐VX㨑>1ꢶkT⿄蘥㝑o|<嗸層沈挄GEOM@-䞚䧰$만峬輏䠱V✩5宸-揂D'㗪yP掶7b⠟J㕻SfP?d}v㼂Ꮕ'猘": {
-                                                                                                                                 "陓y잀v>╪": null,
-                                                                                                                                 "鬿L+7:됑Y=焠U;킻䯌잫!韎ஔ\f": {
-                                                                                                                                  "駫WmGጶ": {
-                                                                                                                                   "\\~m6狩K": -2586304199791962143,
-                                                                                                                                   "ႜࠀ%͑l⿅D.瑢Dk%0紪dḨTI픸%뗜☓s榗኉\"?V籄7w髄♲쟗翛歂E䤓皹t ?)ᄟ鬲鐜6C": {
-                                                                                                                                    "_췤a圷1\u000eB-XOy缿請∎$`쳌eZ~杁튻/蜞`塣৙\"⪰\"沒l}蕌\\롃荫氌.望wZ|o!)Hn獝qg}": null,
-                                                                                                                                    "kOSܧ䖨钨:಼鉝ꭝO醧S`십`ꓭ쭁ﯢN&Et㺪馻㍢ⅳ㢺崡ຊ蜚锫\\%ahx켨|ż劻ꎄ㢄쐟A躊᰹p譞綨Ir쿯\u0016ﵚOd럂*僨郀N*b㕷63z": {
-                                                                                                                                     ":L5r+T㡲": [{
-                                                                                                                                      "VK泓돲ᮙRy㓤➙Ⱗ38oi}LJቨ7Ó㹡৘*q)1豢⛃e᫛뙪壥镇枝7G藯g㨛oI䄽 孂L缊ꋕ'EN`": -2148138481412096818,
-                                                                                                                                      "`⛝ᘑ$(खꊲ⤖ᄁꤒ䦦3=)]Y㢌跨NĴ驳줟秠++d孳>8ᎊ떩EꡣSv룃 쯫أ?#E|᭙㎐?zv:5祉^⋑V": [
-                                                                                                                                       -1.4691944435285607E-19,
-                                                                                                                                       3.4128661569395795E17,
-                                                                                                                                       "㐃촗^G9佭龶n募8R厞eEw⺡_ㆱ%⼨D뉄퉠2ꩵᛅⳍ搿L팹Lවn=\"慉념ᛮy>!`g!풲晴[/;?[v겁軇}⤳⤁핏∌T㽲R홓遉㓥",
-                                                                                                                                       "愰_⮹T䓒妒閤둥?0aB@㈧g焻-#~跬x<\/舁P݄ꐡ=\\׳P\u0015jᳪᢁq;㯏l%᭗;砢觨▝,謁ꍰGy?躤O黩퍋Y㒝a擯\n7覌똟_䔡]fJ晋IAS",
-                                                                                                                                       4367930106786121250,
-                                                                                                                                       -4.9421193149720582E17,
-                                                                                                                                       null,
-                                                                                                                                       {
-                                                                                                                                        ";ﾸ똾柉곟ⰺKpፇ䱻ฺ䖝{o~h!ｅꁿ઻욄ښ\u0002y?xUd\u207c悜ꌭ": [
-                                                                                                                                         1.6010824122815255E-19,
-                                                                                                                                         [
-                                                                                                                                          "宨︩9앉檥pr쇷?WxLb",
-                                                                                                                                          "氇9】J玚\u000f옛呲~ 輠1D嬛,*mW3?n휂糊γ虻*ᴫ꾠?q凐趗Ko↦GT铮",
-                                                                                                                                          "㶢ថmO㍔k'诔栀Z蛟}GZ钹D",
-                                                                                                                                          false,
-                                                                                                                                          -6.366995517736813E-20,
-                                                                                                                                          -4894479530745302899,
-                                                                                                                                          null,
-                                                                                                                                          "V%᫡II璅䅛䓎풹ﱢ/pU9se되뛞x梔~C)䨧䩻蜺(g㘚R?/Ự[忓C뾠ࢤc왈邠买?嫥挤풜隊枕",
-                                                                                                                                          ",v碍喔㌲쟚蔚톬៓ꭶ",
-                                                                                                                                          3.9625444752577524E-19,
-                                                                                                                                          null,
-                                                                                                                                          [
-                                                                                                                                           "kO8란뿒䱕馔b臻⍟隨\"㜮鲣Yq5m퐔<u뷆c譆\u001bN?<",
-                                                                                                                                           [{
-                                                                                                                                            ";涉c蒀ᴧN䘱䤳 ÿꭷ,핉dSTDB>K#ꢘug㼈ᝦ=P^6탲@䧔%$CqSw铜랊0&m⟭<\/a逎ym\u0013vᯗ": true,
-                                                                                                                                            "洫`|XN뤮\u0018詞=紩鴘_sX)㯅鿻Ố싹": 7.168252736947373E-20,
-                                                                                                                                            "ꛊ饤ﴏ袁(逊+~⽫얢鈮艬O힉7D筗S곯w操I斞᠈븘蓷x": [[[[
-                                                                                                                                             -7.3136069426336952E18,
-                                                                                                                                             -2.13572396712722688E18,
-                                                                                                                                             {
-                                                                                                                                              "硢3㇩R:o칢行E<=\u0018ၬYuH!\u00044U%卝炼2>\u001eSi$⓷ꒈ'렢gᙫ番ꯒ㛹럥嶀澈v;葷鄕x蓎\\惩+稘UEᖸﳊ㊈壋N嫿⏾挎,袯苷ኢ\\x|3c": 7540762493381776411,
-                                                                                                                                              "?!*^ᢏ窯?\u0001ڔꙃw虜돳FgJ?&⨫*uo籤:?}ꃹ=ٴ惨瓜Z媊@ત戹㔏똩Ԛ耦Wt轁\\枒^\\ꩵ}}}ꀣD\\]6M_⌫)H豣:36섘㑜": {
-                                                                                                                                               ";홗ᰰU஋㙛`D왔ཿЃS회爁\u001b-㢈`봆?盂㛣듿ᦾ蒽_AD~EEຆ㊋(eNwk=Rɠ峭q\"5Ἠ婾^>'ls\n8QAK<l_⭨穟": [
-                                                                                                                                                true,
-                                                                                                                                                true,
-                                                                                                                                                {"ﳷm箅6qⷈ?ﲈ憟b۷⫉἞V뚴少U呡瓴ꉆs~嘵得㌶4XR漊": [
-                                                                                                                                                 "폆介fM暪$9K[ㄇ샍큳撦g撟恸jҐF㹹aj bHᘀ踉ꎐＣ粄 a?\u000fK즉郝 幨9D舢槷Xh뵎u훩Ꜿ턾ƅ埂P埆k멀{䢹~?D<\/꼢XR\u001b〱䝽꼨i㘀ḟ㚺A-挸",
-                                                                                                                                                 false,
-                                                                                                                                                 null,
-                                                                                                                                                 -1.1710758021294953E-20,
-                                                                                                                                                 3996737830256461142,
-                                                                                                                                                 true,
-                                                                                                                                                 null,
-                                                                                                                                                 -8271596984134071193,
-                                                                                                                                                 "_1G퉁텑m䮔鰼6멲Nmꇩſt쓟튍N许FDj+3^ﶜ⎸\u0019⤕橥!\"s-뾞lz北׸ꍚ랬)?l⻮고i䑰\u001f䪬",
-                                                                                                                                                 4.459124464204517E-19,
-                                                                                                                                                 -4.0967172848578447E18,
-                                                                                                                                                 5643211135841796287,
-                                                                                                                                                 -9.482336221192844E-19,
-                                                                                                                                                 "౪冏釶9D?s螭X榈枸j2秀v]泌鰚岒聵轀쌶i텽qMbL]R,",
-                                                                                                                                                 null,
-                                                                                                                                                 [
-                                                                                                                                                  null,
-                                                                                                                                                  {"M쪊ꯪ@;\u0011罙ꕅ<e᝺|爑Yⵝ<\/&ᩎ<腊ሑᮔ੃F豭": [
-                                                                                                                                                   "^0࡟1볏P폋ፏ杈F⨥Iꂴ\"z磣VⅡ=8퀝2]䢹h1\u0017{jT<I煛5%D셍S⑙⅏J*샐 巙ດ;᧡䙞",
-                                                                                                                                                   [{
-                                                                                                                                                    "'㶡큾鄧`跊\"gV[?u᭒Ʊ髷%葉굵a띦N켧Qﯳy%y䩟髒L䯜S䵳r絅肾킂ၐ'ꔦg긓a'@혔যW谁ᝬF栩ŷ+7w鞚": 6.3544416675584832E17,
-                                                                                                                                                    "苎脷v改hm쏵|㋊g_ᔐ 뒨蹨峟썎㷸|Ο刢?Gͨ옛-?GꦱIEYUX4?%ꘋᆊ㱺": -2.8418378709165287E-19,
-                                                                                                                                                    "誰?(H]N맘]k洳\"q蒧蘞!R퐫\\(Q$T5N堍⫣윿6|럦속︅ﭗ(": [
-                                                                                                                                                     "峩_\u0003A瘘?✓[硫䎯ၽuጭ\"@Y綅첞m榾=贮9R벿῜Z",
-                                                                                                                                                     null,
-                                                                                                                                                     "䰉㗹㷾Iaᝃqcp쓘὾൫Q|ﵓ<\/ḙ>)- Q䲌mo펹L_칍樖庫9꩝쪹ᘹ䑖瀍aK ?*趤f뭓廝p=磕",
-                                                                                                                                                     "哑z懅ᤏ-ꍹux쀭",
-                                                                                                                                                     [
-                                                                                                                                                      true,
-                                                                                                                                                      3998739591332339511,
-                                                                                                                                                      "ጻ㙙?᳸aK<\/囩U`B3袗ﱱ?\"/k鏔䍧2l@쿎VZ쨎/6ꃭ脥|B?31+on颼-ꮧ,O嫚m ࡭`KH葦:粘i]aSU쓙$쐂f+詛頖b",
-                                                                                                                                                      [{"^<9<箝&絡;%i﫡2攑紴\\켉h쓙-柂䚝ven\u20f7浯-Ꮏ\r^훁䓚헬\u000e?\\ㅡֺJ떷VOt": [{
-                                                                                                                                                       "-௄卶k㘆혐஽y⎱㢬sS઄+^瞥h;ᾷj;抭\u0003밫f<\/5Ⱗ裏_朻%*[-撵䷮彈-芈": {
-                                                                                                                                                        "㩩p3篊G|宮hz䑊o곥j^Co0": [
-                                                                                                                                                         653239109285256503,
-                                                                                                                                                         {"궲?|\":N1ۿ氃NZ#깩:쇡o8킗ࡊ[\"됸Po핇1(6鰏$膓}⽐*)渽J'DN<썙긘毦끲Ys칖": {
-                                                                                                                                                          "2Pr?Xjㆠ?搮/?㓦柖馃5뚣Nᦼ|铢r衴㩖\"甝湗ܝ憍": "\"뾯i띇筝牻$珲/4ka $匝휴译zbAᩁꇸ瑅&뵲衯ꎀᆿ7@ꈋ'ᶨH@ᠴl+",
-                                                                                                                                                          "7뢽뚐v?4^ꊥ_⪛.>pởr渲<\/⢕疻c\"g䇘vU剺dஔ鮥꒚(dv祴X⼹\\a8y5坆": true,
-                                                                                                                                                          "o뼄B욞羁hr﷔폘뒚⿛U5pꪴfg!6\\\"爑쏍䢱W<ﶕ\\텣珇oI/BK뺡'谑♟[Ut븷亮g(\"t⡎有?ꬊ躺翁艩nl F⤿蠜": 1695826030502619742,
-                                                                                                                                                          "ۊ깖>ࡹ햹^ⵕ쌾BnN〳2C䌕tʬ]찠?ݾ2饺蹳ぶꌭ訍\"◹ᬁD鯎4e滨T輀ﵣ੃3\u20f3킙D瘮g\\擦+泙ၧ 鬹ﯨַ肋7놷郟lP冝{ߒhড়r5,꓋": null,
-                                                                                                                                                          "ΉN$y{}2\\N﹯ⱙK'8ɜͣwt,．钟廣䎘ꆚk媄_": null,
-                                                                                                                                                          "䎥eᾆᝦ읉,Jުn岪㥐s搖謽䚔5t㯏㰳㱊ZhD䃭f絕s鋡篟a`Q鬃┦鸳n_靂(E4迠_觅뷝_宪D(NL疶hL追V熑%]v肫=惂!㇫5⬒\u001f喺4랪옑": {
-                                                                                                                                                           "2a輍85먙R㮧㚪Sm}E2yꆣꫨrRym㐱膶ᔨ\\t綾A☰.焄뙗9<쫷챻䒵셴᭛䮜.<\/慌꽒9叻Ok䰊Z㥪幸k": [
-                                                                                                                                                            null,
-                                                                                                                                                            true,
-                                                                                                                                                            {"쌞쐍": {
-                                                                                                                                                             "▟GL K2i뛱iＱ\"̠.옛1X$}涺]靎懠ڦ늷?tf灟ݞゟ{": 1.227740268699265E-19,
-                                                                                                                                                             "꒶]퓚%ฬK❅": [{
-                                                                                                                                                              "(ෛ@Ǯっ䧼䵤[aﾃൖvEnAdU렖뗈@볓yꈪ,mԴ|꟢캁(而첸죕CX4Y믅": "2⯩㳿ꢚ훀~迯?᪑\\啚;4X\u20c2襏B箹)俣eỻw䇄",
-                                                                                                                                                              "75༂f詳䅫ꐧ鏿 }3\u20b5'∓䝱虀f菼Iq鈆﨤g퍩)BFa왢d0뮪痮M鋡nw∵謊;ꝧf美箈ḋ*\u001c`퇚퐋䳫$!V#N㹲抗ⱉ珎(V嵟鬒_b㳅\u0019": null,
-                                                                                                                                                              "e_m@(i㜀3ꦗ䕯䭰Oc+-련0뭦⢹苿蟰ꂏSV䰭勢덥.ྈ爑Vd,ᕥ=퀍)vz뱊ꈊB_6듯\"?{㒲&㵞뵫疝돡믈%Qw限,?\r枮\"? N~癃ruࡗdn&": null,
-                                                                                                                                                              "㉹&'Pfs䑜공j<\/?|8oc᧨L7\\pXᭁ 9᪘": -2.423073789014103E18,
-                                                                                                                                                              "䝄瑄䢸穊f盈᥸,B뾧푗횵B1쟢f\u001f凄": "魖⚝2儉j꼂긾껢嗎0ࢇ纬xI4](੓`蕞;픬\fC\"斒\")2櫷I﹥迧",
-                                                                                                                                                              "ퟯ詔x悝령+T?Bg⥄섅kOeQ큼㻴*{E靼6氿L缋\u001c둌๶-㥂2==-츫I즃㠐Lg踞ꙂEG貨鞠\"\u0014d'.缗gI-lIb䋱ᎂDy缦?": null,
-                                                                                                                                                              "紝M㦁犿w浴詟棓쵫G:䜁?V2ힽ7N*n&㖊Nd-'ຊ?-樹DIv⊜)g䑜9뉂ㄹ푍阉~ꅐ쵃#R^\u000bB䌎䦾]p.䀳": [{"ϒ爛\"ꄱ︗竒G䃓-ま帳あ.j)qgu扐徣ਁZ鼗A9A鸦甈!k蔁喙:3T%&㠘+,䷞|챽v䚞문H<\/醯r셓㶾\\a볜卺zE䝷_죤ဵ뿰᎟CB": [
-                                                                                                                                                               6233512720017661219,
-                                                                                                                                                               null,
-                                                                                                                                                               -1638543730522713294,
-                                                                                                                                                               false,
-                                                                                                                                                               -8901187771615024724,
-                                                                                                                                                               [
-                                                                                                                                                                3891351109509829590,
-                                                                                                                                                                true,
-                                                                                                                                                                false,
-                                                                                                                                                                -1.03836679125188032E18,
-                                                                                                                                                                {
-                                                                                                                                                                 "<?起HCᷭ죎劐莇逰/{gs\u0014⽛㰾愫tￖ<솞ڢ됌煲膺਻9x닳x࡭Q訽,ᶭඦtt掾\"秧㺌d˪䙻꫗:ᭈh4緞痐䤴c뫚떩త<?ᕢ謚6]폛O鰐鋛镠贩赟\"<G♷1'": true,
-                                                                                                                                                                 "቙ht4ߝBqꦤ+\u0006멲趫灔)椾": -1100102890585798710,
-                                                                                                                                                                 "総兎곇뇸粟F醇;朠?厱楛㶆ⶏ7r⾛o꯬᳡F\\머幖 㜦\f[搦᥽㮣0䕊?J㊳뀄e㔔+?<n↴复": [
-                                                                                                                                                                  "4~ꉍ羁\\偮(泤叕빜\u0014>j랎:g曞ѕᘼ}链N",
-                                                                                                                                                                  -1.1103819473845426E-19,
-                                                                                                                                                                  true,
-                                                                                                                                                                  [
-                                                                                                                                                                   true,
-                                                                                                                                                                   null,
-                                                                                                                                                                   -7.9091791735309888E17,
-                                                                                                                                                                   true,
-                                                                                                                                                                   {"}蔰鋈+ꐨ啵0?g*사%`J?*": [{
-                                                                                                                                                                    "\"2wG?yn,癷BK\\龞䑞x?蠢": -3.7220345009853505E-19,
-                                                                                                                                                                    ";饹়❀)皋`噿焒j(3⿏w>偍5X<np?<줯<Y]捘!J೸UⳂNे7v௸㛃ᄧ톿䨷鯻v焇=烻TQ!F⦰䣣눿K鷚눁'⭲m捠(䚻": [
-                                                                                                                                                                     "蹕 淜੃b\"+몾ⴕ",
-                                                                                                                                                                     null,
-                                                                                                                                                                     35892237756161615,
-                                                                                                                                                                     {
-                                                                                                                                                                      " 듹㏝)5慁箱&$~:遰쮐<\/堋?% \\勽唅z손帋䘺H髀麡M퇖uz\u0012m諦d᳤콌樝\rX싹̡Ო": -433791617729505482,
-                                                                                                                                                                      "-j溗ࢵcz!:}✽5ഇ,욨ݏs#덫=南浺^}E\\Y\\T*뼈cd꺐cۘ뎁䨸됱K䠴㉿恿逳@wf쏢<\/[L[": -9.3228549642908109E17,
-                                                                                                                                                                      "Ms킭u஗%\\u⍎/家欲ἅ答㓽/꯳齳|㭘Pr\"v<\/禇䔆$GA䊻˔-:틊[h?倬荤ᾞ৳.Gw\u000b": [
-                                                                                                                                                                       "0宜塙I@䏴蝉\\Uy뒅=2<h暒K._贡璐Yi檻_⮵uᐝ㘗聠[f\u0015힢Hꔮ}጑;誏yf0\"\u20cc?(=q斠➽5ꎾ鞘kⲃ",
-                                                                                                                                                                       -2.9234211354411E-19,
-                                                                                                                                                                       false,
-                                                                                                                                                                       true,
-                                                                                                                                                                       {
-                                                                                                                                                                        "\u0011⟴GH_;#怵:\u001c\u0002n1U\\p/왔(┫]hꐚ7\r0䵷첗岷O௷?㝎[殇|J=?韷pᶟ儜犆?5კ1kꍖiH竧뛈ପdmk游y(콪팱꾍k慧 y辣": [
-                                                                                                                                                                         false,
-                                                                                                                                                                         "O\"끍p覈ykv磂㢠㝵~뀬튍lC&4솎䇃:Mj",
-                                                                                                                                                                         -7.009964654003924E-20,
-                                                                                                                                                                         false,
-                                                                                                                                                                         -49306078522414046,
-                                                                                                                                                                         null,
-                                                                                                                                                                         null,
-                                                                                                                                                                         2160432477732354319,
-                                                                                                                                                                         true,
-                                                                                                                                                                         "4횡h+!踹ꐬP鮄{0&뱥M?샍鞅n㮞ᨹ?쒆毪l'箅^ꚥ頛`e㻨52柳⮙嫪࡟딯a.~䵮1f吘N&zȭL榓ۃ鳠5d㟆M@㣥ӋA΍q0縶$",
-                                                                                                                                                                         -3.848996532974368E16,
-                                                                                                                                                                         true,
-                                                                                                                                                                         null,
-                                                                                                                                                                         -3.5240055580952525E18,
-                                                                                                                                                                         {
-                                                                                                                                                                          " vﭷၵ#ce乃5僞?Z D`묨粇ᐔ绠vWL譢u뽀\\J|tⓙt№\"ꨋnT凮ᒩ蝂篝b騩:䢭Hbv읻峨z㹚T趗햆귣학津XiＹ@ᖥK": true,
-                                                                                                                                                                          "!F 醌y䉸W2ꇬ\u0006/䒏7~%9擛햀徉9⛰+?㌘;ꠓX䇻Dfi뼧쒒\u0012F謞՝絺+臕kऍLSQ쌁X쎬幦HZ98蒊枳": "澤令#\u001d抍⛳@N搕퀂[5,✄ꘇ~䘷?\u0011Xꈺ[硸⠘⛯X醪聡x\u0007쌇MiX/|ﾐ뚁K8䁡W)銀q僞綂蔕E",
-                                                                                                                                                                          "6␲䣖R৞@ငg?<\/೴x陙Xꈺ崸⠅ᇾ\\0X,H쟴셭A稂ힿゝF\\쑞\u0012懦(Aᯕ灭~\u0001껮X?逊": 5.7566819207732864E17,
-                                                                                                                                                                          "[c?椓": false,
-                                                                                                                                                                          "k䒇": 2583824107104166717,
-                                                                                                                                                                          "꙯N훙㏅ﮒ燣㨊瞯咽jMxby뻭뵫װ[\"1畈?ৱL": "띣ᔂ魠羓犴ꚃ+|rY",
-                                                                                                                                                                          "녺Z?䬝鉉:?ⳙ瘏Cኯ.Vs[釿䨉쐧\\\\*쵢猒$\\y溔^,㑳": {"藶꺟": [{
-                                                                                                                                                                           "\"d훣N2zq]?'檿죸忷篇ﮟ擤m'9!죶≓p뭻\\ᇷ\f퇶_䰸h๐Q嵃訾㘑従ꯦ䞶jL틊r澵Omᾫ!H䱤팼/;|᭺I7슎YhuXi⚼": -1.352716906472438E-19,
-                                                                                                                                                                           "M⽇倻5J䂫औ᝔楸#J[Fﹱ쫮W誻bWz?}1\"9硪뻶fe": "盬:Ѹ砿획땣T凊(m灦呜ﻝR㿎艴䂵h",
-                                                                                                                                                                           "R띾k힪CH钙_i苮ⰵoᾨ紑퉎7h؉\"柀蝽z0့\"<?嘭$蜝?礲7岇槀묡?V钿T⣜v+솒灚ԛ2米mH?>薙婏聿3aFÆÝ": "2,ꓴg?_섦_>Y쪥션钺;=趘F~?D㨫\bX?㹤+>/믟kᠪ멅쬂Uzỵ]$珧`m雁瑊ඖ鯬cꙉ梢f묛bB",
-                                                                                                                                                                           "♽n$YjKiXX*GO贩鏃豮祴遞K醞眡}ꗨv嵎꼷0୸+M菋eH徸J꣆:⼐悥B켽迚㯃b諂\u000bjꠜ碱逮m8": [
-                                                                                                                                                                            "푷᣺ﻯd8ﱖ嬇ភH鹎⡱᱅0g:果6$GQ췎{vᷧYy-脕x偹砡館⮸C蓼ꏚ=軄H犠G谖ES詤Z蠂3l봟hￒ7䦹1GPQG癸숟~[#駥8zQ뛣J소obg,",
-                                                                                                                                                                            null,
-                                                                                                                                                                            1513751096373485652,
-                                                                                                                                                                            null,
-                                                                                                                                                                            -6.851466660824754E-19,
-                                                                                                                                                                            {"䩂-⴮2ٰK솖풄꾚ႻP앳1H鷛wmR䗂皎칄?醜<\/&ࠧ㬍X濬䵈K`vJ륒Q/IC묛!;$vϑ": {
-                                                                                                                                                                             "@-ꚗxྐྵ@m瘬\u0010U絨ﮌ驐\\켑寛넆T=tQ㭤L연@脸삯e-:⩼u㎳VQ㋱襗ຓ<Ⅶ䌸cML3+\u001e_C)r\\9+Jn\\Pﺔ8蠱檾萅Pq鐳话T䄐I": -1.80683891195530061E18,
-                                                                                                                                                                             "ᷭዻU~ཷsgSJ`᪅'%㖔n5픆桪砳峣3獮枾䌷⊰呀": {
-                                                                                                                                                                              "Ş੉䓰邟自~X耤pl7间懑徛s첦5ਕXexh⬖鎥᐀nNr(J컗｜ૃF\"Q겮葲놔엞^겄+㈆话〾희紐G'E?飕1f❼텬悚泬먐U睬훶Qs": false,
-                                                                                                                                                                              "(\u20dag8큽튣>^Y{뤋.袊䂓;_g]S\u202a꽬L;^'#땏bႌ?C緡<䝲䲝断ꏏ6\u001asD7IK5Wxo8\u0006p弊⼂ꯍ扵\u0003`뵂픋%ꄰ⫙됶l囏尛+䗅E쟇\\": [
-                                                                                                                                                                               true,
-                                                                                                                                                                               {
-                                                                                                                                                                                "\n鱿aK㝡␒㼙2촹f;`쾏qIࡔG}㝷䐍瓰w늮*粅9뒪ㄊCj倡翑閳R渚MiUO~仨䜶RꙀA僈㉋⦋n{㖥0딿벑逦⥻0h薓쯴Ꝼ": [
-                                                                                                                                                                                 5188716534221998369,
-                                                                                                                                                                                 2579413015347802508,
-                                                                                                                                                                                 9.010794400256652E-21,
-                                                                                                                                                                                 -6.5327297761238093E17,
-                                                                                                                                                                                 1.11635352494065523E18,
-                                                                                                                                                                                 -6656281618760253655,
-                                                                                                                                                                                 {
-                                                                                                                                                                                  "": ")?",
-                                                                                                                                                                                  "TWKLꑙ裑꺔UE俸塑炌Ũ᜕-o\"徚#": {"M/癟6!oI51ni퐚=댡>xꍨ\u0004 ?": {
-                                                                                                                                                                                   "皭": {"⢫䋖>u%w잼<䕏꘍P䋵$魋拝U䮎緧皇Y훂&|羋ꋕ잿cJ䨈跓齳5\u001a삱籷I꿾뤔S8㌷繖_Yឯ䲱B턼O歵F\\l醴o_欬6籏=D": [
-                                                                                                                                                                                    false,
-                                                                                                                                                                                    true,
-                                                                                                                                                                                    {"Mt|ꏞD|F궣MQ뵕T,띺k+?㍵i": [
-                                                                                                                                                                                     7828094884540988137,
-                                                                                                                                                                                     false,
-                                                                                                                                                                                     {
-                                                                                                                                                                                      "!༦鯠,&aﳑ>[euJꏽ綷搐B.h": -7648546591767075632,
-                                                                                                                                                                                      "-n켧嘰{7挐毄Y,>❏螵煫乌pv醑Q嶚!|⌝責0왾덢ꏅ蛨S\\)竰'舓Q}A釡5#v": 3344849660672723988,
-                                                                                                                                                                                      "8閪麁V=鈢1녈幬6棉⪮둌\u207d᚛驉ꛃ'r䆉惏ै|bἧﺢᒙ<=穊强s혧eꮿ慩⌡ \\槳W븧J檀C,ᘉ의0俯퀉M;筷ࣴ瓿{늊埂鄧_4揸Nn阼Jੵ˥(社": true,
-                                                                                                                                                                                      "o뼀vw)4A뢵(a䵢)p姃뛸\u000fK#KiQp\u0005ꅍ芅쏅": null,
-                                                                                                                                                                                      "砥$ꥸ┇耽u斮Gc{z빔깎밇\\숰\u001e괷各㶇쵿_ᴄ+h穢p촀Ნ䃬z䝁酳ӂ31xꔄ1_砚W렘G#2葊P ": [
-                                                                                                                                                                                       -3709692921720865059,
-                                                                                                                                                                                       null,
-                                                                                                                                                                                       [
-                                                                                                                                                                                        6669892810652602379,
-                                                                                                                                                                                        -135535375466621127,
-                                                                                                                                                                                        "뎴iO}Z? 馢녱稹ᄾ䐩rSt帤넆&7i騏멗畖9誧鄜'w{Ͻ^2窭외b㑎粖i矪ꦨ탪跣)KEㆹ\u0015V8[W?⽉>'kc$䨘ᮛ뉻٬M5",
-                                                                                                                                                                                        1.10439588726055846E18,
-                                                                                                                                                                                        false,
-                                                                                                                                                                                        -4349729830749729097,
-                                                                                                                                                                                        null,
-                                                                                                                                                                                        [
-                                                                                                                                                                                         false,
-                                                                                                                                                                                         "_蠢㠝^䟪/D녒㡋ỎC䒈판\u0006એq@O펢%;鹐쏌o戥~A[ꡉ濽ỳ&虃᩾荣唙藍茨Ig楡꒻M窓冉?",
-                                                                                                                                                                                         true,
-                                                                                                                                                                                         2.17220752996421728E17,
-                                                                                                                                                                                         -5079714907315156164,
-                                                                                                                                                                                         -9.960375974658589E-20,
-                                                                                                                                                                                         "ᾎ戞༒",
-                                                                                                                                                                                         true,
-                                                                                                                                                                                         false,
-                                                                                                                                                                                         [[
-                                                                                                                                                                                          "ⶉᖌX⧕홇)g엃⹪x뚐癟\u0002",
-                                                                                                                                                                                          -5185853871623955469,
-                                                                                                                                                                                          {
-                                                                                                                                                                                           "L㜤9ợㇶK鐰⋓V뽋˖!斫as|9＂፬䆪?7胜&n薑~": -2.11545634977136992E17,
-                                                                                                                                                                                           "O8뀩D}캖q萂6༣㏗䈓煮吽ਆᎼDᣘ폛;": false,
-                                                                                                                                                                                           "YTᡅ^L㗎cbY$pᣞ縿#fh!ꘂb삵玊颟샞ဢ$䁗鼒몁~rkH^:닮먖츸륈⪺쒉砉?㙓扫㆕꣒`R䢱B酂?C뇞<5Iޚ讳騕S瞦z": null,
-                                                                                                                                                                                           "\\RB?`mG댵鉡幐物䵎有5*e骄T㌓ᛪ琾駒Ku\u001a[柆jUq8⋈5鿋츿myﻗ?雍ux঴?": 5828963951918205428,
-                                                                                                                                                                                           "n0晅:黯 xu씪^퓞cB㎊ᬍ⺘٤փ~B岚3㥕擄vᲂ~F?C䶖@$m~忔S왖㲚?챴⊟W#벌{'㰝I䝠縁s樘\\X뢻9핡I6菍ㄛ8쯶]wॽ0L\"q": null,
-                                                                                                                                                                                           "x增줖j⦦t䏢᎙㛿Yf鼘~꫓恄4惊\u209c": "oOhbᤃ᛽z&Bi犑\\3B㩬劇䄑oŁ쨅孥멁ຖacA㖫借㞝vg싰샂㐜#譞⢤@k]鋰嘘䜾L熶塥_<\/⍾屈ﮊ_mY菹t뙺}Ox=w鮮4S1ꐩמּ'巑",
-                                                                                                                                                                                           "㗓蟵ꂾe蠅匳(JP䗏෸\u0089耀왲": [{
-                                                                                                                                                                                            "ᤃ㵥韎뤽\r?挥O쯡⇔㞚3伖\u0005P⋪\"D궣QLn(⚘罩䩢Ŏv䤘尗뼤됛O淽鋋闚r崩a{4箙{煷m6〈": {
-                                                                                                                                                                                             "l곺1L": {
-                                                                                                                                                                                              "T'ਤ?砅|੬Km]䄩\"(࿶<\/6U爢䫈倔郴l2㴱^줣k'L浖L鰄Rp今鎗⒗C얨M훁㡧ΘX粜뫈N꤇輊㌻켑#㮮샶-䍗룲蠝癜㱐V>=\\I尬癤t=": 7648082845323511446,
-                                                                                                                                                                                              "鋞EP:<\/_`ၧe混ㇹBd⯢㮂驋\\q碽饩跓྿ᴜ+j箿렏㗑yK毢宸p謹h䦹乕U媣\\炤": [[
-                                                                                                                                                                                               "3",
-                                                                                                                                                                                               [
-                                                                                                                                                                                                true,
-                                                                                                                                                                                                3.4058271399411134E-20,
-                                                                                                                                                                                                true,
-                                                                                                                                                                                                "揀+憱f逮@먻BpW曉\u001a㣐⎊$n劈D枤㡞좾\u001aᛁ苔౩闝1B䷒Ṋ݋➐ꀞꐃ磍$t੤_:蘺⮼(#N",
-                                                                                                                                                                                                697483894874368636,
-                                                                                                                                                                                                [
-                                                                                                                                                                                                 "vᘯ锴)0訶}䳅⩚0O壱韈ߜ\u0018*U鍾䏖=䧉뽑单휻ID쿇嘗?ꌸῬ07",
-                                                                                                                                                                                                 -5.4858784319382006E18,
-                                                                                                                                                                                                 7.5467775182251151E18,
-                                                                                                                                                                                                 -8911128589670029195,
-                                                                                                                                                                                                 -7531052386005780140,
-                                                                                                                                                                                                 null,
-                                                                                                                                                                                                 [
-                                                                                                                                                                                                  null,
-                                                                                                                                                                                                  true,
-                                                                                                                                                                                                  [[{
-                                                                                                                                                                                                   "1欯twG<u䝮␽ꇣ_ჟﱴଶ-쪋\"?홺k:莝Ꜫ*⺵꽹댅釔좵}P?=9렿46b\u001c\\S?(筈僦⇶爷谰1ྷa": true,
-                                                                                                                                                                                                   "TҫJYxڪ\\鰔℮혡)m_WVi眪1[71><\/Q:0怯押殃탷聫사<ỗꕧ蚨䡁nDꌕ\u001c녬~蓩<N蹑\"{䫥lKc혁뫖앺:vⵑ": "g槵?",
-                                                                                                                                                                                                   "aꨩ뻃싥렌1`롗}Yg>鲃g儊>ꏡl㻿/⑷*챳6㻜W毤緛ﹺᨪ4\u0013뺚J髬e3쳸䘦伧?恪&{L掾p+꬜M䏊d娘6": {
-                                                                                                                                                                                                    "2p첼양棜h䜢﮶aQ*c扦v︥뮓kC寵횂S銩&ǝ{O*य़iH`U큅ࡓr䩕5ꄸ?`\\᧫?ᮼ?t〟崾훈k薐ì/ｉy꤃뵰z1<\/AQ#뿩8jJ1z@u䕥": 1.82135747285215155E18,
-                                                                                                                                                                                                    "ZdN &=d년ᅆ'쑏ⅉ:烋5&៏ᄂ汎来L㯄固{钧u\\㊏튚e摑&t嗄ꖄUb❌?m䴘熚9EW": [{
-                                                                                                                                                                                                     "ଛ{i*a(": -8.0314147546006822E17,
-                                                                                                                                                                                                     "⫾ꃆY\u000e+W`௸ \"M뒶+\\뷐lKE}(NT킶Yj選篒쁶'jNQ硾(똡\\\"逌ⴍy? IRꜘ὞鄬﨧:M\\f⠋Cꚜ쫊ᚴNV^D䕗ㅖἔIao꿬C⍏8": [
-                                                                                                                                                                                                      287156137829026547,
-                                                                                                                                                                                                      {
-                                                                                                                                                                                                       "H丞N逕<rO䎗:텕<\/䶩샌Sd%^ᵯ눐엑者g䖩똭蕮1U驣?Pⰰ\u001fp(W]67\u0015﫣6굺OR羸#촐F蒈;嘙i✵@_撶y㤏⤍(:᧗뼢༌朆@⏰㤨ꭲ?-n>⯲": {"": {
-                                                                                                                                                                                                        "7-;枮阕梒9ᑄZ": [[[[
-                                                                                                                                                                                                         null,
-                                                                                                                                                                                                         {
-                                                                                                                                                                                                          "": [[[[
-                                                                                                                                                                                                           -7.365909561486078E-19,
-                                                                                                                                                                                                           2948694324944243408,
-                                                                                                                                                                                                           null,
-                                                                                                                                                                                                           [
-                                                                                                                                                                                                            true,
-                                                                                                                                                                                                            "荒\"并孷䂡쵼9o䀘F\u0002龬7⮹Wz%厖/*? a*R枈㌦됾g뒠䤈q딄㺿$쮸tᶎ릑弣^鏎<\/Y鷇驜L鿽<\/춋9Mᲆឨ^<\/庲3'l낢",
-                                                                                                                                                                                                            "c鮦\u001b두\\~?眾ಢu݆綑෪蘛轋◜gȃ<\/ⴃcpkDt誩܅\"Y",
-                                                                                                                                                                                                            [[
-                                                                                                                                                                                                             null,
-                                                                                                                                                                                                             null,
-                                                                                                                                                                                                             [
-                                                                                                                                                                                                              3113744396744005402,
-                                                                                                                                                                                                              true,
-                                                                                                                                                                                                              "v(y",
-                                                                                                                                                                                                              {
-                                                                                                                                                                                                               "AQ幆h쾜O+꺷铀ꛉ練A蚗⼺螔j㌍3꽂楎䥯뎸먩?": null,
-                                                                                                                                                                                                               "蠗渗iz鱖w]擪E": 1.2927828494783804E-17,
-                                                                                                                                                                                                               "튷|䀭n*曎b✿~杤U]Gz鄭kW|㴚#㟗ഠ8u擨": [[
-                                                                                                                                                                                                                true,
-                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                {"⾪壯톽g7?㥜ώQꑐ㦀恃㧽伓\\*᧰閖樧뢇赸N휶䎈pI氇镊maᬠ탷#X?A+kНM ༑᩟؝?5꧎鰜ṚY즫궔 =ঈ;ﳈ?*s|켦蜌wM笙莔": [
-                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                 -3808207793125626469,
-                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                  -469910450345251234,
-                                                                                                                                                                                                                  7852761921290328872,
-                                                                                                                                                                                                                  -2.7979740127017492E18,
-                                                                                                                                                                                                                  1.4458504352519893E-20,
-                                                                                                                                                                                                                  true,
-                                                                                                                                                                                                                  "㽙깹?먏䆢:䴎ۻg殠JBTU⇞}ꄹꗣi#I뵣鉍r혯~脀쏃#釯:场:䔁>䰮o'㼽HZ擓௧nd",
-                                                                                                                                                                                                                  [
-                                                                                                                                                                                                                   974441101787238751,
-                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                   -2.1647718292441327E-19,
-                                                                                                                                                                                                                   1.03602824249831488E18,
-                                                                                                                                                                                                                   [
-                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                    1.0311977941822604E-17,
-                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                    true,
-                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                     "": -3.7019778830816707E18,
-                                                                                                                                                                                                                     "E峾恆茍6xLIm縂0n2视֯J-ᤜz+ᨣ跐mYD豍繹⹺䊓몓ﴀE(@詮(!Y膽#᎙2䟓섣A䈀㟎,囪QbK插wcG湎ꤧtG엝x⥏俎j'A一ᯥ뛙6ㅑ鬀": 8999803005418087004,
-                                                                                                                                                                                                                     "よ殳\\zD⧅%Y泥簳Uꈩ*wRL{3#3FYHା[d岀䉯T稉駅䞘礄P:闈W怏ElB㤍喬赔bG䠼U଄Nw鰯闀楈ePsDꥷ꭬⊊": [
-                                                                                                                                                                                                                      6.77723657904486E-20,
-                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                       "ཚ_뷎꾑蹝q'㾱ꂓ钚蘞慵렜떆`ⴹ⎼櫯]J?[t9Ⓢ !컶躔I᮸uz>3a㠕i,錃L$氰텰@7녫W㸮?羧W뇧ꃞ,N鋮숪2ɼ콏┍䁲6",
-                                                                                                                                                                                                                       "&y?뢶=킕올Za惻HZk>c\u20b58i?ꦶcfBv잉ET9j䡡",
-                                                                                                                                                                                                                       "im珊Ճb칧<D-諂*u2ꡜ췛~䬢(텸ﵦ>校\\뼾쯀",
-                                                                                                                                                                                                                       9.555715121193197E-20,
-                                                                                                                                                                                                                       true,
-                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                        "<㫚v6腓㨭e1㕔&&V∌ᗈT奄5Lጥ>탤?튣瑦㳆ꉰ!(ᙪ㿬擇_n쌯IMΉ㕨␰櫈ᱷ5풔蟹&L.첽e鰷쯃劼﫭b#ﭶ퓀7뷄Wr㢈๧Tʴશ㶑澕鍍%": -1810142373373748101,
-                                                                                                                                                                                                                        "fg晌o?߲ꗄ;>C>?=鑰監侯Kt굅": true,
-                                                                                                                                                                                                                        "䫡蓺ꑷ]C蒹㦘\"1ః@呫\u0014NL䏾eg呮፳,r$裢k>/\\<z": [[
-                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                         "C䡏>?ㄤᇰﻛ쉕1஥'Ċ\" \\_?쨔\"ʾr: 9S䘏禺ᪧꄂ㲄",
-                                                                                                                                                                                                                         [[{
-                                                                                                                                                                                                                          "*硙^+E쌺I1䀖ju?:⦈Ꞓl๴竣迃xKC/饉:\fl\"XTFﾨ蟭,芢<\/骡軺띜hꏘ\u001f銿<棔햳▨(궆*=乥b8\\媦䷀뫝}닶ꇭ(Kej䤑M": [{
-                                                                                                                                                                                                                           "1Ꮼ?>옿I╅C<ގ?ꊌ冉SV5A㢊㶆z-๎玶绢2F뵨@㉌뀌o嶔f9-庒茪珓뷳4": null,
-                                                                                                                                                                                                                           ";lᰳ": "CbB+肻a䄷苝*/볳+/4fq=㰁h6瘉샴4铢Y骐.⌖@哼猎㦞+'gꋸ㒕ߤ㞑(䶒跲ti⑴a硂#No볔",
-                                                                                                                                                                                                                           "t?/jE幸YHT셵⩎K!Eq糦ꗣv刴w\"l$ο:=6:移": {
-                                                                                                                                                                                                                            "z]鑪醊嫗J-Xm銌翁絨c里됏炙Ep㣋鏣똼嚌䀓GP﹖cmf4鹭T䅿꣭姧␸wy6ꦶ;S&(}ᎧKxᾂQ|t뻳k\"d6\"|Ml췆hwLt꼼4$&8Պ褵婶鯀9": {"嵃닢ᒯ'd᧫䳳#NXe3-붋鸿ଢ떓%dK\u0013䲎ꖍYV.裸R⍉rR3蟛\\:젯:南ĺLʆ넕>|텩鴷矔ꋅⒹ{t孶㓑4_": [
-                                                                                                                                                                                                                             true,
-                                                                                                                                                                                                                             null,
-                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                              false,
-                                                                                                                                                                                                                              "l怨콈lᏒ",
-                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                               "0w䲏嬧-:`䉅쉇漧\\܂yㄨb%㽄j7ᦶ涶<": 3.7899452730383747E-19,
-                                                                                                                                                                                                                               "ꯛTẀq纤q嶏V⿣?\"g}ი艹(쥯B T騠I=仵및X": {"KX6颠+&ᅃ^f畒y[": {
-                                                                                                                                                                                                                                "H?뱜^?꤂-⦲1a㋞&ꍃ精Ii᤾챪咽쬘唂쫷<땡劈훫놡o㥂\\ KⴙD秼F氮[{'좴:례晰Iq+I쭥_T綺砸GO煝䟪ᚪ`↹l羉q쐼D꽁ᜅ훦: vUV": true,
-                                                                                                                                                                                                                                "u^yﳍ0㱓#[y뜌앸ꊬL㷩?蕶蘾⻍KӼ": -7931695755102841701,
-                                                                                                                                                                                                                                "䤬轉車>\u001c鴵惋\"$쯃྆⇻n뽀G氠S坪]ಲꨍ捇Qxኻ椕駔\\9ࣼ﫻읜磡煮뺪ᶚ볝l㕆t+sζ": [[[
-                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                  3363739578828074923,
-                                                                                                                                                                                                                                  true,
-                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                   "\"鸣詩 볰㑵gL㯦῅춝旫}ED辗ﮈI쀤-ꧤ|㠦Z\"娑ᕸ4爏騍㣐\"]쳝Af]茛⬻싦o蚁k䢯䩐菽3廇喑ޅ": 4.5017999150704666E17,
-                                                                                                                                                                                                                                   "TYႇ7ʠ值4챳唤~Zo&ݛ": false,
-                                                                                                                                                                                                                                   "`塄J袛㭆끺㳀N㺣`꽐嶥KﯝSVᶔ∲퀠獾N딂X\"ᤏhNﬨvI": {"\u20bb㭘I䖵䰼?sw䂷쇪](泒f\"~;꼪Fԝsᝦ": {"p,'ꉂ軿=A蚶?bƉ㏵䅰諬'LYKL6B깯⋩겦뎙(ᜭ\u0006噣d꾆㗼Z;䄝䚔cd<情@䞂3苼㸲U{)<6&ꩻ钛\u001au〷N숨囖愙j=BXW욕^x芜堏Ῑ爂뛷꒻t✘Q\b": [[
-                                                                                                                                                                                                                                    "籛&ଃ䩹.ꃩ㦔\\C颫#暪&!勹ꇶ놽攺J堬镙~軌C'꾖䣹㮅岃ᙴ鵣",
-                                                                                                                                                                                                                                    4.317829988264744E15,
-                                                                                                                                                                                                                                    6.013585322002147E-20,
-                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                    true,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    -3.084633632357326E-20,
-                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                                     "\"짫愔昻  X\"藣j\"\"먁ཅѻ㘤㬯0晲DU꟒㸃d벀윒l䦾c੻*3": null,
-                                                                                                                                                                                                                                     "谈Wm陧阦咟ฯ歖擓N喴㋐銭rCCnVࢥ^♼Ⅾ젲씗刊S༝+_t赔\\b䚍뉨ꬫ6펛cL䊘᜼<\/澤pF懽&H": [
-                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                       "W\"HDUuΌ퀟M'P4࿰H똆ⰱﮯ<\/凐蘲\"C鴫ﭒж}ꭩ쥾t5yd诪ﮡ퍉ⴰ@?氐醳rj4I6Qt": 6.9090159359219891E17,
-                                                                                                                                                                                                                                       "絛ﳛ⺂": {"諰P㗮聦`ZQ?ꫦh*റcb⧱}埌茥h{棩렛툽o3钛5鮁l7Q榛6_g)ὄ\u0013kj뤬^爖eO4Ⱈ槞鉨ͺ订%qX0T썗嫷$?\\\"봅늆'%": [
-                                                                                                                                                                                                                                        -2.348150870600346E-19,
-                                                                                                                                                                                                                                        [[
-                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                         -6619392047819511778,
-                                                                                                                                                                                                                                         false,
-                                                                                                                                                                                                                                         [[
-                                                                                                                                                                                                                                          -1.2929189982356161E-20,
-                                                                                                                                                                                                                                          1.7417192219309838E-19,
-                                                                                                                                                                                                                                          {"?嵲2࿐2\u0001啑㷳c縯": [
-                                                                                                                                                                                                                                           null,
-                                                                                                                                                                                                                                           [
-                                                                                                                                                                                                                                            false,
-                                                                                                                                                                                                                                            true,
-                                                                                                                                                                                                                                            2578060295690793218,
-                                                                                                                                                                                                                                            {
-                                                                                                                                                                                                                                             "?\"殃呎#㑑F": true,
-                                                                                                                                                                                                                                             "}F炊_殛oU헢兔Ꝉ,赭9703.B数gTz3⏬": {
-                                                                                                                                                                                                                                              "5&t3,햓Mݸᵣ㴵;꣫䩍↳#@뫷䠅+W-ࣇzᓃ鿕ಔ梭?T䮑ꥬ旴]u뫵막bB讍:왳둛lEh=숾鱠p咐$짏#?g⹷ᗊv㷵.斈u頻\u0018-G.": "뽙m-ouࣤ஫牷\"`Ksꕞ筼3HlȨvC堈\"I]㖡玎r먞#'W賜鴇k'c룼髋䆿飉㗆xg巤9;芔cጐ/ax䊨♢큓r吓㸫೼䢗da᩾\"]屣`",
-                                                                                                                                                                                                                                              ":M딪<䢥喠\u0013㖅x9蕐㑂XO]ｆ*Q呰瞊吭VP@9,㨣 D\\穎vˤƩs㜂-曱唅L걬/롬j㈹EB8g<\/섩o渀\"u0y&룣": ">氍緩L/䕑돯Ꟙ蕞^aB뒣+0jK⪄瑨痜LXK^힦1qK{淚t츔X:Vm{2r獁B뾄H첚7氥?쉟䨗ꠂv팳圎踁齀\\",
-                                                                                                                                                                                                                                              "D彤5㢷Gꪻ[lㄆ@὜⓰絳[ଃ獽쮹☒[*0ꑚ㜳": 9022717159376231865,
-                                                                                                                                                                                                                                              "ҖaV銣tW+$魿\u20c3亜~뫡ᙰ禿쨽㏡fṼzE/h": "5臐㋇Ჯ쮺? 昨탰Wﾑ밎#'\"崲钅U?幫뺀⍾@4kh>騧\\0ҾEV=爐͌U捀%ꉼ 㮋<{j]{R>:gԩL\u001c瀈锌ﯲﳡꚒ'⫿E4暍㌗뵉X\"H᝜",
-                                                                                                                                                                                                                                              "ᱚגּ;s醒}犍SἿ㦣&{T$jkB\\\tḮ앾䤹o<避(tW": "vb⯽䴪䮢@|)",
-                                                                                                                                                                                                                                              "⥒퐁껉%惀뗌+녣迺顀q條g⚯i⤭룐M琹j̈́⽜A": -8385214638503106917,
-                                                                                                                                                                                                                                              "逨ꊶZ<\/W⫟솪㎮ᘇb?ꠔi\"H㧺x෷韒Xꫨฟ|]窽\u001a熑}Agn?Mᶖa<rఄ4Ů䢤슲Axģe곖㴤x竾郍B謉鸵k薽M)\"芣眜`菉ꉛ䴺": "鹏^ె캫?3耲]|Ü1䡒㝮]8e?䶍^",
-                                                                                                                                                                                                                                              "뿸樅#P㡊1M룮Uꪭ绢ꑮZ9꽸": {"\nJ^є|3袄ㅐ7⨆銦y睝⋷仴ct?[,<\/ㅬ`?갔髞%揁A೚C": {
-                                                                                                                                                                                                                                               " 䇞3갫䅪": [{
-                                                                                                                                                                                                                                                "0|⩁㑂砕ㅻ": null,
-                                                                                                                                                                                                                                                "D箳᠉`|=⼭)\"*࣊㦏LjO誋": "",
-                                                                                                                                                                                                                                                "ࠚDZmꗥ}ᷴ╈r7헴ȥ4Kp5a)o}鎘门L搰䆓'✎k俎c#T68ӏ⩶6L鎴<r൦$黊BQY㼳\\跿F慮⡨拵贀!甶V喅/": null,
-                                                                                                                                                                                                                                                "ⵣq⳹ﻨLk]晩1*y\\$%}䖶P煑㇆䈦E嫁櫕Y࣓嫨䓏OL낮梚㸇洛洚BYtgl∛S☕䉓宑⋢粚ꔯ꠼붠": ")ꬑ윤`\"Ⱓ<\/婽*Y䔸ᓰ_ﳍt슲坩隥&S糧䛮闵诌豐sh쯽邴*섴؏͎=㯨\"RVힳ,^t\"ac?䤒ꉀxHa=Uꛕ㐙TkF껾",
-                                                                                                                                                                                                                                                "弾cUAF?暤c덽.欀nK앭]r傊䀓ﯳ馽垃[䥛oI0N砊鈥헅Co쟋钄ㅷ㊌뷚7": [
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 "૓鏨?^䆏{\u0006`X䧵儱&롡尙砡\u0006뻝쑬sj▻XfᬶgcㄢV >9韲4$3Ỵ^=쏍煤ፐ돷2䣃%鷠/eQ9頸쥎",
-                                                                                                                                                                                                                                                 2398360204813891033,
-                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                 3.2658897259932633E-19,
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 "?ꚃ8Nn㞷幵d䲳䱲뀙ꪛQ瑓鎴]䩋-鰾捡䳡??掊",
-                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                 -1309779089385483661,
-                                                                                                                                                                                                                                                 "ᦲxu_/yecR.6芏.ᜇ過 ~",
-                                                                                                                                                                                                                                                 -5658779764160586501,
-                                                                                                                                                                                                                                                 "쒌:曠=l썜䢜wk#s蕚\"互㮉m䉤~0듐䋙#G;h숄옥顇෤勹(C7㢅雚㐯L⠅VV簅<",
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 -4.664877097240962E18,
-                                                                                                                                                                                                                                                 -4.1931322262828017E18,
-                                                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                                                  ",": {
-                                                                                                                                                                                                                                                   "v㮟麑䄠뤵g{M띮.\u001bzt뢜뵡0Ǥ龍떟Ᾰ怷ϓRT@Lꀌ樂U㏠⾕e扉|bJg(뵒㠶唺~ꂿ(땉x⻫싉쁊;%0鎻V(o\f,N鏊%nk郼螺": -1.73631993428376141E18,
-                                                                                                                                                                                                                                                   "쟧摑繮Q@Rᕾ㭚㾣4隅待㓎3蒟": [
-                                                                                                                                                                                                                                                    4971487283312058201,
-                                                                                                                                                                                                                                                    8973067552274458613,
-                                                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                                                     "`a揙ᣗ\u0015i<S幼訃锭B0&槩✨[Wp皩[g≊k葾x2ᡆ橲䲢W": true,
-                                                                                                                                                                                                                                                     "kH皈Sꁱq傑u?솹풑~o^F=劣N*reJ沤wW苯7p㼹䎐a=ꮧL㷩냴nWꌑ㞱uu谁lVN珿᤻(e豶5#L쪉ᅄ઄\u0015숟봊P瀚X蓎": false,
-                                                                                                                                                                                                                                                     "䫯דּ〖Sc䛭점L뵾pCꙞ\"엇즓_ﰛ톣ꫀ먩㺣㮠⭴!\\W┏t䖰軅y\u0014~ᇰ렢E7*俜䥪W䀩䷐h봆vjஉ묣༏G39.뼳輼:㮿ᐦA饕TUL}~": [
-                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                      8.8648298810470003E17,
-                                                                                                                                                                                                                                                      5.735561205600924E-20,
-                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                      -102555823658171644,
-                                                                                                                                                                                                                                                      1.2674932032973067E-19,
-                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                       "D胣O㯨\u0017Ku눓㒏텁nᨊ!Ꚇ廫_>Bo¸": 4.3236479112537999E18,
-                                                                                                                                                                                                                                                       "HW&퉡ぁ圍<W)6悰ꠑHEp14xy峑ft\u0005s亘V튉䢮ꦈX嵐꬝?lI_덝춇-6Ss噺Nk-ﮥ큃܁郪*PR(S6╋@仙V懸뺵ﯜV粹": "9䗌斀4㐈^Qs隄硏j\u0003",
-                                                                                                                                                                                                                                                       "Vk鶅C泹筁HX훉朗*r\\z顊誌儖4?n7᏾6몋䎡ﳈ],H頢p蚐㑄P4满E䏩V䬕ญL廂쒬쑨ꆷh迡ꍰ譖墎 ]鹿ฌ7ﶽ冭༽<ꈓS\\l䋮?_ﾕ檒?": -8598528325153980065,
-                                                                                                                                                                                                                                                       "t=q퍣疻тZ\\錅J.镎|nfḷ鴒1厰L灯纜E]୦⥪]Ꮾ'羝p/咩0닳ﳁqﳖཽk ?X1Ft%ś뭢v鋋⺃爵⒗": [[
-                                                                                                                                                                                                                                                        5.0824756359232045E-19,
-                                                                                                                                                                                                                                                        [
-                                                                                                                                                                                                                                                         7.268480839079619E-19,
-                                                                                                                                                                                                                                                         {"탿^굞⧕iј덊ꀛw껩6ꟳXs酚\\>Y?瑡Qy훍q!帰敏s舠㫸zꚗaS歲v`G株巷Jp6킼 (귶鍔⾏⡈>M汐㞍ቴ꙲dv@i㳓ᇆ?黍": [
-                                                                                                                                                                                                                                                          null,
-                                                                                                                                                                                                                                                          4997607199327183467,
-                                                                                                                                                                                                                                                          "E㻎蠫ᐾ高䙟蘬洼旾﫠텛㇛?'M$㣒蔸=A_亀绉앭rN帮",
-                                                                                                                                                                                                                                                          null,
-                                                                                                                                                                                                                                                          [{
-                                                                                                                                                                                                                                                           "Eᑞ)8<Z㡿W镀䛒C생V?0ꯦ+tL)`齳AjB姀XೳD빠㻲ƙgn9⑰ྍ῜&\"㚹>餧A5u&㗾q?": [
-                                                                                                                                                                                                                                                            -1.969987519306507E-19,
-                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                            [
-                                                                                                                                                                                                                                                             3.42437673373841E-20,
-                                                                                                                                                                                                                                                             true,
-                                                                                                                                                                                                                                                             "e걷M墁\"割P␛퍧厀R䱜3ﻴO퓫r﹉⹊",
-                                                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                                                              -8164221302779285367,
-                                                                                                                                                                                                                                                              [
-                                                                                                                                                                                                                                                               true,
-                                                                                                                                                                                                                                                               null,
-                                                                                                                                                                                                                                                               "爘y^-?蘞Ⲽꪓa␅ꍨ}I",
-                                                                                                                                                                                                                                                               1.4645984996724427E-19,
-                                                                                                                                                                                                                                                               [{
-                                                                                                                                                                                                                                                                "tY좗⧑mrzﺝ㿥ⴖ᥷j諅\u0000q賋譁Ꞅ⮱S\nࡣB/큃굪3Zɑ复o<\/;롋": null,
-                                                                                                                                                                                                                                                                "彟h浠_|V4䦭Dᙣ♞u쿻=삮㍦\u001e哀鬌": [{"6횣楠,qʎꗇ鎆빙]㱭R굋鈌%栲j分僅ペ䇰w폦p蛃N溈ꡐꏀ?@(GI뉬$ﮄ9誁ꓚ2e甸ڋ[䁺,\u0011\u001cࢃ=\\+衪䷨ᯕ鬸K": [[
-                                                                                                                                                                                                                                                                 "ㅩ拏鈩勥\u000etgWVXs陂規p狵w퓼{뮵_i\u0002ퟑႢ⬐d6鋫F~챿搟\u0096䚼1ۼ칥0꣯儏=鋷牋ⅈꍞ龐",
-                                                                                                                                                                                                                                                                 -7283717290969427831,
-                                                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                                                                  4911644391234541055,
-                                                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                                                   "I鈒첽P릜朸W徨觘-Hᎄ퐟⓺>8kr1{겵䍃〛ᬡ̨O귑o䝕'쿡鉕p5": "fv粖RN瞖蛐a?q꤄\u001d⸥}'ꣴ犿ꦼ?뤋?鵆쥴덋䡫s矷̄?ඣ/;괱絢oWfV<\/\u202cC,㖦0䑾%n賹g&T;|lj_欂N4w",
-                                                                                                                                                                                                                                                                   "짨䠗;䌕u i+r๏0": [{"9䥁\\఩8\"馇z䇔<\/ႡY3e狚쐡\"ุ6ﰆZ遖c\"Ll:ꮾ疣<\/᭙Ｏ◌납୕湞9⡳Und㫜\u0018^4pj1;䧐儂䗷ୗ>@e톬": {
-                                                                                                                                                                                                                                                                    "a⑂F鋻Q螰'<퇽Q贝瀧{ᘪ,cP&~䮃Z?gＩ彃": [
-                                                                                                                                                                                                                                                                     -1.69158726118025933E18,
-                                                                                                                                                                                                                                                                     [
-                                                                                                                                                                                                                                                                      "궂z簽㔛㮨瘥⤜䛖Gℤ逆Y⪾j08Sn昞ꘔ캻禀鴚P謦b{ꓮmN靐Mᥙ5\"睏2냑I\u0011.L&=?6ᄠ뻷X鸌t刑\"#z)o꫚n쳟줋",
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      7517598198523963704,
-                                                                                                                                                                                                                                                                      "ኑQp襟`uᩄr方]*F48ꔵn俺ሙ9뇒",
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      6645782462773449868,
-                                                                                                                                                                                                                                                                      1219168146640438184,
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                                       ")ယ넌竀Sd䰾zq⫣⏌ʥ\u0010ΐ' |磪&p牢蔑mV蘸૰짬꺵;K": [
-                                                                                                                                                                                                                                                                        -7.539062290108008E-20,
-                                                                                                                                                                                                                                                                        [
-                                                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                                                         false,
-                                                                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                                                         6574577753576444630,
-                                                                                                                                                                                                                                                                         [[
-                                                                                                                                                                                                                                                                          1.2760162530699766E-19,
-                                                                                                                                                                                                                                                                          [
-                                                                                                                                                                                                                                                                           null,
-                                                                                                                                                                                                                                                                           [
-                                                                                                                                                                                                                                                                            "顊\\憎zXB,",
-                                                                                                                                                                                                                                                                            [{
-                                                                                                                                                                                                                                                                             "㇆{CVC9－MN㜋ઘR눽#{h@ퟨ!鼚׼XOvXS\u0017ᝣ=cS+梽៲綆16s덽휐y屬?ᇳG2ᴭ\u00054쫖y룇nKcW̭炦s/鰘ᬽ?J|퓀髣n勌\u0010홠P>j": false,
-                                                                                                                                                                                                                                                                             "箴": [
-                                                                                                                                                                                                                                                                              false,
-                                                                                                                                                                                                                                                                              "鍞j\"ꮾ*엇칬瘫xṬ⭽쩁䃳\"-⋵?ᦽ<cਔ↎⩧%鱩涎삧u9K⦈\"῝ᬑV绩킯愌ṱv@GꝾ跶Ꚇ(?䖃vI᧊xV\r哦j㠒?*=S굤紴ꊀ鹭쬈s<DrIu솹꧑?",
-                                                                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                                                                               ".}S㸼L?t\u000fK⑤s~hU鱜꘦}쪍C滈4ꓗ蛌):ྦ\"顥이⢷ῳYLn\"?fꘌ>댎Ĝ": true,
-                                                                                                                                                                                                                                                                               "Pg帯佃籛n㔠⭹࠳뷏≻࿟3㞱!-쒾!}쭪䃕!籿n涻J5ਲ਼yvy;Rኂ%ᔡጀ裃;M⣼)쵂쑈": 1.80447711803435366E18,
-                                                                                                                                                                                                                                                                               "ꈑC⡂ᑆ㤉壂뎃Xub<\/쀆༈憓ق쨐ק\\": [
-                                                                                                                                                                                                                                                                                7706977185172797197,
-                                                                                                                                                                                                                                                                                {"": {"K╥踮砆NWࡆFy韣7ä밥{|紒︧䃀榫rᩛꦡTSy잺iH8}ퟴ,M?Ʂ勺ᴹ@T@~꾂=I㙕뾰_涀쑜嫴曣8IY?ҿo줫fऒ}\\S\"ᦨ뵼#nDX": {
-                                                                                                                                                                                                                                                                                 "♘k6?଱癫d68?㽚乳䬳-V顷\u0005蝕?\u0018䞊V{邾zじl]雏k臤~ൖH뒐iꢥ]g?.G碄懺䔛p<q꜉S岗_.%": 7688630934772863849,
-                                                                                                                                                                                                                                                                                 "溗摽嗙O㧀,⡢⼰呠ꅧ㓲/葇䢛icc@-r\b渂ꌳ뻨饑觝ᖜ\\鮭\u0014엙㥀᧺@浹W2꛵{W률G溮킀轡䬆g㨑'Q聨៪网Hd\"Q늴ᱢﶨ邮昕纚枑?▰hr羌驀[痹<\/": [
-                                                                                                                                                                                                                                                                                  -1.0189902027934687E-19,
-                                                                                                                                                                                                                                                                                  {"窶椸릎뚻shE\"ꪗႥꎳU矖佟{SJ": [{"-慜x櫹XY-澐ܨ⣷ઢ鯙%Fu\u0000迋▒}᥷L嗭臖oញc넨\u0016/迎1b꯸g뢱㐧蓤䒏8C散삭|\"컪輩鹩\"\\g$zG䥽긷?狸꿭扵㲐:URON&oU8": [
-                                                                                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                                                                                   true,
-                                                                                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                                                                                   -2.8907335031148883E17,
-                                                                                                                                                                                                                                                                                   -3864019407187144121,
-                                                                                                                                                                                                                                                                                   {
-                                                                                                                                                                                                                                                                                    "`빬d⵺4H뜳⧈쓑ohஸ*㶐ﻇ⸕䠵!i䝬﹑h夘▥ꗐ푹갇㵳TA鳠嚵\\B<X}3訒c⋝{*﫢w]璨-g捭\\j໵侠Ei层\u0011": 3.758356090089446E-19,
-                                                                                                                                                                                                                                                                                    "䄘ﮐ)Y놞씃㾱陰큁:{\u2059/S⓴": [[
-                                                                                                                                                                                                                                                                                     null,
-                                                                                                                                                                                                                                                                                     [[
-                                                                                                                                                                                                                                                                                      -3.8256602120220546E-20,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      7202317607724472882,
-                                                                                                                                                                                                                                                                                      "CWQ뚿",
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      false,
-                                                                                                                                                                                                                                                                                      true,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      2857038485417498625,
-                                                                                                                                                                                                                                                                                      6.191302233218633E-20,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      -6795250594296208046,
-                                                                                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                                                                                       true,
-                                                                                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                                                                                        "%ዧ遰Yᚯ⚀x莰愒Vᔈ턗BN洝ꤟA1⍌l콹풪H;OX๫륞쪐ᰚц@͎黾a邬<L厒Xb龃7f웨窂二;": [[
-                                                                                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                                                                                         "耲?䙧㘓F6Xs틭멢.v뚌?鄟恠▽'묺競?WvᆾCtxo?dZ;䨸疎",
-                                                                                                                                                                                                                                                                                         {
-                                                                                                                                                                                                                                                                                          "@hWꉁ&\"빜4礚UO~C;う殩_ꀥ蘁奢^챟k→ᡱKMⵉ<\/Jㅲ붉L͟Q": false,
-                                                                                                                                                                                                                                                                                          "tU뢂8龰I먽7,.Y搽Z툼=&⨥覽K乫햶㠸%#@Z끖愓^⍊⾂몒3E_噆J(廊ឭyd䞜鈬Ћ档'⣘I": {
-                                                                                                                                                                                                                                                                                           "tK*ꔵ銂u艗ԃ쿏∳ꄂ霫X3♢9y?=ⲭdЊb&xy}": [
-                                                                                                                                                                                                                                                                                            -4.097346784534325E-20,
-                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                            6016848468610144624,
-                                                                                                                                                                                                                                                                                            -8194387253692332861,
-                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                            {
-                                                                                                                                                                                                                                                                                             "(祬诀譕쯠娣c봝r?畄kT뼾⌘⎨?noV䏘쥝硎n?": [
-                                                                                                                                                                                                                                                                                              1.82679422844617293E18,
-                                                                                                                                                                                                                                                                                              [
-                                                                                                                                                                                                                                                                                               false,
-                                                                                                                                                                                                                                                                                               2.6849944122427694E18,
-                                                                                                                                                                                                                                                                                               true,
-                                                                                                                                                                                                                                                                                               [
-                                                                                                                                                                                                                                                                                                false,
-                                                                                                                                                                                                                                                                                                {
-                                                                                                                                                                                                                                                                                                 ";0z⭆;화$bਔ瀓\"衱^?잢ᢛ⣿~`ꕉ薸⌳໿湘腌'&:ryБꋥၼ꒥筙꬜긨?X": -3536753685245791530,
-                                                                                                                                                                                                                                                                                                 "c;Y7釚Uꃣ割J༨Y戣w}c峰뢨㽑㫈0N>R$䅒X觨l봜A刊8R梒',}u邩퉕?;91Ea䈈믁G⊶芔h袪&廣㺄j;㡏綽\u001bN頸쳘橆": -2272208444812560733,
-                                                                                                                                                                                                                                                                                                 "拑Wﵚj鵼駳Oࣿ)#㾅顂N傓纝y僱栜'Bꐍ-!KF*ꭇK￤?䈴^:啤wG逭w᧯": "xᣱmYe1ۏ@霄F$ě꧘푫O䤕퀐Pq52憬ꀜ兴㑗ᡚ?L鷝ퟐ뭐zJꑙ}╆ᅨJB]\"袌㺲u8䯆f",
-                                                                                                                                                                                                                                                                                                 "꿽၅㔂긱Ǧ?SI": -1669030251960539193,
-                                                                                                                                                                                                                                                                                                 "쇝ɨ`!葎>瞺瘡驷錶❤ﻮ酜=": -6961311505642101651,
-                                                                                                                                                                                                                                                                                                 "?f7♄꫄Jᡔ훮e읇퍾፣䭴KhखT;Qty}O\\|뫁IῒNe(5惁ꥶㆷY9ﮡ\\ oy⭖-䆩婁m#x봉>Y鈕E疣s驇↙ᙰm<": {"퉻:dꂁ&efￎ쫢[\"돈늖꺙|Ô剐1͖-K:ʚ᭕/;쏖㷛]I痐职4g<Oꗢ뫺N쯂륬J╆.`ᇵP轆&fd$?苅o궓vO侃沲⍩嚅沗 E%⿰얦wi\\*趫": [
-                                                                                                                                                                                                                                                                                                  3504362220185634767,
-                                                                                                                                                                                                                                                                                                  false,
-                                                                                                                                                                                                                                                                                                  "qzX朝qT3軞T垈ꮲQ览ᚻ⻑쎎b驌䵆ꬠ5Fୗ䲁缿ꝁ蒇潇Ltᆄ钯蜀W欥ሺ",
-                                                                                                                                                                                                                                                                                                  "볰ɐ霬)젝鶼kwoc엷荁r \u001d쒷⎹8{%澡K늒?iﺩd=&皼倚J9s@３偛twὡgj䁠흪5⭉⨺役&놎cﺉ㺡N5",
-                                                                                                                                                                                                                                                                                                  false,
-                                                                                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                                                                                  "D0st[ni锹r*0k6ꀎ덇UX2⽼৞䃚粭#)Z桷36P]<\/`",
-                                                                                                                                                                                                                                                                                                  4281410120849816730,
-                                                                                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                                                                                  -3256922126984394461,
-                                                                                                                                                                                                                                                                                                  1.16174580369801549E18,
-                                                                                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                                                                                   " ᆼꤗ~*TN긂<㡴턱℃酰^蘒涯잰淭傛2rൡet쾣䐇m*㸏y\"\\糮᧺qv쌜镜T@yg1譬ﭧﳭ\f": null,
-                                                                                                                                                                                                                                                                                                   "圾ᨿ0xᮛ禵ਗ਼D-㟻ẵ錚e\"赜.˶m)鴑B(I$<\/轴퉯揷⋏⏺*)宓쓌?*橯Lx\\f쩂㞼⇸\"ﺧ軂遳V\\땒\"캘c:G": null,
-                                                                                                                                                                                                                                                                                                   "?﵁_곢翸폈8㿠h열Q2㭛}RY㯕ＹT놂⽻e^B<\/맫ﻇ繱\u0017Gц⟊ᢑﵩS:jt櫣嗒⟰W㴚搦ᅉe[w䋺?藂翙Ⲱ芮䍘╢囥lpdu7r볺I 近qFyᗊ": [
-                                                                                                                                                                                                                                                                                                    "$b脬aﾠ襬育Bگ嵺Pw+'M<\/כֿn䚚v螁bN⒂}褺%lቦ阤\"ꓺᏗM牏,۞Ҷ!矬?ke9銊X괦)䈽틁脽ṫ䈞ᴆ^=Yᗿ遛4I귺⋥%",
-                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                    2.9444482723232051E18,
-                                                                                                                                                                                                                                                                                                    2072621064799640026,
-                                                                                                                                                                                                                                                                                                    "/_뇴뫢j㍒=Nꡦ↍Ժ赒❬톥䨞珯su*媸瀳鷔抡o흺-៳辏勷f绔:䵢搢2",
-                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                    "쒜 E䌐/큁\u0018懺_<\\隺&{wF⤊谼(<죽遠8?@*rᶊGd뻻갇&Ⳇq᣿e࢔t_ꩄ梸O詬C᧧Kꩠ풤9눙醅됞}竸rw?滨ӽK⥿ཊG魲']`๖5㄰",
-                                                                                                                                                                                                                                                                                                    -2375253967958699084,
-                                                                                                                                                                                                                                                                                                    {"嗱⿲\"f億ᝬ": {"v?䚑킡`◤k3,骥曘뒤Oᒱ㲹^圮᠀YT껛&촮P:G/T⣝#튣k3炩蠏k@橈䏷S䧕,熜晬k1鮥玸먚7䤡f绝嗚샴ᥒ~0q拮垑a뻱LⰖ_": [{
-                                                                                                                                                                                                                                                                                                     ":p尢": -6.688985172863383E17,
-                                                                                                                                                                                                                                                                                                     "A0\u0001疠ﻵ爻鼀湶I~W^岀mZx#㍈7r拣$Ꜷ疕≛⦒痋盩Vꬷ᭝ΩQꍪ療鈑A(劽詗ꭅo-獶鑺\"Ⓠ@$j탥;": [
-                                                                                                                                                                                                                                                                                                      8565614620787930994,
-                                                                                                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                                                                                                       "嶗PC?උQ㪣$&j幾㾷h慑 즊慧⪉霄M窊ꁷ'鮕)䊏铨m趦䗲(g罣ЮKVﯦ鏮5囗ﰼ鿦",
-                                                                                                                                                                                                                                                                                                       -7168038789747526632,
-                                                                                                                                                                                                                                                                                                       null,
-                                                                                                                                                                                                                                                                                                       -7.8069738975270288E16,
-                                                                                                                                                                                                                                                                                                       2.25819579241348352E17,
-                                                                                                                                                                                                                                                                                                       -6.5597416611655936E18,
-                                                                                                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                                                                                                        "瘕멦핓+?ﾌZ귢z鍛V": {
-                                                                                                                                                                                                                                                                                                         "ᕾ": 1.7363275204701887E-19,
-                                                                                                                                                                                                                                                                                                         "㭌s뎹㳉": {"\u00187FI6Yf靺+UC쬸麁␲䂿긕R\\ᆮC?Φ耭\rOத际핅홦*베W㸫㯼᡹cㅜ|G㮗\u0013[o`?jHV앝?蒪꩚!퍫ᜦ㌇䚇鿘:@": [
-                                                                                                                                                                                                                                                                                                          "}푛Г콲<䟏C藐呈#2㓋#ྕ፟尿9q竓gI%랙mꍬoa睕贿J咿D_熏Zz皳験I豼B扳ḢQ≖㻹㱣D䝦練2'ᗍ㗣▌砲8罿%హF姦;0悇<\/\"p嚧",
-                                                                                                                                                                                                                                                                                                          -710184373154164247,
-                                                                                                                                                                                                                                                                                                          "Vo쫬⬾ꝫⴷŻ\u0004靎HBꅸ_aVBＨbN>Z4⍜kเꛘZ⥺\\Bʫᇩ鄨魢弞&幟ᓮ2̊盜",
-                                                                                                                                                                                                                                                                                                          -9006004849098116748,
-                                                                                                                                                                                                                                                                                                          -3118404930403695681,
-                                                                                                                                                                                                                                                                                                          {
-                                                                                                                                                                                                                                                                                                           "_彃Y艘-\"Xx㤩㳷瑃?%2䐡鵛o<A?\"顜ᘌΈ;ⷅC洺L蚴蚀voq:,Oo4쪂)": 5719065258177391842,
-                                                                                                                                                                                                                                                                                                           "l륪맽耞塻論倐E㗑/㲕QM辬I\"qi酨玑㖪5q]尾魨鲡ƞY}⮯蠇%衟Fsf윔䐚찤i腳": {"ꢪ'a䣊糈": {"밑/♋S8s㼴5瓹O{댞\"9XﰇlJ近8}q{긧ⓈI᱑꿋腸D瀬H\"ﺬ'3?}\u0014#?丙㑯ᥨ圦',g鑠(樴턇?": [
-                                                                                                                                                                                                                                                                                                            2.5879275511391145E18,
-                                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                                            [
-                                                                                                                                                                                                                                                                                                             "3㼮ꔌ1Gẃ2W龙j͊{1囐㦭9x宠㑝oR䐕犽",
-                                                                                                                                                                                                                                                                                                             1268729930083267852,
-                                                                                                                                                                                                                                                                                                             "땕軚⿦7C",
-                                                                                                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                                                                                                              -3.757935946502082E18,
-                                                                                                                                                                                                                                                                                                              "\"赌'糬_2뭾᝝b",
-                                                                                                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                                                                                                               "(a䕎ጽjҰD4.ᴡ66ԃ畮<\/l`k癸\\㇋ࣆ욯R㫜픉녬挛;ڴ맺`.;焓q淞뮕ٹ趴r蔞ꯔ䟩v粏u5<\/pZ埖Skrvj帛=\u0005aa": null,
-                                                                                                                                                                                                                                                                                                               "璄≩ v몛ᘮ%?:1頌챀H㷪뉮k滘e": [
-                                                                                                                                                                                                                                                                                                                "ꤾ{`c샬왌펡[俊络vmz㪀悫⸹ᷥ5o'㾵 L蹦qjYIYណԠW냁剫<\/W嗂0,}",
-                                                                                                                                                                                                                                                                                                                2.4817616702666762E18,
-                                                                                                                                                                                                                                                                                                                false,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                -8.6036958071260979E17,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                -1.2744078022652468E-19,
-                                                                                                                                                                                                                                                                                                                -4.4752020268429594E17,
-                                                                                                                                                                                                                                                                                                                1.13672865156637872E17,
-                                                                                                                                                                                                                                                                                                                [
-                                                                                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                                                                                 -4.178004168554046E-20,
-                                                                                                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                                                                                                 2927542512798605527,
-                                                                                                                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                                                                                                                  ".ꔓ뉤1䵬cHy汼䊆賓ᐇƩ|樷❇醎㬅4\u0003赵}#yD5膏晹뱓9ꖁ虛J㺕 t䊛膎ؤ": {
-                                                                                                                                                                                                                                                                                                                   "rVtᓸ5^`েN⹻Yv᥋lꌫt拘?<鮰넿ZC?㒽^": {"␪k_:>귵옔夘v*탋职&㳈챗|O钧": [
-                                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                                    "daꧺdᗹ羞쯧H㍤鄳頳<型孒ン냆㹀f4㹰\u000f|C*ሟ鰠(O<ꨭ峹ipຠ*y೧4VQ蔔hV淬{?ᵌEfrI_",
-                                                                                                                                                                                                                                                                                                                    "j;ꗣ밷邍副]ᗓ",
-                                                                                                                                                                                                                                                                                                                    -4299029053086432759,
-                                                                                                                                                                                                                                                                                                                    -5610837526958786727,
-                                                                                                                                                                                                                                                                                                                    [
-                                                                                                                                                                                                                                                                                                                     null,
-                                                                                                                                                                                                                                                                                                                     [
-                                                                                                                                                                                                                                                                                                                      -1.3958390678662759E-19,
-                                                                                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                                                                                       "lh좈T_믝Y\"伨\u001cꔌG爔겕ꫳ晚踍⿻읐T䯎]~e#฽燇\"5hٔ嶰`泯r;ᗜ쮪Q):/t筑,榄&5懶뎫狝(": [{
-                                                                                                                                                                                                                                                                                                                        "2ፁⓛ]r3C攟וּ9賵s⛔6'ஂ|\"ⵈ鶆䐹禝3\"痰ࢤ霏䵩옆䌀?栕r7O簂Isd?K᫜`^讶}z8?z얰T:X倫⨎ꑹ": -6731128077618251511,
-                                                                                                                                                                                                                                                                                                                        "|︦僰~m漿햭\\Y1'Vvخ굇ቍ챢c趖": [null]
-                                                                                                                                                                                                                                                                                                                       }],
-                                                                                                                                                                                                                                                                                                                       "虌魿閆5⛔煊뎰㞤ᗴꥰF䮥蘦䂪樳-K᝷-(^\u20dd_": 2.11318679791770592E17
-                                                                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                                                                                    ]
-                                                                                                                                                                                                                                                                                                                   ]},
-                                                                                                                                                                                                                                                                                                                   "묗E䀳㧯᳀逞GMc\b墹㓄끖Ơ&U??펌鑍 媋k))ᄊ": null,
-                                                                                                                                                                                                                                                                                                                   "묥7콽벼諌J_DɯﮪM殴䣏,煚ྼ`Y:씧<\/⩫%yf䦀!1Ჶk춎Q米W∠WC跉鬽*ᛱi<?,l<崣炂骵*?8푐៣ⰵ憉⎑.,Nw罣q+ο컆弎": false
-                                                                                                                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                                                                                                                  "e[|଀+lꑸ㝈TT?뿿|ꫛ9`㱯䊸楋-곳賨?쳁k棽擋wQ餈⟐Nq[q霩䵀뷮锅ꚢ": 5753148631596678144,
-                                                                                                                                                                                                                                                                                                                  "sᓝ鴻߸d렶ὕ蜗ဟ툑!诉౿": false,
-                                                                                                                                                                                                                                                                                                                  "|4䕳鵻?䈔(]틍/Ui#湻{듲ーMዀt7潔泄Ch⸨}쏣`螧銚㋼壯kⰥQ戵峉갑x辙'첛": "jd䘯$䕌茷!auw眶ㅥ䁣ꆢ民i",
-                                                                                                                                                                                                                                                                                                                  "剖駰ꞫsM2]ᾴ2ࡷ祅拌Av狔꩛'ꓗ킧ꣁ0酜✘O'": false,
-                                                                                                                                                                                                                                                                                                                  "澩뢣ꀁeU~D\\ꮡ킠": "v^YC嚈ί\u0007죋h>㴕L꘻ꀏ쓪\"_g鿄'#t⽙?,Wg㥖|D鑆e⥏쪸僬h鯔咼ඡ;4TK聎졠嫞"
-                                                                                                                                                                                                                                                                                                                 }
-                                                                                                                                                                                                                                                                                                                ]
-                                                                                                                                                                                                                                                                                                               ]
-                                                                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                                                                                                            ]
-                                                                                                                                                                                                                                                                                                           ]}}
-                                                                                                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                                                                                                         ]}
-                                                                                                                                                                                                                                                                                                        },
-                                                                                                                                                                                                                                                                                                        "뿋뀾淣截䔲踀&XJ펖꙯^Xb訅ꫥgᬐ>棟S\"혧騾밫겁7-": "擹8C憎W\"쵮yR뢩浗絆䠣簿9䏈引Wcy䤶孖ꯥ;퐌]輩䍐3@{叝 뽸0ᡈ쵡Ⲇ\u001dL匁꧐2F~ݕ㪂@W^靽L襒ᦘ~沦zZ棸!꒲栬R"
-                                                                                                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                                                                                                     ],
-                                                                                                                                                                                                                                                                                                     "Z:덃൛5Iz찇䅄駠㭧蓡K1": "e8᧤좱U%?ⵇ䯿鿝\u0013縮R∱骒EO\u000fg?幤@֗퉙vU`",
-                                                                                                                                                                                                                                                                                                     "䐃쪈埽້=Ij,쭗쓇చ": false
-                                                                                                                                                                                                                                                                                                    }]}}
-                                                                                                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                                                 ]}
-                                                                                                                                                                                                                                                                                                }
-                                                                                                                                                                                                                                                                                               ]
-                                                                                                                                                                                                                                                                                              ]
-                                                                                                                                                                                                                                                                                             ],
-                                                                                                                                                                                                                                                                                             "咰긖VM]᝼6䓑쇎琺etDҌ?㞏ꩄ퇫밉gj8蠃\"⩐5䛹1ࣚ㵪": "ക蹊?⎲⧘⾚̀I#\"䈈⦞돷`wo窭戕෱휾䃼)앷嵃꾞稧,Ⴆ윧9S?೗EMk3Მ3+e{⹔Te驨7䵒?타Ulg悳o43"
-                                                                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                                                                           ],
-                                                                                                                                                                                                                                                                                           "zQᤚ纂땺6#ٽ﹧v￿#ࠫ휊冟蹧텈ꃊʆ?&a䥯De潝|쿓pt瓞㭻啹^盚2Ꝋf醪,얏T窧\\Di䕎谄nn父ꋊE": -2914269627845628872,
-                                                                                                                                                                                                                                                                                           "䉩跐|㨻ᷢ㝉B{蓧瞸`I!℄욃힕#ೲᙾ竛ᔺCjk췒늕貭词\u0017署?W딚%(pꍁ⤼띳^=on뺲l䆼bzrﳨ[&j狸䠠=ᜑꦦ\u2061յnj=牲攑)M\\龏": false,
-                                                                                                                                                                                                                                                                                           "뎕y絬᫡⥮Ϙᯑ㌔/NF*˓.,QEzvK!Iwz?|쥾\"ꩻL꼗Bꔧ賴緜s뉣隤茛>ロ?(?^`>冺飒=噸泥⺭Ᲊ婓鎔븜z^坷裮êⓅ໗jM7ﶕ找\\O": 1.376745434746303E-19
-                                                                                                                                                                                                                                                                                          },
-                                                                                                                                                                                                                                                                                          "䐛r滖w㏤<k;l8ꡔጵ⮂ny辶⋃퍼僮z\"﮲X@t5෼暧퓞猋♅䦖QC鹮|픨( ,>,|Nዜ": false
-                                                                                                                                                                                                                                                                                         }
-                                                                                                                                                                                                                                                                                        ]],
-                                                                                                                                                                                                                                                                                        "@꿙?薕尬 gd晆(띄5躕ﻫS蔺4)떒錸瓍?~": 1665108992286702624,
-                                                                                                                                                                                                                                                                                        "w믍nᏠ=`঺ￆC>'從됐槷䤝眷螄㎻揰扰XￊC贽uჍ낟jKD03T!lDV쀉Ӊy뢖,袛!终캨G?鉮Q)⑗1쾅庅O4ꁉH7?d\u0010蠈줘월ސ粯Q!낇껉6텝|{": null,
-                                                                                                                                                                                                                                                                                        "~˷jg쿤촖쉯y": -5.5527605669177098E18,
-                                                                                                                                                                                                                                                                                        "펅Wᶺzꐆと푭e?4j仪열[D<鈑皶婆䵽ehS?袪;HꍨM뗎ば[(嗏M3q퍟g4y╸鰧茀[Bi盤~﫝唎鋆彺⦊q?B4쉓癚O洙킋툈䶯_?ퟲ": null
-                                                                                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                                                                                     ]]
-                                                                                                                                                                                                                                                                                    ]],
-                                                                                                                                                                                                                                                                                    "꟱Ԕ㍤7曁聯ಃ錐V䷰?v㪃૦~K\"$%请|ꇹn\"k䫛㏨鲨\u2023䄢\u0004[<S8ᐬ뭩脥7U.m࿹:D葍┆2蘸^U'w1젅;䠆ꋪB껮>︊VJ?䶟ាꮈ䗱=깘U빩": -4863152493797013264
-                                                                                                                                                                                                                                                                                   }
-                                                                                                                                                                                                                                                                                  ]}]}
-                                                                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                                                                }}}
-                                                                                                                                                                                                                                                                               ],
-                                                                                                                                                                                                                                                                               "쏷쐲۹퉃~aE唙a챑,9㮹gLHd'䔏|킗㍞䎥&KZYT맵7䥺N<Hp4ꕭ⹠꽐c~皽z": "课|ᖾ䡁廋萄䐪W\u0016&Jn괝b~摓M>ⱳ同莞鿧w\\༌疣n/+ꎥU\"封랾○ퟙAJᭌ?9䛝$?驔9讐짘魡T֯c藳`虉C읇쐦T"
-                                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                                             ],
-                                                                                                                                                                                                                                                                             "谶개gTR￐>ၵ͚dt晑䉇陏滺}9㉸P漄": -3350307268584339381
-                                                                                                                                                                                                                                                                            }]
-                                                                                                                                                                                                                                                                           ]
-                                                                                                                                                                                                                                                                          ]
-                                                                                                                                                                                                                                                                         ]]
-                                                                                                                                                                                                                                                                        ]
-                                                                                                                                                                                                                                                                       ],
-                                                                                                                                                                                                                                                                       "0y꟭馋X뱔瑇:䌚￐廿jg-懲鸭䷭垤㒬茭u賚찶ಽ+\\mT땱\u20821殑㐄J쩩䭛ꬿNS潔*d\\X,壠뒦e殟%LxG9:摸": 3737064585881894882,
-                                                                                                                                                                                                                                                                       "풵O^-⧧ⅶvѪ8廸鉵㈉ר↝Q㿴뺟EႳvNM:磇>w/៻唎뷭୥!냹D䯙i뵱貁C#⼉NH6`柴ʗ#\\!2䂗Ⱨf?諳.P덈-返I꘶6?8ꐘ": -8934657287877777844,
-                                                                                                                                                                                                                                                                       "溎-蘍寃i诖ര\"汵\"\ftl,?d⼡쾪⺋h匱[,෩I8MҧF{k瓿PA'橸ꩯ綷퉲翓": null
-                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                                    ],
-                                                                                                                                                                                                                                                                    "ោ係؁<元": 1.7926963090826924E-18
-                                                                                                                                                                                                                                                                   }}]
-                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                                                ]]}]
-                                                                                                                                                                                                                                                               }]
-                                                                                                                                                                                                                                                              ]
-                                                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                                                            ]
-                                                                                                                                                                                                                                                           ],
-                                                                                                                                                                                                                                                           "ጩV<\"ڸsOᤘ": 2.0527167903723048E-19
-                                                                                                                                                                                                                                                          }]
-                                                                                                                                                                                                                                                         ]}
-                                                                                                                                                                                                                                                        ]
-                                                                                                                                                                                                                                                       ]],
-                                                                                                                                                                                                                                                       "∳㙰3젴p᧗䱙?`<U὇<\/意E[ᮚAj诂ᒽ阚uv徢ဎ떗尔Ᵹ훀쩑J䐴?⪏=륪ᆩ푰ஓ㐕?럽VK\"X?檨လ齿I/耉A(AWA~⏯稐蹫": false,
-                                                                                                                                                                                                                                                       "偒妝뾇}䀼链i⇃%⋜&璪Ix渥5涧qq棩ᥝ-⠫AA낇yY颕A*裦O|n?䭬혗F": null,
-                                                                                                                                                                                                                                                       "琭CL얭B혆Kॎ`鎃nrsZiժW砏)?p~K~A眱䲏QO妣\u001b\u001b]ᵆᆯ&㐋ᏹ豉뺘$ꭧ#j=C)祤⫢歑1o㒙諩": 7028426989382601021,
-                                                                                                                                                                                                                                                       "쳱冲&ဤ䌏앧h胺-齱H忱8왪RDKᅒ䬋ᔶS*J}ስ漵'㼹뮠9걢9p봋경ጕtởꚳT䶽瘙%춴`@nಆ4<d??#僜ᙤ钴=薔ꭂbLXNam蹈": "樭る蹿= Uurwkn뙧⌲%\"쑃牪\"cq윕o@",
-                                                                                                                                                                                                                                                       "溌[H]焎SLㅁ?뀼䫨災W": 1.1714289118497062E-19,
-                                                                                                                                                                                                                                                       "ﬢp븇剌燇kĔ尘㶿㴞睠꾘Ia;s❺^)$穮?sHᢥ폪l": null
-                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                                                  "TKnzj5o<\/K㊗ꗣ藠⦪駇>yZA8Ez0,^ᙛ4_0븢\u001ft:~䎼s.bb룦明yNP8弆C偯;⪾짍'蕴뮛": -6976654157771105701,
-                                                                                                                                                                                                                                                  "큵ꦀ\\㇑:nv+뒤燻䀪ﴣ﷍9ᚈ኷K㚊誦撪䚛,ꮪxሲ쳊\u0005HSf?asg昱dqꬌVꙇ㼺'k*'㈈": -5.937042203633044E-20
-                                                                                                                                                                                                                                                 }
-                                                                                                                                                                                                                                                ]
-                                                                                                                                                                                                                                               }],
-                                                                                                                                                                                                                                               "?}\u20e0],s嶳菋@#2u쒴sQS䩗=ꥮ;烌,|ꘔ䘆": "ᅩ영N璠kZ먕眻?2ቲ芋眑D륟渂⸑ﴃIRE]啗`K'"
-                                                                                                                                                                                                                                              }},
-                                                                                                                                                                                                                                              "쨀jmV賂ﰊ姐䂦玞㬙ᏪM᪟Վ씜~`uOn*ॠ8\u000ef6??\\@/?9見d筜ﳋB|S䝬葫㽁o": true
-                                                                                                                                                                                                                                             },
-                                                                                                                                                                                                                                             "즛ꄤ酳艚␂㺘봿㎨iG৕ࡿ?1\"䘓您\u001fSኝ⺿溏zៀ뻤B\u0019?윐a䳵᭱䉺膷d:<\/": 3935553551038864272
-                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                           ]
-                                                                                                                                                                                                                                          ]}
-                                                                                                                                                                                                                                         ]]
-                                                                                                                                                                                                                                        ]]
-                                                                                                                                                                                                                                       ]}
-                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                   ]]}},
-                                                                                                                                                                                                                                   "᥺3h↛!ꋰy\"攜(ெl䪕oUkc1A㘞ᡲ촾ᣫ<\/䒌E㛝潨i{v?W౾H\\RჅpz蝬R脾;v:碽✘↯삞鷱o㸧瑠jcmK7㶧뾥찲n": true,
-                                                                                                                                                                                                                                   "ⶸ?x䊺⬝-䰅≁!e쩆2ꎿ准G踌XXᩯ1߁}0?.헀Z馟;稄\baDꟹ{-寪⚈ꉷ鮸_L7ƽᾚ<\u001bጨA䧆송뇵⨔\\礍뗔d设룱㶉cq{HyぱR㥽吢ſtp": -7985372423148569301,
-                                                                                                                                                                                                                                   "緫#콮IB6<\/=5Eh礹\t8럭@饹韠r㰛斣$甝LV췐a갵'请o0g:^": "䔨(.",
-                                                                                                                                                                                                                                   "띳℡圤pﾝ௄ĝ倧訜B쁟G䙔\"Sb⓮;$$▏S1J뢙SF|赡g*\"Vu䲌y": "䪈&틐),\\kT鬜1풥;뷴'Zေ䩹@J鞽NぼM?坥eWb6榀ƩZڮ淽⺞삳煳xჿ絯8eⶍ羷V}ჿ쎱䄫R뱃9Z>'\u20f1ⓕ䏜齮"
-                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                ]]]
-                                                                                                                                                                                                                               }}
-                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                            ]},
-                                                                                                                                                                                                                            "펮b.h粔폯2npX詫g錰鷇㇒<쐙S値bBi@?镬矉`剔}c2壧ଭfhY깨R()痩⺃a\\⍔?M&ﯟ<劜꺄멊ᄟA\"_=": null
-                                                                                                                                                                                                                           },
-                                                                                                                                                                                                                           "~潹Rqn榢㆓aR鬨侅?䜑亡V_翅㭔(䓷w劸ၳDp䀅<\/ﰎ鶊m䵱팱긽ꆘ<tD쇋>긓准D3掱;o:_ќ)껚콥8곤d矦8nP倥ꃸI": null,
-                                                                                                                                                                                                                           "뾎/Q㣩㫸벯➡㠦◕挮a鶧⋓偼\u00001뱓fm覞n?㛅\"": 2.8515592202045408E17
-                                                                                                                                                                                                                          }],
-                                                                                                                                                                                                                          ",": -5426918750465854828,
-                                                                                                                                                                                                                          "2櫫@0柡g䢻/gꆑ6演&D稒肩Y?艘/놘p{f투`飷ᒉ챻돎<늛䘍ﴡ줰쫄": false,
-                                                                                                                                                                                                                          "8(鸑嵀⵹ퟡ<9㣎Tߗ┘d슒ل蘯&㠦뮮eࠍk砝g 엻": false,
-                                                                                                                                                                                                                          "d-\u208b?0ﳮ嵙'(J`蔿d^踅⤔榥\\J⵲v7": 6.8002426206715341E17,
-                                                                                                                                                                                                                          "ཎ耰큓ꐕ㱷\u0013y=詽I\"盈xm{0쾽倻䉚ષso#鰑/8㸴짯%ꀄ떸b츟*\\鲷礬ZQ兩?np㋄椂榨kc᡹醅3": false,
-                                                                                                                                                                                                                          "싊j20": false
-                                                                                                                                                                                                                         }]]
-                                                                                                                                                                                                                        ]],
-                                                                                                                                                                                                                        "俛\u0017n緽Tu뫉蜍鼟烬.ꭠIⰓ\"Ἀ᜾uC쎆J@古%ꛍm뻨ᾀ画蛐휃T:錖㑸ዚ9죡$": true
-                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                     ],
-                                                                                                                                                                                                                     "㍵⇘ꦖ辈s}㱮慀밒s`\"㞟j:`i픻Z<C1衽$\"-饧?℃\u0010⼒{p飗%R\"䲔\")칀\\%": true,
-                                                                                                                                                                                                                     "苧.8\u00120ݬ仓": 6912164821255417986,
-                                                                                                                                                                                                                     "떎顣俁X;.#Q틝.笂'p쟨唒퐏랩냆¦aⱍ{谐.b我$蜑SH\u000f琾=䟼⣼奔ᜏ攕B&挰繗㝔ꅂ-Qv\\0䶝䚥ぺio［㑮-ᇼ䬰컪ṼiY){데\u0010q螰掻~\n輚x\u0014罺)軴": 3.024364150712629E-20
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                  ]
-                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                ]}
-                                                                                                                                                                                                               ]]
-                                                                                                                                                                                                              }
-                                                                                                                                                                                                             ]
-                                                                                                                                                                                                            ]]
-                                                                                                                                                                                                           ]
-                                                                                                                                                                                                          ]]]],
-                                                                                                                                                                                                          "\"凲o肉Iz絾豉J8?i~傠᫽䇂!WD溊J?ᡒvs菆嵹➒淴>섫^諎0Ok{켿歁෣胰a2﨤[탳뚬쎼嫭뉮m": 409440660915023105,
-                                                                                                                                                                                                          "w墄#*ᢄ峠밮jLa`ㆪ꺊漓Lで끎!Agk'ꁛ뢃㯐岬D#㒦": false,
-                                                                                                                                                                                                          "ଦPGI䕺L몥罭ꃑ궩﮶#⮈ᢓӢ䚬p7웼臧%~S菠␌힀6&t䳙y㪘냏\\*;鉏ￊ鿵'嗕pa\"oL쇿꬈Cg": "㶽1灸D⟸䴅ᆤ뉎﷛渤csx 䝔цꬃ锚捬?ຽ+x~꘩uI࡞\u0007栲5呚ẓem?袝\")=㥴䨃pac!/揎Y",
-                                                                                                                                                                                                          "ᷱo\\||뎂몷r篙|#X䦜I#딌媸픕叞RD斳X4t⯩夬=[뭲r=绥jh뷱츝⪘%]⚋܈㖴スH텹m(WO曝劉0~K3c柢Ր㏉着逳~": false,
-                                                                                                                                                                                                          "煽_qb[첑\\륌wE❽ZtCNﭝ+餌ᕜOꛭ": "{ﳾ쉌&s惧ᭁⵆ3䢫;䨞팑꒪흘褀࢖Q䠿V5뭀䎂澻%받u5텸oA⮥U㎦;B䳌wz䕙$ឿ\\௅婺돵⪾퐆\\`Kyौꋟ._\u0006L챯l뇠Hi䧈偒5",
-                                                                                                                                                                                                          "艊佁ࣃ롇䱠爬!*;⨣捎慓q靓|儑ᨋL+迥=6㒺딉6弄3辅J-㕎뛄듘SG㆛(\noAzQꝱ䰩X*ぢO퀌%펠낌mo틮a^<\/F&_눊ᾉ㨦ы4\"8H": 2974648459619059400,
-                                                                                                                                                                                                          "鬙@뎣䫳ၮ끡?){y?5K;TA*k溱䫜J汃ꂯ싔썍\u001dA}룖(<\/^,": false,
-                                                                                                                                                                                                          "몏@QꋦFꊩᒐ뎶lXl垨4^郣|ꮇ;䝴ᝓ}쵲z珖": null
-                                                                                                                                                                                                         }
-                                                                                                                                                                                                        ]]]],
-                                                                                                                                                                                                        ":_=닧弗D䙋暨鏛. 㱻붘䂍J儒&ZK/녩䪜r囁⽯D喠죥7⹌䪥c\u001a\u2076￞妈朹oLk菮F౟覛쐧㮏7T;}蛙2{9\"崓bB<\/⡷룀;즮鿹)丒툃୤뷠5W⊢嶜(fb뭳갣": "E{响1WM"
-                                                                                                                                                                                                       }},
-                                                                                                                                                                                                       "䘨tjJ驳豨?y輊M*᳑梵瞻઻ofQG瑮e": 2.222802939724948E-19,
-                                                                                                                                                                                                       "䮴=❑➶T෋w䞜\"垦ꃼUt\u001dx;B$뵣䙶E↌艣ᡥ!᧟;䱀[䔯k쬃`੍8饙른熏'2_'袻tGf蒭J땟as꯳╖&啒zWࡇᒫYSᏬ\u0014ℑ첥鈤|cG~Pᓮ\">\"": "ႆl\f7V儊㦬nHꄬꨧC{쐢~C⮃⛓嶦vꄎ1w鰠嘩뿠魄&\"_qMⵖ釔녮ꝇ 㝚{糍J哋 cv?-jkﻯྌ鹑L舟r",
-                                                                                                                                                                                                       "龧葆yB✱H盋夔ﶉ?n*0(": "ꧣኆ㢓氥qZZ酒ຜ)鮢樛)X䣆gTSґG텞k.J圬疝롫쯭z L：\\ྤ@w炋塜쿖ᾳy뢀䶃뱝N䥨㚔勇겁#p",
-                                                                                                                                                                                                       "도畎Q娡\"@S/뼋:䵏!P衅촚fVHQs✜ᐫi㻑殡B䜇%믚k*U#濨낄~": "ꍟዕ쳸ꍈ敋&l妏\u0005憡멗瘌uPgᅪm<\/To쯬锩h뒓k"
-                                                                                                                                                                                                      }
-                                                                                                                                                                                                     ]
-                                                                                                                                                                                                    }],
-                                                                                                                                                                                                    "墥홞r绚<\/⸹ⰃB}<躅\\Y;๑@䔸>韫䜲뱀X뗩鿥쩗SI%ﴞ㳕䛇?<\/\u00018x\\&侂9鋙a[LR㋭W胕)⡿8㞙0JF,}?허d1cDMᐃ␛鄝ⱕ%X)!XQ": "ⳍꗳ=橇a;3t⦾꼑仈ူaᚯ⯋ꕃAs鴷N⍕_䎃ꙎAz\u0016䯷\\<࿫>8q{}ｷ?ᣰ}'0ᴕ펓B┦lF#趤厃T?㕊#撹圂䆲"
-                                                                                                                                                                                                   },
-                                                                                                                                                                                                   "܋닐龫論c웑": false,
-                                                                                                                                                                                                   "ㇿ/q\"6-co髨휝C큦#\u001b4~?3䐹E삇<<": 7.600917488140322E-20,
-                                                                                                                                                                                                   "䁝E6?㣖ꃁ间t祗*鑠{ḣV(浾h逇큞=W?ૉ?nꇽ8ꅉຉj으쮺@Ꚅ㰤u]Oyr": "v≁᫸_*όAඤԆl)ۓᦇQ}폠z༏q滚",
-                                                                                                                                                                                                   "ｿ᥊/넺I": true
-                                                                                                                                                                                                  }]]
-                                                                                                                                                                                                 ]
-                                                                                                                                                                                                ]
-                                                                                                                                                                                               ]
-                                                                                                                                                                                              ]]
-                                                                                                                                                                                             },
-                                                                                                                                                                                             "䭑Ik攑\u0002QV烄:芩.麑㟴㘨≕": true,
-                                                                                                                                                                                             "坄꿕C쇻풉~崍%碼\\8\"䬦꣙": null,
-                                                                                                                                                                                             "欌L圬䅘Y8c(♺2?ON}o椳s宥2䉀eJ%闹r冁O^K諭%凞⺉⡻,掜?$ꥉ?略焕찳㯊艼誜4?\"﯎<゛XፈINT:詓 +": -1.0750456770694562E-19,
-                                                                                                                                                                                             "獒àc뜭싼ﺳ뎤K`]p隨LtE": null,
-                                                                                                                                                                                             "甙8䵊神EIꩤ鐯ᢀ,ﵮU䝑u疒ử驺䚿≚ഋ梶秓F`覤譐#짾蔀묊4<媍쬦靪_Yzgcࡶ4k紥`kc[Lﮗ簐*I瀑[⾰L殽鑥_mGȠ<\/|囹灠g桰iri": true,
-                                                                                                                                                                                             "챓ꖙꟻ좝菇ou,嗠0\\jK핻뜠qwQ?ഩ㼕3Y彦b\u009bJ榶N棨f?됦鏖綃6鳵M[OE봨u햏.Ꮁ癜蟳뽲ꩌ뻾rM豈R嗀羫 uDꎚ%": null
-                                                                                                                                                                                            },
-                                                                                                                                                                                            "V傜2<": 7175127699521359521
-                                                                                                                                                                                           }],
-                                                                                                                                                                                           "铫aG切<\/\"ী⊆e<^g࢛)D顝ｎאַ饼\u008c猪繩嵿ﱚCꡬ㻊g엺A엦\u000f暿_f꿤볝㦕桦`蒦䎔j甬%岝rj 糏": "䚢偎눴Au<4箞7礦Iﱔ坠eȧ䪸u䵁p|逹$嗫쨘ꖾ﷐!胠z寓팢^㨔|u8Nሇe텔ꅦ抷]،鹎㳁#༔繁 ",
-                                                                                                                                                                                           "낂乕ꃻ볨ϱ-ꇋ㖍fs⿫)zꜦ/K?솞♞ꑌ宭hJ᤭瑥Fu": false,
-                                                                                                                                                                                           "쟰ぜ魛G\u0003u?`㾕ℾ㣭5螠烶這趩ꖢ:@咕ꐶx뒘느m䰨b痃렐0鳊喵熬딃$摉_~7*ⱦ녯1錾GKhJ惎秴6'H妈Tᧅ窹㺒疄矤铟wላ": null,
-                                                                                                                                                                                           "쯆q4!3錕㲏ⵆ㇛꘷Z瑩뭆\\◪NH\u001d\\㽰U~㯶<\"쑣낞3ᵤ'峉eꢬ;鬹o꣒木X*長PXᘱu\"䠹n惞": null,
-                                                                                                                                                                                           "ᅸ祊\"&ꥴCjࢼ﴿?䡉`U效5殼㮞V昽ꏪ#ﺸ\\&t6x꠹盥꣰a[\u001aꪍSpe鎿蠹": -1.1564713893659811E-19
-                                                                                                                                                                                          }
-                                                                                                                                                                                         ]]
-                                                                                                                                                                                        ]
-                                                                                                                                                                                       ]
-                                                                                                                                                                                      ],
-                                                                                                                                                                                      "羵䥳H,6ⱎ겾|@t\"#햊1|稃 섭)띜=뻔ꡜ???櫎~*ῡ꫌/繣ﻠq": null
-                                                                                                                                                                                     }
-                                                                                                                                                                                    ]}
-                                                                                                                                                                                   ]},
-                                                                                                                                                                                   "츤": false
-                                                                                                                                                                                  }},
-                                                                                                                                                                                  "s": 3.7339341963399598E18
-                                                                                                                                                                                 }
-                                                                                                                                                                                ],
-                                                                                                                                                                                "N,I?1+㢓|ࣱ嶃쩥V2\u0012(4EE虪朶$|w颇v步": "~읢~_,Mzr㐫YB溓E淚\"ⅹ䈔ᏺ抙 b,nt5V㐒J檶ꏨ⻔?",
-                                                                                                                                                                                "Q껑ꡡ}$넎qH煔惍/ez^!ẳF댙䝌馻剁8": "梲;yt钰$i冄}AL%a j뜐奷걳뚾d꿽*ሬuDY3?뮟鼯뮟w㍪틱V",
-                                                                                                                                                                                "o{Q/K O胟㍏zUdꀐm&⨺J舕⾏魸訟㌥[T籨櫉唐킝 aṭ뱫촙莛>碶覆⧬짙쭰ׯdAiH໥벤퐥_恸[ 0e:죃TC弼荎뵁DA:w唵ꣁ": null,
-                                                                                                                                                                                "὏樎䵮軧|?౗aWH쩃1 ꅭsu": null
-                                                                                                                                                                               }
-                                                                                                                                                                              ]
-                                                                                                                                                                             },
-                                                                                                                                                                             "勂\\&m鰈J釮=Ⲽ鳋+䂡郑": null,
-                                                                                                                                                                             "殣b綊倶5㥗惢⳷萢ᑀ䬄镧M^ﱴ3⣢翣n櫻1㨵}ኯ뗙顖Z.Q➷ꮨ뗇\u0004": "ꔙ䁼>n^[GीA䨟AM琢ᒊS쨲w?d㶣젊嘶纝麓+愣a%気ྞSc됓ᔘ:8bM7Xd8㶑臌]Ꙥ0ꐭ쒙䫣挵C薽Dfⵃ떼᷸",
-                                                                                                                                                                             "?紡.셪_෨j\u0013Ox┠$Xᶨ-ᅇo薹-}軫;y毝㪜K㣁?.EV쮱4둽⛻䤜'2盡\u001f60(|e쐰㼎ᦀ㒧-$l@ﻑ坳\u0003䭱响巗WFo5c㧆T턁Y맸♤(": -2.50917882560589088E17
-                                                                                                                                                                            }}
-                                                                                                                                                                           ],
-                                                                                                                                                                           "侸\\릩.᳠뎠狣살cs项䭩畳H1s瀉븇19?.w骴崖㤊h痠볭㞳㞳䁮Ql怠㦵": "@䟴-=7f",
-                                                                                                                                                                           "鹟1x௢+d ;vi䭴FSDS\u0004hꎹ㚍?⒍⦏ў6u,扩@됷Su)Pag휛TᒗV痩!瞏釀ꖞ蘥&ೞ蘐ꭰꞇᝎ": "ah懱Ժ&\u20f7䵅♎඀䞧鿪굛ౕ湚粎蚵ᯋ幌YOE)५襦㊝Y*^\"R+ඈ咷蝶9ꥂ榨艦멎헦閝돶v좛咊E)K㓷ྭr",
-                                                                                                                                                                           "搆q쮦4綱켙셁.f4<\/g<籽늷?#蚴픘:fF\u00051㹉뀭.ᰖ풎f֦Hv蔎㧤.!䭽=鞽]음H:?\"-4": 8.740133984938656E-20
-                                                                                                                                                                          }]}
-                                                                                                                                                                         }
-                                                                                                                                                                        ],
-                                                                                                                                                                        "tVKn딩꘥⊾蹓᤹{\u0003lR꼽ᄲQFᅏ傅ﱋ猢⤊ᔁ,E㓒秤nTතv`♛I\u0000]꫔ṞD\"麵c踝杰X&濿또꣹깳౥葂鿎\\aꡨ?": 3900062609292104525
-                                                                                                                                                                       }
-                                                                                                                                                                      ],
-                                                                                                                                                                      "ਉ샒⊩Lu@S䧰^g": -1.1487677090371648E18,
-                                                                                                                                                                      "⎢k⑊꬗yᏫ7^err糎Dt\u000bJ礯확ㆍ沑ｻꋽe赔㝢^J\u0004笲㿋idra剰-᪉C錇/Ĝ䂾ညS지?~콮gR敉⬹'䧭": 1901472137232418266,
-                                                                                                                                                                      "灗k䶥:?촽贍쓉꓈㒸g獘[뵎\\胕?\u0014_榙p.j稶,$`糉妋0>Fᡰly㘽$?": "]ꙛO赎&#㠃돱剳\"<◆>0誉齐_|z|裵씪>ᐌ㼍\"Z[琕}O?G뚇諦cs⠜撺5cu痑U圲\u001c?鴴計l춥/╓哼䄗茏ꮅ뫈댽A돌롖뤫V窗讬sHd&\nOi;_u"
-                                                                                                                                                                     }
-                                                                                                                                                                    ],
-                                                                                                                                                                    "Uﺗ\\Y\\梷䄬~\u0002": null,
-                                                                                                                                                                    "k\"Y磓ᗔ휎@U冈<\/w컑)[": false,
-                                                                                                                                                                    "曏J蝷⌻덦\u001f㙳s꥓⍟邫P늮쥄c∬ྡྷ舆렮칤Z趣5콡넛A쳨\\뀙骫(棻.*&輛LiIfi{@EA婳KᬰTXT": -4.3088230431977587E17
-                                                                                                                                                                   }]}
-                                                                                                                                                                  ]
-                                                                                                                                                                 ],
-                                                                                                                                                                 "곃㲧<\/dఓꂟs其ࡧ&N葶=?c㠤Ჴ'횠숄臼#\u001a~": false
-                                                                                                                                                                }
-                                                                                                                                                               ]
-                                                                                                                                                              ]}]
-                                                                                                                                                             }]
-                                                                                                                                                            }}
-                                                                                                                                                           ],
-                                                                                                                                                           "2f`⽰E쵟>J笂裭!〛觬囀ۺ쟰#桊l鹛ⲋ|RA_Vx፭gE됓h﵀mfỐ|?juTU档[d⢼⺻p濚7E峿": 5613688852456817133
-                                                                                                                                                          },
-                                                                                                                                                          "濘끶g忮7㏵殬W팕Q曁 뫰)惃廊5%-蹚zYZ樭ﴷQ锘쯤崫gg": true,
-                                                                                                                                                          "絥ᇑ⦏쒓븣爚H.㗊߄o蘵貆ꂚ(쎔O᥉ﮓ]姨Wꁓ!RMA|o퉢THx轮7M껁U즨'i뾘舯o": "跥f꜃?"
-                                                                                                                                                         }}
-                                                                                                                                                        ],
-                                                                                                                                                        "鷰鹮K-9k;ﰰ?_ݦѷ-ꅣ䩨Zꥱ\"mꠟ屎/콑Y╘2&鸞脇㏢ꀇ࠺ⰼ拾喭틮L꽩bt俸墶 [l/웄\"꾦\u20d3iও-&+\u000fQ+໱뵞": -1.296494662286671E-19
-                                                                                                                                                       },
-                                                                                                                                                       "HX੹/⨇୕붷Uﮘ旧\\쾜͔3l鄈磣糂̖䟎Eᐳw橖b῀_딕hu葰窳闹вU颵|染H죶.fP䗮:j䫢\\b뎖i燕ꜚG⮠W-≚뉗l趕": "ଊ칭Oa᡺$IV㷧L\u0019脴셀붿餲햪$迳向쐯켂PqfT\" ?I屉鴼쿕@硙z^鏕㊵M}㚛T젣쓌-W⩐-g%⺵<뮱~빅╴瑿浂脬\u0005왦燲4Ⴭb|D堧 <\/oEQh",
-                                                                                                                                                       "䘶#㥘੐캔f巋ἡAJ䢚쭈ࣨ뫒*mᇊK，ࣺAꑱ\u000bR<\/A\"1a6鵌㯀bh곿w(\"$ꘁ*rಐ趣.d࿩k/抶면䒎9W⊃9": "漩b挋Sw藎\u0000",
-                                                                                                                                                       "畀e㨼mK꙼HglKb,\"'䤜": null
-                                                                                                                                                      }]}]
-                                                                                                                                                     ]
-                                                                                                                                                    ]
-                                                                                                                                                   }]
-                                                                                                                                                  ]}
-                                                                                                                                                 ]
-                                                                                                                                                ]}
-                                                                                                                                               ],
-                                                                                                                                               "歙>駿ꣂ숰Q`J΋方樛(d鱾뼣(뫖턭\u20f9lচ9歌8o]8윶l얶?镖G摄탗6폋폵+g:䱫홊<멀뀿/س|ꭺs걐跶稚W々c㫣⎖": "㣮蔊깚Cꓔ舊|XRf遻㆚︆'쾉췝\\&言",
-                                                                                                                                               "殭\"cށɨꝙ䞘:嬮e潽Y펪㳅/\"O@ࠗ겴]췖YǞ(t>R\"N?梳LD恭=n氯T豰2R諸#N}*灧4}㶊G䍣b얚": null,
-                                                                                                                                               "襞<\/啧 B|싞W瓇)6簭鼡艆lN쩝`|펭佡\\間邝[z릶&쭟愱ꅅ\\T᰽1鯯偐栈4̸s윜R7⒝/똽?치X": "⏊躖Cﱰ2Qẫ脐&இ?%냝悊",
-                                                                                                                                               ",鰧偵셣싹xᎹ힨᯳EṬH㹖9": -4604276727380542356
-                                                                                                                                              }
-                                                                                                                                             }
-                                                                                                                                            ]]]],
-                                                                                                                                            "웺㚑xs}q䭵䪠馯8?LB犯zK'os䚛HZ\"L?셎s^㿧㴘Cv2": null
-                                                                                                                                           }]
-                                                                                                                                          ]
-                                                                                                                                         ]
-                                                                                                                                        ],
-                                                                                                                                        "Kd2Kv+|z": 7367845130646124107,
-                                                                                                                                        "ᦂⶨ?ᝢ 祂些ഷ牢㋇操\"腭䙾㖪\\(y4cE뽺ㆷ쫺ᔖ%zfۻ$ў1柦,㶢9r漢": -3.133230960444846E-20,
-                                                                                                                                        "琘M焀q%㢟f鸯O⣏蓑맕鯊$O噷|)z褫^㢦⠮ꚯ꫞`毕1qꢚ{ĭ䎀বώT\"뱘3G൴?^^of": null
-                                                                                                                                       }
-                                                                                                                                      ],
-                                                                                                                                      "a8V᯺?:ﺃ/8ꉿBq|9啓댚;*i2": null,
-                                                                                                                                      "cpT瀇H珰Ừpೃi鎪Rr␣숬-鹸ҩ䠚z脚цGoN8入y%趌I┽2ឪЀiJNcN)槣/▟6S숆牟\"箑X僛G殱娇葱T%杻:J諹昰qV쨰": 8331037591040855245
-                                                                                                                                     }],
-                                                                                                                                     "G5ᩜ䄗巢껳": true
-                                                                                                                                    }
-                                                                                                                                   },
-                                                                                                                                   "Ồ巢ゕ@_譙A`碫鄐㡥砄㠓(^K": "?܃B혢▦@犑ὺD~T⧁|醁;o=J牌9냚⢽㨘{4觍蚔9#$∺\u0016p囅\\3Xk阖⪚\"UzA穕롬✎➁㭒춺C㣌ဉ\"2瓑员ᅽꝶ뫍}꽚ꞇ鶂舟彺]ꍽJC蝧銉",
-                                                                                                                                   "␆Ě膝\"b-퉐ACR言J謈53~V튥x䜢?ꃽɄY뮩ꚜ": "K/↾e萃}]Bs⾿q룅鷦-膋?m+死^魊镲6",
-                                                                                                                                   "粡霦c枋AHퟁo礼Ke?qWcA趸㡔ꂏ?\u000e춂8iতᦜ婪\u0015㢼nﵿꍻ!ᐴ関\u001d5j㨻gfῩUK5Ju丝tかTI'?㓏t>⼟o a>i}ᰗ;뤕ܝ": false,
-                                                                                                                                   "ꄮ匴껢ꂰ涽+䜨B蛹H䛓-k蕞fu7kL谖,'涃V~챳逋穞cT\"vQ쓕ObaCRQ㓡Ⲯ?轭⫦輢墳?vA餽=h䮇킵n폲퉅喙?\"'1疬V嬗Qd灗'Lự": "6v!s믁㭟㣯獃!磸餠ቂh0C뿯봗F鷭gꖶ~ｺkK<ᦈTt\\跓w㭣횋钘ᆹ듡䑚W䟾X'ꅔ4FL勉Vܴ邨y)2'〚쭉⽵-鞣E,Q.?块",
-                                                                                                                                   "?(˧쩯@崟吋歄K": null
-                                                                                                                                  },
-                                                                                                                                  "Gc럃녧>?2DYI鴿\\륨)澔0ᔬlx'觔7젘⤡縷螩%Sv׫묈/]↱&S h\u0006歋ᑛxi̘}ひY蔯_醨鯘煑橾8?䵎쨋z儬ꁏ*@츾:": null
-                                                                                                                                 }
-                                                                                                                                }
-                                                                                                                               }
-                                                                                                                              ]
-                                                                                                                             ]
-                                                                                                                            ]}
-                                                                                                                           },
-                                                                                                                           "HO츧G": 3.694949578823609E17,
-                                                                                                                           "QC\u0012(翻曇Tf㷟bGBJ옉53\\嚇ᛎD/\u001b夾၉4\"핀@祎)쫆yD\"i먎Vn㿿V1W᨝䶀": -6150931500380982286,
-                                                                                                                           "Z㓮P翸鍱鉼K䋞꘺튿⭁Y": -7704503411315138850,
-                                                                                                                           "]모开ꬖP븣c霤<[3aΠ\"黁䖖䰑뮋ꤦ秽∼㑷冹T+YUt\"싳F↭䖏&鋌": -2.7231911483181824E18,
-                                                                                                                           "tꎖ": -4.9517948741799555E-19,
-                                                                                                                           "䋘즊.⬅IꬃۣQ챢ꄑ黐|f?C⾺|兕읯sC鬸섾整腨솷V": "旆柩l<K髝M戶鯮t:wR2ꉱ`9'l픪*폍芦㊢Pjjo堡^  읇얛嶅있ষ0?F",
-                                                                                                                           "下9T挞\\$yᮇk쌋⼇,ਉ": true,
-                                                                                                                           "櫨:ㆣ,邍lr崕祜㐮烜Z,XXD蕼㉴ kM꯽?P0﹉릗": null,
-                                                                                                                           "gv솠歽閘4镳䗄2澾>쪦sᖸMy㦅울썉瘗㎜檵9ꍂ駓ૉᚿ/u3씅徐拉[Z䞸ࡗ1ꆱ&Ｑ풘?ǂ8\u0011BCDY2볨;鸏": null,
-                                                                                                                           "幫 n煥s쁇펇 왊-$C\"衝:\u0014㣯舼.3뙗Yl⋇\"K迎멎[꽵s}9鉳UK8쐥\"掄㹖h㙈!얄સ?Ꜳ봺R伕UTD媚Ｉ䜘W鏨蔮": -4.150842714188901E-17,
-                                                                                                                           "ﺯ^㄄\b죵@fྉkf颡팋Ꞧ{/Pm0V둳⻿/落韒ꊔᚬ@5螺G\\咸a谆⊪ቧ慷绖?财(鷇u錝F=r၍橢ឳn:^iᴵtD볠覅N赴": null
-                                                                                                                          }]
-                                                                                                                         }]
-                                                                                                                        }
-                                                                                                                       ]
-                                                                                                                      ]}
-                                                                                                                     ]},
-                                                                                                                     "謯?w厓奰T李헗聝ឍ貖o⪇弒L!캶$ᆅ": -4299324168507841322,
-                                                                                                                     "뺊奉_垐浸延몏孄Z舰2i$q붿좾껇d▵餏\"v暜Ҭ섁m￴g>": -1.60911932510533427E18
-                                                                                                                    }
-                                                                                                                   ]
-                                                                                                                  }
-                                                                                                                 ]
-                                                                                                                ]],
-                                                                                                                "퉝꺔㠦楶Pꅱ": 7517896876489142899,
-                                                                                                                "": false
-                                                                                                               }
-                                                                                                              ]},
-                                                                                                              "是u&I狻餼|谖j\"7c됮sסּ-踳鉷`䣷쉄_A艣鳞凃*m⯾☦椿q㎭N溔铉tlㆈ^": 1.93547720203604352E18,
-                                                                                                              "kⲨ\\%vr#\u000bⒺY\\t<\/3﬌R訤='﹠8蝤Ꞵ렴曔r": false
-                                                                                                             }
-                                                                                                            ]},
-                                                                                                            "阨{c?C\u001d~K?鎌Ԭ8烫#뙣P초遗t㭱E­돒䆺}甗[R*1!\\~h㕅᰺@<9JꏏષI䳖栭6綘걹ￌM\"▯是∔v鬽顭⋊譬": "운ﶁK敂(欖C취پ℄爦賾"
-                                                                                                           }
-                                                                                                          }}
-                                                                                                         }],
-                                                                                                         "鷨赼鸙+\\䭣t圙ڹx᜾ČN<\/踘\"S_맶a鷺漇T彚⎲i㈥LT-xA캔$\u001cUH=a0츺l릦": "溣㣂0濕=鉵氬駘>Pꌢpb솇쬤h힊줎獪㪬CrQ矠a&脍꼬爼M茴/΅\u0017弝轼y#Ꞡc6둴=?R崏뷠麖w?"
-                                                                                                        },
-                                                                                                        "閕ᘜ]CT)䵞l9z'xZF{:ؐI/躅匽졁:䟇AGF૸\u001cퟗ9)駬慟ꡒꆒRS״툋A<>\u0010\"ꂔ炃7g덚E৏bꅰ輤]o㱏_뷕ܘ暂\"u": "芢+U^+㢩^鱆8*1鈶鮀\u0002뺰9⬳ꪮlL䃣괟,G8\u20a8DF㉪錖0ㄤ瓶8Nଷd?眡GLc陓\\_죌V쁰ल二?c띦捱 \u0019JC\u0011b⤉zẒT볕\"绣蘨뚋cꡉkI\u001e鳴",
-                                                                                                        "ꃣI'{6u^㡃#཰Kq4逹y൒䧠䵮!㱙/n??{L풓ZET㙠퍿X2᩟綳跠葿㚙w཮x캽扳B唕S|尾}촕%N?o䪨": null,
-                                                                                                        "ⰴFjෟ셈[\u0018辷px?椯\\1<ﲻ栘ᣁ봢憠뉴p": -5263694954586507640
-                                                                                                       }
-                                                                                                      ]
-                                                                                                     ]]
-                                                                                                    ]}
-                                                                                                   ]}]
-                                                                                                  ]
-                                                                                                 ],
-                                                                                                 "?#癘82禩鋆ꊝty?&": -1.9419029518535086E-19
-                                                                                                }
-                                                                                               ]
-                                                                                              ]
-                                                                                             ]}
-                                                                                            ]
-                                                                                           ]
-                                                                                          ],
-                                                                                          "훊榲.|῕戄&.㚏Zꛦ2\"䢥ሆ⤢fV_摕婔?≍Fji冀탆꜕i㏬_ẑKᅢ꫄蔻XWc|饡Siẘ^㲦?羡2ぴ1縁ᙅ?쐉Ou": false
-                                                                                         }]]
-                                                                                        ]}}},
-                                                                                        "慂뗄卓蓔ᐓ匐嚖/颹蘯/翻ㆼL?뇊,텵<\\獷ごCボ": null
-                                                                                       },
-                                                                                       "p溉ᑟi짣z:䒤棇r^٫%G9缑r砌롧.물农g?0׼ሩ4ƸO㣥㯄쩞ጩ": null,
-                                                                                       "껎繥YxK\"F젷쨹뤤1wq轫o?鱑뜀瘊?뎃h灑\\ꛣ}K峐^ኖ⤐林ꉓhy": null
-                                                                                      }
-                                                                                     ],
-                                                                                     "᱀n肓ㄛ\"堻2>m殮'1橌%Ꞵ군=Ӳ鯨9耛<\/n據0u彘8㬇៩f᏿诙]嚊": "䋯쪦S럶匏ㅛ#)O`ሀX_鐪渲⛀㨻宅闩➈ꢙஶDR⪍"
-                                                                                    },
-                                                                                    "tA썓龇 ⋥bj왎录r땽✒롰;羋^\\?툳*┎?썀ma䵳넅U䳆૘〹䆀LQ0\b疀U~u$M}(鵸g⳾i抦뛹?䤈땚검.鹆?ꩡtⶥGĒ;!ቹHS峻B츪켏f5≺": 2366175040075384032,
-                                                                                    "전pJjleb]ួ": -7.5418493141528422E18,
-                                                                                    "n.鎖ጲ\n?,$䪘": true
-                                                                                   },
-                                                                                   "欈Ar㉣螵᪚茩?O)": null
-                                                                                  },
-                                                                                  "쫸M#x}D秱欐K=侫们丐.KꕾxẠ\u001e㿯䣛F܍캗qq8꟞ṢFD훎⵳簕꭛^鳜\u205c٫~⑟~冫ऊ2쫰<\/戲윱o<\"": true
-                                                                                 },
-                                                                                 "㷝聥/T뱂\u0010锕|内䞇x侁≦㭖:M?iM᣿IJe煜dG࣯尃⚩gPt*辂.{磼럾䝪@a\\袛?}ᓺB珼": true
-                                                                                }
-                                                                               }
-                                                                              ]]}]}},
-                                                                              "tn\"6ꫤ샾䄄;銞^%VBPwu묪`Y僑N.↺Ws?3C⤻9唩S䠮ᐴm;sᇷ냞඘B/;툥B?lB∤)G+O9m裢0kC햪䪤": -4.5941249382502277E18,
-                                                                              "ᚔt'\\愫?鵀@\\びꂕP큠<<]煹G-b!S?\nꖽ鼫,ݛ&頺y踦?E揆릱H}햧캡b@手.p탻>췽㣬ꒅ`qe佭P>ᓂ&?u}毚ᜉ蟶頳졪ᎏzl2wO": -2.53561440423275936E17
-                                                                             }]}
-                                                                            }
-                                                                           ]
-                                                                          ]],
-                                                                          "潈촒⿂叡": 5495738871964062986
-                                                                         }
-                                                                        ]]
-                                                                       }
-                                                                      ]
-                                                                     ]}
-                                                                    ]]
-                                                                   ]]
-                                                                  ]}
-                                                                 ]
-                                                                ]},
-                                                                "ႁq킍蓅R`謈蟐ᦏ儂槐僻ﹶ9婌櫞釈~\"%匹躾ɢ뤥>࢟瀴愅?殕节/냔O✬H鲽엢?ᮈੁ⋧d␽㫐zCe*": 2.15062231586689536E17,
-                                                                "㶵Ui曚珰鋪ᾼ臧P{䍏䷪쨑̟A뼿T渠誈䏚D1!잶<\/㡍7?)2l≣穷᛾稝{:;㡹nemיּ訊`G": null,
-                                                                "䀕\"飕辭p圁f#뫆䶷뛮;⛴ᩍ3灚덏ᰝ쎓⦷詵%᜖Մfs⇫(\u001e~P|ﭗCⲾផv湟W첋(텪બT<บSꏉ੗⋲X婵i ӵ⇮?L䬇|ꈏ?졸": 1.548341247351782E-19
-                                                               }
-                                                              ]
-                                                             },
-                                                             "t;:N\u0015q鐦Rt缆{ꮐC?஛㷱敪\\+鲊㉫㓪몗릙竏(氵kYS": "XᰂT?൮ô",
-                                                             "碕飦幑|+ 㚦鏶`镥ꁩ B<\/加륙": -4314053432419755959,
-                                                             "秌孳(p!G?V傫%8ሽ8w;5鲗㦙LI檸\u2098": "zG N볞䆭鎍흘\\ONK3횙<\/樚立圌Q튅k쩎Ff쁋aׂJK銆ઘ즐狩6༥✙䩜篥CzP(聻駇HHퟲ讃%,ά{렍p而刲vy䦅ክ^톺M楒鍢㹳]Mdg2>䤉洞",
-                                                             "踛M젧>忔芿㌜Zk": 2215369545966507819,
-                                                             "씐A`$槭頰퍻^U覒\bG毲aᣴU;8!팲f꜇E⸃_卵{嫏羃X쀳C7뗮m(嚼u N܁谟D劯9]#": true,
-                                                             "ﻩ!뵸-筚P᭛}ἰ履lPh?౮ⶹꆛ穉뎃g萑㑓溢CX뾇G㖬A錟]RKaꄘ]Yo+@䘁's섎襠$^홰}F": null
-                                                            },
-                                                            "粘ꪒ4HXᕘ蹵.$區\r\u001d묁77pPc^y笲Q<\/ꖶ 訍䃍ᨕG?*": 1.73773035935040224E17
-                                                           },
-                                                           "婅拳?bkU;#D矠❴vVN쩆t㜷A풃갮娪a%鮏絪3dAv룒#tm쑬⌛qYwc4|L8KZ;xU⓭㳔밆拓EZ7襨eD|隰ऌ䧼u9Ԣ+]贴P荿": 2.9628516456987075E18
-                                                          }]}}]
-                                                         ]}
-                                                        }}
-                                                       ]}]
-                                                      ],
-                                                      "|g翉F*湹̶\u0005⏐1脉̀eI쩓ᖂ㫱0碞l䴨ꑅ㵽7AtἈ턧yq䳥塑:z:遀ﾼX눔擉)`N3昛oQ셖y-ڨ⾶恢ꈵq^<\/": null,
-                                                      "菹\\랓G^璬x৴뭸ゆUS겧﮷Bꮤ ┉銜᯻0%N7}~f洋坄Xꔼ<\/4妟Vꄟ9:౟곡t킅冩䧉笭裟炂4봋ⱳ叺怊t+怯涗\"0㖈Hq": false,
-                                                      "졬믟'ﺇফ圪쓬멤m邸QLব䗁愍4jvs翙 ྍ꧀艳H-|": null,
-                                                      "컮襱⣱뗠 R毪/鹙꾀%헳8&": -5770986448525107020
-                                                     }
-                                                    ],
-                                                    "B䔚bꐻ뙏姓展槰T-똌鷺tc灿᫽^㓟䏀o3o$꘭趙萬I顩)뇭Ἑ䓝\f@{ᣨ`x3蔛": null
-                                                   }
-                                                  ]
-                                                 ]
-                                                }],
-                                                "⦖扚vWꃱ꥙㾠壢輓{-⎳鹷贏璿䜑bG倛⋐磎c皇皩7a~ﳫU╣Q࠭ꎉS摅姽OW.홌ೞ.": null,
-                                                "蚪eVlH献r}ᮏ믠ﰩꔄ@瑄ⲱ": null,
-                                                "퀭$JWoꩢg역쁍䖔㑺h&ୢtXX愰㱇?㾫I_6 OaB瑈q裿": null,
-                                                "꽦ﲼLyr纛Zdu珍B絟쬴糔?㕂짹䏵e": "ḱ\u2009cX9멀i䶛簆㳀k"
-                                               }
-                                              ]]]],
-                                              "(_ꏮg່澮?ᩑyM<艷\u001aꪽ\\庼뙭Z맷㰩Vm\\lY筺]3㋲2㌩㄀Eਟ䝵⨄쐨ᔟgङHn鐖⤇놋瓇Q탚單oY\"♆臾jHᶈ征ቄ??uㇰA?#1侓": null
-                                             },
-                                             "觓^~ሢ&iI띆g륎ḱ캀.ᓡꀮ胙鈉": 1.0664523593012836E-19,
-                                             "y詭Gbᔶऽs댁U:杜⤎ϲ쁗⮼D醄诿q뙰I#즧v蔎xHᵿt᡽[**?崮耖p缫쿃L菝,봬ꤦC쯵#=X1瞻@OZc鱗CQTx": null
-                                            }
-                                           ]
-                                          }}],
-                                          "剘紁\u0004\\Xn⊠6,တױ;嵣崇}讃iႽ)d1\\䔓": null
-                                         },
-                                         "脨z\"{X,1u찜<'k&@?1}Yn$\u0015Rd輲ｰa쮂굄+B$l": true,
-                                         "諳>*쭮괐䵟Ґ+<箁}빀䅱⡔檏臒hIH脟ꩪC핝ଗP좕\"0i<\/C褻D۞恗+^5?'ꂱ䚫^7}㡠cq6\\쨪ꔞꥢ?纖䫀氮蒫侲빦敶q{A煲G": -6880961710038544266
-                                        }}]
-                                       },
-                                       "5s⨲JvಽῶꭂᄢI.a৊": null,
-                                       "?1q꽏쿻ꛋDR%U娝>DgN乭G": -1.2105047302732358E-19
-                                      }
-                                     ]
-                                    ]},
-                                    "qZz`撋뙹둣j碇쁏\\ꆥ\u0018@藴疰Wz)O{F䶛l᷂绘訥$]뮍夻䢋䩇萿獰樧猵⣭j萶q)$꬚⵷0馢W:Ⱍ!Qoe": -1666634370862219540,
-                                    "t": "=wp|~碎Q鬳Ӎ\\l-<\/^ﳊhn퐖}䍔t碵ḛ혷?靻䊗",
-                                    "邙쇡㯇%#=,E4勃驆V繚q[Y댻XV㡸[逹ᰏ葢B@u=JS5?bLRn얮㍉⏅ﰳ?a6[&큟!藈": 1.2722786745736667E-19
-                                   },
-                                   "X블땨4{ph鵋ꉯ웸 5p簂䦭s_E徔濧d稝~No穔噕뽲)뉈c5M윅>⚋[岦䲟懷恁?鎐꓆ฬ爋獠䜔s{\u001bm鐚儸煛%bﯿXT>ꗘ@8G": 1157841540507770724,
-                                   "媤娪Q杸\u0011SAyᡈ쿯": true,
-                                   "灚^ಸ%걁<\/蛯<O\"-刷㏠R(kO=䢊䅎l䰓팪A絫픧": "譔\\㚄 ?R7㔪G㋉⣰渆?\\#|gN⤴;W칷A׫癮଼ೣ㏳뒜7d恓꾲0扬S0ᆵi/贎ྡn䆋武",
-                                   "萇砇Gこ朦켋Wq`㞲攊*冁~霓L剢zI腧튴T繙Cঅ뫬╈뮜ㄾ䦧촄椘B⊬츩r2f㶱厊8eϬ{挚␯OM焄覤\\(Kӡ>?\"祴坓\\\\'흍": -3.4614808555942579E18,
-                                   "釴U:O湛㴑䀣렑縓\ta)<D8ﭳ槁髭D.L|xs斋敠\"띋早7wᎍ": true,
-                                   "쵈+쬎簨up䓬?q+~\u0019仇뵈᫯3ᵣ恘枰劫㪢u珘-퀭:컙:u`⌿A(9鄦!<珚nj3:Hࣨ巋䀁旸뎈맻v\"\\(곘vO㤰aZe<\/W鹙鄜;l厮둝": null,
-                                   "": -1.2019926774977002E-18,
-                                   "%者O7.Nꪍs梇接z蕜綛<\/䜭\"죊y<曋漵@Ś⹝sD⟓jݗᢜ?z/9ၲMa쨮긗贎8ᔮ㦛;6p뾥໭䭊0B찛+)(Y㿠鸁䕒^옥": "鬃뫤&痽舎J콮藐󽸰ᨨMꈫ髿v<N\\.삒껅я1ꭼ5䴷5쳬臨wj덥"
-                                  }],
-                                  "鷎'㳗@帚妇OAj' 谬f94ǯ(횡ﾋ%io쪖삐좛>(j:숾却䗌gCiB뽬Oyuq輥厁/7)?今hY︺Q": null
-                                 }
-                                ]
-                               ]]]}]
-                              ],
-                              "I笔趠Ph!<ཛྷ㸞诘X$畉F\u0005笷菟.Esr릙!W☆䲖뗷莾뒭U\"䀸犜Uo3Gꯌx4r蔇᡹㧪쨢準<䂀%ࡡꟼ瑍8炝Xs0䀝销?fi쥱ꆝલBB": -8571484181158525797,
-                              "L⦁o#J|\"⽩-㱢d㌛8d\\㶤傩儻E[Y熯)r噤὘勇 }": "e(濨쓌K䧚僒㘍蠤Vᛸ\"络QJL2,嬓왍伢㋒䴿考澰@(㏾`kX$끑эE斡,蜍&~y",
-                              "vj.|统圪ᵮPL?2oŶ`밧\"勃+0ue%⿥绬췈체$6:qa렐Q;~晘3㙘鹑": true,
-                              "ශؙ4獄⶿c︋i⚅:ん閝Ⳙ苆籦kw{䙞셕pC췃ꍬ␜꟯ꚓ酄b힝hwk꭭M鬋8B耳쑘WQ\\偙ac'唀x᪌\u2048*h짎#ፇ鮠뾏ឿ뀌": false,
-                              "⎀jꄒ牺3Ⓝ컴~?親ꕽぼܓ喏瘘!@<튋㐌꿱⩦{a?Yv%⪧笯Uܱ栅E搚i뚬:ꄃx7䙳ꦋ&䓹vq☶I䁘ᾘ涜\\썉뺌Lr%Bc㍜3?ꝭ砿裞]": null,
-                              "⭤뙓z(㡂%亳K䌽꫿AԾ岺㦦㼴輞낚Vꦴw냟鬓㹈뽈+o3譻K1잞": 2091209026076965894,
-                              "ㇲ\t⋇轑ꠤ룫X긒\"zoY읇희wj梐쐑l侸`e%s": -9.9240075473576563E17,
-                              "啸ꮑ㉰!ᚓ}銏": -4.0694813896301194E18,
-                              ">]囋੽EK뇜>_ꀣ緳碖{쐐裔[<ನ\"䇅\"5L?#xTwv#罐\u0005래t应\\N?빗;": "v쮽瞭p뭃"
-                             }
-                            ]],
-                            "斴槾?Z翁\"~慍弞ﻆ=꜡o5鐋dw\"?K蠡i샾ogDﲰ_C*⬟iㇷ4nય蟏[㟉U꽌娛苸 ঢ়操贻洞펻)쿗૊許X⨪VY츚Z䍾㶭~튃ᵦ<\/E臭tve猑x嚢": null,
-                            "锡⛩<\/칥ꈙᬙ蝀&Ꚑ籬■865?_>L詏쿨䈌浿弥爫̫lj&zx<\/C쉾?覯n?": null,
-                            "꾳鑤/꼩d=ᘈn挫ᑩ䰬ZC": "3錢爋6Ƹ䴗v⪿Wr益G韠[\u0010屗9쁡钁u?殢c䳀蓃樄욂NAq赟c튒瘁렶Aૡɚ捍"
-                           }
-                          ]
-                         ]
-                        ]}
-                       ]
-                      ]
-                     }]]]}}
-                    ]}],
-                    "Ej䗳U<\/Q=灒샎䞦,堰頠@褙g_\u0003ꤾfⶽ?퇋!łB〙ד3CC䌴鈌U:뭔咎(Qો臃䡬荋BO7㢝䟸\"Yb": 2.36010731779814E-20,
-                    "逸'0岔j\u000e눘먷翌C츊秦=ꭣ棭ှ;鳸=麱$XP⩉駚橄A\\좱⛌jqv䰞3Ь踌v㳆¹gT┌gvLB賖烡m?@E঳i": null
-                   },
-                   "曺v찘ׁ?&绫O័": 9107241066550187880
-                  }
-                 ]
-                ],
-                "(e屄\u0019昜훕琖b蓘ᬄ0/۲묇Z蘮ဏ⨏蛘胯뢃@㘉8ሪWᨮ⦬ᅳ䅴HI၇쨳z囕陻엣1赳o": true,
-                ",b刈Z,ၠ晐T솝ŕB⩆ou'퐼≃绗雗d譊": null,
-                "a唥KB\"ﳝ肕$u\n^⅄P䟼냉䞸⩪u윗瀱ꔨ#yşs꒬=1|ﲤ爢`t౐튼쳫_Az(Ṋ擬㦷좕耈6": 2099309172767331582,
-                "?㴸U<\/䢔ꯡ阽扆㐤q鐋?f㔫wM嬙-;UV죫嚔픞G&\"Cᗍ䪏풊Q": "VM7疹+陕枡툩窲}翡䖶8欞čsT뮐}璤:jﺋ鎴}HfA൝⧻Zd#Qu茅J髒皣Y-︴[?-~쉜v딏璮㹚䅊﩯<-#\u000e걀h\u0004u抱﵊㼃U<㱷⊱IC進"
-               },
-               "숌dee節鏽邺p넱蹓+e罕U": true
-              }
-             ],
-             "b⧴룏??ᔠ3ぱ>%郿劃翐ꏬꠛW瞳᫏누躨狀ໄy੽\"ីuS=㨞馸k乆E": "トz݈^9R䬑<ﮛG<s~<\/?ⵆᏥ老熷u듷"
-            }}
-           ]
-          }
-         ]}
-        }
-       }
-      }
-     }},
-     "宩j鬅쳜QꝖјy獔Z᭵1v擖}䨿F%cֲ᫺贴m塼딚NP亪\"ￋsa뺯ꘓ2:9뛓༂쌅䊈#>Rꨳ\u000fTT泠纷꽀MR<CBxP񱒫X쇤": -2.22390568492330598E18,
-     "?䯣ᄽ@Z鸅->ᴱ纊:㠭볮?%N56%鈕1䗍䜁a䲗j陇=뿻偂衋࿘ᓸ?ᕵZ+<\/}H耢b䀁z^f$&㝒LkꢳI脚뙛u": 5.694374481577558E-20
-    }]
-   }
-  ]],
-  "obj": {"key": "wrong value"},
-  "퓲꽪m{㶩/뇿#⼢&᭙硞㪔E嚉c樱㬇1a綑᝖DḾ䝩": null
- },
- "key": "6.908319653520691E8",
- "z": {
-  "6U閆崬밺뀫颒myj츥휘:$薈mY햚#rz飏+玭V㭢뾿愴YꖚX亥ᮉ푊\u0006垡㐭룝\"厓ᔧḅ^Sqpv媫\"⤽걒\"˽Ἆ?ꇆ䬔未tv{DV鯀Tἆl凸g\\㈭ĭ즿UH㽤": null,
-  "b茤z\\.N": [[
-   "ZL:ￄዎ*Y|猫劁櫕荾Oj为1糕쪥泏S룂w࡛Ᏺ⸥蚙)",
-   {
-    "\"䬰ỐwD捾V`邀⠕VD㺝sH6[칑.:醥葹*뻵倻aD\"": true,
-    "e浱up蔽Cr෠JK軵xCʨ<뜡癙Y獩ｹ齈X/螗唻?<蘡+뷄㩤쳖3偑犾&\\첊xz坍崦ݻ鍴\"嵥B3㰃詤豺嚼aqJ⑆∥韼@\u000b㢊\u0015L臯.샥": false,
-    "l?Ǩ喳e6㔡$M꼄I,(3᝝縢,䊀疅뉲B㴔傳䂴\u0088㮰钘ꜵ!ᅛ韽>": -5514085325291784739,
-    "o㮚?\"춛㵉<\/﬊ࠃ䃪䝣wp6ἀ䱄[s*S嬈貒pᛥ㰉'돀": [{
-     "(QP윤懊FI<ꃣ『䕷[\"珒嶮?%Ḭ壍಻䇟0荤!藲끹bd浶tl\u2049#쯀@僞": {"i妾8홫": {
-      ",M맃䞛K5nAㆴVN㒊햬$n꩑&ꎝ椞阫?/ṏ세뉪1x쥼㻤㪙`\"$쟒薟B煌܀쨝ଢ଼2掳7㙟鴙X婢\u0002": "Vዉ菈᧷⦌kﮞఈnz*<?੃'ahhCFX(\u0007⮊E㭍䱾Gxꥩr❣.洎",
-      "뻴5bDD큯O傆盓왻U?ꞅꐊN鐭᧢τ\"迳豲8\u001b䃥ꂻ䴺ྸH筴,": {
-       "\"L鸔SE㬡XV&~͎'놅蔞눶l匛?'.K氁\\ƢẨ疇mΊ'꽳&!鹠m'|{P痊 秄쒿u\u00111䋧gϩx7t丗D䊨䠻z0.A0": -1.50139930144708198E18,
-       "8鋂뛷?첒B☚>﷜FM\"荭7ꍀ-VR<\/';䁙E9$䩉\f @s?퍪o3^衴cඎ䧪aK鼟ｑ䆨c{䳠5mᒲՙ蘹ᮩ": {
-        "F㲷JGo⯍P덵x뒳p䘧☔\"+ꨲ吿JfR㔹)4n紬G练Q፞!C|": true,
-        "p^㫮솎oc.೚A㤠??r\u000f)⾽⌲們M2.䴘䩳:⫭胃\\፾@Fᭌ\\K": false,
-        "蟌Tk愙潦伩": {
-         "a<\/@ᾛ慂侇瘎": -7271305752851720826,
-         "艓藬/>၄ṯ,XW~㲆w": {"E痧郶)㜓ha朗!N赻瞉駠uC\u20ad辠<Ve?폱!Im䁎搄:*s 9諚Prᵾ뒰髶B̌qWA8梸vS⫊⢳{t㺲q㺈랊뮣RqK밢쳪": [
-          false,
-          {
-           "\u000b=>x퓮⣫P1ࠫLMMX'M刼唳됤": null,
-           "P쓫晥%k覛ዩIUᇸ滨:噐혲lMR5䋈V梗>%幽u頖\\)쟟": null,
-           "eg+昉~矠䧞难\b?gQ쭷筝\\eꮠNl{ಢ哭|]Mn銌╥zꖘzⱷ⭤ᮜ^": [
-            -1.30142114406914976E17,
-            -1.7555215491128452E-19,
-            null,
-            "渾㨝ߏ牄귛r?돌?w[⚞ӻ~廩輫㼧/",
-            -4.5737191805302129E18,
-            null,
-            "xy࿑M[oc셒竓Ⓔx?뜓y䊦>-D켍(&&?XKkc꩖ﺸᏋ뵞K伕6ী)딀P朁yW揙?훻魢傎EG碸9類៌g踲C⟌aEX舲:z꒸许",
-            3808159498143417627,
-            null,
-            {"m試\u20df1{G8&뚈h홯J<\/": {
-             "3ஸ厠zs#1K7:rᥞoꅔꯧ&띇鵼鞫6跜#赿5l'8{7㕳(b/j\"厢aq籀ꏚ\u0015厼稥": [
-              -2226135764510113982,
-              true,
-              null,
-              {
-               "h%'맞S싅Hs&dl슾W0j鿏MםD놯L~S-㇡R쭬%": null,
-               "⟓咔謡칲\u0000孺ꛭx旑檉㶆?": null,
-               "恇I転;￸B2Y`z\\獓w,놏濐撐埵䂄)!䶢D=ഭ㴟jyY": {
-                "$ࡘt厛毣ൢI芁<겿骫⫦6tr惺a": [
-                 6.385779736989334E-20,
-                 false,
-                 true,
-                 true,
-                 [
-                  -6.891946211462334E-19,
-                  null,
-                  {
-                   "]-\\Ꟑ1/薓❧Ὂ\\l牑\u0007A郃)阜ᇒᓌ-塯`W峬G}SDb㬨Q臉⮻빌O鞟톴첂B㺱<ƈmu챑J㴹㷳픷Oㆩs": {
-                    "\"◉B\"pᶉt骔J꩸ᄇᛐi╰栛K쉷㉯鐩!㈐n칍䟅難>盥y铿e୔蒏M貹ヅ8嘋퀯䉶ጥ㏢殊뻳\"絧╿ꉑ䠥?∃蓊{}㣣Gk긔H1哵峱": false,
-                    "6.瀫cN䇮F㧺?\\椯=ڈT䘆4␘8qv": -3.5687501019676885E-19,
-                    "Q?yऴr혴{஀䳘p惭f1ﹸ䅷䕋贲<ྃᄊ繲hq\\b|#QSTs1c-7(䵢\u2069匏絘ꯉ:l毴汞t戀oෟᵶ뮱፣-醇Jx䙬䐁햢0࣫ᡁgrㄛ": "\u0011_xM/蘇Chv;dhA5.嗀绱V爤ﰦi뵲M",
-                    "⏑[\"ugoy^儣횎~U\\섯겜論l2jw஌yD腅̂\u0019": true,
-                    "ⵯɇ䐲᫿࢚!㯢l샅笶戮1꣖0Xe": null,
-                    "劅f넀識b宁焊E찓橵G!ʱ獓뭔雩괛": [{"p⹣켙[q>燣䍃㞽ᩲx:쓤삘7玑퇼0<\/q璂ᑁ[Z\\3䅵䧳\u0011㤧|妱緒C['췓Yꞟ3Z鳱雼P錻BU씧U`ᢶg蓱>.1ӧ譫'L_5V䏵Ц": [
-                     false,
-                     false,
-                     {"22䂍盥N霂얢<F8꼵7Gసyh뀍g᦭ꄢx硴嬢\u001a?E괆T|;7犟\"Wt%䐩O⨵t&#ᬋK'蜍Ძ揔⾠鲂T멷靃\u0018䓞cE": {"f=䏏츜瞾zw?孡鏣\\铀᫞yẆg(\u0011M6(s2]`ਫ": [[[{
-                      "'y몱纣4S@\\,i㷯럹Ua充Tᣢ9躘Zଞ쥿䐊s<\/刎\\\"뉦-8/": "蜑.X0꭛낢륹i젨ꚁ<8?s볕蝡|Q✬᯦@\\G㑢屿Mn졾J굤⥟JW뤵苑r쁕툄嵵?⾥O",
-                      "^1挲~[n귆誈央碠멪gI洷": -8214236471236116548,
-                      "sሣ%娌暡clr蟜㑓2\u000bS❟_X㨔⚴5~蔷ꀇ|Xu㬖,꤭卹r(g믇쩍%췸앙|栣U\\2]䤉+啠菡ꯎT鉹m\n/`SzDᅼ鞶": 1.1217523390167132E-19,
-                      "u톇=黚\\ ꂮ췵L>躰e9⑩_뵜斌n@B}$괻Yᐱ@䧋V\"☒-諯cV돯ʠ": true,
-                      "Ű螧ᔼ檍鍎땒딜qꄃH뜣<獧ूCY吓⸏>XQ㵡趌o끬k픀빯a(ܵ甏끆୯/6Nᪧ}搚ᆚ짌P牰泱鈷^d꣟#L삀\"㕹襻;k㸊\\f+": true,
-                      "쎣\",|⫝̸阊x庿k잣v庅$鈏괎炔k쬪O_": [
-                       "잩AzZGz3v愠ꉈⵎ?㊱}S尳௏p\r2>췝IP䘈M)w|\u000eE",
-                       -9222726055990423201,
-                       null,
-                       [
-                        false,
-                        {"´킮'뮤쯽Wx讐V,6ᩪ1紲aႈ\u205czD": [
-                         -930994432421097536,
-                         3157232031581030121,
-                         "l貚PY䃛5@䭄<nW\u001e",
-                         [
-                          3.801747732605161E18,
-                          [
-                           null,
-                           false,
-                           {
-                            "": 4.0442013775147072E16,
-                            "2J[sᡪ㞿|n'#廲꯬乞": true,
-                            "B[繰`\\㏏a̼㨀偛㽓<\/꥖ᵈO让\r43⡩徑ﬓ๨ﮕx:㣜o玐ꉟぢC珵὆ᓞ쇓Qs氯였9駵q혃Ljꂔ<\/昺+t䐋༻猙c沪~櫆bpJ9UᏐ:칣妙!皗F4㑄탎䕀櫳振讓": 7.3924182188256287E18,
-                            "H磵ai委曷n柋T<\/勿F&:ꣴfU@㿗榻Lb+?퍄sp\"᪟~>귻m㎮琸f": 1.0318894506812084E-19,
-                            "࢜⩢Ш䧔1肽씮+༎ᣰ闺馺窃䕨8Mƶq腽xc(៯夐J5굄䕁Qj_훨/~価.䢵慯틠퇱豠㼇Qﵘ$DuSp(8Uญ<\/ಟ룴𥳐ݩ$": 8350772684161555590,
-                            "ㆎQ䄾\u001bpᩭ${[諟^^骴᤮b^ㅥI┧T㉇⾞\"绦<AYJ⒃-oF<\/蛎mm;obh婃ᦢ": false,
-                            "䔤䣈?汝.p襟&d㱅\\Jᚠ@?O첁ࢽ휔VR蔩|㒢柺": [[
-                             "-ꕨ岓棻r@鿆^3~䪤Ѐ狼︌ﹲ\\᝸MlE쵠Q+",
-                             null,
-                             false,
-                             3346674396990536343,
-                             null,
-                             {
-                              "": null,
-                              "/䏨S쨑,&繷㉥8C엮赸3馢|뇲{鄎ꗇqFﶉ雕UD躢?Ꟛအ꽡[hᕱᗅ㦋쭞Mユ茍?L槽암V#성唐%㣕嘵\\ڹ(嘏躿&q": [
-                               -1364715155337673920,
-                               false,
-                               -8197733031775379251,
-                               "E팗鮲JwH\\觡܈᜝\"+뉞娂N휗v噙၂깼\u001dD帒l%-斔N",
-                               -3.844267973858711E-20,
-                               [{"쬯(褈Q 蟚뿢 /ⱖ㻥\u0017/?v邘䃡0U.Z1x?鯔V尠8Em<": [[[
-                                null,
-                                [
-                                 null,
-                                 -5841406347577698873,
-                                 "킷\"S⋄籞繗솸ᵣ浵w쑿ퟗ7nᎏx3앙z㘌쿸I葥覯㬏0ᆝb汆狺뷘ႀnꋋ",
-                                 -1227911573141158702,
-                                 {
-                                  "u㉮PᾺV鵸A\\g*ࡗ9슟晭+ͧↀ쿅H\u001c꾣犓}癇恛ᗬ黩䟘X梑鐆e>r䰂f矩'-7䡭桥Dz兔V9谶居㺍ᔊ䩯덲.\u001eL0ὅㅷ釣": [{
-                                   "<쯬J卷^숞u࠯䌗艞R9닪g㐾볎a䂈歖意:%鐔|ﵤ|y}>;2,覂⶚啵tb*仛8乒㓶B࿠㯉戩oX 貘5V嗆렽낁߼4h䧛ꍺM空\\b꿋貼": 8478577078537189402,
-                                   "VD*|吝z~h譺aᯒ": {
-                                    "YI췢K<\/濳xNne玗rJo쾘3핰鴊\"↱AR:ࢷ\"9?\"臁說)?誚ꊏe)_D翾W?&F6J@뺾ꍰNZ醊Z쾈വH嶿?炫㷱鬰M겈<bS}㎥l|刖k": {"H7鷮퇢_k": [
-                                     true,
-                                     "s㟑瀭좾쮀⑁Y찺k맢戲쀸俻ກ6儮끗扖puߖꜻ馶rꈞ痘?3ྚ畊惘䎗\"vv)*臔웅鿈䧲^v,껛㰙J <ᚶ5",
-                                     7950276470944656796,
-                                     4.9392301536234746E17,
-                                     -4796050478201554639,
-                                     "yꬴc<3㻚",
-                                     "o塁\u20a4蒵鮬裢CᴧnB㭱f.",
-                                     false,
-                                     [
-                                      false,
-                                      "㡐弑V?瀆䰺q!출㇞yᘪ꼼(IS~Ka 烿ꟿ샕桤\u0005HQҹ㯪罂q萾⚇懋⦕둡v",
-                                      1862560050083946970,
-                                      "\u20b6[|(뭹gꍒ펉O轄Dl묽]ﯨ髯QEbA㒾m@롴礠㕓2땫n6ْ엘঵篳R잷꙲m색摪|@㿫5aK设f胭r8/NI4춫栵\\꯬2]",
-                                      false,
-                                      {
-                                       "\u000b7*㙛燏.~?䔊p搕e_拺艿뷍f{ꔻ1s驙`$Ė戧?q⋬沭?塷᭚蹀unoa5": {
-                                        "S귯o紞㾕ᅶ侏銇12|ʟ畴iNAo?|Sw$M拲գ㭄紧螆+,梔": null,
-                                        "㭚0?xB疱敻ேBPwv뾃熉(ӠpJ]갢\"Bj'\u0016GE椱<\/zgៅx黢礇h},M9ﴦ?LḨ": "Si B%~㬒E",
-                                        "핇㉊살㍢숨~ȪRo䦅D桺0z]﬽蠆c9ᣨyPP㿷U~㞐?쯟퍸宒뉆U|}㉓郾ࣻ*櫎꼪䁗s?~7\u001e㘔h9{aឋ}:㶒P8": [{"\\R囡쐬nN柋琍؛7칾 :㶃衇徜V 深f1淍♠i?3S角폞^ᆞ\u20e8ṰD\u0007秡+躒臔&-6": {
-                                         "䨑g.fh㔗=8!\"狿ൻLU^뻱g䲚㻐'W}k欤?๒鲇S꧗䫾$ĥ피": -794055816303360636,
-                                         "外頮詋~텡竆繃䏩苨뾺朁꼃瘹f*㉀枙NH/\u2027ꢁ}j묎vペq︉식뜡Od5 N顯ି烅仟Qfㆤ嚢(i䬅c;맧?嶰㩼츱獡?-": {
-                                          "e݆㍡⬬'2㻒?U篲鿄\"隻Ҭ5NꭰꤺBꀈ拾᩺[刯5곑Na램ﴦ዆]㝓qw钄\u001b\"Y洊䗿祏塥迵[⼞⠳P$꠱5먃0轢`": [{"獰E賝﫚b먭N긆Ⰹ史2逶ꜛ?H짉~?P}jj}侷珿_T>᭨b,⻁鈵P䕡䀠८ⱄ홎鄣": {
-                                           "@?k2鶖㋮\"Oರ K㨇廪儲\u0017䍾J?);\b*묀㗠섳햭1MC V": null,
-                                           "UIICP!BUA`ᢈ㋸~袩㗪⾒=fB﮴l1ꡛ죘R辂여ҳ7쮡<䩲`熕8頁": 4481809488267626463,
-                                           "Y?+8먙ᚔ鋳蜩럶1㥔y璜౩`": [
-                                            null,
-                                            1.2850335807501874E-19,
-                                            "~V2",
-                                            2035406654801997866,
-                                            {
-                                             "<숻1>\"": -8062468865199390827,
-                                             "M㿣E]}qwG莎Gn᝶(ꔙ\\D⬲iꇲs寢t駇S뀡ꢜ": false,
-                                             "pꝤ㎏9W%>M;-U璏f(^j1?&RB隧 忓b똊E": "#G?C8.躬ꥯ'?냪#< 渟&헿란zpo왓Kj}鷧XﻘMツb䕖;㪻",
-                                             "vE풤幉xz뱕쫥Ug㦲aH} ᣟp:鬼Yᰟ<Fɋ잣緂頒⺏䉲瑑䅂,C~ޅG!f熢-B7~9Pqࡢ[츑#3ꕎ,Öඳ聁⩅㵧춀뿍xy䌏͂tdj!箧᳆|9蚡돬": -2.54467378964089632E17,
-                                             "䵈䅦5빖,궆-:໿댾仫0ᙚyᦝhqᚄ": null,
-                                             "侯Y\"湛졯劇U셎YX灍ⅸ2伴|筧\\䁒㶶᷏쁑Waᦵᗱ㜏늾膠<Jc63<G\u20fe䇹66僣k0O\"_@U": null,
-                                             "姪y$#s漴JH璌Ӊ脛J㝾펔ﹴoꈶ㚸PD:薠쏖%說ថ蹂1］⾕5튄": {
-                                              "᝾Huw3䮅如쿺䍟嫝]<鰨ݷ?꯯䫓傩|ᐶස媽\\澒≡闢": "Mm\"쏇ᯄ졽\"楇<\/ꥆ흭局n隴@鿣w⠊4P贈徎W㊋;䤞'.팇蒁䡴egpx嗎wஅ獗堮ᛐnˁ︖䀤4噙?໚郝᱋ޘॎt恑姫籕殥陃\"4[ꝬqL4Wꠎx",
-                                              "ℇj遌5B뒚\" U": "硄ꏘ{憠굏:&t䌨m Cઌ쿣鞛XFꠟs䝭ﶃ\"格a0x闊昵吲L\\杚聈aꁸj싹獅\"灟ﱡ馆*굖糠<ꔏ躎",
-                                              "톌賠弳ꟍb\"螖X50sĶ晠3f秂坯Iⓟ:萘": 5.573183333596288E18,
-                                              "%䴺": [[[[
-                                               -6957233336860166165,
-                                               false,
-                                               null,
-                                               {
-                                                "\"\\௮茒袀ᕥ23ୃ괶?䕎.嚲◉㏞L+ᵡ艱hL콇붆@": null,
-                                                "%螥9ꭌ<\/-t": true,
-                                                ",9|耢椸䁓Xk죱\u0015$Ώ鲞[?엢ᝲ혪즈ⴂ▂ℴ㗯\"g뺘\\ꍜ#\u0002ヮ}ሎ芲P[鹮轧@냲䃦=#(": 2.78562909315899616E17,
-                                                "R?H䧰ⵇ<,憰쮼Q總iR>H3镔ᴚ斦\\鏑r*2橱G⼔F/.j": true,
-                                                "RK좬뎂a홠f*f㱉ᮍ⦋潙㨋Gu곌SGI3I뿐\\F',)t`荁蘯囯ﮉ裲뇟쥼_ገ驪▵撏ᕤV": 1.52738225997956557E18,
-                                                "^k굲䪿꠹B逤%F㱢漥O披M㽯镞竇霒i꼂焅륓\u00059=皫之눃\u2047娤閍銤唫ၕb<\/w踲䔼u솆맚,䝒ᝳ'/it": "B餹饴is権ꖪ怯ꦂẉဎt\"!凢谵⧿0\\<=(uL䷍刨쑪>俆揓Cy襸Q힆䆭涷<\/ᐱ0ɧ䗾䚹\\ኜ?ꄢᇘ`䴢{囇}᠈䴥X4퓪檄]ꥷ/3謒ሴn+g騍X",
-                                                "GgG꽬[(嫓몍6\u0004궍宩㙻/>\u0011^辍dT腪hxǑ%ꊇk,8(W⧂結P鬜O": [{
-                                                 "M㴾c>\\ᓲ\u0019V{>ꤩ혙넪㭪躂TS-痴໸闓⍵/徯O.M㏥ʷD囎⧔쁳휤T??鉬뇙=#ꢫ숣BX䭼<\/d똬졬g榿)eꨋﯪ좇첻<?2K)": null,
-                                                 "Z17縬z]愀䖌 ᾋBCg5딒국憍꾓aⲷ턷u:U촳驿?雺楶\u0001\u001c{q*ᰗ苑B@k揰z.*蓗7ረIm\"Oᱍ@7?_": true,
-                                                 "㺃Z<": -4349275766673120695,
-                                                 "휃䠂fa塆ffixKe'덬鏗੄뺾w࠾鑎k땢m*႑햞鐮6攊&虜h黚,Y䱳Sﭼ둺pN6": [
-                                                  false,
-                                                  "IΎ䣲,\"ᬮ˪癘P~Qlnx喁Sᮔ༬˨I珌m䜛酛\u0003iꐸ㦧cQ帲晼D' \\(粋wQcN\\뵰跈",
-                                                  [
-                                                   "D0\\L?M1쥍Kaꏌsd+盌귤憊tz䌣댐בO坂wϢ%ὒgp,Ai⎧ᶆI餾ꦍ棩嘅᳉怴%m]ၶis纖D凜镧o심b U",
-                                                   {
-                                                    "?଼\u0011Rv&^[+匚I趈T媫\u0010.䥤ᆯ1q僤HydⲰl㒽K'ᅾiౕ豲초딨@\u0013J'쪪VD౼P4Ezg#8*㋤W馓]c쿯8": false,
-                                                    "c/擯X5~JmK䵶^쐎ച|B|u[솝(X뚤6v}W㤘⠛aR弌臌쾭諦eⒷ僡-;㩩⭖ⷴ徆龄갬{䱓ᥩ!﯏⊚ᇨ<v燡露`:볉癮꨽り★Ax7Ꮀ譥~舑\\Vꍋ\"$)v": "e&sFF쬘OBd슊寮f蠛জ봞mn~锆竒G脁\"趵G刕䕳&L唽붵<\/I,X팚B⍥X,kԇҗ眄_慡:U附ᓚA蕧>\u001a\u0011\";~쓆BH4坋攊7힪",
-                                                    "iT:L闞椕윚*滛gI≀Wਟඊ'ꢆ縺뱹鮚Nꩁ᧬蕼21줧\\䋯``⍐\\㏱鳨": 1927052677739832894,
-                                                    "쮁缦腃g]礿Y㬙 fヺSɪ꾾N㞈": [
-                                                     null,
-                                                     null,
-                                                     {
-                                                      "!t,灝Y 1䗉罵?c饃호䉂Cᐭ쒘z(즽sZG㬣sഖE4뢜㓕䏞丮Qp簍6EZឪ겛fx'ꩱQ0罣i{k锩*㤴㯞r迎jTⲤ渔m炅肳": [
-                                                       -3.3325685522591933E18,
-                                                       [{"㓁5]A䢕1룥BC?Ꙍ`r룔Ⳛ䙡u伲+\u0001്o": [
-                                                        null,
-                                                        4975309147809803991,
-                                                        null,
-                                                        null,
-                                                        {"T팘8Dﯲ稟MM☻㧚䥧/8ﻥ⥯aXLaH\"顾S☟耲ît7fS෉놁뮔/ꕼ䓈쁺4\\霶䠴ᩢ<\/t4?죵>uD5➶༆쉌럮⢀秙䘥\u20972ETR3濡恆vB? ~鸆\u0005": {
-                                                         "`閖m璝㥉b뜴?Wf;?DV콜\u2020퍉౓擝宏ZMj3mJ먡-傷뱙yח㸷꥿ ໘u=M읝!5吭L4v\\?ǎ7C홫": null,
-                                                         "|": false,
-                                                         "~Ztᛋ䚘\\擭㗝傪W陖+㗶qᵿ蘥ᙄp%䫎)}=⠔6ᮢS湟-螾-mXH?cp": 448751162044282216,
-                                                         "\u209fad놹j檋䇌ᶾ梕㉝bוּ<d䗱:줰M酄\u0000X#_r獢A饓ꍗُKo_跔?ᪧ嵜鼲<": null,
-                                                         "ꆘ)ubI@h@洭Ai㜎䏱k\u0003?T䉐3间%j6j棍j=❁\\U毮ᬹ*8䀔v6cpj⭬~Q꿾뺶펵悡!쩭厝l六㽫6퇓ޭ2>": {"?苴ꩠD䋓帘5騱qﱖPF?☸珗顒yU ᡫcb䫎 S@㥚gꮒ쎘泴멖\\:I鮱TZ듒ᶨQ3+f7캙\"?\f풾\\o杞紟﻽M.⏎靑OP": [
-                                                          -2.6990368911551596E18,
-                                                          [{"䒖@<᰿<\/⽬tTr腞&G%᳊秩蜰擻f㎳?S㵧\r*k뎾-乢겹隷j軛겷0룁鮁": {")DO0腦:춍逿:1㥨่!蛍樋2": [{
-                                                           ",ꌣf侴笾m๫ꆽ?1?U?\u0011ꌈꂇ": {
-                                                            "x捗甠nVq䅦w`CD⦂惺嘴0I#vỵ} \\귂S끴D얾?Ԓj溯\"v餄a": {
-                                                             "@翙c⢃趚痋i\u0015OQ⍝lq돆Y0pࢥ3쉨䜩^<8g懥0w)]䊑n洺o5쭝QL댊랖L镈Qnt⪟㒅십q헎鳒⮤眉ᔹ梠@O縠u泌ㄘb榚癸XޔFtj;iC": false,
-                                                             "I&뱋゘|蓔䔕측瓯%6ᗻHW\\N1貇#?僐ᗜgh᭪o'䗈꽹Rc욏/蔳迄༝!0邔䨷푪8疩)[쭶緄㇈୧ፐ": {
-                                                              "B+:ꉰ`s쾭)빼C羍A䫊pMgjdx䐝Hf9᥸W0!C樃'蘿f䫤סи\u0017Jve? 覝f둀⬣퓉Whk\"஼=չﳐ皆笁BIW虨쫓F廰饞": -642906201042308791,
-                                                              "sb,XcZ<\/m㉹ ;䑷@c䵀s奤⬷7`ꘖ蕘戚?Feb#輜}p4nH⬮eKL트}": [
-                                                               "RK鳗z=袤Pf|[,u욺",
-                                                               "Ẏᏻ罯뉋⺖锅젯㷻{H䰞쬙-쩓D]~\u0013O㳢gb@揶蔉|kᦂ❗!\u001ebM褐sca쨜襒y⺉룓",
-                                                               null,
-                                                               null,
-                                                               true,
-                                                               -1.650777344339075E-19,
-                                                               false,
-                                                               "☑lꄆs힨꤇]'uTന⌳농].1⋔괁沰\"IWഩ\u0019氜8쟇䔻;3衲恋,窌z펏喁횗?4?C넁问?ᥙ橭{稻Ⴗ_썔",
-                                                               "n?]讇빽嗁}1孅9#ꭨ靶v\u0014喈)vw祔}룼쮿I",
-                                                               -2.7033457331882025E18,
-                                                               {
-                                                                ";⚃^㱋x:饬ኡj'꧵T☽O㔬RO婎?향ᒭ搩$渣y4i;(Q>꿘e8q": "j~錘}0g;L萺*;ᕭꄮ0l潛烢5H▄쳂ꏒוֹꙶT犘≫x閦웧v",
-                                                                "~揯\u2018c4職렁E~ᑅቚꈂ?nq뎤.:慹`F햘+%鉎O瀜쟏敛菮⍌浢<\/㮺紿P鳆ࠉ8I-o?#jﮨ7v3Dt赻J9": null,
-                                                                "ࣝW䌈0ꍎqC逖,횅c၃swj;jJS櫍5槗OaB>D踾Y": {"㒰䵝F%?59.㍈cᕨ흕틎ḏ㋩B=9IېⓌ{:9.yw｝呰ㆮ肒᎒tI㾴62\"ዃ抡C﹬B<\/<EO꽓ᇕu&鋫\\禞퐹u꒍.7훯ಶ2䩦͉ᶱf깵ᷣ늎": [
-                                                                 5.5099570884646902E18,
-                                                                 "uQN濿m臇<%?谣鮢s]]x0躩慌闋<;( 鋤.0ᠵd1#벘a:Gs?햷'.)ㅴ䞟琯崈FS@O㌛ᓬ抢큌ើ냷쿟툥IZn[惵ꐧ3뙍[&v憙J>촋jo朣",
-                                                                 [
-                                                                  -7675533242647793366,
-                                                                  {"ᙧ呃:[㒺쳀쌡쏂H稈㢤\u001dᶗGG-{GHྻຊꡃ哸䵬;$?&d\\⥬こN圴됤挨-'ꕮ$PU%?冕눖i魁q騎Q": [
-                                                                   false,
-                                                                   [[
-                                                                    7929823049157504248,
-                                                                    [[
-                                                                     true,
-                                                                     "Z菙\u0017'eꕤ᱕l,0\\X\u001c[=雿8蠬L<\/낲긯W99g톉4ퟋb㝺\u0007劁'!麕Q궈oW:@X၎z蘻m絙璩귓죉+3柚怫tS捇蒣䝠-擶D[0=퉿8)q0ٟ",
-                                                                     "唉\nFA椭穒巯\\䥴䅺鿤S#b迅獘 ﶗ꬘\\?q1qN犠pX꜅^䤊⛤㢌[⬛휖岺q唻ⳡ틍\"㙙Eh@oA賑㗠y必Nꊑᗘ",
-                                                                     -2154220236962890773,
-                                                                     -3.2442003245397908E18,
-                                                                     "Wᄿ筠:瘫퀩?o貸q⊻(᎞KWf宛尨h^残3[U(='橄",
-                                                                     -7857990034281549164,
-                                                                     1.44283696979059942E18,
-                                                                     null,
-                                                                     {"ꫯAw跭喀 ?_9\"Aty背F=9缉ྦྷ@;?^鞀w:uN㘢Rỏ": [
-                                                                      7.393662029337442E15,
-                                                                      3564680942654233068,
-                                                                      [
-                                                                       false,
-                                                                       -5253931502642112194,
-                                                                       "煉\\辎ೆ罍5⒭1䪁䃑s䎢:[e5}峳ﴱn騎3?腳Hyꏃ膼N潭錖,Yᝋ˜YAၓ㬠bG렣䰣:",
-                                                                       true,
-                                                                       null,
-                                                                       {
-                                                                        "⒛'P&%죮|:⫶춞": -3818336746965687085,
-                                                                        "钖m<\/0ݎMtF2Pk=瓰୮洽겎.": [[
-                                                                         -8757574841556350607,
-                                                                         -3045234949333270161,
-                                                                         null,
-                                                                         {
-                                                                          "Ꮬr輳>⫇9hU##w@귪A\\C 鋺㘓ꖐ梒뒬묹㹻+郸嬏윤'+g<\/碴,}ꙫ>손;情d齆J䬁ຩ撛챝탹/R澡7剌tꤼ?ặ!`⏲睤\u00002똥଴⟏": null,
-                                                                          "\u20f2ܹe\\tAꥍư\\x当뿖렉禛;G檳ﯪS૰3~㘠#[J<}{奲 5箉⨔{놁<\/釿抋,嚠/曳m&WaOvT赋皺璑텁": [[
-                                                                           false,
-                                                                           null,
-                                                                           true,
-                                                                           -5.7131445659795661E18,
-                                                                           "萭m䓪D5|3婁ఞ>蠇晼6nﴺPp禽羱DS<睓닫屚삏姿",
-                                                                           true,
-                                                                           [
-                                                                            -8759747687917306831,
-                                                                            {
-                                                                             ">ⓛ\t,odKr{䘠?b퓸C嶈=DyEᙬ@ᴔ쨺芛髿UT퓻春<\/yꏸ>豚W釺N뜨^?꽴﨟5殺ᗃ翐%>퍂ဿ䄸沂Ea;A_\u0005閹殀W+窊?Ꭼd\u0013P汴G5썓揘": 4.342729067882445E-18,
-                                                                             "Q^즾眆@AN\u0011Kb榰냎Y#䝀ꀒᳺ'q暇睵s\"!3#I⊆畼寤@HxJ9": false,
-                                                                             "⿾D[)袨㇩i]웪䀤ᛰMvR<蟏㣨": {"v퇓L㪱ꖣ豛톤\\곱#kDTN": [{
-                                                                              "(쾴䡣,寴ph(C\"㳶w\"憳2s馆E!n!&柄<\/0Pꈗſ?㿳Qd鵔": {"娇堰孹L錮h嵅⛤躏顒?CglN束+쨣ﺜ\\MrH": {"獞䎇둃ቲ弭팭^ꄞ踦涟XK錆쳞ឌ`;੶S炥騞ଋ褂B៎{ڒ䭷ᶼ靜pI荗虶K$": [{"◖S~躘蒉꫿輜譝Q㽙闐@ᢗ¥E榁iء5┄^B[絮跉ᰥ遙PWi3wㄾⵀDJ9!w㞣ᄎ{듒ꓓb6\\篴??c⼰鶹⟧\\鮇ꮇ": [[
-                                                                               654120831325413520,
-                                                                               -1.9562073916357608E-19,
-                                                                               {
-                                                                                "DC(昐衵ἡ긙갵姭|֛[t": 7.6979110359897907E18,
-                                                                                "J␅))嫼❳9Xfd飉j7猬ᩉ+⤻眗벎E鰉Zﾶ63zၝ69}ZᶐL崭ᦥ⡦靚⋛ꎨ~i㨃咊ꧭo䰠阀3C(": -3.5844809362512589E17,
-                                                                                "p꣑팱쒬ꎑ뛡Ꙩ挴恍胔&7ᔈ묒4Hd硶훐㎖zꢼ豍㿢aሃ=<\/湉鵲EӅ%$F!퍶棌孼{O駍਺geu+": ")\u001b잓kŀX쩫A밁®ڣ癦狢)扔弒p}k縕ꩋ,䃉tࣼi",
-                                                                                "ァF肿輸<솄G-䢹䛸ꊏl`Tqꕗ蒞a氷⸅ᴉ蠰]S/{J왲m5{9.uέ~㕚㣹u>x8U讁B덺襪盎QhVS맅킃i识{벂磄Iහ䙅xZy/抍૭Z鲁-霳V据挦ℒ": null,
-                                                                                "㯛|Nꐸb7ⵐb?拠O\u0014ކ?-(EꞨ4ꕷᄤYᯕOW瞺~螸\"욿ќ<u鵵઎⸊倾쑷෻rT⪄牤銱;W殆͢芄ਰ嚝훚샢⊿+㲽": null,
-                                                                                "単逆ົ%_맛d)zJ%3칧_릟#95䌨怡\u001ci턠ॣi冘4赖'ਐ䧐_栔!": {
-                                                                                 "*?2~4㲌᭳쯁ftႷ1#oJ\b䊇镇됔 \u2079x䛁㊝ᮂN;穽跖s휇ᣄ홄傷z⸷(霸!3y뺏M쒿햏۽v㳉tở心3黎v쭻 Rp཮Vr~T?&˴k糒븥쩩r*D": null,
-                                                                                 "8@~홟ꔘk1[": -5570970366240640754,
-                                                                                 "BZt鏦ꡬc餖  s(mᛴ\u0000◄d腑t84C⟐坯VṊ뉙'噱Ꝕ珽GC顀?허0ꞹ&돇䛭C䷫](": 2.4303828213012387E-20,
-                                                                                 "y撔Z외放+}ḑ骈ᙝ&\u0016`G便2|-e]঳?QF㜹YF\"㿒緄햷㈟塚䷦ୀጤlM蘸N㾆▛럪㞂tᕬ镈쇝喠l amcxPnm\u001a᱋<\/]_]ﻹ瞧?H": false,
-                                                                                 "ፏ氏묢뜚I[♺뽛x?0H봬Wpn꨹Ra䝿쌑{㴂ni祻윸A'y|⺴ᚘ庌9{$恲{톽=m#@6ᨧfgs44陎J#<Ễ쨓瀵❩a୛㷉㙉ܸ◠냔嬯~呄籁羥镳": false,
-                                                                                 "㘱{<頬22?IF@곊I겂嶻L᝛D{@r쒂?IAᣧ洪惒誸b徂z췺꾍㠭\\刊%禨쌐ⶣ仵\\P[:47;<ᇅ<\/": {
-                                                                                  "^U釳-v㢈ꗝ◄菘rᜨi;起kR犺䵫\u0000锍쁙m-ԙ!lḃ꛸뻾F(W귛y": "#ᠺH㸢5v8_洑C",
-                                                                                  "䔵໳$ᙠ6菞\u206e摎q圩P|慍sV4:㜾(I溞I?": -6569206717947549676,
-                                                                                  "透Ꞃ緵퇝8 >e㺰\"'㌢ƐW\u0004瞕>0?V鷵엳": true,
-                                                                                  "뤥G\\迋䠿[庩'꼡\u001aiᩮV쯁ᳪ䦪Ô;倱ନ뛁誈": null,
-                                                                                  "쥹䄆䚟Q榁䎐᢭<\/2㕣p}HW蟔|䃏꿈ꚉ锳2Pb7㙑Tⅹᵅ": {
-                                                                                   "Y?֭$>#cVBꩨ:>eL蒁務": {
-                                                                                    "86柡0po 䏚&-捑Ћ祌<\/휃-G*㶢הּ쩍s㶟餇c걺yu꽎還5*턧簕Og婥SꝐ": null,
-                                                                                    "a+葞h٥ࠆ裈嗫ﵢ5輙퀟ᛜ,QDﹼ⟶Y騠锪E_|x죗j侵;m蜫轘趥?븅w5+mi콛L": {
-                                                                                     ";⯭ﱢ!买F⽍柤鶂n䵣V㫚墱2렾ELEl⣆": [
-                                                                                      true,
-                                                                                      -3.6479311868339015E-18,
-                                                                                      -7270785619461995400,
-                                                                                      3.334081886177621E18,
-                                                                                      2.581457786298155E18,
-                                                                                      -6.605252412954115E-20,
-                                                                                      -3.9232347037744167E-20,
-                                                                                      {
-                                                                                       "B6㊕.k1": null,
-                                                                                       "ZAꄮJ鮷ᳱo갘硥鈠䠒츼": {
-                                                                                        "ᕅ}럡}.@y陪鶁r業'援퀉x䉴ﵴl퍘):씭脴ᥞhiꃰblﲂ䡲엕8߇M㶭0燋標挝-?PCwe⾕J碻Ᾱ䬈䈥뷰憵賣뵓痬+": {"a췩v礗X⋈耓ፊf罅靮!㔽YYᣓw澍33⎔芲F|\"䜏T↮輦挑6ᓘL侘?ￆ]덆1R௯✎餘6ꏽ<\/௨\\?q喷ꁫj~@ulq": {"嗫欆뾔Xꆹ4H㌋F嵧]ࠎ]㠖1ꞤT<$m뫏O i댳0䲝i": {"?෩?\u20cd슮|ꯆjs{?d7?eNs⢚嫥氂䡮쎱:鑵롟2hJꎒﯭ鱢3춲亄:뼣v䊭諱Yj択cVmR䩃㘬T\"N홝*ै%x^F\\_s9보zz4淗?q": [
-                                                                                         null,
-                                                                                         "?",
-                                                                                         2941869570821073737,
-                                                                                         "{5{殇0䝾g6밖퍋臩綹R$䖭j紋釰7sXI繳漪행y",
-                                                                                         false,
-                                                                                         "aH磂?뛡#惇d婅?Fe,쐘+늵䍘\"3r瘆唊勐j⳧࠴ꇓ<\/唕윈x⬌讣䋵%拗ᛆⰿ妴᝔M2㳗必꧂淲?ゥ젯檢<8끒MidX䏒3᳻Q▮佐UT|⤪봦靏⊏",
-                                                                                         [[{
-                                                                                          "颉(&뜸귙{y^\"P퟉춝Ჟ䮭D顡9=?}Y誱<$b뱣RvO8cH煉＠tk~4ǂ⤧⩝屋SS;J{vV#剤餓ᯅc?#a6D,s": [
-                                                                                           -7.8781018564821536E16,
-                                                                                           true,
-                                                                                           [
-                                                                                            -2.28770899315832371E18,
-                                                                                            false,
-                                                                                            -1.0863912140143876E-20,
-                                                                                            -6282721572097446995,
-                                                                                            6767121921199223078,
-                                                                                            -2545487755405567831,
-                                                                                            false,
-                                                                                            null,
-                                                                                            -9065970397975641765,
-                                                                                            [
-                                                                                             -5.928721243413937E-20,
-                                                                                             {"6촊\u001a홯kB0w撨燠룉{绎6⳹!턍贑y▾鱧ժ[;7ᨷ∀*땒䪮1x霆Hᩭ☔\"r䝐7毟ᝰr惃3ꉭE+>僒澐": [
-                                                                                              "Ta쎩aƝt쵯ⰪVb",
-                                                                                              [
-                                                                                               -5222472249213580702,
-                                                                                               null,
-                                                                                               -2851641861541559595,
-                                                                                               null,
-                                                                                               4808804630502809099,
-                                                                                               5657671602244269874,
-                                                                                               "5犲﨣4mᥣ?yf젫꾯|䋬잁$`Iⳉﴷ扳兝,'c",
-                                                                                               false,
-                                                                                               [
-                                                                                                null,
-                                                                                                {
-                                                                                                 "DyUIN쎾M仼惀⮥裎岶泭lh扠\u001e礼.tEC癯튻@_Qd4c5S熯A<\/＼6U윲蹴Q=%푫汹\\\u20614b[௒C⒥Xe⊇囙b,服3ss땊뢍i~逇PA쇸1": -2.63273619193485312E17,
-                                                                                                 "Mq꺋貘k휕=nK硍뫞輩>㾆~἞ࡹ긐榵l⋙Hw뮢帋M엳뢯v⅃^": 1877913476688465125,
-                                                                                                 "ᶴ뻗`~筗免⚽টW˃⽝b犳䓺Iz篤p;乨A\u20ef쩏?疊m㝀컩뫡b탔鄃ᾈV(遢珳=뎲ିeF仢䆡谨8t0醄7㭧瘵⻰컆r厡궥d)a阄፷Ed&c﯄伮1p": null,
-                                                                                                 "⯁w4曢\"(欷輡": "\"M᭫]䣒頳B\\燧ࠃN㡇j姈g⊸⺌忉ꡥF矉স%^",
-                                                                                                 "㣡Oᄦ昵⫮Y祎S쐐級㭻撥>{I$": -378474210562741663,
-                                                                                                 "䛒掷留Q%쓗1*1J*끓헩ᦢ﫫哉쩧EↅIcꅡ\\?ⴊl귛顮4": false,
-                                                                                                 "寔愆샠5]䗄IH贈=d﯊/偶?ॊn%晥D視N򗘈'᫂⚦|X쵩넽z질tskxDQ莮Aoﱻ뛓": true,
-                                                                                                 "钣xp?&\u001e侉/y䴼~?U篔蘚缣/I畚?Q绊": -3034854258736382234,
-                                                                                                 "꺲໣眀)⿷J暘pИfAV삕쳭Nꯗ4々'唄ⶑ伻㷯騑倭D*Ok꧁3b␽_<\/챣Xm톰ၕ䆄`*fl㭀暮滠毡?": [
-                                                                                                  "D男p`V뙸擨忝븪9c麺`淂⢦Yw⡢+kzܖ\fY1䬡H歁)벾Z♤溊-혰셢?1<-\u0005;搢Tᐁle\\ᛵߓﭩ榩<QF;t=?Qꀞ",
-                                                                                                  [
-                                                                                                   null,
-                                                                                                   [{"-췫揲ᬨ墊臸<ࠒH跥 㔭쥃㫯W=z[wধ╌<~yW楄S!⑻h즓lĖN￧篌W듷튗乵᪪템먵Pf悥ᘀk䷭焼\\讄r擁鐬y6VF<\/6랿p)麡ꁠ㪁\"pழe": [
-                                                                                                    "#幎杴颒嶈)ㄛJ.嶤26_⋌东챯ꠉ⤋ؚ/⏚%秼Q룠QGztﾺ㎷អI翰Xp睔鍜ꨍ",
-                                                                                                    {",T?": [
-                                                                                                     false,
-                                                                                                     [[
-                                                                                                      true,
-                                                                                                      7974824014498027996,
-                                                                                                      false,
-                                                                                                      [
-                                                                                                       4.3305464880956252E18,
-                                                                                                       {
-                                                                                                        "᱿W^A]'rᮢ)鏥z餝;Hu\\Fk?ﴺ?IG浅-䙧>訝-xJ;巡8깊蠝ﻓU$K": {
-                                                                                                         "Vꕡ諅搓W=斸s︪vﲜ츧$)iꡟ싉e寳?ጭムVથ嵬i楝Fg<\/Z|៪ꩆ-5'@ꃱ80!燱R쇤t糳]罛逇dṌ֣XHiͦ{": true,
-                                                                                                         "Ya矲C멗Q9膲墅携휻c\\딶G甔<\/.齵휴": -1.1456247877031811E-19,
-                                                                                                         "z#.OO￝J": -8263224695871959017,
-                                                                                                         "崍_3夼ᮟ1F븍뽯ᦓ鴭V豈Ь": [{
-                                                                                                          "N蒬74": null,
-                                                                                                          "yuB?厅vK笗!ᔸcXQ旦컶P-녫mﾵ麟_": "1R@ 톘xa_|﩯遘s槞d!d껀筤⬫薐焵먑D{\\6k共倌☀G~AS_D\"딟쬚뮥馲렓쓠攥WTMܭ8nX㩴䕅檹E\u0007ﭨN 2 ℆涐ꥏ꠵3▙玽|됨_\u2048",
-                                                                                                          "恐A C䧩G": {":M큣5e들\\ꍀ恼ᔄ靸|I﨏$)n": {
-                                                                                                           "|U䬫㟯SKV6ꛤ㗮\bn봻䲄fＸT:㾯쳤'笓0b/ೢC쳖?2浓uO.䰴": "ཐ꼋e?``,ᚇ慐^8ꜙNM䂱\u0001IᖙꝧM'vKdꌊH牮r\\O@䊷ᓵ쀆(fy聻i툺\"?<\/峧ࣞ⓺ᤤ쵒߯ꎺ騬?)刦\u2072l慪y꺜ﲖTj+u",
-                                                                                                           "뽫<G;稳UL⸙q2n쵿C396炿J蓡z⣁zဩSOU?<\/뙍oE큸O鿅෴ꍈEm#\"[瑦⤫ᝆgl⡗q8\"큘덥係@ᆤ=\u0001爖羝췀㸩b9\\jeqt㟿㮸龾m㳳긄": {
-                                                                                                            "9\"V霟釜{/o0嫲C咀-饷䈍[녩)\r䤴tMW\\龟ϣ^ي㪙忩䞞N湆Y笕)萨ꖤ誥煽:14⫻57U$擒䲐薡Qvↇ櫲현誧?nஷ6": {"l웾䌵.䅋䦝ic碳g[糲Ƿ-ឈᚱ4쑧\u0004C࿼\u0018&쬑?멲<\/fD_檼픃pd쪼n㕊渪V䛉m揈W儅톳뗳䓆7㭽諤T煠Ney?0᪵鈑&": [
-                                                                                                             false,
-                                                                                                             null,
-                                                                                                             {
-                                                                                                              "\r;鼶j᠂꼍RLz~♔9gf?ӡ浐": -1.4843072575250897E-19,
-                                                                                                              "&ꊒ\"ꋟ䝭E诮ﯚO?SW뒁훪mb旙⎕ᗕ⶙|ᷤ5y4甥": "j5|庠t铱?v 횋0\"'rxz䃢杺Ɜ!\u0002",
-                                                                                                              "Q ၩ㟧": {"Hﬔ\u2058䪠틙izZㅛ탟H^ﶲA??R6呠Z솋R.࿶g8": [
-                                                                                                               -8762672252886298799,
-                                                                                                               -1.9486830507000208E17,
-                                                                                                               null,
-                                                                                                               -7157359405410123024,
-                                                                                                               null,
-                                                                                                               null,
-                                                                                                               -995856734219489233,
-                                                                                                               "呧㫹A4!",
-                                                                                                               null,
-                                                                                                               -1.9105609358624648E-19,
-                                                                                                               5888184370445333848,
-                                                                                                               2.25460605078245E-19,
-                                                                                                               2.5302739297121987E18,
-                                                                                                               "뢹sbEf捵2丯?뗾耸(Wd띙SବꭖrtU?筤P똙QpbbKqaE$来V웰3i/lK퉜,8︸e= g螓t竦컼?.寋8鵗",
-                                                                                                               7377742975895263424,
-                                                                                                               2.4218442017790503E-19,
-                                                                                                               {
-                                                                                                                "y꒚ཫ쨘醬킃糟}yTSt䡀⇂뿽4ൢ戰U": [[
-                                                                                                                 3600537227234741875,
-                                                                                                                 4435474101760273035,
-                                                                                                                 -1.42274517007951795E18,
-                                                                                                                 -5567915915496026866,
-                                                                                                                 null,
-                                                                                                                 null,
-                                                                                                                 [
-                                                                                                                  -3204084299154861161,
-                                                                                                                  {
-                                                                                                                   "7梧慸憏.a瘎\u00041U鵮Ck֨d惥耍ⳡY,⭏써E垁FFI鱑ⳬ줢7⧵Bﴠ耘줕햸q컴~*瑍W.떛ࡆ@'᐀+轳": -961121410259132975,
-                                                                                                                   "⥅]l黭㣓绶;!!⎃=朼㐿e&ἂ繤C﯀l䝣㌀6TM쑮w懃ꡡ#ᤆ䰓,墼湼゙뽸㲿䧽쫨xᵖ듨<\/ T0峸iQ:溫脐\\\"쎪ὴ砇宖^M泼큥➅鈫@ᄟ༩\u2008⥼": true,
-                                                                                                                   "⩐\"籽汎P싯鲘蟼sRᐯ䅩\u0019R(kRᖁ&ಌ 0\"鳶!馼YH": null,
-                                                                                                                   "鮼ꚇ싋։刟\rRLd步Nⴗ5Eࡆ訛갚[I醵NC(郴ṉy5D뤺౳QY壯5苴y훨(W\\Cଇ姚C艄깹\u001c歷㋵ZC᥂": [
-                                                                                                                    -6806235313106257498,
-                                                                                                                    null,
-                                                                                                                    "}N⸿讽sꚪ;\\p繇j苄䫨\u20e7%5x?t#",
-                                                                                                                    {
-                                                                                                                     "O〗k<墻yV$ఁrs-c1ఌ唪.C7_Yobᦜ褷'b帰mㄑl⌅": {"qB뗗擄3隂5뺍櫂䱟e촸P/鏩,3掁ꗩ=冉棓㑉|˞F襴뿴,:㞦<퓂⧙礞♗g뚎ᛩ<\/뉽ⶳ⸻A?_x2I㽝勒*I홱鍧粿~曟㤙2绥Ly6+썃uu鿜בf큘|歍ࣖÉ": [
-                                                                                                                      ">hh䈵w>1ⲏ쐭V[ⅎ\\헑벑F_㖝⠗㫇h恽;῝汰ᱼ瀖J옆9RR셏vsZ柺鶶툤r뢱橾/ꉇ囦FGm\"謗ꉦ⨶쒿⥡%]鵩#ᖣ_蹎 u5|祥?O",
-                                                                                                                      null,
-                                                                                                                      2.0150326776036215E-19,
-                                                                                                                      null,
-                                                                                                                      true,
-                                                                                                                      false,
-                                                                                                                      true,
-                                                                                                                      {"\fa᭶P捤WWc᠟f뚉ᬏ퓗ⳀW睹5:HXH=q7x찙X$)모r뚥ᆟ!Jﳸf": [
-                                                                                                                       -2995806398034583407,
-                                                                                                                       [
-                                                                                                                        6441377066589744683,
-                                                                                                                        "Mﶒ醹i)Gἦ廃s6몞 KJ౹礎VZ螺费힀\u0000冺업{谥'꡾뱻:.ꘘ굄奉攼Di᷑K鶲y繈욊阓v㻘}枭캗e矮1c?휐\"4\u0005厑莔뀾墓낝⽴洗ṹ䇃糞@b1\u0016즽Y轹",
-                                                                                                                        {
-                                                                                                                         "1⽕⌰鉟픏M㤭n⧴ỼD#%鐘⊯쿼稁븣몐紧ᅇ㓕ᛖcw嬀~ഌ㖓(0r⧦Q䑕髍ര铂㓻R儮\"@ꇱm❈௿᦯頌8}㿹犴?xn잆꥽R": 2.07321075750427366E18,
-                                                                                                                         "˳b18㗈䃟柵Z曆VTAu7+㛂cb0﯑Wp執<\/臋뭡뚋刼틮荋벲TLP预庰܈G\\O@VD'鱃#乖끺*鑪ꬳ?Mޞdﭹ{␇圯쇜㼞顄︖Y홡g": [{
-                                                                                                                          "0a,FZ": true,
-                                                                                                                          "2z̬蝣ꧦ驸\u0006L↛Ḣ4๚뿀'?lcwᄧ㐮!蓚䃦-|7.飑挴.樵*+1ﮊ\u0010ꛌ%貨啺/JdM:똍!FBe?鰴㨗0O财I藻ʔWA᫓G쳛u`<\/I": [{
-                                                                                                                           "$τ5V鴐a뾆両環iZp頻යn븃v": -4869131188151215571,
-                                                                                                                           "*즢[⦃b礞R◚nΰꕢH=귰燙[yc誘g䆌?ଜ臛": {
-                                                                                                                            "洤湌鲒)⟻\\䥳va}PeAMnＮ[": "㐳ɪ/(軆lZR,Cp殍ȮN啷\"3B婴?i=r$펽ᤐ쀸",
-                                                                                                                            "阄R4㒿㯔ڀ69ZᲦ2癁핌噗P崜#\\-쭍袛&鐑/$4童V꩑_ZHA澢fZ3": {"x;P{긳:G閉:9?活H": [
-                                                                                                                             "繺漮6?z犞焃슳\">ỏ[Ⳛ䌜녏䂹>聵⼶煜Y桥[泥뚩MvK$4jtﾛ",
-                                                                                                                             "E#갶霠좭㦻ୗ먵F+䪀o蝒ba쮎4X㣵 h",
-                                                                                                                             -335836610224228782,
-                                                                                                                             null,
-                                                                                                                             null,
-                                                                                                                             [
-                                                                                                                              "r1᫩0>danjY짿bs{",
-                                                                                                                              [
-                                                                                                                               -9.594464059325631E-23,
-                                                                                                                               1.0456894622831624E-20,
-                                                                                                                               null,
-                                                                                                                               5.803973284253454E-20,
-                                                                                                                               -8141787905188892123,
-                                                                                                                               true,
-                                                                                                                               -4735305442504973382,
-                                                                                                                               9.513150514479281E-20,
-                                                                                                                               "7넳$螔忷㶪}䪪l짴\u0007鹁P鰚HF銏ZJﳴ/⍎1ᷓ忉睇ᜋ쓈x뵠m䷐窥Ꮤ^\u0019ᶌ偭#ヂt☆၃pᎍ臶䟱5$䰵&๵分숝]䝈뉍♂坎\u0011<>",
-                                                                                                                               "C蒑貑藁lﰰ}X喇몛;t밿O7/᯹f\u0015kI嘦<ዴ㟮ᗎZ`GWퟩ瑹࡮ᅴB꿊칈??R校s脚",
-                                                                                                                               {
-                                                                                                                                "9珵戬+AU^洘拻ቒy柭床'粙XG鞕᠜繀伪%]hC,$輙?Ut乖Qm떚W8઼}~q⠪rU䤶CQ痗ig@#≲t샌f㈥酧l;y闥ZH斦e⸬]j⸗?ঢ拻퀆滌": null,
-                                                                                                                                "畯}㧢J罚帐VX㨑>1ꢶkT⿄蘥㝑o|<嗸層沈挄GEOM@-䞚䧰$만峬輏䠱V✩5宸-揂D'㗪yP掶7b⠟J㕻SfP?d}v㼂Ꮕ'猘": {
-                                                                                                                                 "陓y잀v>╪": null,
-                                                                                                                                 "鬿L+7:됑Y=焠U;킻䯌잫!韎ஔ\f": {
-                                                                                                                                  "駫WmGጶ": {
-                                                                                                                                   "\\~m6狩K": -2586304199791962143,
-                                                                                                                                   "ႜࠀ%͑l⿅D.瑢Dk%0紪dḨTI픸%뗜☓s榗኉\"?V籄7w髄♲쟗翛歂E䤓皹t ?)ᄟ鬲鐜6C": {
-                                                                                                                                    "_췤a圷1\u000eB-XOy缿請∎$`쳌eZ~杁튻/蜞`塣৙\"⪰\"沒l}蕌\\롃荫氌.望wZ|o!)Hn獝qg}": null,
-                                                                                                                                    "kOSܧ䖨钨:಼鉝ꭝO醧S`십`ꓭ쭁ﯢN&Et㺪馻㍢ⅳ㢺崡ຊ蜚锫\\%ahx켨|ż劻ꎄ㢄쐟A躊᰹p譞綨Ir쿯\u0016ﵚOd럂*僨郀N*b㕷63z": {
-                                                                                                                                     ":L5r+T㡲": [{
-                                                                                                                                      "VK泓돲ᮙRy㓤➙Ⱗ38oi}LJቨ7Ó㹡৘*q)1豢⛃e᫛뙪壥镇枝7G藯g㨛oI䄽 孂L缊ꋕ'EN`": -2148138481412096818,
-                                                                                                                                      "`⛝ᘑ$(खꊲ⤖ᄁꤒ䦦3=)]Y㢌跨NĴ驳줟秠++d孳>8ᎊ떩EꡣSv룃 쯫أ?#E|᭙㎐?zv:5祉^⋑V": [
-                                                                                                                                       -1.4691944435285607E-19,
-                                                                                                                                       3.4128661569395795E17,
-                                                                                                                                       "㐃촗^G9佭龶n募8R厞eEw⺡_ㆱ%⼨D뉄퉠2ꩵᛅⳍ搿L팹Lවn=\"慉념ᛮy>!`g!풲晴[/;?[v겁軇}⤳⤁핏∌T㽲R홓遉㓥",
-                                                                                                                                       "愰_⮹T䓒妒閤둥?0aB@㈧g焻-#~跬x<\/舁P݄ꐡ=\\׳P\u0015jᳪᢁq;㯏l%᭗;砢觨▝,謁ꍰGy?躤O黩퍋Y㒝a擯\n7覌똟_䔡]fJ晋IAS",
-                                                                                                                                       4367930106786121250,
-                                                                                                                                       -4.9421193149720582E17,
-                                                                                                                                       null,
-                                                                                                                                       {
-                                                                                                                                        ";ﾸ똾柉곟ⰺKpፇ䱻ฺ䖝{o~h!ｅꁿ઻욄ښ\u0002y?xUd\u207c悜ꌭ": [
-                                                                                                                                         1.6010824122815255E-19,
-                                                                                                                                         [
-                                                                                                                                          "宨︩9앉檥pr쇷?WxLb",
-                                                                                                                                          "氇9】J玚\u000f옛呲~ 輠1D嬛,*mW3?n휂糊γ虻*ᴫ꾠?q凐趗Ko↦GT铮",
-                                                                                                                                          "㶢ថmO㍔k'诔栀Z蛟}GZ钹D",
-                                                                                                                                          false,
-                                                                                                                                          -6.366995517736813E-20,
-                                                                                                                                          -4894479530745302899,
-                                                                                                                                          null,
-                                                                                                                                          "V%᫡II璅䅛䓎풹ﱢ/pU9se되뛞x梔~C)䨧䩻蜺(g㘚R?/Ự[忓C뾠ࢤc왈邠买?嫥挤풜隊枕",
-                                                                                                                                          ",v碍喔㌲쟚蔚톬៓ꭶ",
-                                                                                                                                          3.9625444752577524E-19,
-                                                                                                                                          null,
-                                                                                                                                          [
-                                                                                                                                           "kO8란뿒䱕馔b臻⍟隨\"㜮鲣Yq5m퐔<u뷆c譆\u001bN?<",
-                                                                                                                                           [{
-                                                                                                                                            ";涉c蒀ᴧN䘱䤳 ÿꭷ,핉dSTDB>K#ꢘug㼈ᝦ=P^6탲@䧔%$CqSw铜랊0&m⟭<\/a逎ym\u0013vᯗ": true,
-                                                                                                                                            "洫`|XN뤮\u0018詞=紩鴘_sX)㯅鿻Ố싹": 7.168252736947373E-20,
-                                                                                                                                            "ꛊ饤ﴏ袁(逊+~⽫얢鈮艬O힉7D筗S곯w操I斞᠈븘蓷x": [[[[
-                                                                                                                                             -7.3136069426336952E18,
-                                                                                                                                             -2.13572396712722688E18,
-                                                                                                                                             {
-                                                                                                                                              "硢3㇩R:o칢行E<=\u0018ၬYuH!\u00044U%卝炼2>\u001eSi$⓷ꒈ'렢gᙫ番ꯒ㛹럥嶀澈v;葷鄕x蓎\\惩+稘UEᖸﳊ㊈壋N嫿⏾挎,袯苷ኢ\\x|3c": 7540762493381776411,
-                                                                                                                                              "?!*^ᢏ窯?\u0001ڔꙃw虜돳FgJ?&⨫*uo籤:?}ꃹ=ٴ惨瓜Z媊@ત戹㔏똩Ԛ耦Wt轁\\枒^\\ꩵ}}}ꀣD\\]6M_⌫)H豣:36섘㑜": {
-                                                                                                                                               ";홗ᰰU஋㙛`D왔ཿЃS회爁\u001b-㢈`봆?盂㛣듿ᦾ蒽_AD~EEຆ㊋(eNwk=Rɠ峭q\"5Ἠ婾^>'ls\n8QAK<l_⭨穟": [
-                                                                                                                                                true,
-                                                                                                                                                true,
-                                                                                                                                                {"ﳷm箅6qⷈ?ﲈ憟b۷⫉἞V뚴少U呡瓴ꉆs~嘵得㌶4XR漊": [
-                                                                                                                                                 "폆介fM暪$9K[ㄇ샍큳撦g撟恸jҐF㹹aj bHᘀ踉ꎐＣ粄 a?\u000fK즉郝 幨9D舢槷Xh뵎u훩Ꜿ턾ƅ埂P埆k멀{䢹~?D<\/꼢XR\u001b〱䝽꼨i㘀ḟ㚺A-挸",
-                                                                                                                                                 false,
-                                                                                                                                                 null,
-                                                                                                                                                 -1.1710758021294953E-20,
-                                                                                                                                                 3996737830256461142,
-                                                                                                                                                 true,
-                                                                                                                                                 null,
-                                                                                                                                                 -8271596984134071193,
-                                                                                                                                                 "_1G퉁텑m䮔鰼6멲Nmꇩſt쓟튍N许FDj+3^ﶜ⎸\u0019⤕橥!\"s-뾞lz北׸ꍚ랬)?l⻮고i䑰\u001f䪬",
-                                                                                                                                                 4.459124464204517E-19,
-                                                                                                                                                 -4.0967172848578447E18,
-                                                                                                                                                 5643211135841796287,
-                                                                                                                                                 -9.482336221192844E-19,
-                                                                                                                                                 "౪冏釶9D?s螭X榈枸j2秀v]泌鰚岒聵轀쌶i텽qMbL]R,",
-                                                                                                                                                 null,
-                                                                                                                                                 [
-                                                                                                                                                  null,
-                                                                                                                                                  {"M쪊ꯪ@;\u0011罙ꕅ<e᝺|爑Yⵝ<\/&ᩎ<腊ሑᮔ੃F豭": [
-                                                                                                                                                   "^0࡟1볏P폋ፏ杈F⨥Iꂴ\"z磣VⅡ=8퀝2]䢹h1\u0017{jT<I煛5%D셍S⑙⅏J*샐 巙ດ;᧡䙞",
-                                                                                                                                                   [{
-                                                                                                                                                    "'㶡큾鄧`跊\"gV[?u᭒Ʊ髷%葉굵a띦N켧Qﯳy%y䩟髒L䯜S䵳r絅肾킂ၐ'ꔦg긓a'@혔যW谁ᝬF栩ŷ+7w鞚": 6.3544416675584832E17,
-                                                                                                                                                    "苎脷v改hm쏵|㋊g_ᔐ 뒨蹨峟썎㷸|Ο刢?Gͨ옛-?GꦱIEYUX4?%ꘋᆊ㱺": -2.8418378709165287E-19,
-                                                                                                                                                    "誰?(H]N맘]k洳\"q蒧蘞!R퐫\\(Q$T5N堍⫣윿6|럦속︅ﭗ(": [
-                                                                                                                                                     "峩_\u0003A瘘?✓[硫䎯ၽuጭ\"@Y綅첞m榾=贮9R벿῜Z",
-                                                                                                                                                     null,
-                                                                                                                                                     "䰉㗹㷾Iaᝃqcp쓘὾൫Q|ﵓ<\/ḙ>)- Q䲌mo펹L_칍樖庫9꩝쪹ᘹ䑖瀍aK ?*趤f뭓廝p=磕",
-                                                                                                                                                     "哑z懅ᤏ-ꍹux쀭",
-                                                                                                                                                     [
-                                                                                                                                                      true,
-                                                                                                                                                      3998739591332339511,
-                                                                                                                                                      "ጻ㙙?᳸aK<\/囩U`B3袗ﱱ?\"/k鏔䍧2l@쿎VZ쨎/6ꃭ脥|B?31+on颼-ꮧ,O嫚m ࡭`KH葦:粘i]aSU쓙$쐂f+詛頖b",
-                                                                                                                                                      [{"^<9<箝&絡;%i﫡2攑紴\\켉h쓙-柂䚝ven\u20f7浯-Ꮏ\r^훁䓚헬\u000e?\\ㅡֺJ떷VOt": [{
-                                                                                                                                                       "-௄卶k㘆혐஽y⎱㢬sS઄+^瞥h;ᾷj;抭\u0003밫f<\/5Ⱗ裏_朻%*[-撵䷮彈-芈": {
-                                                                                                                                                        "㩩p3篊G|宮hz䑊o곥j^Co0": [
-                                                                                                                                                         653239109285256503,
-                                                                                                                                                         {"궲?|\":N1ۿ氃NZ#깩:쇡o8킗ࡊ[\"됸Po핇1(6鰏$膓}⽐*)渽J'DN<썙긘毦끲Ys칖": {
-                                                                                                                                                          "2Pr?Xjㆠ?搮/?㓦柖馃5뚣Nᦼ|铢r衴㩖\"甝湗ܝ憍": "\"뾯i띇筝牻$珲/4ka $匝휴译zbAᩁꇸ瑅&뵲衯ꎀᆿ7@ꈋ'ᶨH@ᠴl+",
-                                                                                                                                                          "7뢽뚐v?4^ꊥ_⪛.>pởr渲<\/⢕疻c\"g䇘vU剺dஔ鮥꒚(dv祴X⼹\\a8y5坆": true,
-                                                                                                                                                          "o뼄B욞羁hr﷔폘뒚⿛U5pꪴfg!6\\\"爑쏍䢱W<ﶕ\\텣珇oI/BK뺡'谑♟[Ut븷亮g(\"t⡎有?ꬊ躺翁艩nl F⤿蠜": 1695826030502619742,
-                                                                                                                                                          "ۊ깖>ࡹ햹^ⵕ쌾BnN〳2C䌕tʬ]찠?ݾ2饺蹳ぶꌭ訍\"◹ᬁD鯎4e滨T輀ﵣ੃3\u20f3킙D瘮g\\擦+泙ၧ 鬹ﯨַ肋7놷郟lP冝{ߒhড়r5,꓋": null,
-                                                                                                                                                          "ΉN$y{}2\\N﹯ⱙK'8ɜͣwt,．钟廣䎘ꆚk媄_": null,
-                                                                                                                                                          "䎥eᾆᝦ읉,Jުn岪㥐s搖謽䚔5t㯏㰳㱊ZhD䃭f絕s鋡篟a`Q鬃┦鸳n_靂(E4迠_觅뷝_宪D(NL疶hL追V熑%]v肫=惂!㇫5⬒\u001f喺4랪옑": {
-                                                                                                                                                           "2a輍85먙R㮧㚪Sm}E2yꆣꫨrRym㐱膶ᔨ\\t綾A☰.焄뙗9<쫷챻䒵셴᭛䮜.<\/慌꽒9叻Ok䰊Z㥪幸k": [
-                                                                                                                                                            null,
-                                                                                                                                                            true,
-                                                                                                                                                            {"쌞쐍": {
-                                                                                                                                                             "▟GL K2i뛱iＱ\"̠.옛1X$}涺]靎懠ڦ늷?tf灟ݞゟ{": 1.227740268699265E-19,
-                                                                                                                                                             "꒶]퓚%ฬK❅": [{
-                                                                                                                                                              "(ෛ@Ǯっ䧼䵤[aﾃൖvEnAdU렖뗈@볓yꈪ,mԴ|꟢캁(而첸죕CX4Y믅": "2⯩㳿ꢚ훀~迯?᪑\\啚;4X\u20c2襏B箹)俣eỻw䇄",
-                                                                                                                                                              "75༂f詳䅫ꐧ鏿 }3\u20b5'∓䝱虀f菼Iq鈆﨤g퍩)BFa왢d0뮪痮M鋡nw∵謊;ꝧf美箈ḋ*\u001c`퇚퐋䳫$!V#N㹲抗ⱉ珎(V嵟鬒_b㳅\u0019": null,
-                                                                                                                                                              "e_m@(i㜀3ꦗ䕯䭰Oc+-련0뭦⢹苿蟰ꂏSV䰭勢덥.ྈ爑Vd,ᕥ=퀍)vz뱊ꈊB_6듯\"?{㒲&㵞뵫疝돡믈%Qw限,?\r枮\"? N~癃ruࡗdn&": null,
-                                                                                                                                                              "㉹&'Pfs䑜공j<\/?|8oc᧨L7\\pXᭁ 9᪘": -2.423073789014103E18,
-                                                                                                                                                              "䝄瑄䢸穊f盈᥸,B뾧푗횵B1쟢f\u001f凄": "魖⚝2儉j꼂긾껢嗎0ࢇ纬xI4](੓`蕞;픬\fC\"斒\")2櫷I﹥迧",
-                                                                                                                                                              "ퟯ詔x悝령+T?Bg⥄섅kOeQ큼㻴*{E靼6氿L缋\u001c둌๶-㥂2==-츫I즃㠐Lg踞ꙂEG貨鞠\"\u0014d'.缗gI-lIb䋱ᎂDy缦?": null,
-                                                                                                                                                              "紝M㦁犿w浴詟棓쵫G:䜁?V2ힽ7N*n&㖊Nd-'ຊ?-樹DIv⊜)g䑜9뉂ㄹ푍阉~ꅐ쵃#R^\u000bB䌎䦾]p.䀳": [{"ϒ爛\"ꄱ︗竒G䃓-ま帳あ.j)qgu扐徣ਁZ鼗A9A鸦甈!k蔁喙:3T%&㠘+,䷞|챽v䚞문H<\/醯r셓㶾\\a볜卺zE䝷_죤ဵ뿰᎟CB": [
-                                                                                                                                                               6233512720017661219,
-                                                                                                                                                               null,
-                                                                                                                                                               -1638543730522713294,
-                                                                                                                                                               false,
-                                                                                                                                                               -8901187771615024724,
-                                                                                                                                                               [
-                                                                                                                                                                3891351109509829590,
-                                                                                                                                                                true,
-                                                                                                                                                                false,
-                                                                                                                                                                -1.03836679125188032E18,
-                                                                                                                                                                {
-                                                                                                                                                                 "<?起HCᷭ죎劐莇逰/{gs\u0014⽛㰾愫tￖ<솞ڢ됌煲膺਻9x닳x࡭Q訽,ᶭඦtt掾\"秧㺌d˪䙻꫗:ᭈh4緞痐䤴c뫚떩త<?ᕢ謚6]폛O鰐鋛镠贩赟\"<G♷1'": true,
-                                                                                                                                                                 "቙ht4ߝBqꦤ+\u0006멲趫灔)椾": -1100102890585798710,
-                                                                                                                                                                 "総兎곇뇸粟F醇;朠?厱楛㶆ⶏ7r⾛o꯬᳡F\\머幖 㜦\f[搦᥽㮣0䕊?J㊳뀄e㔔+?<n↴复": [
-                                                                                                                                                                  "4~ꉍ羁\\偮(泤叕빜\u0014>j랎:g曞ѕᘼ}链N",
-                                                                                                                                                                  -1.1103819473845426E-19,
-                                                                                                                                                                  true,
-                                                                                                                                                                  [
-                                                                                                                                                                   true,
-                                                                                                                                                                   null,
-                                                                                                                                                                   -7.9091791735309888E17,
-                                                                                                                                                                   true,
-                                                                                                                                                                   {"}蔰鋈+ꐨ啵0?g*사%`J?*": [{
-                                                                                                                                                                    "\"2wG?yn,癷BK\\龞䑞x?蠢": -3.7220345009853505E-19,
-                                                                                                                                                                    ";饹়❀)皋`噿焒j(3⿏w>偍5X<np?<줯<Y]捘!J೸UⳂNे7v௸㛃ᄧ톿䨷鯻v焇=烻TQ!F⦰䣣눿K鷚눁'⭲m捠(䚻": [
-                                                                                                                                                                     "蹕 淜੃b\"+몾ⴕ",
-                                                                                                                                                                     null,
-                                                                                                                                                                     35892237756161615,
-                                                                                                                                                                     {
-                                                                                                                                                                      " 듹㏝)5慁箱&$~:遰쮐<\/堋?% \\勽唅z손帋䘺H髀麡M퇖uz\u0012m諦d᳤콌樝\rX싹̡Ო": -433791617729505482,
-                                                                                                                                                                      "-j溗ࢵcz!:}✽5ഇ,욨ݏs#덫=南浺^}E\\Y\\T*뼈cd꺐cۘ뎁䨸됱K䠴㉿恿逳@wf쏢<\/[L[": -9.3228549642908109E17,
-                                                                                                                                                                      "Ms킭u஗%\\u⍎/家欲ἅ答㓽/꯳齳|㭘Pr\"v<\/禇䔆$GA䊻˔-:틊[h?倬荤ᾞ৳.Gw\u000b": [
-                                                                                                                                                                       "0宜塙I@䏴蝉\\Uy뒅=2<h暒K._贡璐Yi檻_⮵uᐝ㘗聠[f\u0015힢Hꔮ}጑;誏yf0\"\u20cc?(=q斠➽5ꎾ鞘kⲃ",
-                                                                                                                                                                       -2.9234211354411E-19,
-                                                                                                                                                                       false,
-                                                                                                                                                                       true,
-                                                                                                                                                                       {
-                                                                                                                                                                        "\u0011⟴GH_;#怵:\u001c\u0002n1U\\p/왔(┫]hꐚ7\r0䵷첗岷O௷?㝎[殇|J=?韷pᶟ儜犆?5კ1kꍖiH竧뛈ପdmk游y(콪팱꾍k慧 y辣": [
-                                                                                                                                                                         false,
-                                                                                                                                                                         "O\"끍p覈ykv磂㢠㝵~뀬튍lC&4솎䇃:Mj",
-                                                                                                                                                                         -7.009964654003924E-20,
-                                                                                                                                                                         false,
-                                                                                                                                                                         -49306078522414046,
-                                                                                                                                                                         null,
-                                                                                                                                                                         null,
-                                                                                                                                                                         2160432477732354319,
-                                                                                                                                                                         true,
-                                                                                                                                                                         "4횡h+!踹ꐬP鮄{0&뱥M?샍鞅n㮞ᨹ?쒆毪l'箅^ꚥ頛`e㻨52柳⮙嫪࡟딯a.~䵮1f吘N&zȭL榓ۃ鳠5d㟆M@㣥ӋA΍q0縶$",
-                                                                                                                                                                         -3.848996532974368E16,
-                                                                                                                                                                         true,
-                                                                                                                                                                         null,
-                                                                                                                                                                         -3.5240055580952525E18,
-                                                                                                                                                                         {
-                                                                                                                                                                          " vﭷၵ#ce乃5僞?Z D`묨粇ᐔ绠vWL譢u뽀\\J|tⓙt№\"ꨋnT凮ᒩ蝂篝b騩:䢭Hbv읻峨z㹚T趗햆귣학津XiＹ@ᖥK": true,
-                                                                                                                                                                          "!F 醌y䉸W2ꇬ\u0006/䒏7~%9擛햀徉9⛰+?㌘;ꠓX䇻Dfi뼧쒒\u0012F謞՝絺+臕kऍLSQ쌁X쎬幦HZ98蒊枳": "澤令#\u001d抍⛳@N搕퀂[5,✄ꘇ~䘷?\u0011Xꈺ[硸⠘⛯X醪聡x\u0007쌇MiX/|ﾐ뚁K8䁡W)銀q僞綂蔕E",
-                                                                                                                                                                          "6␲䣖R৞@ငg?<\/೴x陙Xꈺ崸⠅ᇾ\\0X,H쟴셭A稂ힿゝF\\쑞\u0012懦(Aᯕ灭~\u0001껮X?逊": 5.7566819207732864E17,
-                                                                                                                                                                          "[c?椓": false,
-                                                                                                                                                                          "k䒇": 2583824107104166717,
-                                                                                                                                                                          "꙯N훙㏅ﮒ燣㨊瞯咽jMxby뻭뵫װ[\"1畈?ৱL": "띣ᔂ魠羓犴ꚃ+|rY",
-                                                                                                                                                                          "녺Z?䬝鉉:?ⳙ瘏Cኯ.Vs[釿䨉쐧\\\\*쵢猒$\\y溔^,㑳": {"藶꺟": [{
-                                                                                                                                                                           "\"d훣N2zq]?'檿죸忷篇ﮟ擤m'9!죶≓p뭻\\ᇷ\f퇶_䰸h๐Q嵃訾㘑従ꯦ䞶jL틊r澵Omᾫ!H䱤팼/;|᭺I7슎YhuXi⚼": -1.352716906472438E-19,
-                                                                                                                                                                           "M⽇倻5J䂫औ᝔楸#J[Fﹱ쫮W誻bWz?}1\"9硪뻶fe": "盬:Ѹ砿획땣T凊(m灦呜ﻝR㿎艴䂵h",
-                                                                                                                                                                           "R띾k힪CH钙_i苮ⰵoᾨ紑퉎7h؉\"柀蝽z0့\"<?嘭$蜝?礲7岇槀묡?V钿T⣜v+솒灚ԛ2米mH?>薙婏聿3aFÆÝ": "2,ꓴg?_섦_>Y쪥션钺;=趘F~?D㨫\bX?㹤+>/믟kᠪ멅쬂Uzỵ]$珧`m雁瑊ඖ鯬cꙉ梢f묛bB",
-                                                                                                                                                                           "♽n$YjKiXX*GO贩鏃豮祴遞K醞眡}ꗨv嵎꼷0୸+M菋eH徸J꣆:⼐悥B켽迚㯃b諂\u000bjꠜ碱逮m8": [
-                                                                                                                                                                            "푷᣺ﻯd8ﱖ嬇ភH鹎⡱᱅0g:果6$GQ췎{vᷧYy-脕x偹砡館⮸C蓼ꏚ=軄H犠G谖ES詤Z蠂3l봟hￒ7䦹1GPQG癸숟~[#駥8zQ뛣J소obg,",
-                                                                                                                                                                            null,
-                                                                                                                                                                            1513751096373485652,
-                                                                                                                                                                            null,
-                                                                                                                                                                            -6.851466660824754E-19,
-                                                                                                                                                                            {"䩂-⴮2ٰK솖풄꾚ႻP앳1H鷛wmR䗂皎칄?醜<\/&ࠧ㬍X濬䵈K`vJ륒Q/IC묛!;$vϑ": {
-                                                                                                                                                                             "@-ꚗxྐྵ@m瘬\u0010U絨ﮌ驐\\켑寛넆T=tQ㭤L연@脸삯e-:⩼u㎳VQ㋱襗ຓ<Ⅶ䌸cML3+\u001e_C)r\\9+Jn\\Pﺔ8蠱檾萅Pq鐳话T䄐I": -1.80683891195530061E18,
-                                                                                                                                                                             "ᷭዻU~ཷsgSJ`᪅'%㖔n5픆桪砳峣3獮枾䌷⊰呀": {
-                                                                                                                                                                              "Ş੉䓰邟自~X耤pl7间懑徛s첦5ਕXexh⬖鎥᐀nNr(J컗｜ૃF\"Q겮葲놔엞^겄+㈆话〾희紐G'E?飕1f❼텬悚泬먐U睬훶Qs": false,
-                                                                                                                                                                              "(\u20dag8큽튣>^Y{뤋.袊䂓;_g]S\u202a꽬L;^'#땏bႌ?C緡<䝲䲝断ꏏ6\u001asD7IK5Wxo8\u0006p弊⼂ꯍ扵\u0003`뵂픋%ꄰ⫙됶l囏尛+䗅E쟇\\": [
-                                                                                                                                                                               true,
-                                                                                                                                                                               {
-                                                                                                                                                                                "\n鱿aK㝡␒㼙2촹f;`쾏qIࡔG}㝷䐍瓰w늮*粅9뒪ㄊCj倡翑閳R渚MiUO~仨䜶RꙀA僈㉋⦋n{㖥0딿벑逦⥻0h薓쯴Ꝼ": [
-                                                                                                                                                                                 5188716534221998369,
-                                                                                                                                                                                 2579413015347802508,
-                                                                                                                                                                                 9.010794400256652E-21,
-                                                                                                                                                                                 -6.5327297761238093E17,
-                                                                                                                                                                                 1.11635352494065523E18,
-                                                                                                                                                                                 -6656281618760253655,
-                                                                                                                                                                                 {
-                                                                                                                                                                                  "": ")?",
-                                                                                                                                                                                  "TWKLꑙ裑꺔UE俸塑炌Ũ᜕-o\"徚#": {"M/癟6!oI51ni퐚=댡>xꍨ\u0004 ?": {
-                                                                                                                                                                                   "皭": {"⢫䋖>u%w잼<䕏꘍P䋵$魋拝U䮎緧皇Y훂&|羋ꋕ잿cJ䨈跓齳5\u001a삱籷I꿾뤔S8㌷繖_Yឯ䲱B턼O歵F\\l醴o_欬6籏=D": [
-                                                                                                                                                                                    false,
-                                                                                                                                                                                    true,
-                                                                                                                                                                                    {"Mt|ꏞD|F궣MQ뵕T,띺k+?㍵i": [
-                                                                                                                                                                                     7828094884540988137,
-                                                                                                                                                                                     false,
-                                                                                                                                                                                     {
-                                                                                                                                                                                      "!༦鯠,&aﳑ>[euJꏽ綷搐B.h": -7648546591767075632,
-                                                                                                                                                                                      "-n켧嘰{7挐毄Y,>❏螵煫乌pv醑Q嶚!|⌝責0왾덢ꏅ蛨S\\)竰'舓Q}A釡5#v": 3344849660672723988,
-                                                                                                                                                                                      "8閪麁V=鈢1녈幬6棉⪮둌\u207d᚛驉ꛃ'r䆉惏ै|bἧﺢᒙ<=穊强s혧eꮿ慩⌡ \\槳W븧J檀C,ᘉ의0俯퀉M;筷ࣴ瓿{늊埂鄧_4揸Nn阼Jੵ˥(社": true,
-                                                                                                                                                                                      "o뼀vw)4A뢵(a䵢)p姃뛸\u000fK#KiQp\u0005ꅍ芅쏅": null,
-                                                                                                                                                                                      "砥$ꥸ┇耽u斮Gc{z빔깎밇\\숰\u001e괷各㶇쵿_ᴄ+h穢p촀Ნ䃬z䝁酳ӂ31xꔄ1_砚W렘G#2葊P ": [
-                                                                                                                                                                                       -3709692921720865059,
-                                                                                                                                                                                       null,
-                                                                                                                                                                                       [
-                                                                                                                                                                                        6669892810652602379,
-                                                                                                                                                                                        -135535375466621127,
-                                                                                                                                                                                        "뎴iO}Z? 馢녱稹ᄾ䐩rSt帤넆&7i騏멗畖9誧鄜'w{Ͻ^2窭외b㑎粖i矪ꦨ탪跣)KEㆹ\u0015V8[W?⽉>'kc$䨘ᮛ뉻٬M5",
-                                                                                                                                                                                        1.10439588726055846E18,
-                                                                                                                                                                                        false,
-                                                                                                                                                                                        -4349729830749729097,
-                                                                                                                                                                                        null,
-                                                                                                                                                                                        [
-                                                                                                                                                                                         false,
-                                                                                                                                                                                         "_蠢㠝^䟪/D녒㡋ỎC䒈판\u0006એq@O펢%;鹐쏌o戥~A[ꡉ濽ỳ&虃᩾荣唙藍茨Ig楡꒻M窓冉?",
-                                                                                                                                                                                         true,
-                                                                                                                                                                                         2.17220752996421728E17,
-                                                                                                                                                                                         -5079714907315156164,
-                                                                                                                                                                                         -9.960375974658589E-20,
-                                                                                                                                                                                         "ᾎ戞༒",
-                                                                                                                                                                                         true,
-                                                                                                                                                                                         false,
-                                                                                                                                                                                         [[
-                                                                                                                                                                                          "ⶉᖌX⧕홇)g엃⹪x뚐癟\u0002",
-                                                                                                                                                                                          -5185853871623955469,
-                                                                                                                                                                                          {
-                                                                                                                                                                                           "L㜤9ợㇶK鐰⋓V뽋˖!斫as|9＂፬䆪?7胜&n薑~": -2.11545634977136992E17,
-                                                                                                                                                                                           "O8뀩D}캖q萂6༣㏗䈓煮吽ਆᎼDᣘ폛;": false,
-                                                                                                                                                                                           "YTᡅ^L㗎cbY$pᣞ縿#fh!ꘂb삵玊颟샞ဢ$䁗鼒몁~rkH^:닮먖츸륈⪺쒉砉?㙓扫㆕꣒`R䢱B酂?C뇞<5Iޚ讳騕S瞦z": null,
-                                                                                                                                                                                           "\\RB?`mG댵鉡幐物䵎有5*e骄T㌓ᛪ琾駒Ku\u001a[柆jUq8⋈5鿋츿myﻗ?雍ux঴?": 5828963951918205428,
-                                                                                                                                                                                           "n0晅:黯 xu씪^퓞cB㎊ᬍ⺘٤փ~B岚3㥕擄vᲂ~F?C䶖@$m~忔S왖㲚?챴⊟W#벌{'㰝I䝠縁s樘\\X뢻9핡I6菍ㄛ8쯶]wॽ0L\"q": null,
-                                                                                                                                                                                           "x增줖j⦦t䏢᎙㛿Yf鼘~꫓恄4惊\u209c": "oOhbᤃ᛽z&Bi犑\\3B㩬劇䄑oŁ쨅孥멁ຖacA㖫借㞝vg싰샂㐜#譞⢤@k]鋰嘘䜾L熶塥_<\/⍾屈ﮊ_mY菹t뙺}Ox=w鮮4S1ꐩמּ'巑",
-                                                                                                                                                                                           "㗓蟵ꂾe蠅匳(JP䗏෸\u0089耀왲": [{
-                                                                                                                                                                                            "ᤃ㵥韎뤽\r?挥O쯡⇔㞚3伖\u0005P⋪\"D궣QLn(⚘罩䩢Ŏv䤘尗뼤됛O淽鋋闚r崩a{4箙{煷m6〈": {
-                                                                                                                                                                                             "l곺1L": {
-                                                                                                                                                                                              "T'ਤ?砅|੬Km]䄩\"(࿶<\/6U爢䫈倔郴l2㴱^줣k'L浖L鰄Rp今鎗⒗C얨M훁㡧ΘX粜뫈N꤇輊㌻켑#㮮샶-䍗룲蠝癜㱐V>=\\I尬癤t=": 7648082845323511446,
-                                                                                                                                                                                              "鋞EP:<\/_`ၧe混ㇹBd⯢㮂驋\\q碽饩跓྿ᴜ+j箿렏㗑yK毢宸p謹h䦹乕U媣\\炤": [[
-                                                                                                                                                                                               "3",
-                                                                                                                                                                                               [
-                                                                                                                                                                                                true,
-                                                                                                                                                                                                3.4058271399411134E-20,
-                                                                                                                                                                                                true,
-                                                                                                                                                                                                "揀+憱f逮@먻BpW曉\u001a㣐⎊$n劈D枤㡞좾\u001aᛁ苔౩闝1B䷒Ṋ݋➐ꀞꐃ磍$t੤_:蘺⮼(#N",
-                                                                                                                                                                                                697483894874368636,
-                                                                                                                                                                                                [
-                                                                                                                                                                                                 "vᘯ锴)0訶}䳅⩚0O壱韈ߜ\u0018*U鍾䏖=䧉뽑单휻ID쿇嘗?ꌸῬ07",
-                                                                                                                                                                                                 -5.4858784319382006E18,
-                                                                                                                                                                                                 7.5467775182251151E18,
-                                                                                                                                                                                                 -8911128589670029195,
-                                                                                                                                                                                                 -7531052386005780140,
-                                                                                                                                                                                                 null,
-                                                                                                                                                                                                 [
-                                                                                                                                                                                                  null,
-                                                                                                                                                                                                  true,
-                                                                                                                                                                                                  [[{
-                                                                                                                                                                                                   "1欯twG<u䝮␽ꇣ_ჟﱴଶ-쪋\"?홺k:莝Ꜫ*⺵꽹댅釔좵}P?=9렿46b\u001c\\S?(筈僦⇶爷谰1ྷa": true,
-                                                                                                                                                                                                   "TҫJYxڪ\\鰔℮혡)m_WVi眪1[71><\/Q:0怯押殃탷聫사<ỗꕧ蚨䡁nDꌕ\u001c녬~蓩<N蹑\"{䫥lKc혁뫖앺:vⵑ": "g槵?",
-                                                                                                                                                                                                   "aꨩ뻃싥렌1`롗}Yg>鲃g儊>ꏡl㻿/⑷*챳6㻜W毤緛ﹺᨪ4\u0013뺚J髬e3쳸䘦伧?恪&{L掾p+꬜M䏊d娘6": {
-                                                                                                                                                                                                    "2p첼양棜h䜢﮶aQ*c扦v︥뮓kC寵횂S銩&ǝ{O*य़iH`U큅ࡓr䩕5ꄸ?`\\᧫?ᮼ?t〟崾훈k薐ì/ｉy꤃뵰z1<\/AQ#뿩8jJ1z@u䕥": 1.82135747285215155E18,
-                                                                                                                                                                                                    "ZdN &=d년ᅆ'쑏ⅉ:烋5&៏ᄂ汎来L㯄固{钧u\\㊏튚e摑&t嗄ꖄUb❌?m䴘熚9EW": [{
-                                                                                                                                                                                                     "ଛ{i*a(": -8.0314147546006822E17,
-                                                                                                                                                                                                     "⫾ꃆY\u000e+W`௸ \"M뒶+\\뷐lKE}(NT킶Yj選篒쁶'jNQ硾(똡\\\"逌ⴍy? IRꜘ὞鄬﨧:M\\f⠋Cꚜ쫊ᚴNV^D䕗ㅖἔIao꿬C⍏8": [
-                                                                                                                                                                                                      287156137829026547,
-                                                                                                                                                                                                      {
-                                                                                                                                                                                                       "H丞N逕<rO䎗:텕<\/䶩샌Sd%^ᵯ눐엑者g䖩똭蕮1U驣?Pⰰ\u001fp(W]67\u0015﫣6굺OR羸#촐F蒈;嘙i✵@_撶y㤏⤍(:᧗뼢༌朆@⏰㤨ꭲ?-n>⯲": {"": {
-                                                                                                                                                                                                        "7-;枮阕梒9ᑄZ": [[[[
-                                                                                                                                                                                                         null,
-                                                                                                                                                                                                         {
-                                                                                                                                                                                                          "": [[[[
-                                                                                                                                                                                                           -7.365909561486078E-19,
-                                                                                                                                                                                                           2948694324944243408,
-                                                                                                                                                                                                           null,
-                                                                                                                                                                                                           [
-                                                                                                                                                                                                            true,
-                                                                                                                                                                                                            "荒\"并孷䂡쵼9o䀘F\u0002龬7⮹Wz%厖/*? a*R枈㌦됾g뒠䤈q딄㺿$쮸tᶎ릑弣^鏎<\/Y鷇驜L鿽<\/춋9Mᲆឨ^<\/庲3'l낢",
-                                                                                                                                                                                                            "c鮦\u001b두\\~?眾ಢu݆綑෪蘛轋◜gȃ<\/ⴃcpkDt誩܅\"Y",
-                                                                                                                                                                                                            [[
-                                                                                                                                                                                                             null,
-                                                                                                                                                                                                             null,
-                                                                                                                                                                                                             [
-                                                                                                                                                                                                              3113744396744005402,
-                                                                                                                                                                                                              true,
-                                                                                                                                                                                                              "v(y",
-                                                                                                                                                                                                              {
-                                                                                                                                                                                                               "AQ幆h쾜O+꺷铀ꛉ練A蚗⼺螔j㌍3꽂楎䥯뎸먩?": null,
-                                                                                                                                                                                                               "蠗渗iz鱖w]擪E": 1.2927828494783804E-17,
-                                                                                                                                                                                                               "튷|䀭n*曎b✿~杤U]Gz鄭kW|㴚#㟗ഠ8u擨": [[
-                                                                                                                                                                                                                true,
-                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                {"⾪壯톽g7?㥜ώQꑐ㦀恃㧽伓\\*᧰閖樧뢇赸N휶䎈pI氇镊maᬠ탷#X?A+kНM ༑᩟؝?5꧎鰜ṚY즫궔 =ঈ;ﳈ?*s|켦蜌wM笙莔": [
-                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                 -3808207793125626469,
-                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                  -469910450345251234,
-                                                                                                                                                                                                                  7852761921290328872,
-                                                                                                                                                                                                                  -2.7979740127017492E18,
-                                                                                                                                                                                                                  1.4458504352519893E-20,
-                                                                                                                                                                                                                  true,
-                                                                                                                                                                                                                  "㽙깹?먏䆢:䴎ۻg殠JBTU⇞}ꄹꗣi#I뵣鉍r혯~脀쏃#釯:场:䔁>䰮o'㼽HZ擓௧nd",
-                                                                                                                                                                                                                  [
-                                                                                                                                                                                                                   974441101787238751,
-                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                   -2.1647718292441327E-19,
-                                                                                                                                                                                                                   1.03602824249831488E18,
-                                                                                                                                                                                                                   [
-                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                    1.0311977941822604E-17,
-                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                    true,
-                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                     "": -3.7019778830816707E18,
-                                                                                                                                                                                                                     "E峾恆茍6xLIm縂0n2视֯J-ᤜz+ᨣ跐mYD豍繹⹺䊓몓ﴀE(@詮(!Y膽#᎙2䟓섣A䈀㟎,囪QbK插wcG湎ꤧtG엝x⥏俎j'A一ᯥ뛙6ㅑ鬀": 8999803005418087004,
-                                                                                                                                                                                                                     "よ殳\\zD⧅%Y泥簳Uꈩ*wRL{3#3FYHା[d岀䉯T稉駅䞘礄P:闈W怏ElB㤍喬赔bG䠼U଄Nw鰯闀楈ePsDꥷ꭬⊊": [
-                                                                                                                                                                                                                      6.77723657904486E-20,
-                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                       "ཚ_뷎꾑蹝q'㾱ꂓ钚蘞慵렜떆`ⴹ⎼櫯]J?[t9Ⓢ !컶躔I᮸uz>3a㠕i,錃L$氰텰@7녫W㸮?羧W뇧ꃞ,N鋮숪2ɼ콏┍䁲6",
-                                                                                                                                                                                                                       "&y?뢶=킕올Za惻HZk>c\u20b58i?ꦶcfBv잉ET9j䡡",
-                                                                                                                                                                                                                       "im珊Ճb칧<D-諂*u2ꡜ췛~䬢(텸ﵦ>校\\뼾쯀",
-                                                                                                                                                                                                                       9.555715121193197E-20,
-                                                                                                                                                                                                                       true,
-                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                        "<㫚v6腓㨭e1㕔&&V∌ᗈT奄5Lጥ>탤?튣瑦㳆ꉰ!(ᙪ㿬擇_n쌯IMΉ㕨␰櫈ᱷ5풔蟹&L.첽e鰷쯃劼﫭b#ﭶ퓀7뷄Wr㢈๧Tʴશ㶑澕鍍%": -1810142373373748101,
-                                                                                                                                                                                                                        "fg晌o?߲ꗄ;>C>?=鑰監侯Kt굅": true,
-                                                                                                                                                                                                                        "䫡蓺ꑷ]C蒹㦘\"1ః@呫\u0014NL䏾eg呮፳,r$裢k>/\\<z": [[
-                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                         "C䡏>?ㄤᇰﻛ쉕1஥'Ċ\" \\_?쨔\"ʾr: 9S䘏禺ᪧꄂ㲄",
-                                                                                                                                                                                                                         [[{
-                                                                                                                                                                                                                          "*硙^+E쌺I1䀖ju?:⦈Ꞓl๴竣迃xKC/饉:\fl\"XTFﾨ蟭,芢<\/骡軺띜hꏘ\u001f銿<棔햳▨(궆*=乥b8\\媦䷀뫝}닶ꇭ(Kej䤑M": [{
-                                                                                                                                                                                                                           "1Ꮼ?>옿I╅C<ގ?ꊌ冉SV5A㢊㶆z-๎玶绢2F뵨@㉌뀌o嶔f9-庒茪珓뷳4": null,
-                                                                                                                                                                                                                           ";lᰳ": "CbB+肻a䄷苝*/볳+/4fq=㰁h6瘉샴4铢Y骐.⌖@哼猎㦞+'gꋸ㒕ߤ㞑(䶒跲ti⑴a硂#No볔",
-                                                                                                                                                                                                                           "t?/jE幸YHT셵⩎K!Eq糦ꗣv刴w\"l$ο:=6:移": {
-                                                                                                                                                                                                                            "z]鑪醊嫗J-Xm銌翁絨c里됏炙Ep㣋鏣똼嚌䀓GP﹖cmf4鹭T䅿꣭姧␸wy6ꦶ;S&(}ᎧKxᾂQ|t뻳k\"d6\"|Ml췆hwLt꼼4$&8Պ褵婶鯀9": {"嵃닢ᒯ'd᧫䳳#NXe3-붋鸿ଢ떓%dK\u0013䲎ꖍYV.裸R⍉rR3蟛\\:젯:南ĺLʆ넕>|텩鴷矔ꋅⒹ{t孶㓑4_": [
-                                                                                                                                                                                                                             true,
-                                                                                                                                                                                                                             null,
-                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                              false,
-                                                                                                                                                                                                                              "l怨콈lᏒ",
-                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                               "0w䲏嬧-:`䉅쉇漧\\܂yㄨb%㽄j7ᦶ涶<": 3.7899452730383747E-19,
-                                                                                                                                                                                                                               "ꯛTẀq纤q嶏V⿣?\"g}ი艹(쥯B T騠I=仵및X": {"KX6颠+&ᅃ^f畒y[": {
-                                                                                                                                                                                                                                "H?뱜^?꤂-⦲1a㋞&ꍃ精Ii᤾챪咽쬘唂쫷<땡劈훫놡o㥂\\ KⴙD秼F氮[{'좴:례晰Iq+I쭥_T綺砸GO煝䟪ᚪ`↹l羉q쐼D꽁ᜅ훦: vUV": true,
-                                                                                                                                                                                                                                "u^yﳍ0㱓#[y뜌앸ꊬL㷩?蕶蘾⻍KӼ": -7931695755102841701,
-                                                                                                                                                                                                                                "䤬轉車>\u001c鴵惋\"$쯃྆⇻n뽀G氠S坪]ಲꨍ捇Qxኻ椕駔\\9ࣼ﫻읜磡煮뺪ᶚ볝l㕆t+sζ": [[[
-                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                  3363739578828074923,
-                                                                                                                                                                                                                                  true,
-                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                   "\"鸣詩 볰㑵gL㯦῅춝旫}ED辗ﮈI쀤-ꧤ|㠦Z\"娑ᕸ4爏騍㣐\"]쳝Af]茛⬻싦o蚁k䢯䩐菽3廇喑ޅ": 4.5017999150704666E17,
-                                                                                                                                                                                                                                   "TYႇ7ʠ值4챳唤~Zo&ݛ": false,
-                                                                                                                                                                                                                                   "`塄J袛㭆끺㳀N㺣`꽐嶥KﯝSVᶔ∲퀠獾N딂X\"ᤏhNﬨvI": {"\u20bb㭘I䖵䰼?sw䂷쇪](泒f\"~;꼪Fԝsᝦ": {"p,'ꉂ軿=A蚶?bƉ㏵䅰諬'LYKL6B깯⋩겦뎙(ᜭ\u0006噣d꾆㗼Z;䄝䚔cd<情@䞂3苼㸲U{)<6&ꩻ钛\u001au〷N숨囖愙j=BXW욕^x芜堏Ῑ爂뛷꒻t✘Q\b": [[
-                                                                                                                                                                                                                                    "籛&ଃ䩹.ꃩ㦔\\C颫#暪&!勹ꇶ놽攺J堬镙~軌C'꾖䣹㮅岃ᙴ鵣",
-                                                                                                                                                                                                                                    4.317829988264744E15,
-                                                                                                                                                                                                                                    6.013585322002147E-20,
-                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                    true,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    -3.084633632357326E-20,
-                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                    null,
-                                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                                     "\"짫愔昻  X\"藣j\"\"먁ཅѻ㘤㬯0晲DU꟒㸃d벀윒l䦾c੻*3": null,
-                                                                                                                                                                                                                                     "谈Wm陧阦咟ฯ歖擓N喴㋐銭rCCnVࢥ^♼Ⅾ젲씗刊S༝+_t赔\\b䚍뉨ꬫ6펛cL䊘᜼<\/澤pF懽&H": [
-                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                       "W\"HDUuΌ퀟M'P4࿰H똆ⰱﮯ<\/凐蘲\"C鴫ﭒж}ꭩ쥾t5yd诪ﮡ퍉ⴰ@?氐醳rj4I6Qt": 6.9090159359219891E17,
-                                                                                                                                                                                                                                       "絛ﳛ⺂": {"諰P㗮聦`ZQ?ꫦh*റcb⧱}埌茥h{棩렛툽o3钛5鮁l7Q榛6_g)ὄ\u0013kj뤬^爖eO4Ⱈ槞鉨ͺ订%qX0T썗嫷$?\\\"봅늆'%": [
-                                                                                                                                                                                                                                        -2.348150870600346E-19,
-                                                                                                                                                                                                                                        [[
-                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                         -6619392047819511778,
-                                                                                                                                                                                                                                         false,
-                                                                                                                                                                                                                                         [[
-                                                                                                                                                                                                                                          -1.2929189982356161E-20,
-                                                                                                                                                                                                                                          1.7417192219309838E-19,
-                                                                                                                                                                                                                                          {"?嵲2࿐2\u0001啑㷳c縯": [
-                                                                                                                                                                                                                                           null,
-                                                                                                                                                                                                                                           [
-                                                                                                                                                                                                                                            false,
-                                                                                                                                                                                                                                            true,
-                                                                                                                                                                                                                                            2578060295690793218,
-                                                                                                                                                                                                                                            {
-                                                                                                                                                                                                                                             "?\"殃呎#㑑F": true,
-                                                                                                                                                                                                                                             "}F炊_殛oU헢兔Ꝉ,赭9703.B数gTz3⏬": {
-                                                                                                                                                                                                                                              "5&t3,햓Mݸᵣ㴵;꣫䩍↳#@뫷䠅+W-ࣇzᓃ鿕ಔ梭?T䮑ꥬ旴]u뫵막bB讍:왳둛lEh=숾鱠p咐$짏#?g⹷ᗊv㷵.斈u頻\u0018-G.": "뽙m-ouࣤ஫牷\"`Ksꕞ筼3HlȨvC堈\"I]㖡玎r먞#'W賜鴇k'c룼髋䆿飉㗆xg巤9;芔cጐ/ax䊨♢큓r吓㸫೼䢗da᩾\"]屣`",
-                                                                                                                                                                                                                                              ":M딪<䢥喠\u0013㖅x9蕐㑂XO]ｆ*Q呰瞊吭VP@9,㨣 D\\穎vˤƩs㜂-曱唅L걬/롬j㈹EB8g<\/섩o渀\"u0y&룣": ">氍緩L/䕑돯Ꟙ蕞^aB뒣+0jK⪄瑨痜LXK^힦1qK{淚t츔X:Vm{2r獁B뾄H첚7氥?쉟䨗ꠂv팳圎踁齀\\",
-                                                                                                                                                                                                                                              "D彤5㢷Gꪻ[lㄆ@὜⓰絳[ଃ獽쮹☒[*0ꑚ㜳": 9022717159376231865,
-                                                                                                                                                                                                                                              "ҖaV銣tW+$魿\u20c3亜~뫡ᙰ禿쨽㏡fṼzE/h": "5臐㋇Ჯ쮺? 昨탰Wﾑ밎#'\"崲钅U?幫뺀⍾@4kh>騧\\0ҾEV=爐͌U捀%ꉼ 㮋<{j]{R>:gԩL\u001c瀈锌ﯲﳡꚒ'⫿E4暍㌗뵉X\"H᝜",
-                                                                                                                                                                                                                                              "ᱚגּ;s醒}犍SἿ㦣&{T$jkB\\\tḮ앾䤹o<避(tW": "vb⯽䴪䮢@|)",
-                                                                                                                                                                                                                                              "⥒퐁껉%惀뗌+녣迺顀q條g⚯i⤭룐M琹j̈́⽜A": -8385214638503106917,
-                                                                                                                                                                                                                                              "逨ꊶZ<\/W⫟솪㎮ᘇb?ꠔi\"H㧺x෷韒Xꫨฟ|]窽\u001a熑}Agn?Mᶖa<rఄ4Ů䢤슲Axģe곖㴤x竾郍B謉鸵k薽M)\"芣眜`菉ꉛ䴺": "鹏^ె캫?3耲]|Ü1䡒㝮]8e?䶍^",
-                                                                                                                                                                                                                                              "뿸樅#P㡊1M룮Uꪭ绢ꑮZ9꽸": {"\nJ^є|3袄ㅐ7⨆銦y睝⋷仴ct?[,<\/ㅬ`?갔髞%揁A೚C": {
-                                                                                                                                                                                                                                               " 䇞3갫䅪": [{
-                                                                                                                                                                                                                                                "0|⩁㑂砕ㅻ": null,
-                                                                                                                                                                                                                                                "D箳᠉`|=⼭)\"*࣊㦏LjO誋": "",
-                                                                                                                                                                                                                                                "ࠚDZmꗥ}ᷴ╈r7헴ȥ4Kp5a)o}鎘门L搰䆓'✎k俎c#T68ӏ⩶6L鎴<r൦$黊BQY㼳\\跿F慮⡨拵贀!甶V喅/": null,
-                                                                                                                                                                                                                                                "ⵣq⳹ﻨLk]晩1*y\\$%}䖶P煑㇆䈦E嫁櫕Y࣓嫨䓏OL낮梚㸇洛洚BYtgl∛S☕䉓宑⋢粚ꔯ꠼붠": ")ꬑ윤`\"Ⱓ<\/婽*Y䔸ᓰ_ﳍt슲坩隥&S糧䛮闵诌豐sh쯽邴*섴؏͎=㯨\"RVힳ,^t\"ac?䤒ꉀxHa=Uꛕ㐙TkF껾",
-                                                                                                                                                                                                                                                "弾cUAF?暤c덽.欀nK앭]r傊䀓ﯳ馽垃[䥛oI0N砊鈥헅Co쟋钄ㅷ㊌뷚7": [
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 "૓鏨?^䆏{\u0006`X䧵儱&롡尙砡\u0006뻝쑬sj▻XfᬶgcㄢV >9韲4$3Ỵ^=쏍煤ፐ돷2䣃%鷠/eQ9頸쥎",
-                                                                                                                                                                                                                                                 2398360204813891033,
-                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                 3.2658897259932633E-19,
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 "?ꚃ8Nn㞷幵d䲳䱲뀙ꪛQ瑓鎴]䩋-鰾捡䳡??掊",
-                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                 -1309779089385483661,
-                                                                                                                                                                                                                                                 "ᦲxu_/yecR.6芏.ᜇ過 ~",
-                                                                                                                                                                                                                                                 -5658779764160586501,
-                                                                                                                                                                                                                                                 "쒌:曠=l썜䢜wk#s蕚\"互㮉m䉤~0듐䋙#G;h숄옥顇෤勹(C7㢅雚㐯L⠅VV簅<",
-                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                 -4.664877097240962E18,
-                                                                                                                                                                                                                                                 -4.1931322262828017E18,
-                                                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                                                  ",": {
-                                                                                                                                                                                                                                                   "v㮟麑䄠뤵g{M띮.\u001bzt뢜뵡0Ǥ龍떟Ᾰ怷ϓRT@Lꀌ樂U㏠⾕e扉|bJg(뵒㠶唺~ꂿ(땉x⻫싉쁊;%0鎻V(o\f,N鏊%nk郼螺": -1.73631993428376141E18,
-                                                                                                                                                                                                                                                   "쟧摑繮Q@Rᕾ㭚㾣4隅待㓎3蒟": [
-                                                                                                                                                                                                                                                    4971487283312058201,
-                                                                                                                                                                                                                                                    8973067552274458613,
-                                                                                                                                                                                                                                                    {
-                                                                                                                                                                                                                                                     "`a揙ᣗ\u0015i<S幼訃锭B0&槩✨[Wp皩[g≊k葾x2ᡆ橲䲢W": true,
-                                                                                                                                                                                                                                                     "kH皈Sꁱq傑u?솹풑~o^F=劣N*reJ沤wW苯7p㼹䎐a=ꮧL㷩냴nWꌑ㞱uu谁lVN珿᤻(e豶5#L쪉ᅄ઄\u0015숟봊P瀚X蓎": false,
-                                                                                                                                                                                                                                                     "䫯דּ〖Sc䛭점L뵾pCꙞ\"엇즓_ﰛ톣ꫀ먩㺣㮠⭴!\\W┏t䖰軅y\u0014~ᇰ렢E7*俜䥪W䀩䷐h봆vjஉ묣༏G39.뼳輼:㮿ᐦA饕TUL}~": [
-                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                      8.8648298810470003E17,
-                                                                                                                                                                                                                                                      5.735561205600924E-20,
-                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                      -102555823658171644,
-                                                                                                                                                                                                                                                      1.2674932032973067E-19,
-                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                       "D胣O㯨\u0017Ku눓㒏텁nᨊ!Ꚇ廫_>Bo¸": 4.3236479112537999E18,
-                                                                                                                                                                                                                                                       "HW&퉡ぁ圍<W)6悰ꠑHEp14xy峑ft\u0005s亘V튉䢮ꦈX嵐꬝?lI_덝춇-6Ss噺Nk-ﮥ큃܁郪*PR(S6╋@仙V懸뺵ﯜV粹": "9䗌斀4㐈^Qs隄硏j\u0003",
-                                                                                                                                                                                                                                                       "Vk鶅C泹筁HX훉朗*r\\z顊誌儖4?n7᏾6몋䎡ﳈ],H頢p蚐㑄P4满E䏩V䬕ญL廂쒬쑨ꆷh迡ꍰ譖墎 ]鹿ฌ7ﶽ冭༽<ꈓS\\l䋮?_ﾕ檒?": -8598528325153980065,
-                                                                                                                                                                                                                                                       "t=q퍣疻тZ\\錅J.镎|nfḷ鴒1厰L灯纜E]୦⥪]Ꮾ'羝p/咩0닳ﳁqﳖཽk ?X1Ft%ś뭢v鋋⺃爵⒗": [[
-                                                                                                                                                                                                                                                        5.0824756359232045E-19,
-                                                                                                                                                                                                                                                        [
-                                                                                                                                                                                                                                                         7.268480839079619E-19,
-                                                                                                                                                                                                                                                         {"탿^굞⧕iј덊ꀛw껩6ꟳXs酚\\>Y?瑡Qy훍q!帰敏s舠㫸zꚗaS歲v`G株巷Jp6킼 (귶鍔⾏⡈>M汐㞍ቴ꙲dv@i㳓ᇆ?黍": [
-                                                                                                                                                                                                                                                          null,
-                                                                                                                                                                                                                                                          4997607199327183467,
-                                                                                                                                                                                                                                                          "E㻎蠫ᐾ高䙟蘬洼旾﫠텛㇛?'M$㣒蔸=A_亀绉앭rN帮",
-                                                                                                                                                                                                                                                          null,
-                                                                                                                                                                                                                                                          [{
-                                                                                                                                                                                                                                                           "Eᑞ)8<Z㡿W镀䛒C생V?0ꯦ+tL)`齳AjB姀XೳD빠㻲ƙgn9⑰ྍ῜&\"㚹>餧A5u&㗾q?": [
-                                                                                                                                                                                                                                                            -1.969987519306507E-19,
-                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                            [
-                                                                                                                                                                                                                                                             3.42437673373841E-20,
-                                                                                                                                                                                                                                                             true,
-                                                                                                                                                                                                                                                             "e걷M墁\"割P␛퍧厀R䱜3ﻴO퓫r﹉⹊",
-                                                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                                                              -8164221302779285367,
-                                                                                                                                                                                                                                                              [
-                                                                                                                                                                                                                                                               true,
-                                                                                                                                                                                                                                                               null,
-                                                                                                                                                                                                                                                               "爘y^-?蘞Ⲽꪓa␅ꍨ}I",
-                                                                                                                                                                                                                                                               1.4645984996724427E-19,
-                                                                                                                                                                                                                                                               [{
-                                                                                                                                                                                                                                                                "tY좗⧑mrzﺝ㿥ⴖ᥷j諅\u0000q賋譁Ꞅ⮱S\nࡣB/큃굪3Zɑ复o<\/;롋": null,
-                                                                                                                                                                                                                                                                "彟h浠_|V4䦭Dᙣ♞u쿻=삮㍦\u001e哀鬌": [{"6횣楠,qʎꗇ鎆빙]㱭R굋鈌%栲j分僅ペ䇰w폦p蛃N溈ꡐꏀ?@(GI뉬$ﮄ9誁ꓚ2e甸ڋ[䁺,\u0011\u001cࢃ=\\+衪䷨ᯕ鬸K": [[
-                                                                                                                                                                                                                                                                 "ㅩ拏鈩勥\u000etgWVXs陂規p狵w퓼{뮵_i\u0002ퟑႢ⬐d6鋫F~챿搟\u0096䚼1ۼ칥0꣯儏=鋷牋ⅈꍞ龐",
-                                                                                                                                                                                                                                                                 -7283717290969427831,
-                                                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                                                 [
-                                                                                                                                                                                                                                                                  4911644391234541055,
-                                                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                                                   "I鈒첽P릜朸W徨觘-Hᎄ퐟⓺>8kr1{겵䍃〛ᬡ̨O귑o䝕'쿡鉕p5": "fv粖RN瞖蛐a?q꤄\u001d⸥}'ꣴ犿ꦼ?뤋?鵆쥴덋䡫s矷̄?ඣ/;괱絢oWfV<\/\u202cC,㖦0䑾%n賹g&T;|lj_欂N4w",
-                                                                                                                                                                                                                                                                   "짨䠗;䌕u i+r๏0": [{"9䥁\\఩8\"馇z䇔<\/ႡY3e狚쐡\"ุ6ﰆZ遖c\"Ll:ꮾ疣<\/᭙Ｏ◌납୕湞9⡳Und㫜\u0018^4pj1;䧐儂䗷ୗ>@e톬": {
-                                                                                                                                                                                                                                                                    "a⑂F鋻Q螰'<퇽Q贝瀧{ᘪ,cP&~䮃Z?gＩ彃": [
-                                                                                                                                                                                                                                                                     -1.69158726118025933E18,
-                                                                                                                                                                                                                                                                     [
-                                                                                                                                                                                                                                                                      "궂z簽㔛㮨瘥⤜䛖Gℤ逆Y⪾j08Sn昞ꘔ캻禀鴚P謦b{ꓮmN靐Mᥙ5\"睏2냑I\u0011.L&=?6ᄠ뻷X鸌t刑\"#z)o꫚n쳟줋",
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      7517598198523963704,
-                                                                                                                                                                                                                                                                      "ኑQp襟`uᩄr方]*F48ꔵn俺ሙ9뇒",
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      6645782462773449868,
-                                                                                                                                                                                                                                                                      1219168146640438184,
-                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                                       ")ယ넌竀Sd䰾zq⫣⏌ʥ\u0010ΐ' |磪&p牢蔑mV蘸૰짬꺵;K": [
-                                                                                                                                                                                                                                                                        -7.539062290108008E-20,
-                                                                                                                                                                                                                                                                        [
-                                                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                                                         false,
-                                                                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                                                                         true,
-                                                                                                                                                                                                                                                                         6574577753576444630,
-                                                                                                                                                                                                                                                                         [[
-                                                                                                                                                                                                                                                                          1.2760162530699766E-19,
-                                                                                                                                                                                                                                                                          [
-                                                                                                                                                                                                                                                                           null,
-                                                                                                                                                                                                                                                                           [
-                                                                                                                                                                                                                                                                            "顊\\憎zXB,",
-                                                                                                                                                                                                                                                                            [{
-                                                                                                                                                                                                                                                                             "㇆{CVC9－MN㜋ઘR눽#{h@ퟨ!鼚׼XOvXS\u0017ᝣ=cS+梽៲綆16s덽휐y屬?ᇳG2ᴭ\u00054쫖y룇nKcW̭炦s/鰘ᬽ?J|퓀髣n勌\u0010홠P>j": false,
-                                                                                                                                                                                                                                                                             "箴": [
-                                                                                                                                                                                                                                                                              false,
-                                                                                                                                                                                                                                                                              "鍞j\"ꮾ*엇칬瘫xṬ⭽쩁䃳\"-⋵?ᦽ<cਔ↎⩧%鱩涎삧u9K⦈\"῝ᬑV绩킯愌ṱv@GꝾ跶Ꚇ(?䖃vI᧊xV\r哦j㠒?*=S굤紴ꊀ鹭쬈s<DrIu솹꧑?",
-                                                                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                                                                               ".}S㸼L?t\u000fK⑤s~hU鱜꘦}쪍C滈4ꓗ蛌):ྦ\"顥이⢷ῳYLn\"?fꘌ>댎Ĝ": true,
-                                                                                                                                                                                                                                                                               "Pg帯佃籛n㔠⭹࠳뷏≻࿟3㞱!-쒾!}쭪䃕!籿n涻J5ਲ਼yvy;Rኂ%ᔡጀ裃;M⣼)쵂쑈": 1.80447711803435366E18,
-                                                                                                                                                                                                                                                                               "ꈑC⡂ᑆ㤉壂뎃Xub<\/쀆༈憓ق쨐ק\\": [
-                                                                                                                                                                                                                                                                                7706977185172797197,
-                                                                                                                                                                                                                                                                                {"": {"K╥踮砆NWࡆFy韣7ä밥{|紒︧䃀榫rᩛꦡTSy잺iH8}ퟴ,M?Ʂ勺ᴹ@T@~꾂=I㙕뾰_涀쑜嫴曣8IY?ҿo줫fऒ}\\S\"ᦨ뵼#nDX": {
-                                                                                                                                                                                                                                                                                 "♘k6?଱癫d68?㽚乳䬳-V顷\u0005蝕?\u0018䞊V{邾zじl]雏k臤~ൖH뒐iꢥ]g?.G碄懺䔛p<q꜉S岗_.%": 7688630934772863849,
-                                                                                                                                                                                                                                                                                 "溗摽嗙O㧀,⡢⼰呠ꅧ㓲/葇䢛icc@-r\b渂ꌳ뻨饑觝ᖜ\\鮭\u0014엙㥀᧺@浹W2꛵{W률G溮킀轡䬆g㨑'Q聨៪网Hd\"Q늴ᱢﶨ邮昕纚枑?▰hr羌驀[痹<\/": [
-                                                                                                                                                                                                                                                                                  -1.0189902027934687E-19,
-                                                                                                                                                                                                                                                                                  {"窶椸릎뚻shE\"ꪗႥꎳU矖佟{SJ": [{"-慜x櫹XY-澐ܨ⣷ઢ鯙%Fu\u0000迋▒}᥷L嗭臖oញc넨\u0016/迎1b꯸g뢱㐧蓤䒏8C散삭|\"컪輩鹩\"\\g$zG䥽긷?狸꿭扵㲐:URON&oU8": [
-                                                                                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                                                                                   true,
-                                                                                                                                                                                                                                                                                   null,
-                                                                                                                                                                                                                                                                                   -2.8907335031148883E17,
-                                                                                                                                                                                                                                                                                   -3864019407187144121,
-                                                                                                                                                                                                                                                                                   {
-                                                                                                                                                                                                                                                                                    "`빬d⵺4H뜳⧈쓑ohஸ*㶐ﻇ⸕䠵!i䝬﹑h夘▥ꗐ푹갇㵳TA鳠嚵\\B<X}3訒c⋝{*﫢w]璨-g捭\\j໵侠Ei层\u0011": 3.758356090089446E-19,
-                                                                                                                                                                                                                                                                                    "䄘ﮐ)Y놞씃㾱陰큁:{\u2059/S⓴": [[
-                                                                                                                                                                                                                                                                                     null,
-                                                                                                                                                                                                                                                                                     [[
-                                                                                                                                                                                                                                                                                      -3.8256602120220546E-20,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      7202317607724472882,
-                                                                                                                                                                                                                                                                                      "CWQ뚿",
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      false,
-                                                                                                                                                                                                                                                                                      true,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      2857038485417498625,
-                                                                                                                                                                                                                                                                                      6.191302233218633E-20,
-                                                                                                                                                                                                                                                                                      null,
-                                                                                                                                                                                                                                                                                      -6795250594296208046,
-                                                                                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                                                                                       true,
-                                                                                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                                                                                        "%ዧ遰Yᚯ⚀x莰愒Vᔈ턗BN洝ꤟA1⍌l콹풪H;OX๫륞쪐ᰚц@͎黾a邬<L厒Xb龃7f웨窂二;": [[
-                                                                                                                                                                                                                                                                                         null,
-                                                                                                                                                                                                                                                                                         "耲?䙧㘓F6Xs틭멢.v뚌?鄟恠▽'묺競?WvᆾCtxo?dZ;䨸疎",
-                                                                                                                                                                                                                                                                                         {
-                                                                                                                                                                                                                                                                                          "@hWꉁ&\"빜4礚UO~C;う殩_ꀥ蘁奢^챟k→ᡱKMⵉ<\/Jㅲ붉L͟Q": false,
-                                                                                                                                                                                                                                                                                          "tU뢂8龰I먽7,.Y搽Z툼=&⨥覽K乫햶㠸%#@Z끖愓^⍊⾂몒3E_噆J(廊ឭyd䞜鈬Ћ档'⣘I": {
-                                                                                                                                                                                                                                                                                           "tK*ꔵ銂u艗ԃ쿏∳ꄂ霫X3♢9y?=ⲭdЊb&xy}": [
-                                                                                                                                                                                                                                                                                            -4.097346784534325E-20,
-                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                            6016848468610144624,
-                                                                                                                                                                                                                                                                                            -8194387253692332861,
-                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                            {
-                                                                                                                                                                                                                                                                                             "(祬诀譕쯠娣c봝r?畄kT뼾⌘⎨?noV䏘쥝硎n?": [
-                                                                                                                                                                                                                                                                                              1.82679422844617293E18,
-                                                                                                                                                                                                                                                                                              [
-                                                                                                                                                                                                                                                                                               false,
-                                                                                                                                                                                                                                                                                               2.6849944122427694E18,
-                                                                                                                                                                                                                                                                                               true,
-                                                                                                                                                                                                                                                                                               [
-                                                                                                                                                                                                                                                                                                false,
-                                                                                                                                                                                                                                                                                                {
-                                                                                                                                                                                                                                                                                                 ";0z⭆;화$bਔ瀓\"衱^?잢ᢛ⣿~`ꕉ薸⌳໿湘腌'&:ryБꋥၼ꒥筙꬜긨?X": -3536753685245791530,
-                                                                                                                                                                                                                                                                                                 "c;Y7釚Uꃣ割J༨Y戣w}c峰뢨㽑㫈0N>R$䅒X觨l봜A刊8R梒',}u邩퉕?;91Ea䈈믁G⊶芔h袪&廣㺄j;㡏綽\u001bN頸쳘橆": -2272208444812560733,
-                                                                                                                                                                                                                                                                                                 "拑Wﵚj鵼駳Oࣿ)#㾅顂N傓纝y僱栜'Bꐍ-!KF*ꭇK￤?䈴^:啤wG逭w᧯": "xᣱmYe1ۏ@霄F$ě꧘푫O䤕퀐Pq52憬ꀜ兴㑗ᡚ?L鷝ퟐ뭐zJꑙ}╆ᅨJB]\"袌㺲u8䯆f",
-                                                                                                                                                                                                                                                                                                 "꿽၅㔂긱Ǧ?SI": -1669030251960539193,
-                                                                                                                                                                                                                                                                                                 "쇝ɨ`!葎>瞺瘡驷錶❤ﻮ酜=": -6961311505642101651,
-                                                                                                                                                                                                                                                                                                 "?f7♄꫄Jᡔ훮e읇퍾፣䭴KhखT;Qty}O\\|뫁IῒNe(5惁ꥶㆷY9ﮡ\\ oy⭖-䆩婁m#x봉>Y鈕E疣s驇↙ᙰm<": {"퉻:dꂁ&efￎ쫢[\"돈늖꺙|Ô剐1͖-K:ʚ᭕/;쏖㷛]I痐职4g<Oꗢ뫺N쯂륬J╆.`ᇵP轆&fd$?苅o궓vO侃沲⍩嚅沗 E%⿰얦wi\\*趫": [
-                                                                                                                                                                                                                                                                                                  3504362220185634767,
-                                                                                                                                                                                                                                                                                                  false,
-                                                                                                                                                                                                                                                                                                  "qzX朝qT3軞T垈ꮲQ览ᚻ⻑쎎b驌䵆ꬠ5Fୗ䲁缿ꝁ蒇潇Ltᆄ钯蜀W欥ሺ",
-                                                                                                                                                                                                                                                                                                  "볰ɐ霬)젝鶼kwoc엷荁r \u001d쒷⎹8{%澡K늒?iﺩd=&皼倚J9s@３偛twὡgj䁠흪5⭉⨺役&놎cﺉ㺡N5",
-                                                                                                                                                                                                                                                                                                  false,
-                                                                                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                                                                                  "D0st[ni锹r*0k6ꀎ덇UX2⽼৞䃚粭#)Z桷36P]<\/`",
-                                                                                                                                                                                                                                                                                                  4281410120849816730,
-                                                                                                                                                                                                                                                                                                  null,
-                                                                                                                                                                                                                                                                                                  -3256922126984394461,
-                                                                                                                                                                                                                                                                                                  1.16174580369801549E18,
-                                                                                                                                                                                                                                                                                                  {
-                                                                                                                                                                                                                                                                                                   " ᆼꤗ~*TN긂<㡴턱℃酰^蘒涯잰淭傛2rൡet쾣䐇m*㸏y\"\\糮᧺qv쌜镜T@yg1譬ﭧﳭ\f": null,
-                                                                                                                                                                                                                                                                                                   "圾ᨿ0xᮛ禵ਗ਼D-㟻ẵ錚e\"赜.˶m)鴑B(I$<\/轴퉯揷⋏⏺*)宓쓌?*橯Lx\\f쩂㞼⇸\"ﺧ軂遳V\\땒\"캘c:G": null,
-                                                                                                                                                                                                                                                                                                   "?﵁_곢翸폈8㿠h열Q2㭛}RY㯕ＹT놂⽻e^B<\/맫ﻇ繱\u0017Gц⟊ᢑﵩS:jt櫣嗒⟰W㴚搦ᅉe[w䋺?藂翙Ⲱ芮䍘╢囥lpdu7r볺I 近qFyᗊ": [
-                                                                                                                                                                                                                                                                                                    "$b脬aﾠ襬育Bگ嵺Pw+'M<\/כֿn䚚v螁bN⒂}褺%lቦ阤\"ꓺᏗM牏,۞Ҷ!矬?ke9銊X괦)䈽틁脽ṫ䈞ᴆ^=Yᗿ遛4I귺⋥%",
-                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                    2.9444482723232051E18,
-                                                                                                                                                                                                                                                                                                    2072621064799640026,
-                                                                                                                                                                                                                                                                                                    "/_뇴뫢j㍒=Nꡦ↍Ժ赒❬톥䨞珯su*媸瀳鷔抡o흺-៳辏勷f绔:䵢搢2",
-                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                    "쒜 E䌐/큁\u0018懺_<\\隺&{wF⤊谼(<죽遠8?@*rᶊGd뻻갇&Ⳇq᣿e࢔t_ꩄ梸O詬C᧧Kꩠ풤9눙醅됞}竸rw?滨ӽK⥿ཊG魲']`๖5㄰",
-                                                                                                                                                                                                                                                                                                    -2375253967958699084,
-                                                                                                                                                                                                                                                                                                    {"嗱⿲\"f億ᝬ": {"v?䚑킡`◤k3,骥曘뒤Oᒱ㲹^圮᠀YT껛&촮P:G/T⣝#튣k3炩蠏k@橈䏷S䧕,熜晬k1鮥玸먚7䤡f绝嗚샴ᥒ~0q拮垑a뻱LⰖ_": [{
-                                                                                                                                                                                                                                                                                                     ":p尢": -6.688985172863383E17,
-                                                                                                                                                                                                                                                                                                     "A0\u0001疠ﻵ爻鼀湶I~W^岀mZx#㍈7r拣$Ꜷ疕≛⦒痋盩Vꬷ᭝ΩQꍪ療鈑A(劽詗ꭅo-獶鑺\"Ⓠ@$j탥;": [
-                                                                                                                                                                                                                                                                                                      8565614620787930994,
-                                                                                                                                                                                                                                                                                                      [
-                                                                                                                                                                                                                                                                                                       "嶗PC?උQ㪣$&j幾㾷h慑 즊慧⪉霄M窊ꁷ'鮕)䊏铨m趦䗲(g罣ЮKVﯦ鏮5囗ﰼ鿦",
-                                                                                                                                                                                                                                                                                                       -7168038789747526632,
-                                                                                                                                                                                                                                                                                                       null,
-                                                                                                                                                                                                                                                                                                       -7.8069738975270288E16,
-                                                                                                                                                                                                                                                                                                       2.25819579241348352E17,
-                                                                                                                                                                                                                                                                                                       -6.5597416611655936E18,
-                                                                                                                                                                                                                                                                                                       {
-                                                                                                                                                                                                                                                                                                        "瘕멦핓+?ﾌZ귢z鍛V": {
-                                                                                                                                                                                                                                                                                                         "ᕾ": 1.7363275204701887E-19,
-                                                                                                                                                                                                                                                                                                         "㭌s뎹㳉": {"\u00187FI6Yf靺+UC쬸麁␲䂿긕R\\ᆮC?Φ耭\rOத际핅홦*베W㸫㯼᡹cㅜ|G㮗\u0013[o`?jHV앝?蒪꩚!퍫ᜦ㌇䚇鿘:@": [
-                                                                                                                                                                                                                                                                                                          "}푛Г콲<䟏C藐呈#2㓋#ྕ፟尿9q竓gI%랙mꍬoa睕贿J咿D_熏Zz皳験I豼B扳ḢQ≖㻹㱣D䝦練2'ᗍ㗣▌砲8罿%హF姦;0悇<\/\"p嚧",
-                                                                                                                                                                                                                                                                                                          -710184373154164247,
-                                                                                                                                                                                                                                                                                                          "Vo쫬⬾ꝫⴷŻ\u0004靎HBꅸ_aVBＨbN>Z4⍜kเꛘZ⥺\\Bʫᇩ鄨魢弞&幟ᓮ2̊盜",
-                                                                                                                                                                                                                                                                                                          -9006004849098116748,
-                                                                                                                                                                                                                                                                                                          -3118404930403695681,
-                                                                                                                                                                                                                                                                                                          {
-                                                                                                                                                                                                                                                                                                           "_彃Y艘-\"Xx㤩㳷瑃?%2䐡鵛o<A?\"顜ᘌΈ;ⷅC洺L蚴蚀voq:,Oo4쪂)": 5719065258177391842,
-                                                                                                                                                                                                                                                                                                           "l륪맽耞塻論倐E㗑/㲕QM辬I\"qi酨玑㖪5q]尾魨鲡ƞY}⮯蠇%衟Fsf윔䐚찤i腳": {"ꢪ'a䣊糈": {"밑/♋S8s㼴5瓹O{댞\"9XﰇlJ近8}q{긧ⓈI᱑꿋腸D瀬H\"ﺬ'3?}\u0014#?丙㑯ᥨ圦',g鑠(樴턇?": [
-                                                                                                                                                                                                                                                                                                            2.5879275511391145E18,
-                                                                                                                                                                                                                                                                                                            null,
-                                                                                                                                                                                                                                                                                                            [
-                                                                                                                                                                                                                                                                                                             "3㼮ꔌ1Gẃ2W龙j͊{1囐㦭9x宠㑝oR䐕犽",
-                                                                                                                                                                                                                                                                                                             1268729930083267852,
-                                                                                                                                                                                                                                                                                                             "땕軚⿦7C",
-                                                                                                                                                                                                                                                                                                             [
-                                                                                                                                                                                                                                                                                                              -3.757935946502082E18,
-                                                                                                                                                                                                                                                                                                              "\"赌'糬_2뭾᝝b",
-                                                                                                                                                                                                                                                                                                              {
-                                                                                                                                                                                                                                                                                                               "(a䕎ጽjҰD4.ᴡ66ԃ畮<\/l`k癸\\㇋ࣆ욯R㫜픉녬挛;ڴ맺`.;焓q淞뮕ٹ趴r蔞ꯔ䟩v粏u5<\/pZ埖Skrvj帛=\u0005aa": null,
-                                                                                                                                                                                                                                                                                                               "璄≩ v몛ᘮ%?:1頌챀H㷪뉮k滘e": [
-                                                                                                                                                                                                                                                                                                                "ꤾ{`c샬왌펡[俊络vmz㪀悫⸹ᷥ5o'㾵 L蹦qjYIYណԠW냁剫<\/W嗂0,}",
-                                                                                                                                                                                                                                                                                                                2.4817616702666762E18,
-                                                                                                                                                                                                                                                                                                                false,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                -8.6036958071260979E17,
-                                                                                                                                                                                                                                                                                                                null,
-                                                                                                                                                                                                                                                                                                                -1.2744078022652468E-19,
-                                                                                                                                                                                                                                                                                                                -4.4752020268429594E17,
-                                                                                                                                                                                                                                                                                                                1.13672865156637872E17,
-                                                                                                                                                                                                                                                                                                                [
-                                                                                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                                                                                 false,
-                                                                                                                                                                                                                                                                                                                 null,
-                                                                                                                                                                                                                                                                                                                 -4.178004168554046E-20,
-                                                                                                                                                                                                                                                                                                                 true,
-                                                                                                                                                                                                                                                                                                                 2927542512798605527,
-                                                                                                                                                                                                                                                                                                                 {
-                                                                                                                                                                                                                                                                                                                  ".ꔓ뉤1䵬cHy汼䊆賓ᐇƩ|樷❇醎㬅4\u0003赵}#yD5膏晹뱓9ꖁ虛J㺕 t䊛膎ؤ": {
-                                                                                                                                                                                                                                                                                                                   "rVtᓸ5^`েN⹻Yv᥋lꌫt拘?<鮰넿ZC?㒽^": {"␪k_:>귵옔夘v*탋职&㳈챗|O钧": [
-                                                                                                                                                                                                                                                                                                                    false,
-                                                                                                                                                                                                                                                                                                                    "daꧺdᗹ羞쯧H㍤鄳頳<型孒ン냆㹀f4㹰\u000f|C*ሟ鰠(O<ꨭ峹ipຠ*y೧4VQ蔔hV淬{?ᵌEfrI_",
-                                                                                                                                                                                                                                                                                                                    "j;ꗣ밷邍副]ᗓ",
-                                                                                                                                                                                                                                                                                                                    -4299029053086432759,
-                                                                                                                                                                                                                                                                                                                    -5610837526958786727,
-                                                                                                                                                                                                                                                                                                                    [
-                                                                                                                                                                                                                                                                                                                     null,
-                                                                                                                                                                                                                                                                                                                     [
-                                                                                                                                                                                                                                                                                                                      -1.3958390678662759E-19,
-                                                                                                                                                                                                                                                                                                                      {
-                                                                                                                                                                                                                                                                                                                       "lh좈T_믝Y\"伨\u001cꔌG爔겕ꫳ晚踍⿻읐T䯎]~e#฽燇\"5hٔ嶰`泯r;ᗜ쮪Q):/t筑,榄&5懶뎫狝(": [{
-                                                                                                                                                                                                                                                                                                                        "2ፁⓛ]r3C攟וּ9賵s⛔6'ஂ|\"ⵈ鶆䐹禝3\"痰ࢤ霏䵩옆䌀?栕r7O簂Isd?K᫜`^讶}z8?z얰T:X倫⨎ꑹ": -6731128077618251511,
-                                                                                                                                                                                                                                                                                                                        "|︦僰~m漿햭\\Y1'Vvخ굇ቍ챢c趖": [null]
-                                                                                                                                                                                                                                                                                                                       }],
-                                                                                                                                                                                                                                                                                                                       "虌魿閆5⛔煊뎰㞤ᗴꥰF䮥蘦䂪樳-K᝷-(^\u20dd_": 2.11318679791770592E17
-                                                                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                                                                                    ]
-                                                                                                                                                                                                                                                                                                                   ]},
-                                                                                                                                                                                                                                                                                                                   "묗E䀳㧯᳀逞GMc\b墹㓄끖Ơ&U??펌鑍 媋k))ᄊ": null,
-                                                                                                                                                                                                                                                                                                                   "묥7콽벼諌J_DɯﮪM殴䣏,煚ྼ`Y:씧<\/⩫%yf䦀!1Ჶk춎Q米W∠WC跉鬽*ᛱi<?,l<崣炂骵*?8푐៣ⰵ憉⎑.,Nw罣q+ο컆弎": false
-                                                                                                                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                                                                                                                  "e[|଀+lꑸ㝈TT?뿿|ꫛ9`㱯䊸楋-곳賨?쳁k棽擋wQ餈⟐Nq[q霩䵀뷮锅ꚢ": 5753148631596678144,
-                                                                                                                                                                                                                                                                                                                  "sᓝ鴻߸d렶ὕ蜗ဟ툑!诉౿": false,
-                                                                                                                                                                                                                                                                                                                  "|4䕳鵻?䈔(]틍/Ui#湻{듲ーMዀt7潔泄Ch⸨}쏣`螧銚㋼壯kⰥQ戵峉갑x辙'첛": "jd䘯$䕌茷!auw眶ㅥ䁣ꆢ民i",
-                                                                                                                                                                                                                                                                                                                  "剖駰ꞫsM2]ᾴ2ࡷ祅拌Av狔꩛'ꓗ킧ꣁ0酜✘O'": false,
-                                                                                                                                                                                                                                                                                                                  "澩뢣ꀁeU~D\\ꮡ킠": "v^YC嚈ί\u0007죋h>㴕L꘻ꀏ쓪\"_g鿄'#t⽙?,Wg㥖|D鑆e⥏쪸僬h鯔咼ඡ;4TK聎졠嫞"
-                                                                                                                                                                                                                                                                                                                 }
-                                                                                                                                                                                                                                                                                                                ]
-                                                                                                                                                                                                                                                                                                               ]
-                                                                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                                                                                                            ]
-                                                                                                                                                                                                                                                                                                           ]}}
-                                                                                                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                                                                                                         ]}
-                                                                                                                                                                                                                                                                                                        },
-                                                                                                                                                                                                                                                                                                        "뿋뀾淣截䔲踀&XJ펖꙯^Xb訅ꫥgᬐ>棟S\"혧騾밫겁7-": "擹8C憎W\"쵮yR뢩浗絆䠣簿9䏈引Wcy䤶孖ꯥ;퐌]輩䍐3@{叝 뽸0ᡈ쵡Ⲇ\u001dL匁꧐2F~ݕ㪂@W^靽L襒ᦘ~沦zZ棸!꒲栬R"
-                                                                                                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                                                                                                     ],
-                                                                                                                                                                                                                                                                                                     "Z:덃൛5Iz찇䅄駠㭧蓡K1": "e8᧤좱U%?ⵇ䯿鿝\u0013縮R∱骒EO\u000fg?幤@֗퉙vU`",
-                                                                                                                                                                                                                                                                                                     "䐃쪈埽້=Ij,쭗쓇చ": false
-                                                                                                                                                                                                                                                                                                    }]}}
-                                                                                                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                                                 ]}
-                                                                                                                                                                                                                                                                                                }
-                                                                                                                                                                                                                                                                                               ]
-                                                                                                                                                                                                                                                                                              ]
-                                                                                                                                                                                                                                                                                             ],
-                                                                                                                                                                                                                                                                                             "咰긖VM]᝼6䓑쇎琺etDҌ?㞏ꩄ퇫밉gj8蠃\"⩐5䛹1ࣚ㵪": "ക蹊?⎲⧘⾚̀I#\"䈈⦞돷`wo窭戕෱휾䃼)앷嵃꾞稧,Ⴆ윧9S?೗EMk3Მ3+e{⹔Te驨7䵒?타Ulg悳o43"
-                                                                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                                                                           ],
-                                                                                                                                                                                                                                                                                           "zQᤚ纂땺6#ٽ﹧v￿#ࠫ휊冟蹧텈ꃊʆ?&a䥯De潝|쿓pt瓞㭻啹^盚2Ꝋf醪,얏T窧\\Di䕎谄nn父ꋊE": -2914269627845628872,
-                                                                                                                                                                                                                                                                                           "䉩跐|㨻ᷢ㝉B{蓧瞸`I!℄욃힕#ೲᙾ竛ᔺCjk췒늕貭词\u0017署?W딚%(pꍁ⤼띳^=on뺲l䆼bzrﳨ[&j狸䠠=ᜑꦦ\u2061յnj=牲攑)M\\龏": false,
-                                                                                                                                                                                                                                                                                           "뎕y絬᫡⥮Ϙᯑ㌔/NF*˓.,QEzvK!Iwz?|쥾\"ꩻL꼗Bꔧ賴緜s뉣隤茛>ロ?(?^`>冺飒=噸泥⺭Ᲊ婓鎔븜z^坷裮êⓅ໗jM7ﶕ找\\O": 1.376745434746303E-19
-                                                                                                                                                                                                                                                                                          },
-                                                                                                                                                                                                                                                                                          "䐛r滖w㏤<k;l8ꡔጵ⮂ny辶⋃퍼僮z\"﮲X@t5෼暧퓞猋♅䦖QC鹮|픨( ,>,|Nዜ": false
-                                                                                                                                                                                                                                                                                         }
-                                                                                                                                                                                                                                                                                        ]],
-                                                                                                                                                                                                                                                                                        "@꿙?薕尬 gd晆(띄5躕ﻫS蔺4)떒錸瓍?~": 1665108992286702624,
-                                                                                                                                                                                                                                                                                        "w믍nᏠ=`঺ￆC>'從됐槷䤝眷螄㎻揰扰XￊC贽uჍ낟jKD03T!lDV쀉Ӊy뢖,袛!终캨G?鉮Q)⑗1쾅庅O4ꁉH7?d\u0010蠈줘월ސ粯Q!낇껉6텝|{": null,
-                                                                                                                                                                                                                                                                                        "~˷jg쿤촖쉯y": -5.5527605669177098E18,
-                                                                                                                                                                                                                                                                                        "펅Wᶺzꐆと푭e?4j仪열[D<鈑皶婆䵽ehS?袪;HꍨM뗎ば[(嗏M3q퍟g4y╸鰧茀[Bi盤~﫝唎鋆彺⦊q?B4쉓癚O洙킋툈䶯_?ퟲ": null
-                                                                                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                                                                                     ]]
-                                                                                                                                                                                                                                                                                    ]],
-                                                                                                                                                                                                                                                                                    "꟱Ԕ㍤7曁聯ಃ錐V䷰?v㪃૦~K\"$%请|ꇹn\"k䫛㏨鲨\u2023䄢\u0004[<S8ᐬ뭩脥7U.m࿹:D葍┆2蘸^U'w1젅;䠆ꋪB껮>︊VJ?䶟ាꮈ䗱=깘U빩": -4863152493797013264
-                                                                                                                                                                                                                                                                                   }
-                                                                                                                                                                                                                                                                                  ]}]}
-                                                                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                                                                }}}
-                                                                                                                                                                                                                                                                               ],
-                                                                                                                                                                                                                                                                               "쏷쐲۹퉃~aE唙a챑,9㮹gLHd'䔏|킗㍞䎥&KZYT맵7䥺N<Hp4ꕭ⹠꽐c~皽z": "课|ᖾ䡁廋萄䐪W\u0016&Jn괝b~摓M>ⱳ同莞鿧w\\༌疣n/+ꎥU\"封랾○ퟙAJᭌ?9䛝$?驔9讐짘魡T֯c藳`虉C읇쐦T"
-                                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                                             ],
-                                                                                                                                                                                                                                                                             "谶개gTR￐>ၵ͚dt晑䉇陏滺}9㉸P漄": -3350307268584339381
-                                                                                                                                                                                                                                                                            }]
-                                                                                                                                                                                                                                                                           ]
-                                                                                                                                                                                                                                                                          ]
-                                                                                                                                                                                                                                                                         ]]
-                                                                                                                                                                                                                                                                        ]
-                                                                                                                                                                                                                                                                       ],
-                                                                                                                                                                                                                                                                       "0y꟭馋X뱔瑇:䌚￐廿jg-懲鸭䷭垤㒬茭u賚찶ಽ+\\mT땱\u20821殑㐄J쩩䭛ꬿNS潔*d\\X,壠뒦e殟%LxG9:摸": 3737064585881894882,
-                                                                                                                                                                                                                                                                       "풵O^-⧧ⅶvѪ8廸鉵㈉ר↝Q㿴뺟EႳvNM:磇>w/៻唎뷭୥!냹D䯙i뵱貁C#⼉NH6`柴ʗ#\\!2䂗Ⱨf?諳.P덈-返I꘶6?8ꐘ": -8934657287877777844,
-                                                                                                                                                                                                                                                                       "溎-蘍寃i诖ര\"汵\"\ftl,?d⼡쾪⺋h匱[,෩I8MҧF{k瓿PA'橸ꩯ綷퉲翓": null
-                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                                    ],
-                                                                                                                                                                                                                                                                    "ោ係؁<元": 1.7926963090826924E-18
-                                                                                                                                                                                                                                                                   }}]
-                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                                                ]]}]
-                                                                                                                                                                                                                                                               }]
-                                                                                                                                                                                                                                                              ]
-                                                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                                                            ]
-                                                                                                                                                                                                                                                           ],
-                                                                                                                                                                                                                                                           "ጩV<\"ڸsOᤘ": 2.0527167903723048E-19
-                                                                                                                                                                                                                                                          }]
-                                                                                                                                                                                                                                                         ]}
-                                                                                                                                                                                                                                                        ]
-                                                                                                                                                                                                                                                       ]],
-                                                                                                                                                                                                                                                       "∳㙰3젴p᧗䱙?`<U὇<\/意E[ᮚAj诂ᒽ阚uv徢ဎ떗尔Ᵹ훀쩑J䐴?⪏=륪ᆩ푰ஓ㐕?럽VK\"X?檨လ齿I/耉A(AWA~⏯稐蹫": false,
-                                                                                                                                                                                                                                                       "偒妝뾇}䀼链i⇃%⋜&璪Ix渥5涧qq棩ᥝ-⠫AA낇yY颕A*裦O|n?䭬혗F": null,
-                                                                                                                                                                                                                                                       "琭CL얭B혆Kॎ`鎃nrsZiժW砏)?p~K~A眱䲏QO妣\u001b\u001b]ᵆᆯ&㐋ᏹ豉뺘$ꭧ#j=C)祤⫢歑1o㒙諩": 7028426989382601021,
-                                                                                                                                                                                                                                                       "쳱冲&ဤ䌏앧h胺-齱H忱8왪RDKᅒ䬋ᔶS*J}ስ漵'㼹뮠9걢9p봋경ጕtởꚳT䶽瘙%춴`@nಆ4<d??#僜ᙤ钴=薔ꭂbLXNam蹈": "樭る蹿= Uurwkn뙧⌲%\"쑃牪\"cq윕o@",
-                                                                                                                                                                                                                                                       "溌[H]焎SLㅁ?뀼䫨災W": 1.1714289118497062E-19,
-                                                                                                                                                                                                                                                       "ﬢp븇剌燇kĔ尘㶿㴞睠꾘Ia;s❺^)$穮?sHᢥ폪l": null
-                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                                                  "TKnzj5o<\/K㊗ꗣ藠⦪駇>yZA8Ez0,^ᙛ4_0븢\u001ft:~䎼s.bb룦明yNP8弆C偯;⪾짍'蕴뮛": -6976654157771105701,
-                                                                                                                                                                                                                                                  "큵ꦀ\\㇑:nv+뒤燻䀪ﴣ﷍9ᚈ኷K㚊誦撪䚛,ꮪxሲ쳊\u0005HSf?asg昱dqꬌVꙇ㼺'k*'㈈": -5.937042203633044E-20
-                                                                                                                                                                                                                                                 }
-                                                                                                                                                                                                                                                ]
-                                                                                                                                                                                                                                               }],
-                                                                                                                                                                                                                                               "?}\u20e0],s嶳菋@#2u쒴sQS䩗=ꥮ;烌,|ꘔ䘆": "ᅩ영N璠kZ먕眻?2ቲ芋眑D륟渂⸑ﴃIRE]啗`K'"
-                                                                                                                                                                                                                                              }},
-                                                                                                                                                                                                                                              "쨀jmV賂ﰊ姐䂦玞㬙ᏪM᪟Վ씜~`uOn*ॠ8\u000ef6??\\@/?9見d筜ﳋB|S䝬葫㽁o": true
-                                                                                                                                                                                                                                             },
-                                                                                                                                                                                                                                             "즛ꄤ酳艚␂㺘봿㎨iG৕ࡿ?1\"䘓您\u001fSኝ⺿溏zៀ뻤B\u0019?윐a䳵᭱䉺膷d:<\/": 3935553551038864272
-                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                           ]
-                                                                                                                                                                                                                                          ]}
-                                                                                                                                                                                                                                         ]]
-                                                                                                                                                                                                                                        ]]
-                                                                                                                                                                                                                                       ]}
-                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                     ]
-                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                   ]]}},
-                                                                                                                                                                                                                                   "᥺3h↛!ꋰy\"攜(ெl䪕oUkc1A㘞ᡲ촾ᣫ<\/䒌E㛝潨i{v?W౾H\\RჅpz蝬R脾;v:碽✘↯삞鷱o㸧瑠jcmK7㶧뾥찲n": true,
-                                                                                                                                                                                                                                   "ⶸ?x䊺⬝-䰅≁!e쩆2ꎿ准G踌XXᩯ1߁}0?.헀Z馟;稄\baDꟹ{-寪⚈ꉷ鮸_L7ƽᾚ<\u001bጨA䧆송뇵⨔\\礍뗔d设룱㶉cq{HyぱR㥽吢ſtp": -7985372423148569301,
-                                                                                                                                                                                                                                   "緫#콮IB6<\/=5Eh礹\t8럭@饹韠r㰛斣$甝LV췐a갵'请o0g:^": "䔨(.",
-                                                                                                                                                                                                                                   "띳℡圤pﾝ௄ĝ倧訜B쁟G䙔\"Sb⓮;$$▏S1J뢙SF|赡g*\"Vu䲌y": "䪈&틐),\\kT鬜1풥;뷴'Zေ䩹@J鞽NぼM?坥eWb6榀ƩZڮ淽⺞삳煳xჿ絯8eⶍ羷V}ჿ쎱䄫R뱃9Z>'\u20f1ⓕ䏜齮"
-                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                                ]]]
-                                                                                                                                                                                                                               }}
-                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                             ]
-                                                                                                                                                                                                                            ]},
-                                                                                                                                                                                                                            "펮b.h粔폯2npX詫g錰鷇㇒<쐙S値bBi@?镬矉`剔}c2壧ଭfhY깨R()痩⺃a\\⍔?M&ﯟ<劜꺄멊ᄟA\"_=": null
-                                                                                                                                                                                                                           },
-                                                                                                                                                                                                                           "~潹Rqn榢㆓aR鬨侅?䜑亡V_翅㭔(䓷w劸ၳDp䀅<\/ﰎ鶊m䵱팱긽ꆘ<tD쇋>긓准D3掱;o:_ќ)껚콥8곤d矦8nP倥ꃸI": null,
-                                                                                                                                                                                                                           "뾎/Q㣩㫸벯➡㠦◕挮a鶧⋓偼\u00001뱓fm覞n?㛅\"": 2.8515592202045408E17
-                                                                                                                                                                                                                          }],
-                                                                                                                                                                                                                          ",": -5426918750465854828,
-                                                                                                                                                                                                                          "2櫫@0柡g䢻/gꆑ6演&D稒肩Y?艘/놘p{f투`飷ᒉ챻돎<늛䘍ﴡ줰쫄": false,
-                                                                                                                                                                                                                          "8(鸑嵀⵹ퟡ<9㣎Tߗ┘d슒ل蘯&㠦뮮eࠍk砝g 엻": false,
-                                                                                                                                                                                                                          "d-\u208b?0ﳮ嵙'(J`蔿d^踅⤔榥\\J⵲v7": 6.8002426206715341E17,
-                                                                                                                                                                                                                          "ཎ耰큓ꐕ㱷\u0013y=詽I\"盈xm{0쾽倻䉚ષso#鰑/8㸴짯%ꀄ떸b츟*\\鲷礬ZQ兩?np㋄椂榨kc᡹醅3": false,
-                                                                                                                                                                                                                          "싊j20": false
-                                                                                                                                                                                                                         }]]
-                                                                                                                                                                                                                        ]],
-                                                                                                                                                                                                                        "俛\u0017n緽Tu뫉蜍鼟烬.ꭠIⰓ\"Ἀ᜾uC쎆J@古%ꛍm뻨ᾀ画蛐휃T:錖㑸ዚ9죡$": true
-                                                                                                                                                                                                                       }
-                                                                                                                                                                                                                      ]
-                                                                                                                                                                                                                     ],
-                                                                                                                                                                                                                     "㍵⇘ꦖ辈s}㱮慀밒s`\"㞟j:`i픻Z<C1衽$\"-饧?℃\u0010⼒{p飗%R\"䲔\")칀\\%": true,
-                                                                                                                                                                                                                     "苧.8\u00120ݬ仓": 6912164821255417986,
-                                                                                                                                                                                                                     "떎顣俁X;.#Q틝.笂'p쟨唒퐏랩냆¦aⱍ{谐.b我$蜑SH\u000f琾=䟼⣼奔ᜏ攕B&挰繗㝔ꅂ-Qv\\0䶝䚥ぺio［㑮-ᇼ䬰컪ṼiY){데\u0010q螰掻~\n輚x\u0014罺)軴": 3.024364150712629E-20
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                   ]
-                                                                                                                                                                                                                  ]
-                                                                                                                                                                                                                 ]
-                                                                                                                                                                                                                ]}
-                                                                                                                                                                                                               ]]
-                                                                                                                                                                                                              }
-                                                                                                                                                                                                             ]
-                                                                                                                                                                                                            ]]
-                                                                                                                                                                                                           ]
-                                                                                                                                                                                                          ]]]],
-                                                                                                                                                                                                          "\"凲o肉Iz絾豉J8?i~傠᫽䇂!WD溊J?ᡒvs菆嵹➒淴>섫^諎0Ok{켿歁෣胰a2﨤[탳뚬쎼嫭뉮m": 409440660915023105,
-                                                                                                                                                                                                          "w墄#*ᢄ峠밮jLa`ㆪ꺊漓Lで끎!Agk'ꁛ뢃㯐岬D#㒦": false,
-                                                                                                                                                                                                          "ଦPGI䕺L몥罭ꃑ궩﮶#⮈ᢓӢ䚬p7웼臧%~S菠␌힀6&t䳙y㪘냏\\*;鉏ￊ鿵'嗕pa\"oL쇿꬈Cg": "㶽1灸D⟸䴅ᆤ뉎﷛渤csx 䝔цꬃ锚捬?ຽ+x~꘩uI࡞\u0007栲5呚ẓem?袝\")=㥴䨃pac!/揎Y",
-                                                                                                                                                                                                          "ᷱo\\||뎂몷r篙|#X䦜I#딌媸픕叞RD斳X4t⯩夬=[뭲r=绥jh뷱츝⪘%]⚋܈㖴スH텹m(WO曝劉0~K3c柢Ր㏉着逳~": false,
-                                                                                                                                                                                                          "煽_qb[첑\\륌wE❽ZtCNﭝ+餌ᕜOꛭ": "{ﳾ쉌&s惧ᭁⵆ3䢫;䨞팑꒪흘褀࢖Q䠿V5뭀䎂澻%받u5텸oA⮥U㎦;B䳌wz䕙$ឿ\\௅婺돵⪾퐆\\`Kyौꋟ._\u0006L챯l뇠Hi䧈偒5",
-                                                                                                                                                                                                          "艊佁ࣃ롇䱠爬!*;⨣捎慓q靓|儑ᨋL+迥=6㒺딉6弄3辅J-㕎뛄듘SG㆛(\noAzQꝱ䰩X*ぢO퀌%펠낌mo틮a^<\/F&_눊ᾉ㨦ы4\"8H": 2974648459619059400,
-                                                                                                                                                                                                          "鬙@뎣䫳ၮ끡?){y?5K;TA*k溱䫜J汃ꂯ싔썍\u001dA}룖(<\/^,": false,
-                                                                                                                                                                                                          "몏@QꋦFꊩᒐ뎶lXl垨4^郣|ꮇ;䝴ᝓ}쵲z珖": null
-                                                                                                                                                                                                         }
-                                                                                                                                                                                                        ]]]],
-                                                                                                                                                                                                        ":_=닧弗D䙋暨鏛. 㱻붘䂍J儒&ZK/녩䪜r囁⽯D喠죥7⹌䪥c\u001a\u2076￞妈朹oLk菮F౟覛쐧㮏7T;}蛙2{9\"崓bB<\/⡷룀;즮鿹)丒툃୤뷠5W⊢嶜(fb뭳갣": "E{响1WM"
-                                                                                                                                                                                                       }},
-                                                                                                                                                                                                       "䘨tjJ驳豨?y輊M*᳑梵瞻઻ofQG瑮e": 2.222802939724948E-19,
-                                                                                                                                                                                                       "䮴=❑➶T෋w䞜\"垦ꃼUt\u001dx;B$뵣䙶E↌艣ᡥ!᧟;䱀[䔯k쬃`੍8饙른熏'2_'袻tGf蒭J땟as꯳╖&啒zWࡇᒫYSᏬ\u0014ℑ첥鈤|cG~Pᓮ\">\"": "ႆl\f7V儊㦬nHꄬꨧC{쐢~C⮃⛓嶦vꄎ1w鰠嘩뿠魄&\"_qMⵖ釔녮ꝇ 㝚{糍J哋 cv?-jkﻯྌ鹑L舟r",
-                                                                                                                                                                                                       "龧葆yB✱H盋夔ﶉ?n*0(": "ꧣኆ㢓氥qZZ酒ຜ)鮢樛)X䣆gTSґG텞k.J圬疝롫쯭z L：\\ྤ@w炋塜쿖ᾳy뢀䶃뱝N䥨㚔勇겁#p",
-                                                                                                                                                                                                       "도畎Q娡\"@S/뼋:䵏!P衅촚fVHQs✜ᐫi㻑殡B䜇%믚k*U#濨낄~": "ꍟዕ쳸ꍈ敋&l妏\u0005憡멗瘌uPgᅪm<\/To쯬锩h뒓k"
-                                                                                                                                                                                                      }
-                                                                                                                                                                                                     ]
-                                                                                                                                                                                                    }],
-                                                                                                                                                                                                    "墥홞r绚<\/⸹ⰃB}<躅\\Y;๑@䔸>韫䜲뱀X뗩鿥쩗SI%ﴞ㳕䛇?<\/\u00018x\\&侂9鋙a[LR㋭W胕)⡿8㞙0JF,}?허d1cDMᐃ␛鄝ⱕ%X)!XQ": "ⳍꗳ=橇a;3t⦾꼑仈ူaᚯ⯋ꕃAs鴷N⍕_䎃ꙎAz\u0016䯷\\<࿫>8q{}ｷ?ᣰ}'0ᴕ펓B┦lF#趤厃T?㕊#撹圂䆲"
-                                                                                                                                                                                                   },
-                                                                                                                                                                                                   "܋닐龫論c웑": false,
-                                                                                                                                                                                                   "ㇿ/q\"6-co髨휝C큦#\u001b4~?3䐹E삇<<": 7.600917488140322E-20,
-                                                                                                                                                                                                   "䁝E6?㣖ꃁ间t祗*鑠{ḣV(浾h逇큞=W?ૉ?nꇽ8ꅉຉj으쮺@Ꚅ㰤u]Oyr": "v≁᫸_*όAඤԆl)ۓᦇQ}폠z༏q滚",
-                                                                                                                                                                                                   "ｿ᥊/넺I": true
-                                                                                                                                                                                                  }]]
-                                                                                                                                                                                                 ]
-                                                                                                                                                                                                ]
-                                                                                                                                                                                               ]
-                                                                                                                                                                                              ]]
-                                                                                                                                                                                             },
-                                                                                                                                                                                             "䭑Ik攑\u0002QV烄:芩.麑㟴㘨≕": true,
-                                                                                                                                                                                             "坄꿕C쇻풉~崍%碼\\8\"䬦꣙": null,
-                                                                                                                                                                                             "欌L圬䅘Y8c(♺2?ON}o椳s宥2䉀eJ%闹r冁O^K諭%凞⺉⡻,掜?$ꥉ?略焕찳㯊艼誜4?\"﯎<゛XፈINT:詓 +": -1.0750456770694562E-19,
-                                                                                                                                                                                             "獒àc뜭싼ﺳ뎤K`]p隨LtE": null,
-                                                                                                                                                                                             "甙8䵊神EIꩤ鐯ᢀ,ﵮU䝑u疒ử驺䚿≚ഋ梶秓F`覤譐#짾蔀묊4<媍쬦靪_Yzgcࡶ4k紥`kc[Lﮗ簐*I瀑[⾰L殽鑥_mGȠ<\/|囹灠g桰iri": true,
-                                                                                                                                                                                             "챓ꖙꟻ좝菇ou,嗠0\\jK핻뜠qwQ?ഩ㼕3Y彦b\u009bJ榶N棨f?됦鏖綃6鳵M[OE봨u햏.Ꮁ癜蟳뽲ꩌ뻾rM豈R嗀羫 uDꎚ%": null
-                                                                                                                                                                                            },
-                                                                                                                                                                                            "V傜2<": 7175127699521359521
-                                                                                                                                                                                           }],
-                                                                                                                                                                                           "铫aG切<\/\"ী⊆e<^g࢛)D顝ｎאַ饼\u008c猪繩嵿ﱚCꡬ㻊g엺A엦\u000f暿_f꿤볝㦕桦`蒦䎔j甬%岝rj 糏": "䚢偎눴Au<4箞7礦Iﱔ坠eȧ䪸u䵁p|逹$嗫쨘ꖾ﷐!胠z寓팢^㨔|u8Nሇe텔ꅦ抷]،鹎㳁#༔繁 ",
-                                                                                                                                                                                           "낂乕ꃻ볨ϱ-ꇋ㖍fs⿫)zꜦ/K?솞♞ꑌ宭hJ᤭瑥Fu": false,
-                                                                                                                                                                                           "쟰ぜ魛G\u0003u?`㾕ℾ㣭5螠烶這趩ꖢ:@咕ꐶx뒘느m䰨b痃렐0鳊喵熬딃$摉_~7*ⱦ녯1錾GKhJ惎秴6'H妈Tᧅ窹㺒疄矤铟wላ": null,
-                                                                                                                                                                                           "쯆q4!3錕㲏ⵆ㇛꘷Z瑩뭆\\◪NH\u001d\\㽰U~㯶<\"쑣낞3ᵤ'峉eꢬ;鬹o꣒木X*長PXᘱu\"䠹n惞": null,
-                                                                                                                                                                                           "ᅸ祊\"&ꥴCjࢼ﴿?䡉`U效5殼㮞V昽ꏪ#ﺸ\\&t6x꠹盥꣰a[\u001aꪍSpe鎿蠹": -1.1564713893659811E-19
-                                                                                                                                                                                          }
-                                                                                                                                                                                         ]]
-                                                                                                                                                                                        ]
-                                                                                                                                                                                       ]
-                                                                                                                                                                                      ],
-                                                                                                                                                                                      "羵䥳H,6ⱎ겾|@t\"#햊1|稃 섭)띜=뻔ꡜ???櫎~*ῡ꫌/繣ﻠq": null
-                                                                                                                                                                                     }
-                                                                                                                                                                                    ]}
-                                                                                                                                                                                   ]},
-                                                                                                                                                                                   "츤": false
-                                                                                                                                                                                  }},
-                                                                                                                                                                                  "s": 3.7339341963399598E18
-                                                                                                                                                                                 }
-                                                                                                                                                                                ],
-                                                                                                                                                                                "N,I?1+㢓|ࣱ嶃쩥V2\u0012(4EE虪朶$|w颇v步": "~읢~_,Mzr㐫YB溓E淚\"ⅹ䈔ᏺ抙 b,nt5V㐒J檶ꏨ⻔?",
-                                                                                                                                                                                "Q껑ꡡ}$넎qH煔惍/ez^!ẳF댙䝌馻剁8": "梲;yt钰$i冄}AL%a j뜐奷걳뚾d꿽*ሬuDY3?뮟鼯뮟w㍪틱V",
-                                                                                                                                                                                "o{Q/K O胟㍏zUdꀐm&⨺J舕⾏魸訟㌥[T籨櫉唐킝 aṭ뱫촙莛>碶覆⧬짙쭰ׯdAiH໥벤퐥_恸[ 0e:죃TC弼荎뵁DA:w唵ꣁ": null,
-                                                                                                                                                                                "὏樎䵮軧|?౗aWH쩃1 ꅭsu": null
-                                                                                                                                                                               }
-                                                                                                                                                                              ]
-                                                                                                                                                                             },
-                                                                                                                                                                             "勂\\&m鰈J釮=Ⲽ鳋+䂡郑": null,
-                                                                                                                                                                             "殣b綊倶5㥗惢⳷萢ᑀ䬄镧M^ﱴ3⣢翣n櫻1㨵}ኯ뗙顖Z.Q➷ꮨ뗇\u0004": "ꔙ䁼>n^[GीA䨟AM琢ᒊS쨲w?d㶣젊嘶纝麓+愣a%気ྞSc됓ᔘ:8bM7Xd8㶑臌]Ꙥ0ꐭ쒙䫣挵C薽Dfⵃ떼᷸",
-                                                                                                                                                                             "?紡.셪_෨j\u0013Ox┠$Xᶨ-ᅇo薹-}軫;y毝㪜K㣁?.EV쮱4둽⛻䤜'2盡\u001f60(|e쐰㼎ᦀ㒧-$l@ﻑ坳\u0003䭱响巗WFo5c㧆T턁Y맸♤(": -2.50917882560589088E17
-                                                                                                                                                                            }}
-                                                                                                                                                                           ],
-                                                                                                                                                                           "侸\\릩.᳠뎠狣살cs项䭩畳H1s瀉븇19?.w骴崖㤊h痠볭㞳㞳䁮Ql怠㦵": "@䟴-=7f",
-                                                                                                                                                                           "鹟1x௢+d ;vi䭴FSDS\u0004hꎹ㚍?⒍⦏ў6u,扩@됷Su)Pag휛TᒗV痩!瞏釀ꖞ蘥&ೞ蘐ꭰꞇᝎ": "ah懱Ժ&\u20f7䵅♎඀䞧鿪굛ౕ湚粎蚵ᯋ幌YOE)५襦㊝Y*^\"R+ඈ咷蝶9ꥂ榨艦멎헦閝돶v좛咊E)K㓷ྭr",
-                                                                                                                                                                           "搆q쮦4綱켙셁.f4<\/g<籽늷?#蚴픘:fF\u00051㹉뀭.ᰖ풎f֦Hv蔎㧤.!䭽=鞽]음H:?\"-4": 8.740133984938656E-20
-                                                                                                                                                                          }]}
-                                                                                                                                                                         }
-                                                                                                                                                                        ],
-                                                                                                                                                                        "tVKn딩꘥⊾蹓᤹{\u0003lR꼽ᄲQFᅏ傅ﱋ猢⤊ᔁ,E㓒秤nTතv`♛I\u0000]꫔ṞD\"麵c踝杰X&濿또꣹깳౥葂鿎\\aꡨ?": 3900062609292104525
-                                                                                                                                                                       }
-                                                                                                                                                                      ],
-                                                                                                                                                                      "ਉ샒⊩Lu@S䧰^g": -1.1487677090371648E18,
-                                                                                                                                                                      "⎢k⑊꬗yᏫ7^err糎Dt\u000bJ礯확ㆍ沑ｻꋽe赔㝢^J\u0004笲㿋idra剰-᪉C錇/Ĝ䂾ညS지?~콮gR敉⬹'䧭": 1901472137232418266,
-                                                                                                                                                                      "灗k䶥:?촽贍쓉꓈㒸g獘[뵎\\胕?\u0014_榙p.j稶,$`糉妋0>Fᡰly㘽$?": "]ꙛO赎&#㠃돱剳\"<◆>0誉齐_|z|裵씪>ᐌ㼍\"Z[琕}O?G뚇諦cs⠜撺5cu痑U圲\u001c?鴴計l춥/╓哼䄗茏ꮅ뫈댽A돌롖뤫V窗讬sHd&\nOi;_u"
-                                                                                                                                                                     }
-                                                                                                                                                                    ],
-                                                                                                                                                                    "Uﺗ\\Y\\梷䄬~\u0002": null,
-                                                                                                                                                                    "k\"Y磓ᗔ휎@U冈<\/w컑)[": false,
-                                                                                                                                                                    "曏J蝷⌻덦\u001f㙳s꥓⍟邫P늮쥄c∬ྡྷ舆렮칤Z趣5콡넛A쳨\\뀙骫(棻.*&輛LiIfi{@EA婳KᬰTXT": -4.3088230431977587E17
-                                                                                                                                                                   }]}
-                                                                                                                                                                  ]
-                                                                                                                                                                 ],
-                                                                                                                                                                 "곃㲧<\/dఓꂟs其ࡧ&N葶=?c㠤Ჴ'횠숄臼#\u001a~": false
-                                                                                                                                                                }
-                                                                                                                                                               ]
-                                                                                                                                                              ]}]
-                                                                                                                                                             }]
-                                                                                                                                                            }}
-                                                                                                                                                           ],
-                                                                                                                                                           "2f`⽰E쵟>J笂裭!〛觬囀ۺ쟰#桊l鹛ⲋ|RA_Vx፭gE됓h﵀mfỐ|?juTU档[d⢼⺻p濚7E峿": 5613688852456817133
-                                                                                                                                                          },
-                                                                                                                                                          "濘끶g忮7㏵殬W팕Q曁 뫰)惃廊5%-蹚zYZ樭ﴷQ锘쯤崫gg": true,
-                                                                                                                                                          "絥ᇑ⦏쒓븣爚H.㗊߄o蘵貆ꂚ(쎔O᥉ﮓ]姨Wꁓ!RMA|o퉢THx轮7M껁U즨'i뾘舯o": "跥f꜃?"
-                                                                                                                                                         }}
-                                                                                                                                                        ],
-                                                                                                                                                        "鷰鹮K-9k;ﰰ?_ݦѷ-ꅣ䩨Zꥱ\"mꠟ屎/콑Y╘2&鸞脇㏢ꀇ࠺ⰼ拾喭틮L꽩bt俸墶 [l/웄\"꾦\u20d3iও-&+\u000fQ+໱뵞": -1.296494662286671E-19
-                                                                                                                                                       },
-                                                                                                                                                       "HX੹/⨇୕붷Uﮘ旧\\쾜͔3l鄈磣糂̖䟎Eᐳw橖b῀_딕hu葰窳闹вU颵|染H죶.fP䗮:j䫢\\b뎖i燕ꜚG⮠W-≚뉗l趕": "ଊ칭Oa᡺$IV㷧L\u0019脴셀붿餲햪$迳向쐯켂PqfT\" ?I屉鴼쿕@硙z^鏕㊵M}㚛T젣쓌-W⩐-g%⺵<뮱~빅╴瑿浂脬\u0005왦燲4Ⴭb|D堧 <\/oEQh",
-                                                                                                                                                       "䘶#㥘੐캔f巋ἡAJ䢚쭈ࣨ뫒*mᇊK，ࣺAꑱ\u000bR<\/A\"1a6鵌㯀bh곿w(\"$ꘁ*rಐ趣.d࿩k/抶면䒎9W⊃9": "漩b挋Sw藎\u0000",
-                                                                                                                                                       "畀e㨼mK꙼HglKb,\"'䤜": null
-                                                                                                                                                      }]}]
-                                                                                                                                                     ]
-                                                                                                                                                    ]
-                                                                                                                                                   }]
-                                                                                                                                                  ]}
-                                                                                                                                                 ]
-                                                                                                                                                ]}
-                                                                                                                                               ],
-                                                                                                                                               "歙>駿ꣂ숰Q`J΋方樛(d鱾뼣(뫖턭\u20f9lচ9歌8o]8윶l얶?镖G摄탗6폋폵+g:䱫홊<멀뀿/س|ꭺs걐跶稚W々c㫣⎖": "㣮蔊깚Cꓔ舊|XRf遻㆚︆'쾉췝\\&言",
-                                                                                                                                               "殭\"cށɨꝙ䞘:嬮e潽Y펪㳅/\"O@ࠗ겴]췖YǞ(t>R\"N?梳LD恭=n氯T豰2R諸#N}*灧4}㶊G䍣b얚": null,
-                                                                                                                                               "襞<\/啧 B|싞W瓇)6簭鼡艆lN쩝`|펭佡\\間邝[z릶&쭟愱ꅅ\\T᰽1鯯偐栈4̸s윜R7⒝/똽?치X": "⏊躖Cﱰ2Qẫ脐&இ?%냝悊",
-                                                                                                                                               ",鰧偵셣싹xᎹ힨᯳EṬH㹖9": -4604276727380542356
-                                                                                                                                              }
-                                                                                                                                             }
-                                                                                                                                            ]]]],
-                                                                                                                                            "웺㚑xs}q䭵䪠馯8?LB犯zK'os䚛HZ\"L?셎s^㿧㴘Cv2": null
-                                                                                                                                           }]
-                                                                                                                                          ]
-                                                                                                                                         ]
-                                                                                                                                        ],
-                                                                                                                                        "Kd2Kv+|z": 7367845130646124107,
-                                                                                                                                        "ᦂⶨ?ᝢ 祂些ഷ牢㋇操\"腭䙾㖪\\(y4cE뽺ㆷ쫺ᔖ%zfۻ$ў1柦,㶢9r漢": -3.133230960444846E-20,
-                                                                                                                                        "琘M焀q%㢟f鸯O⣏蓑맕鯊$O噷|)z褫^㢦⠮ꚯ꫞`毕1qꢚ{ĭ䎀বώT\"뱘3G൴?^^of": null
-                                                                                                                                       }
-                                                                                                                                      ],
-                                                                                                                                      "a8V᯺?:ﺃ/8ꉿBq|9啓댚;*i2": null,
-                                                                                                                                      "cpT瀇H珰Ừpೃi鎪Rr␣숬-鹸ҩ䠚z脚цGoN8入y%趌I┽2ឪЀiJNcN)槣/▟6S숆牟\"箑X僛G殱娇葱T%杻:J諹昰qV쨰": 8331037591040855245
-                                                                                                                                     }],
-                                                                                                                                     "G5ᩜ䄗巢껳": true
-                                                                                                                                    }
-                                                                                                                                   },
-                                                                                                                                   "Ồ巢ゕ@_譙A`碫鄐㡥砄㠓(^K": "?܃B혢▦@犑ὺD~T⧁|醁;o=J牌9냚⢽㨘{4觍蚔9#$∺\u0016p囅\\3Xk阖⪚\"UzA穕롬✎➁㭒춺C㣌ဉ\"2瓑员ᅽꝶ뫍}꽚ꞇ鶂舟彺]ꍽJC蝧銉",
-                                                                                                                                   "␆Ě膝\"b-퉐ACR言J謈53~V튥x䜢?ꃽɄY뮩ꚜ": "K/↾e萃}]Bs⾿q룅鷦-膋?m+死^魊镲6",
-                                                                                                                                   "粡霦c枋AHퟁo礼Ke?qWcA趸㡔ꂏ?\u000e춂8iতᦜ婪\u0015㢼nﵿꍻ!ᐴ関\u001d5j㨻gfῩUK5Ju丝tかTI'?㓏t>⼟o a>i}ᰗ;뤕ܝ": false,
-                                                                                                                                   "ꄮ匴껢ꂰ涽+䜨B蛹H䛓-k蕞fu7kL谖,'涃V~챳逋穞cT\"vQ쓕ObaCRQ㓡Ⲯ?轭⫦輢墳?vA餽=h䮇킵n폲퉅喙?\"'1疬V嬗Qd灗'Lự": "6v!s믁㭟㣯獃!磸餠ቂh0C뿯봗F鷭gꖶ~ｺkK<ᦈTt\\跓w㭣횋钘ᆹ듡䑚W䟾X'ꅔ4FL勉Vܴ邨y)2'〚쭉⽵-鞣E,Q.?块",
-                                                                                                                                   "?(˧쩯@崟吋歄K": null
-                                                                                                                                  },
-                                                                                                                                  "Gc럃녧>?2DYI鴿\\륨)澔0ᔬlx'觔7젘⤡縷螩%Sv׫묈/]↱&S h\u0006歋ᑛxi̘}ひY蔯_醨鯘煑橾8?䵎쨋z儬ꁏ*@츾:": null
-                                                                                                                                 }
-                                                                                                                                }
-                                                                                                                               }
-                                                                                                                              ]
-                                                                                                                             ]
-                                                                                                                            ]}
-                                                                                                                           },
-                                                                                                                           "HO츧G": 3.694949578823609E17,
-                                                                                                                           "QC\u0012(翻曇Tf㷟bGBJ옉53\\嚇ᛎD/\u001b夾၉4\"핀@祎)쫆yD\"i먎Vn㿿V1W᨝䶀": -6150931500380982286,
-                                                                                                                           "Z㓮P翸鍱鉼K䋞꘺튿⭁Y": -7704503411315138850,
-                                                                                                                           "]모开ꬖP븣c霤<[3aΠ\"黁䖖䰑뮋ꤦ秽∼㑷冹T+YUt\"싳F↭䖏&鋌": -2.7231911483181824E18,
-                                                                                                                           "tꎖ": -4.9517948741799555E-19,
-                                                                                                                           "䋘즊.⬅IꬃۣQ챢ꄑ黐|f?C⾺|兕읯sC鬸섾整腨솷V": "旆柩l<K髝M戶鯮t:wR2ꉱ`9'l픪*폍芦㊢Pjjo堡^  읇얛嶅있ষ0?F",
-                                                                                                                           "下9T挞\\$yᮇk쌋⼇,ਉ": true,
-                                                                                                                           "櫨:ㆣ,邍lr崕祜㐮烜Z,XXD蕼㉴ kM꯽?P0﹉릗": null,
-                                                                                                                           "gv솠歽閘4镳䗄2澾>쪦sᖸMy㦅울썉瘗㎜檵9ꍂ駓ૉᚿ/u3씅徐拉[Z䞸ࡗ1ꆱ&Ｑ풘?ǂ8\u0011BCDY2볨;鸏": null,
-                                                                                                                           "幫 n煥s쁇펇 왊-$C\"衝:\u0014㣯舼.3뙗Yl⋇\"K迎멎[꽵s}9鉳UK8쐥\"掄㹖h㙈!얄સ?Ꜳ봺R伕UTD媚Ｉ䜘W鏨蔮": -4.150842714188901E-17,
-                                                                                                                           "ﺯ^㄄\b죵@fྉkf颡팋Ꞧ{/Pm0V둳⻿/落韒ꊔᚬ@5螺G\\咸a谆⊪ቧ慷绖?财(鷇u錝F=r၍橢ឳn:^iᴵtD볠覅N赴": null
-                                                                                                                          }]
-                                                                                                                         }]
-                                                                                                                        }
-                                                                                                                       ]
-                                                                                                                      ]}
-                                                                                                                     ]},
-                                                                                                                     "謯?w厓奰T李헗聝ឍ貖o⪇弒L!캶$ᆅ": -4299324168507841322,
-                                                                                                                     "뺊奉_垐浸延몏孄Z舰2i$q붿좾껇d▵餏\"v暜Ҭ섁m￴g>": -1.60911932510533427E18
-                                                                                                                    }
-                                                                                                                   ]
-                                                                                                                  }
-                                                                                                                 ]
-                                                                                                                ]],
-                                                                                                                "퉝꺔㠦楶Pꅱ": 7517896876489142899,
-                                                                                                                "": false
-                                                                                                               }
-                                                                                                              ]},
-                                                                                                              "是u&I狻餼|谖j\"7c됮sסּ-踳鉷`䣷쉄_A艣鳞凃*m⯾☦椿q㎭N溔铉tlㆈ^": 1.93547720203604352E18,
-                                                                                                              "kⲨ\\%vr#\u000bⒺY\\t<\/3﬌R訤='﹠8蝤Ꞵ렴曔r": false
-                                                                                                             }
-                                                                                                            ]},
-                                                                                                            "阨{c?C\u001d~K?鎌Ԭ8烫#뙣P초遗t㭱E­돒䆺}甗[R*1!\\~h㕅᰺@<9JꏏષI䳖栭6綘걹ￌM\"▯是∔v鬽顭⋊譬": "운ﶁK敂(欖C취پ℄爦賾"
-                                                                                                           }
-                                                                                                          }}
-                                                                                                         }],
-                                                                                                         "鷨赼鸙+\\䭣t圙ڹx᜾ČN<\/踘\"S_맶a鷺漇T彚⎲i㈥LT-xA캔$\u001cUH=a0츺l릦": "溣㣂0濕=鉵氬駘>Pꌢpb솇쬤h힊줎獪㪬CrQ矠a&脍꼬爼M茴/΅\u0017弝轼y#Ꞡc6둴=?R崏뷠麖w?"
-                                                                                                        },
-                                                                                                        "閕ᘜ]CT)䵞l9z'xZF{:ؐI/躅匽졁:䟇AGF૸\u001cퟗ9)駬慟ꡒꆒRS״툋A<>\u0010\"ꂔ炃7g덚E৏bꅰ輤]o㱏_뷕ܘ暂\"u": "芢+U^+㢩^鱆8*1鈶鮀\u0002뺰9⬳ꪮlL䃣괟,G8\u20a8DF㉪錖0ㄤ瓶8Nଷd?眡GLc陓\\_죌V쁰ल二?c띦捱 \u0019JC\u0011b⤉zẒT볕\"绣蘨뚋cꡉkI\u001e鳴",
-                                                                                                        "ꃣI'{6u^㡃#཰Kq4逹y൒䧠䵮!㱙/n??{L풓ZET㙠퍿X2᩟綳跠葿㚙w཮x캽扳B唕S|尾}촕%N?o䪨": null,
-                                                                                                        "ⰴFjෟ셈[\u0018辷px?椯\\1<ﲻ栘ᣁ봢憠뉴p": -5263694954586507640
-                                                                                                       }
-                                                                                                      ]
-                                                                                                     ]]
-                                                                                                    ]}
-                                                                                                   ]}]
-                                                                                                  ]
-                                                                                                 ],
-                                                                                                 "?#癘82禩鋆ꊝty?&": -1.9419029518535086E-19
-                                                                                                }
-                                                                                               ]
-                                                                                              ]
-                                                                                             ]}
-                                                                                            ]
-                                                                                           ]
-                                                                                          ],
-                                                                                          "훊榲.|῕戄&.㚏Zꛦ2\"䢥ሆ⤢fV_摕婔?≍Fji冀탆꜕i㏬_ẑKᅢ꫄蔻XWc|饡Siẘ^㲦?羡2ぴ1縁ᙅ?쐉Ou": false
-                                                                                         }]]
-                                                                                        ]}}},
-                                                                                        "慂뗄卓蓔ᐓ匐嚖/颹蘯/翻ㆼL?뇊,텵<\\獷ごCボ": null
-                                                                                       },
-                                                                                       "p溉ᑟi짣z:䒤棇r^٫%G9缑r砌롧.물农g?0׼ሩ4ƸO㣥㯄쩞ጩ": null,
-                                                                                       "껎繥YxK\"F젷쨹뤤1wq轫o?鱑뜀瘊?뎃h灑\\ꛣ}K峐^ኖ⤐林ꉓhy": null
-                                                                                      }
-                                                                                     ],
-                                                                                     "᱀n肓ㄛ\"堻2>m殮'1橌%Ꞵ군=Ӳ鯨9耛<\/n據0u彘8㬇៩f᏿诙]嚊": "䋯쪦S럶匏ㅛ#)O`ሀX_鐪渲⛀㨻宅闩➈ꢙஶDR⪍"
-                                                                                    },
-                                                                                    "tA썓龇 ⋥bj왎录r땽✒롰;羋^\\?툳*┎?썀ma䵳넅U䳆૘〹䆀LQ0\b疀U~u$M}(鵸g⳾i抦뛹?䤈땚검.鹆?ꩡtⶥGĒ;!ቹHS峻B츪켏f5≺": 2366175040075384032,
-                                                                                    "전pJjleb]ួ": -7.5418493141528422E18,
-                                                                                    "n.鎖ጲ\n?,$䪘": true
-                                                                                   },
-                                                                                   "欈Ar㉣螵᪚茩?O)": null
-                                                                                  },
-                                                                                  "쫸M#x}D秱欐K=侫们丐.KꕾxẠ\u001e㿯䣛F܍캗qq8꟞ṢFD훎⵳簕꭛^鳜\u205c٫~⑟~冫ऊ2쫰<\/戲윱o<\"": true
-                                                                                 },
-                                                                                 "㷝聥/T뱂\u0010锕|内䞇x侁≦㭖:M?iM᣿IJe煜dG࣯尃⚩gPt*辂.{磼럾䝪@a\\袛?}ᓺB珼": true
-                                                                                }
-                                                                               }
-                                                                              ]]}]}},
-                                                                              "tn\"6ꫤ샾䄄;銞^%VBPwu묪`Y僑N.↺Ws?3C⤻9唩S䠮ᐴm;sᇷ냞඘B/;툥B?lB∤)G+O9m裢0kC햪䪤": -4.5941249382502277E18,
-                                                                              "ᚔt'\\愫?鵀@\\びꂕP큠<<]煹G-b!S?\nꖽ鼫,ݛ&頺y踦?E揆릱H}햧캡b@手.p탻>췽㣬ꒅ`qe佭P>ᓂ&?u}毚ᜉ蟶頳졪ᎏzl2wO": -2.53561440423275936E17
-                                                                             }]}
-                                                                            }
-                                                                           ]
-                                                                          ]],
-                                                                          "潈촒⿂叡": 5495738871964062986
-                                                                         }
-                                                                        ]]
-                                                                       }
-                                                                      ]
-                                                                     ]}
-                                                                    ]]
-                                                                   ]]
-                                                                  ]}
-                                                                 ]
-                                                                ]},
-                                                                "ႁq킍蓅R`謈蟐ᦏ儂槐僻ﹶ9婌櫞釈~\"%匹躾ɢ뤥>࢟瀴愅?殕节/냔O✬H鲽엢?ᮈੁ⋧d␽㫐zCe*": 2.15062231586689536E17,
-                                                                "㶵Ui曚珰鋪ᾼ臧P{䍏䷪쨑̟A뼿T渠誈䏚D1!잶<\/㡍7?)2l≣穷᛾稝{:;㡹nemיּ訊`G": null,
-                                                                "䀕\"飕辭p圁f#뫆䶷뛮;⛴ᩍ3灚덏ᰝ쎓⦷詵%᜖Մfs⇫(\u001e~P|ﭗCⲾផv湟W첋(텪બT<บSꏉ੗⋲X婵i ӵ⇮?L䬇|ꈏ?졸": 1.548341247351782E-19
-                                                               }
-                                                              ]
-                                                             },
-                                                             "t;:N\u0015q鐦Rt缆{ꮐC?஛㷱敪\\+鲊㉫㓪몗릙竏(氵kYS": "XᰂT?൮ô",
-                                                             "碕飦幑|+ 㚦鏶`镥ꁩ B<\/加륙": -4314053432419755959,
-                                                             "秌孳(p!G?V傫%8ሽ8w;5鲗㦙LI檸\u2098": "zG N볞䆭鎍흘\\ONK3횙<\/樚立圌Q튅k쩎Ff쁋aׂJK銆ઘ즐狩6༥✙䩜篥CzP(聻駇HHퟲ讃%,ά{렍p而刲vy䦅ክ^톺M楒鍢㹳]Mdg2>䤉洞",
-                                                             "踛M젧>忔芿㌜Zk": 2215369545966507819,
-                                                             "씐A`$槭頰퍻^U覒\bG毲aᣴU;8!팲f꜇E⸃_卵{嫏羃X쀳C7뗮m(嚼u N܁谟D劯9]#": true,
-                                                             "ﻩ!뵸-筚P᭛}ἰ履lPh?౮ⶹꆛ穉뎃g萑㑓溢CX뾇G㖬A錟]RKaꄘ]Yo+@䘁's섎襠$^홰}F": null
-                                                            },
-                                                            "粘ꪒ4HXᕘ蹵.$區\r\u001d묁77pPc^y笲Q<\/ꖶ 訍䃍ᨕG?*": 1.73773035935040224E17
-                                                           },
-                                                           "婅拳?bkU;#D矠❴vVN쩆t㜷A풃갮娪a%鮏絪3dAv룒#tm쑬⌛qYwc4|L8KZ;xU⓭㳔밆拓EZ7襨eD|隰ऌ䧼u9Ԣ+]贴P荿": 2.9628516456987075E18
-                                                          }]}}]
-                                                         ]}
-                                                        }}
-                                                       ]}]
-                                                      ],
-                                                      "|g翉F*湹̶\u0005⏐1脉̀eI쩓ᖂ㫱0碞l䴨ꑅ㵽7AtἈ턧yq䳥塑:z:遀ﾼX눔擉)`N3昛oQ셖y-ڨ⾶恢ꈵq^<\/": null,
-                                                      "菹\\랓G^璬x৴뭸ゆUS겧﮷Bꮤ ┉銜᯻0%N7}~f洋坄Xꔼ<\/4妟Vꄟ9:౟곡t킅冩䧉笭裟炂4봋ⱳ叺怊t+怯涗\"0㖈Hq": false,
-                                                      "졬믟'ﺇফ圪쓬멤m邸QLব䗁愍4jvs翙 ྍ꧀艳H-|": null,
-                                                      "컮襱⣱뗠 R毪/鹙꾀%헳8&": -5770986448525107020
-                                                     }
-                                                    ],
-                                                    "B䔚bꐻ뙏姓展槰T-똌鷺tc灿᫽^㓟䏀o3o$꘭趙萬I顩)뇭Ἑ䓝\f@{ᣨ`x3蔛": null
-                                                   }
-                                                  ]
-                                                 ]
-                                                }],
-                                                "⦖扚vWꃱ꥙㾠壢輓{-⎳鹷贏璿䜑bG倛⋐磎c皇皩7a~ﳫU╣Q࠭ꎉS摅姽OW.홌ೞ.": null,
-                                                "蚪eVlH献r}ᮏ믠ﰩꔄ@瑄ⲱ": null,
-                                                "퀭$JWoꩢg역쁍䖔㑺h&ୢtXX愰㱇?㾫I_6 OaB瑈q裿": null,
-                                                "꽦ﲼLyr纛Zdu珍B絟쬴糔?㕂짹䏵e": "ḱ\u2009cX9멀i䶛簆㳀k"
-                                               }
-                                              ]]]],
-                                              "(_ꏮg່澮?ᩑyM<艷\u001aꪽ\\庼뙭Z맷㰩Vm\\lY筺]3㋲2㌩㄀Eਟ䝵⨄쐨ᔟgङHn鐖⤇놋瓇Q탚單oY\"♆臾jHᶈ征ቄ??uㇰA?#1侓": null
-                                             },
-                                             "觓^~ሢ&iI띆g륎ḱ캀.ᓡꀮ胙鈉": 1.0664523593012836E-19,
-                                             "y詭Gbᔶऽs댁U:杜⤎ϲ쁗⮼D醄诿q뙰I#즧v蔎xHᵿt᡽[**?崮耖p缫쿃L菝,봬ꤦC쯵#=X1瞻@OZc鱗CQTx": null
-                                            }
-                                           ]
-                                          }}],
-                                          "剘紁\u0004\\Xn⊠6,တױ;嵣崇}讃iႽ)d1\\䔓": null
-                                         },
-                                         "脨z\"{X,1u찜<'k&@?1}Yn$\u0015Rd輲ｰa쮂굄+B$l": true,
-                                         "諳>*쭮괐䵟Ґ+<箁}빀䅱⡔檏臒hIH脟ꩪC핝ଗP좕\"0i<\/C褻D۞恗+^5?'ꂱ䚫^7}㡠cq6\\쨪ꔞꥢ?纖䫀氮蒫侲빦敶q{A煲G": -6880961710038544266
-                                        }}]
-                                       },
-                                       "5s⨲JvಽῶꭂᄢI.a৊": null,
-                                       "?1q꽏쿻ꛋDR%U娝>DgN乭G": -1.2105047302732358E-19
-                                      }
-                                     ]
-                                    ]},
-                                    "qZz`撋뙹둣j碇쁏\\ꆥ\u0018@藴疰Wz)O{F䶛l᷂绘訥$]뮍夻䢋䩇萿獰樧猵⣭j萶q)$꬚⵷0馢W:Ⱍ!Qoe": -1666634370862219540,
-                                    "t": "=wp|~碎Q鬳Ӎ\\l-<\/^ﳊhn퐖}䍔t碵ḛ혷?靻䊗",
-                                    "邙쇡㯇%#=,E4勃驆V繚q[Y댻XV㡸[逹ᰏ葢B@u=JS5?bLRn얮㍉⏅ﰳ?a6[&큟!藈": 1.2722786745736667E-19
-                                   },
-                                   "X블땨4{ph鵋ꉯ웸 5p簂䦭s_E徔濧d稝~No穔噕뽲)뉈c5M윅>⚋[岦䲟懷恁?鎐꓆ฬ爋獠䜔s{\u001bm鐚儸煛%bﯿXT>ꗘ@8G": 1157841540507770724,
-                                   "媤娪Q杸\u0011SAyᡈ쿯": true,
-                                   "灚^ಸ%걁<\/蛯<O\"-刷㏠R(kO=䢊䅎l䰓팪A絫픧": "譔\\㚄 ?R7㔪G㋉⣰渆?\\#|gN⤴;W칷A׫癮଼ೣ㏳뒜7d恓꾲0扬S0ᆵi/贎ྡn䆋武",
-                                   "萇砇Gこ朦켋Wq`㞲攊*冁~霓L剢zI腧튴T繙Cঅ뫬╈뮜ㄾ䦧촄椘B⊬츩r2f㶱厊8eϬ{挚␯OM焄覤\\(Kӡ>?\"祴坓\\\\'흍": -3.4614808555942579E18,
-                                   "釴U:O湛㴑䀣렑縓\ta)<D8ﭳ槁髭D.L|xs斋敠\"띋早7wᎍ": true,
-                                   "쵈+쬎簨up䓬?q+~\u0019仇뵈᫯3ᵣ恘枰劫㪢u珘-퀭:컙:u`⌿A(9鄦!<珚nj3:Hࣨ巋䀁旸뎈맻v\"\\(곘vO㤰aZe<\/W鹙鄜;l厮둝": null,
-                                   "": -1.2019926774977002E-18,
-                                   "%者O7.Nꪍs梇接z蕜綛<\/䜭\"죊y<曋漵@Ś⹝sD⟓jݗᢜ?z/9ၲMa쨮긗贎8ᔮ㦛;6p뾥໭䭊0B찛+)(Y㿠鸁䕒^옥": "鬃뫤&痽舎J콮藐󽸰ᨨMꈫ髿v<N\\.삒껅я1ꭼ5䴷5쳬臨wj덥"
-                                  }],
-                                  "鷎'㳗@帚妇OAj' 谬f94ǯ(횡ﾋ%io쪖삐좛>(j:숾却䗌gCiB뽬Oyuq輥厁/7)?今hY︺Q": null
-                                 }
-                                ]
-                               ]]]}]
-                              ],
-                              "I笔趠Ph!<ཛྷ㸞诘X$畉F\u0005笷菟.Esr릙!W☆䲖뗷莾뒭U\"䀸犜Uo3Gꯌx4r蔇᡹㧪쨢準<䂀%ࡡꟼ瑍8炝Xs0䀝销?fi쥱ꆝલBB": -8571484181158525797,
-                              "L⦁o#J|\"⽩-㱢d㌛8d\\㶤傩儻E[Y熯)r噤὘勇 }": "e(濨쓌K䧚僒㘍蠤Vᛸ\"络QJL2,嬓왍伢㋒䴿考澰@(㏾`kX$끑эE斡,蜍&~y",
-                              "vj.|统圪ᵮPL?2oŶ`밧\"勃+0ue%⿥绬췈체$6:qa렐Q;~晘3㙘鹑": true,
-                              "ශؙ4獄⶿c︋i⚅:ん閝Ⳙ苆籦kw{䙞셕pC췃ꍬ␜꟯ꚓ酄b힝hwk꭭M鬋8B耳쑘WQ\\偙ac'唀x᪌\u2048*h짎#ፇ鮠뾏ឿ뀌": false,
-                              "⎀jꄒ牺3Ⓝ컴~?親ꕽぼܓ喏瘘!@<튋㐌꿱⩦{a?Yv%⪧笯Uܱ栅E搚i뚬:ꄃx7䙳ꦋ&䓹vq☶I䁘ᾘ涜\\썉뺌Lr%Bc㍜3?ꝭ砿裞]": null,
-                              "⭤뙓z(㡂%亳K䌽꫿AԾ岺㦦㼴輞낚Vꦴw냟鬓㹈뽈+o3譻K1잞": 2091209026076965894,
-                              "ㇲ\t⋇轑ꠤ룫X긒\"zoY읇희wj梐쐑l侸`e%s": -9.9240075473576563E17,
-                              "啸ꮑ㉰!ᚓ}銏": -4.0694813896301194E18,
-                              ">]囋੽EK뇜>_ꀣ緳碖{쐐裔[<ನ\"䇅\"5L?#xTwv#罐\u0005래t应\\N?빗;": "v쮽瞭p뭃"
-                             }
-                            ]],
-                            "斴槾?Z翁\"~慍弞ﻆ=꜡o5鐋dw\"?K蠡i샾ogDﲰ_C*⬟iㇷ4nય蟏[㟉U꽌娛苸 ঢ়操贻洞펻)쿗૊許X⨪VY츚Z䍾㶭~튃ᵦ<\/E臭tve猑x嚢": null,
-                            "锡⛩<\/칥ꈙᬙ蝀&Ꚑ籬■865?_>L詏쿨䈌浿弥爫̫lj&zx<\/C쉾?覯n?": null,
-                            "꾳鑤/꼩d=ᘈn挫ᑩ䰬ZC": "3錢爋6Ƹ䴗v⪿Wr益G韠[\u0010屗9쁡钁u?殢c䳀蓃樄욂NAq赟c튒瘁렶Aૡɚ捍"
-                           }
-                          ]
-                         ]
-                        ]}
-                       ]
-                      ]
-                     }]]]}}
-                    ]}],
-                    "Ej䗳U<\/Q=灒샎䞦,堰頠@褙g_\u0003ꤾfⶽ?퇋!łB〙ד3CC䌴鈌U:뭔咎(Qો臃䡬荋BO7㢝䟸\"Yb": 2.36010731779814E-20,
-                    "逸'0岔j\u000e눘먷翌C츊秦=ꭣ棭ှ;鳸=麱$XP⩉駚橄A\\좱⛌jqv䰞3Ь踌v㳆¹gT┌gvLB賖烡m?@E঳i": null
-                   },
-                   "曺v찘ׁ?&绫O័": 9107241066550187880
-                  }
-                 ]
-                ],
-                "(e屄\u0019昜훕琖b蓘ᬄ0/۲묇Z蘮ဏ⨏蛘胯뢃@㘉8ሪWᨮ⦬ᅳ䅴HI၇쨳z囕陻엣1赳o": true,
-                ",b刈Z,ၠ晐T솝ŕB⩆ou'퐼≃绗雗d譊": null,
-                "a唥KB\"ﳝ肕$u\n^⅄P䟼냉䞸⩪u윗瀱ꔨ#yşs꒬=1|ﲤ爢`t౐튼쳫_Az(Ṋ擬㦷좕耈6": 2099309172767331582,
-                "?㴸U<\/䢔ꯡ阽扆㐤q鐋?f㔫wM嬙-;UV죫嚔픞G&\"Cᗍ䪏풊Q": "VM7疹+陕枡툩窲}翡䖶8欞čsT뮐}璤:jﺋ鎴}HfA൝⧻Zd#Qu茅J髒皣Y-︴[?-~쉜v딏璮㹚䅊﩯<-#\u000e걀h\u0004u抱﵊㼃U<㱷⊱IC進"
-               },
-               "숌dee節鏽邺p넱蹓+e罕U": true
-              }
-             ],
-             "b⧴룏??ᔠ3ぱ>%郿劃翐ꏬꠛW瞳᫏누躨狀ໄy੽\"ីuS=㨞馸k乆E": "トz݈^9R䬑<ﮛG<s~<\/?ⵆᏥ老熷u듷"
-            }}
-           ]
-          }
-         ]}
-        }
-       }
-      }
-     }},
-     "宩j鬅쳜QꝖјy獔Z᭵1v擖}䨿F%cֲ᫺贴m塼딚NP亪\"ￋsa뺯ꘓ2:9뛓༂쌅䊈#>Rꨳ\u000fTT泠纷꽀MR<CBxP񱒫X쇤": -2.22390568492330598E18,
-     "?䯣ᄽ@Z鸅->ᴱ纊:㠭볮?%N56%鈕1䗍䜁a䲗j陇=뿻偂衋࿘ᓸ?ᕵZ+<\/}H耢b䀁z^f$&㝒LkꢳI脚뙛u": 5.694374481577558E-20
-    }]
-   }
-  ]],
-  "obj": {"key": "wrong value"},
-  "퓲꽪m{㶩/뇿#⼢&᭙硞㪔E嚉c樱㬇1a綑᝖DḾ䝩": null
- }
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/data/webapp.json b/src/sioclient/lib/rapidjson/bin/data/webapp.json
deleted file mode 100644
index ee7b0f8b..00000000
--- a/src/sioclient/lib/rapidjson/bin/data/webapp.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{"web-app": {
-  "servlet": [   
-    {
-      "servlet-name": "cofaxCDS",
-      "servlet-class": "org.cofax.cds.CDSServlet",
-      "init-param": {
-        "configGlossary:installationAt": "Philadelphia, PA",
-        "configGlossary:adminEmail": "ksm@pobox.com",
-        "configGlossary:poweredBy": "Cofax",
-        "configGlossary:poweredByIcon": "/images/cofax.gif",
-        "configGlossary:staticPath": "/content/static",
-        "templateProcessorClass": "org.cofax.WysiwygTemplate",
-        "templateLoaderClass": "org.cofax.FilesTemplateLoader",
-        "templatePath": "templates",
-        "templateOverridePath": "",
-        "defaultListTemplate": "listTemplate.htm",
-        "defaultFileTemplate": "articleTemplate.htm",
-        "useJSP": false,
-        "jspListTemplate": "listTemplate.jsp",
-        "jspFileTemplate": "articleTemplate.jsp",
-        "cachePackageTagsTrack": 200,
-        "cachePackageTagsStore": 200,
-        "cachePackageTagsRefresh": 60,
-        "cacheTemplatesTrack": 100,
-        "cacheTemplatesStore": 50,
-        "cacheTemplatesRefresh": 15,
-        "cachePagesTrack": 200,
-        "cachePagesStore": 100,
-        "cachePagesRefresh": 10,
-        "cachePagesDirtyRead": 10,
-        "searchEngineListTemplate": "forSearchEnginesList.htm",
-        "searchEngineFileTemplate": "forSearchEngines.htm",
-        "searchEngineRobotsDb": "WEB-INF/robots.db",
-        "useDataStore": true,
-        "dataStoreClass": "org.cofax.SqlDataStore",
-        "redirectionClass": "org.cofax.SqlRedirection",
-        "dataStoreName": "cofax",
-        "dataStoreDriver": "com.microsoft.jdbc.sqlserver.SQLServerDriver",
-        "dataStoreUrl": "jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon",
-        "dataStoreUser": "sa",
-        "dataStorePassword": "dataStoreTestQuery",
-        "dataStoreTestQuery": "SET NOCOUNT ON;select test='test';",
-        "dataStoreLogFile": "/usr/local/tomcat/logs/datastore.log",
-        "dataStoreInitConns": 10,
-        "dataStoreMaxConns": 100,
-        "dataStoreConnUsageLimit": 100,
-        "dataStoreLogLevel": "debug",
-        "maxUrlLength": 500}},
-    {
-      "servlet-name": "cofaxEmail",
-      "servlet-class": "org.cofax.cds.EmailServlet",
-      "init-param": {
-      "mailHost": "mail1",
-      "mailHostOverride": "mail2"}},
-    {
-      "servlet-name": "cofaxAdmin",
-      "servlet-class": "org.cofax.cds.AdminServlet"},
- 
-    {
-      "servlet-name": "fileServlet",
-      "servlet-class": "org.cofax.cds.FileServlet"},
-    {
-      "servlet-name": "cofaxTools",
-      "servlet-class": "org.cofax.cms.CofaxToolsServlet",
-      "init-param": {
-        "templatePath": "toolstemplates/",
-        "log": 1,
-        "logLocation": "/usr/local/tomcat/logs/CofaxTools.log",
-        "logMaxSize": "",
-        "dataLog": 1,
-        "dataLogLocation": "/usr/local/tomcat/logs/dataLog.log",
-        "dataLogMaxSize": "",
-        "removePageCache": "/content/admin/remove?cache=pages&id=",
-        "removeTemplateCache": "/content/admin/remove?cache=templates&id=",
-        "fileTransferFolder": "/usr/local/tomcat/webapps/content/fileTransferFolder",
-        "lookInContext": 1,
-        "adminGroupID": 4,
-        "betaServer": true}}],
-  "servlet-mapping": {
-    "cofaxCDS": "/",
-    "cofaxEmail": "/cofaxutil/aemail/*",
-    "cofaxAdmin": "/admin/*",
-    "fileServlet": "/static/*",
-    "cofaxTools": "/tools/*"},
- 
-  "taglib": {
-    "taglib-uri": "cofax.tld",
-    "taglib-location": "/WEB-INF/tlds/cofax.tld"}}}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/data/widget.json b/src/sioclient/lib/rapidjson/bin/data/widget.json
deleted file mode 100644
index 32690e8b..00000000
--- a/src/sioclient/lib/rapidjson/bin/data/widget.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{"widget": {
-    "debug": "on",
-    "window": {
-        "title": "Sample Konfabulator Widget",
-        "name": "main_window",
-        "width": 500,
-        "height": 500
-    },
-    "image": { 
-        "src": "Images/Sun.png",
-        "name": "sun1",
-        "hOffset": 250,
-        "vOffset": 250,
-        "alignment": "center"
-    },
-    "text": {
-        "data": "Click Here",
-        "size": 36,
-        "style": "bold",
-        "name": "text1",
-        "hOffset": 250,
-        "vOffset": 100,
-        "alignment": "center",
-        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
-    }
-}}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/draft-04/schema b/src/sioclient/lib/rapidjson/bin/draft-04/schema
deleted file mode 100644
index 85eb502a..00000000
--- a/src/sioclient/lib/rapidjson/bin/draft-04/schema
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "id": "http://json-schema.org/draft-04/schema#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Core schema meta-schema",
-    "definitions": {
-        "schemaArray": {
-            "type": "array",
-            "minItems": 1,
-            "items": { "$ref": "#" }
-        },
-        "positiveInteger": {
-            "type": "integer",
-            "minimum": 0
-        },
-        "positiveIntegerDefault0": {
-            "allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ]
-        },
-        "simpleTypes": {
-            "enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ]
-        },
-        "stringArray": {
-            "type": "array",
-            "items": { "type": "string" },
-            "minItems": 1,
-            "uniqueItems": true
-        }
-    },
-    "type": "object",
-    "properties": {
-        "id": {
-            "type": "string",
-            "format": "uri"
-        },
-        "$schema": {
-            "type": "string",
-            "format": "uri"
-        },
-        "title": {
-            "type": "string"
-        },
-        "description": {
-            "type": "string"
-        },
-        "default": {},
-        "multipleOf": {
-            "type": "number",
-            "minimum": 0,
-            "exclusiveMinimum": true
-        },
-        "maximum": {
-            "type": "number"
-        },
-        "exclusiveMaximum": {
-            "type": "boolean",
-            "default": false
-        },
-        "minimum": {
-            "type": "number"
-        },
-        "exclusiveMinimum": {
-            "type": "boolean",
-            "default": false
-        },
-        "maxLength": { "$ref": "#/definitions/positiveInteger" },
-        "minLength": { "$ref": "#/definitions/positiveIntegerDefault0" },
-        "pattern": {
-            "type": "string",
-            "format": "regex"
-        },
-        "additionalItems": {
-            "anyOf": [
-                { "type": "boolean" },
-                { "$ref": "#" }
-            ],
-            "default": {}
-        },
-        "items": {
-            "anyOf": [
-                { "$ref": "#" },
-                { "$ref": "#/definitions/schemaArray" }
-            ],
-            "default": {}
-        },
-        "maxItems": { "$ref": "#/definitions/positiveInteger" },
-        "minItems": { "$ref": "#/definitions/positiveIntegerDefault0" },
-        "uniqueItems": {
-            "type": "boolean",
-            "default": false
-        },
-        "maxProperties": { "$ref": "#/definitions/positiveInteger" },
-        "minProperties": { "$ref": "#/definitions/positiveIntegerDefault0" },
-        "required": { "$ref": "#/definitions/stringArray" },
-        "additionalProperties": {
-            "anyOf": [
-                { "type": "boolean" },
-                { "$ref": "#" }
-            ],
-            "default": {}
-        },
-        "definitions": {
-            "type": "object",
-            "additionalProperties": { "$ref": "#" },
-            "default": {}
-        },
-        "properties": {
-            "type": "object",
-            "additionalProperties": { "$ref": "#" },
-            "default": {}
-        },
-        "patternProperties": {
-            "type": "object",
-            "additionalProperties": { "$ref": "#" },
-            "default": {}
-        },
-        "dependencies": {
-            "type": "object",
-            "additionalProperties": {
-                "anyOf": [
-                    { "$ref": "#" },
-                    { "$ref": "#/definitions/stringArray" }
-                ]
-            }
-        },
-        "enum": {
-            "type": "array",
-            "minItems": 1,
-            "uniqueItems": true
-        },
-        "type": {
-            "anyOf": [
-                { "$ref": "#/definitions/simpleTypes" },
-                {
-                    "type": "array",
-                    "items": { "$ref": "#/definitions/simpleTypes" },
-                    "minItems": 1,
-                    "uniqueItems": true
-                }
-            ]
-        },
-        "allOf": { "$ref": "#/definitions/schemaArray" },
-        "anyOf": { "$ref": "#/definitions/schemaArray" },
-        "oneOf": { "$ref": "#/definitions/schemaArray" },
-        "not": { "$ref": "#" }
-    },
-    "dependencies": {
-        "exclusiveMaximum": [ "maximum" ],
-        "exclusiveMinimum": [ "minimum" ]
-    },
-    "default": {}
-}
diff --git a/src/sioclient/lib/rapidjson/bin/encodings/utf16be.json b/src/sioclient/lib/rapidjson/bin/encodings/utf16be.json
deleted file mode 100644
index e46dbfb9..00000000
Binary files a/src/sioclient/lib/rapidjson/bin/encodings/utf16be.json and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/bin/encodings/utf16bebom.json b/src/sioclient/lib/rapidjson/bin/encodings/utf16bebom.json
deleted file mode 100644
index 0a23ae20..00000000
Binary files a/src/sioclient/lib/rapidjson/bin/encodings/utf16bebom.json and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/bin/encodings/utf16le.json b/src/sioclient/lib/rapidjson/bin/encodings/utf16le.json
deleted file mode 100644
index 92d50453..00000000
Binary files a/src/sioclient/lib/rapidjson/bin/encodings/utf16le.json and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/bin/encodings/utf16lebom.json b/src/sioclient/lib/rapidjson/bin/encodings/utf16lebom.json
deleted file mode 100644
index eaba0013..00000000
Binary files a/src/sioclient/lib/rapidjson/bin/encodings/utf16lebom.json and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/bin/encodings/utf32be.json b/src/sioclient/lib/rapidjson/bin/encodings/utf32be.json
deleted file mode 100644
index 9cbb5222..00000000
Binary files a/src/sioclient/lib/rapidjson/bin/encodings/utf32be.json and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/bin/encodings/utf32bebom.json b/src/sioclient/lib/rapidjson/bin/encodings/utf32bebom.json
deleted file mode 100644
index bde6a99a..00000000
Binary files a/src/sioclient/lib/rapidjson/bin/encodings/utf32bebom.json and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/bin/encodings/utf32le.json b/src/sioclient/lib/rapidjson/bin/encodings/utf32le.json
deleted file mode 100644
index b00f290a..00000000
Binary files a/src/sioclient/lib/rapidjson/bin/encodings/utf32le.json and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/bin/encodings/utf32lebom.json b/src/sioclient/lib/rapidjson/bin/encodings/utf32lebom.json
deleted file mode 100644
index d3db39bf..00000000
Binary files a/src/sioclient/lib/rapidjson/bin/encodings/utf32lebom.json and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/bin/encodings/utf8.json b/src/sioclient/lib/rapidjson/bin/encodings/utf8.json
deleted file mode 100644
index c500c943..00000000
--- a/src/sioclient/lib/rapidjson/bin/encodings/utf8.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"en":"I can eat glass and it doesn't hurt me.",
-	"zh-Hant":"我能吞下玻璃而不傷身體。",
-	"zh-Hans":"我能吞下玻璃而不伤身体。",
-	"ja":"私はガラスを食べられます。それは私を傷つけません。",
-	"ko":"나는 유리를 먹을 수 있어요. 그래도 아프지 않아요"
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/encodings/utf8bom.json b/src/sioclient/lib/rapidjson/bin/encodings/utf8bom.json
deleted file mode 100644
index b9839fe2..00000000
--- a/src/sioclient/lib/rapidjson/bin/encodings/utf8bom.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"en":"I can eat glass and it doesn't hurt me.",
-	"zh-Hant":"我能吞下玻璃而不傷身體。",
-	"zh-Hans":"我能吞下玻璃而不伤身体。",
-	"ja":"私はガラスを食べられます。それは私を傷つけません。",
-	"ko":"나는 유리를 먹을 수 있어요. 그래도 아프지 않아요"
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail1.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail1.json
deleted file mode 100644
index 6216b865..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail1.json
+++ /dev/null
@@ -1 +0,0 @@
-"A JSON payload should be an object or array, not a string."
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail10.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail10.json
deleted file mode 100644
index 5d8c0047..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail10.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Extra value after close": true} "misplaced quoted value"
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail11.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail11.json
deleted file mode 100644
index 76eb95b4..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail11.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Illegal expression": 1 + 2}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail12.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail12.json
deleted file mode 100644
index 77580a45..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail12.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Illegal invocation": alert()}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail13.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail13.json
deleted file mode 100644
index 379406b5..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail13.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Numbers cannot have leading zeroes": 013}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail14.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail14.json
deleted file mode 100644
index 0ed366b3..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail14.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Numbers cannot be hex": 0x14}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail15.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail15.json
deleted file mode 100644
index fc8376b6..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail15.json
+++ /dev/null
@@ -1 +0,0 @@
-["Illegal backslash escape: \x15"]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail16.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail16.json
deleted file mode 100644
index 3fe21d4b..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail16.json
+++ /dev/null
@@ -1 +0,0 @@
-[\naked]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail17.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail17.json
deleted file mode 100644
index 62b9214a..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail17.json
+++ /dev/null
@@ -1 +0,0 @@
-["Illegal backslash escape: \017"]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail18.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail18.json
deleted file mode 100644
index edac9271..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail18.json
+++ /dev/null
@@ -1 +0,0 @@
-[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail19.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail19.json
deleted file mode 100644
index 3b9c46fa..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail19.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Missing colon" null}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail2.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail2.json
deleted file mode 100644
index 6b7c11e5..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail2.json
+++ /dev/null
@@ -1 +0,0 @@
-["Unclosed array"
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail20.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail20.json
deleted file mode 100644
index 27c1af3e..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail20.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Double colon":: null}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail21.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail21.json
deleted file mode 100644
index 62474573..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail21.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Comma instead of colon", null}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail22.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail22.json
deleted file mode 100644
index a7752581..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail22.json
+++ /dev/null
@@ -1 +0,0 @@
-["Colon instead of comma": false]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail23.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail23.json
deleted file mode 100644
index 494add1c..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail23.json
+++ /dev/null
@@ -1 +0,0 @@
-["Bad value", truth]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail24.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail24.json
deleted file mode 100644
index caff239b..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail24.json
+++ /dev/null
@@ -1 +0,0 @@
-['single quote']
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail25.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail25.json
deleted file mode 100644
index 8b7ad23e..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail25.json
+++ /dev/null
@@ -1 +0,0 @@
-["	tab	character	in	string	"]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail26.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail26.json
deleted file mode 100644
index 845d26a6..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail26.json
+++ /dev/null
@@ -1 +0,0 @@
-["tab\   character\   in\  string\  "]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail27.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail27.json
deleted file mode 100644
index 6b01a2ca..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail27.json
+++ /dev/null
@@ -1,2 +0,0 @@
-["line
-break"]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail28.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail28.json
deleted file mode 100644
index 621a0101..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail28.json
+++ /dev/null
@@ -1,2 +0,0 @@
-["line\
-break"]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail29.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail29.json
deleted file mode 100644
index 47ec421b..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail29.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail3.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail3.json
deleted file mode 100644
index 168c81eb..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail3.json
+++ /dev/null
@@ -1 +0,0 @@
-{unquoted_key: "keys must be quoted"}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail30.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail30.json
deleted file mode 100644
index 8ab0bc4b..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail30.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e+]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail31.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail31.json
deleted file mode 100644
index 1cce602b..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail31.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e+-1]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail32.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail32.json
deleted file mode 100644
index 45cba739..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail32.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Comma instead if closing brace": true,
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail33.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail33.json
deleted file mode 100644
index ca5eb19d..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail33.json
+++ /dev/null
@@ -1 +0,0 @@
-["mismatch"}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail4.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail4.json
deleted file mode 100644
index 9de168bf..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail4.json
+++ /dev/null
@@ -1 +0,0 @@
-["extra comma",]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail5.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail5.json
deleted file mode 100644
index ddf3ce3d..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail5.json
+++ /dev/null
@@ -1 +0,0 @@
-["double extra comma",,]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail6.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail6.json
deleted file mode 100644
index ed91580e..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail6.json
+++ /dev/null
@@ -1 +0,0 @@
-[   , "<-- missing value"]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail7.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail7.json
deleted file mode 100644
index 8a96af3e..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail7.json
+++ /dev/null
@@ -1 +0,0 @@
-["Comma after the close"],
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail8.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail8.json
deleted file mode 100644
index b28479c6..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail8.json
+++ /dev/null
@@ -1 +0,0 @@
-["Extra close"]]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail9.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/fail9.json
deleted file mode 100644
index 5815574f..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/fail9.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Extra comma": true,}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/pass1.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/pass1.json
deleted file mode 100644
index 70e26854..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/pass1.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-    "JSON Test Pattern pass1",
-    {"object with 1 member":["array with 1 element"]},
-    {},
-    [],
-    -42,
-    true,
-    false,
-    null,
-    {
-        "integer": 1234567890,
-        "real": -9876.543210,
-        "e": 0.123456789e-12,
-        "E": 1.234567890E+34,
-        "":  23456789012E66,
-        "zero": 0,
-        "one": 1,
-        "space": " ",
-        "quote": "\"",
-        "backslash": "\\",
-        "controls": "\b\f\n\r\t",
-        "slash": "/ & \/",
-        "alpha": "abcdefghijklmnopqrstuvwyz",
-        "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
-        "digit": "0123456789",
-        "0123456789": "digit",
-        "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
-        "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A",
-        "true": true,
-        "false": false,
-        "null": null,
-        "array":[  ],
-        "object":{  },
-        "address": "50 St. James Street",
-        "url": "http://www.JSON.org/",
-        "comment": "// /* <!-- --",
-        "# -- --> */": " ",
-        " s p a c e d " :[1,2 , 3
-
-,
-
-4 , 5        ,          6           ,7        ],"compact":[1,2,3,4,5,6,7],
-        "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
-        "quotes": "&#34; \u0022 %22 0x22 034 &#x22;",
-        "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?"
-: "A key can be any string"
-    },
-    0.5 ,98.6
-,
-99.44
-,
-
-1066,
-1e1,
-0.1e1,
-1e-1,
-1e00,2e+00,2e-00
-,"rosebud"]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/pass2.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/pass2.json
deleted file mode 100644
index d3c63c7a..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/pass2.json
+++ /dev/null
@@ -1 +0,0 @@
-[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/pass3.json b/src/sioclient/lib/rapidjson/bin/jsonchecker/pass3.json
deleted file mode 100644
index 4528d51f..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/pass3.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "JSON Test Pattern pass3": {
-        "The outermost value": "must be an object or array.",
-        "In this test": "It is an object."
-    }
-}
diff --git a/src/sioclient/lib/rapidjson/bin/jsonchecker/readme.txt b/src/sioclient/lib/rapidjson/bin/jsonchecker/readme.txt
deleted file mode 100644
index 321d89d9..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonchecker/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Test suite from http://json.org/JSON_checker/.
-
-If the JSON_checker is working correctly, it must accept all of the pass*.json files and reject all of the fail*.json files.
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/.gitignore b/src/sioclient/lib/rapidjson/bin/jsonschema/.gitignore
deleted file mode 100644
index 1333ed77..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-TODO
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/.travis.yml b/src/sioclient/lib/rapidjson/bin/jsonschema/.travis.yml
deleted file mode 100644
index deecd611..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: python
-python: "2.7"
-install: pip install jsonschema
-script: bin/jsonschema_suite check
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/LICENSE b/src/sioclient/lib/rapidjson/bin/jsonschema/LICENSE
deleted file mode 100644
index c28adbad..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2012 Julian Berman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/README.md b/src/sioclient/lib/rapidjson/bin/jsonschema/README.md
deleted file mode 100644
index 6d9da949..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/README.md
+++ /dev/null
@@ -1,148 +0,0 @@
-JSON Schema Test Suite [![Build Status](https://travis-ci.org/json-schema/JSON-Schema-Test-Suite.png?branch=develop)](https://travis-ci.org/json-schema/JSON-Schema-Test-Suite)
-======================
-
-This repository contains a set of JSON objects that implementors of JSON Schema
-validation libraries can use to test their validators.
-
-It is meant to be language agnostic and should require only a JSON parser.
-
-The conversion of the JSON objects into tests within your test framework of
-choice is still the job of the validator implementor.
-
-Structure of a Test
--------------------
-
-If you're going to use this suite, you need to know how tests are laid out. The
-tests are contained in the `tests` directory at the root of this repository.
-
-Inside that directory is a subdirectory for each draft or version of the
-schema. We'll use `draft3` as an example.
-
-If you look inside the draft directory, there are a number of `.json` files,
-which logically group a set of test cases together. Often the grouping is by
-property under test, but not always, especially within optional test files
-(discussed below).
-
-Inside each `.json` file is a single array containing objects. It's easiest to
-illustrate the structure of these with an example:
-
-```json
-    {
-        "description": "the description of the test case",
-        "schema": {"the schema that should" : "be validated against"},
-        "tests": [
-            {
-                "description": "a specific test of a valid instance",
-                "data": "the instance",
-                "valid": true
-            },
-            {
-                "description": "another specific test this time, invalid",
-                "data": 15,
-                "valid": false
-            }
-        ]
-    }
-```
-
-So a description, a schema, and some tests, where tests is an array containing
-one or more objects with descriptions, data, and a boolean indicating whether
-they should be valid or invalid.
-
-Coverage
---------
-
-Draft 3 and 4 should have full coverage. If you see anything missing or think
-there is a useful test missing, please send a pull request or open an issue.
-
-Who Uses the Test Suite
------------------------
-
-This suite is being used by:
-
-### Coffeescript ###
-
-* [jsck](https://github.com/pandastrike/jsck)
-
-### Dart ###
-
-* [json_schema](https://github.com/patefacio/json_schema) 
-
-### Erlang ###
-
-* [jesse](https://github.com/klarna/jesse)
-
-### Go ###
-
-* [gojsonschema](https://github.com/sigu-399/gojsonschema) 
-* [validate-json](https://github.com/cesanta/validate-json)
-
-### Haskell ###
-
-* [aeson-schema](https://github.com/timjb/aeson-schema)
-* [hjsonschema](https://github.com/seagreen/hjsonschema)
-
-### Java ###
-
-* [json-schema-validator](https://github.com/fge/json-schema-validator)
-
-### JavaScript ###
-
-* [json-schema-benchmark](https://github.com/Muscula/json-schema-benchmark)
-* [direct-schema](https://github.com/IreneKnapp/direct-schema)
-* [is-my-json-valid](https://github.com/mafintosh/is-my-json-valid)
-* [jassi](https://github.com/iclanzan/jassi)
-* [JaySchema](https://github.com/natesilva/jayschema)
-* [json-schema-valid](https://github.com/ericgj/json-schema-valid)
-* [Jsonary](https://github.com/jsonary-js/jsonary)
-* [jsonschema](https://github.com/tdegrunt/jsonschema)
-* [request-validator](https://github.com/bugventure/request-validator)
-* [skeemas](https://github.com/Prestaul/skeemas)
-* [tv4](https://github.com/geraintluff/tv4)
-* [z-schema](https://github.com/zaggino/z-schema)
-* [jsen](https://github.com/bugventure/jsen)
-* [ajv](https://github.com/epoberezkin/ajv)
-
-### Node.js ###
-
-The JSON Schema Test Suite is also available as an
-[npm](https://www.npmjs.com/package/json-schema-test-suite) package.
-Node-specific support is maintained on the [node branch](https://github.com/json-schema/JSON-Schema-Test-Suite/tree/node).
-See [NODE-README.md](https://github.com/json-schema/JSON-Schema-Test-Suite/blob/node/NODE-README.md)
-for more information.
-
-### .NET ###
-
-* [Newtonsoft.Json.Schema](https://github.com/JamesNK/Newtonsoft.Json.Schema)
-
-### PHP ###
-
-* [json-schema](https://github.com/justinrainbow/json-schema)
-
-### Python ###
-
-* [jsonschema](https://github.com/Julian/jsonschema)
-
-### Ruby ###
-
-* [json-schema](https://github.com/hoxworth/json-schema)
-
-### Rust ###
-
-* [valico](https://github.com/rustless/valico)
-
-### Swift ###
-
-* [JSONSchema](https://github.com/kylef/JSONSchema.swift)
-
-If you use it as well, please fork and send a pull request adding yourself to
-the list :).
-
-Contributing
-------------
-
-If you see something missing or incorrect, a pull request is most welcome!
-
-There are some sanity checks in place for testing the test suite. You can run
-them with `bin/jsonschema_suite check` or `tox`. They will be run automatically by
-[Travis CI](https://travis-ci.org/) as well.
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/bin/jsonschema_suite b/src/sioclient/lib/rapidjson/bin/jsonschema/bin/jsonschema_suite
deleted file mode 100755
index 96108c86..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/bin/jsonschema_suite
+++ /dev/null
@@ -1,283 +0,0 @@
-#! /usr/bin/env python
-from __future__ import print_function
-import sys
-import textwrap
-
-try:
-    import argparse
-except ImportError:
-    print(textwrap.dedent("""
-        The argparse library could not be imported. jsonschema_suite requires
-        either Python 2.7 or for you to install argparse. You can do so by
-        running `pip install argparse`, `easy_install argparse` or by
-        downloading argparse and running `python2.6 setup.py install`.
-
-        See https://pypi.python.org/pypi/argparse for details.
-    """.strip("\n")))
-    sys.exit(1)
-
-import errno
-import fnmatch
-import json
-import os
-import random
-import shutil
-import unittest
-import warnings
-
-if getattr(unittest, "skipIf", None) is None:
-    unittest.skipIf = lambda cond, msg : lambda fn : fn
-
-try:
-    import jsonschema
-except ImportError:
-    jsonschema = None
-else:
-    validators = getattr(
-        jsonschema.validators, "validators", jsonschema.validators
-    )
-
-
-ROOT_DIR = os.path.join(
-    os.path.dirname(__file__), os.pardir).rstrip("__pycache__")
-SUITE_ROOT_DIR = os.path.join(ROOT_DIR, "tests")
-
-REMOTES = {
-    "integer.json": {"type": "integer"},
-    "subSchemas.json": {
-        "integer": {"type": "integer"},
-        "refToInteger": {"$ref": "#/integer"},
-    },
-    "folder/folderInteger.json": {"type": "integer"}
-}
-REMOTES_DIR = os.path.join(ROOT_DIR, "remotes")
-
-TESTSUITE_SCHEMA = {
-    "$schema": "http://json-schema.org/draft-03/schema#",
-    "type": "array",
-    "items": {
-        "type": "object",
-        "properties": {
-            "description": {"type": "string", "required": True},
-            "schema": {"required": True},
-            "tests": {
-                "type": "array",
-                "items": {
-                    "type": "object",
-                    "properties": {
-                        "description": {"type": "string", "required": True},
-                        "data": {"required": True},
-                        "valid": {"type": "boolean", "required": True}
-                    },
-                    "additionalProperties": False
-                },
-                "minItems": 1
-            }
-        },
-        "additionalProperties": False,
-        "minItems": 1
-    }
-}
-
-
-def files(paths):
-    for path in paths:
-        with open(path) as test_file:
-            yield json.load(test_file)
-
-
-def groups(paths):
-    for test_file in files(paths):
-        for group in test_file:
-            yield group
-
-
-def cases(paths):
-    for test_group in groups(paths):
-        for test in test_group["tests"]:
-            test["schema"] = test_group["schema"]
-            yield test
-
-
-def collect(root_dir):
-    for root, dirs, files in os.walk(root_dir):
-        for filename in fnmatch.filter(files, "*.json"):
-            yield os.path.join(root, filename)
-
-
-class SanityTests(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        print("Looking for tests in %s" % SUITE_ROOT_DIR)
-        cls.test_files = list(collect(SUITE_ROOT_DIR))
-        print("Found %s test files" % len(cls.test_files))
-        assert cls.test_files, "Didn't find the test files!"
-
-    def test_all_files_are_valid_json(self):
-        for path in self.test_files:
-            with open(path) as test_file:
-                try:
-                    json.load(test_file)
-                except ValueError as error:
-                    self.fail("%s contains invalid JSON (%s)" % (path, error))
-
-    def test_all_descriptions_have_reasonable_length(self):
-        for case in cases(self.test_files):
-            descript = case["description"]
-            self.assertLess(
-                len(descript),
-                60,
-                "%r is too long! (keep it to less than 60 chars)" % (descript,)
-            )
-
-    def test_all_descriptions_are_unique(self):
-        for group in groups(self.test_files):
-            descriptions = set(test["description"] for test in group["tests"])
-            self.assertEqual(
-                len(descriptions),
-                len(group["tests"]),
-                "%r contains a duplicate description" % (group,)
-            )
-
-    @unittest.skipIf(jsonschema is None, "Validation library not present!")
-    def test_all_schemas_are_valid(self):
-        for schema in os.listdir(SUITE_ROOT_DIR):
-            schema_validator = validators.get(schema)
-            if schema_validator is not None:
-                test_files = collect(os.path.join(SUITE_ROOT_DIR, schema))
-                for case in cases(test_files):
-                    try:
-                        schema_validator.check_schema(case["schema"])
-                    except jsonschema.SchemaError as error:
-                        self.fail("%s contains an invalid schema (%s)" %
-                                  (case, error))
-            else:
-                warnings.warn("No schema validator for %s" % schema)
-
-    @unittest.skipIf(jsonschema is None, "Validation library not present!")
-    def test_suites_are_valid(self):
-        validator = jsonschema.Draft3Validator(TESTSUITE_SCHEMA)
-        for tests in files(self.test_files):
-            try:
-                validator.validate(tests)
-            except jsonschema.ValidationError as error:
-                self.fail(str(error))
-
-    def test_remote_schemas_are_updated(self):
-        for url, schema in REMOTES.items():
-            filepath = os.path.join(REMOTES_DIR, url)
-            with open(filepath) as schema_file:
-                self.assertEqual(json.load(schema_file), schema)
-
-
-def main(arguments):
-    if arguments.command == "check":
-        suite = unittest.TestLoader().loadTestsFromTestCase(SanityTests)
-        result = unittest.TextTestRunner(verbosity=2).run(suite)
-        sys.exit(not result.wasSuccessful())
-    elif arguments.command == "flatten":
-        selected_cases = [case for case in cases(collect(arguments.version))]
-
-        if arguments.randomize:
-            random.shuffle(selected_cases)
-
-        json.dump(selected_cases, sys.stdout, indent=4, sort_keys=True)
-    elif arguments.command == "remotes":
-        json.dump(REMOTES, sys.stdout, indent=4, sort_keys=True)
-    elif arguments.command == "dump_remotes":
-        if arguments.update:
-            shutil.rmtree(arguments.out_dir, ignore_errors=True)
-
-        try:
-            os.makedirs(arguments.out_dir)
-        except OSError as e:
-            if e.errno == errno.EEXIST:
-                print("%s already exists. Aborting." % arguments.out_dir)
-                sys.exit(1)
-            raise
-
-        for url, schema in REMOTES.items():
-            filepath = os.path.join(arguments.out_dir, url)
-
-            try:
-                os.makedirs(os.path.dirname(filepath))
-            except OSError as e:
-                if e.errno != errno.EEXIST:
-                    raise
-
-            with open(filepath, "wb") as out_file:
-                json.dump(schema, out_file, indent=4, sort_keys=True)
-    elif arguments.command == "serve":
-        try:
-            from flask import Flask, jsonify
-        except ImportError:
-            print(textwrap.dedent("""
-                The Flask library is required to serve the remote schemas.
-
-                You can install it by running `pip install Flask`.
-
-                Alternatively, see the `jsonschema_suite remotes` or
-                `jsonschema_suite dump_remotes` commands to create static files
-                that can be served with your own web server.
-            """.strip("\n")))
-            sys.exit(1)
-
-        app = Flask(__name__)
-
-        @app.route("/<path:path>")
-        def serve_path(path):
-            if path in REMOTES:
-                return jsonify(REMOTES[path])
-            return "Document does not exist.", 404
-
-        app.run(port=1234)
-
-
-parser = argparse.ArgumentParser(
-    description="JSON Schema Test Suite utilities",
-)
-subparsers = parser.add_subparsers(help="utility commands", dest="command")
-
-check = subparsers.add_parser("check", help="Sanity check the test suite.")
-
-flatten = subparsers.add_parser(
-    "flatten",
-    help="Output a flattened file containing a selected version's test cases."
-)
-flatten.add_argument(
-    "--randomize",
-    action="store_true",
-    help="Randomize the order of the outputted cases.",
-)
-flatten.add_argument(
-    "version", help="The directory containing the version to output",
-)
-
-remotes = subparsers.add_parser(
-    "remotes",
-    help="Output the expected URLs and their associated schemas for remote "
-         "ref tests as a JSON object."
-)
-
-dump_remotes = subparsers.add_parser(
-    "dump_remotes", help="Dump the remote ref schemas into a file tree",
-)
-dump_remotes.add_argument(
-    "--update",
-    action="store_true",
-    help="Update the remotes in an existing directory.",
-)
-dump_remotes.add_argument(
-    "--out-dir",
-    default=REMOTES_DIR,
-    type=os.path.abspath,
-    help="The output directory to create as the root of the file tree",
-)
-
-serve = subparsers.add_parser(
-    "serve",
-    help="Start a webserver to serve schemas used by remote ref tests."
-)
-
-if __name__ == "__main__":
-    main(parser.parse_args())
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/remotes/folder/folderInteger.json b/src/sioclient/lib/rapidjson/bin/jsonschema/remotes/folder/folderInteger.json
deleted file mode 100644
index dbe5c758..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/remotes/folder/folderInteger.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "type": "integer"
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/remotes/integer.json b/src/sioclient/lib/rapidjson/bin/jsonschema/remotes/integer.json
deleted file mode 100644
index dbe5c758..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/remotes/integer.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "type": "integer"
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/remotes/subSchemas.json b/src/sioclient/lib/rapidjson/bin/jsonschema/remotes/subSchemas.json
deleted file mode 100644
index 8b6d8f84..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/remotes/subSchemas.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "integer": {
-        "type": "integer"
-    }, 
-    "refToInteger": {
-        "$ref": "#/integer"
-    }
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/additionalItems.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/additionalItems.json
deleted file mode 100644
index 6d4bff51..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/additionalItems.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-    {
-        "description": "additionalItems as schema",
-        "schema": {
-            "items": [],
-            "additionalItems": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "additional items match schema",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": true
-            },
-            {
-                "description": "additional items do not match schema",
-                "data": [ 1, 2, 3, "foo" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items is schema, no additionalItems",
-        "schema": {
-            "items": {},
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "all items match schema",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array of items with no additionalItems",
-        "schema": {
-            "items": [{}, {}, {}],
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "no additional items present",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "additional items are not permitted",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalItems as false without items",
-        "schema": {"additionalItems": false},
-        "tests": [
-            {
-                "description":
-                    "items defaults to empty schema so everything is valid",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems are allowed by default",
-        "schema": {"items": []},
-        "tests": [
-            {
-                "description": "only the first items are validated",
-                "data": [1, "foo", false],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/additionalProperties.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/additionalProperties.json
deleted file mode 100644
index 40831f9e..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/additionalProperties.json
+++ /dev/null
@@ -1,88 +0,0 @@
-[
-    {
-        "description":
-            "additionalProperties being false does not allow other properties",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "patternProperties": { "^v": {} },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : "boom"},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "patternProperties are not additional properties",
-                "data": {"foo":1, "vroom": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties allows a schema which should validate",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties can exist by itself",
-        "schema": {
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties are allowed by default",
-        "schema": {"properties": {"foo": {}, "bar": {}}},
-        "tests": [
-            {
-                "description": "additional properties are allowed",
-                "data": {"foo": 1, "bar": 2, "quux": true},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/default.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/default.json
deleted file mode 100644
index 17629779..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/default.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
-    {
-        "description": "invalid type for default",
-        "schema": {
-            "properties": {
-                "foo": {
-                    "type": "integer",
-                    "default": []
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"foo": 13},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid string value for default",
-        "schema": {
-            "properties": {
-                "bar": {
-                    "type": "string",
-                    "minLength": 4,
-                    "default": "bad"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"bar": "good"},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/dependencies.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/dependencies.json
deleted file mode 100644
index 2f6ae489..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/dependencies.json
+++ /dev/null
@@ -1,108 +0,0 @@
-[
-    {
-        "description": "dependencies",
-        "schema": {
-            "dependencies": {"bar": "foo"}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies",
-        "schema": {
-            "dependencies": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies subschema",
-        "schema": {
-            "dependencies": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/disallow.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/disallow.json
deleted file mode 100644
index a5c9d90c..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/disallow.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-    {
-        "description": "disallow",
-        "schema": {
-            "disallow": "integer"
-        },
-        "tests": [
-            {
-                "description": "allowed",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "disallowed",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple disallow",
-        "schema": {
-            "disallow": ["integer", "boolean"]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": true,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple disallow subschema",
-        "schema": {
-            "disallow":
-                ["string",
-                 {
-                    "type": "object",
-                    "properties": {
-                        "foo": {
-                            "type": "string"
-                        }
-                    }
-                 }]
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "other match",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/divisibleBy.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/divisibleBy.json
deleted file mode 100644
index ef7cc148..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/divisibleBy.json
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-    {
-        "description": "by int",
-        "schema": {"divisibleBy": 2},
-        "tests": [
-            {
-                "description": "int by int",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "int by int fail",
-                "data": 7,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "by number",
-        "schema": {"divisibleBy": 1.5},
-        "tests": [
-            {
-                "description": "zero is divisible by anything (except 0)",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "4.5 is divisible by 1.5",
-                "data": 4.5,
-                "valid": true
-            },
-            {
-                "description": "35 is not divisible by 1.5",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "by small number",
-        "schema": {"divisibleBy": 0.0001},
-        "tests": [
-            {
-                "description": "0.0075 is divisible by 0.0001",
-                "data": 0.0075,
-                "valid": true
-            },
-            {
-                "description": "0.00751 is not divisible by 0.0001",
-                "data": 0.00751,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/enum.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/enum.json
deleted file mode 100644
index 0c83f080..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/enum.json
+++ /dev/null
@@ -1,71 +0,0 @@
-[
-    {
-        "description": "simple enum validation",
-        "schema": {"enum": [1, 2, 3]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": 4,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum validation",
-        "schema": {"enum": [6, "foo", [], true, {"foo": 12}]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "objects are deep compared",
-                "data": {"foo": false},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enums in properties",
-        "schema": {
-           "type":"object",
-		     "properties": {
-		        "foo": {"enum":["foo"]},
-		        "bar": {"enum":["bar"], "required":true}
-		     }
-		  },
-        "tests": [
-            {
-                "description": "both properties are valid",
-                "data": {"foo":"foo", "bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing optional property is valid",
-                "data": {"bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing required property is invalid",
-                "data": {"foo":"foo"},
-                "valid": false
-            },
-            {
-                "description": "missing all properties is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/extends.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/extends.json
deleted file mode 100644
index 909bce57..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/extends.json
+++ /dev/null
@@ -1,94 +0,0 @@
-[
-    {
-        "description": "extends",
-        "schema": {
-            "properties": {"bar": {"type": "integer", "required": true}},
-            "extends": {
-                "properties": {
-                    "foo": {"type": "string", "required": true}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "extends",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "mismatch extends",
-                "data": {"foo": "baz"},
-                "valid": false
-            },
-            {
-                "description": "mismatch extended",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "baz", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple extends",
-        "schema": {
-            "properties": {"bar": {"type": "integer", "required": true}},
-            "extends" : [
-                {
-                    "properties": {
-                        "foo": {"type": "string", "required": true}
-                    }
-                },
-                {
-                    "properties": {
-                        "baz": {"type": "null", "required": true}
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": "quux", "bar": 2, "baz": null},
-                "valid": true
-            },
-            {
-                "description": "mismatch first extends",
-                "data": {"bar": 2, "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch second extends",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "mismatch both",
-                "data": {"bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "extends simple types",
-        "schema": {
-            "minimum": 20,
-            "extends": {"maximum": 30}
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": 25,
-                "valid": true
-            },
-            {
-                "description": "mismatch extends",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/items.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/items.json
deleted file mode 100644
index f5e18a13..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/items.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-    {
-        "description": "a schema given for items",
-        "schema": {
-            "items": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of items",
-                "data": [1, "x"],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "an array of schemas for items",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"type": "string"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "correct types",
-                "data": [ 1, "foo" ],
-                "valid": true
-            },
-            {
-                "description": "wrong types",
-                "data": [ "foo", 1 ],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/maxItems.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/maxItems.json
deleted file mode 100644
index 3b53a6b3..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/maxItems.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "maxItems validation",
-        "schema": {"maxItems": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "foobar",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/maxLength.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/maxLength.json
deleted file mode 100644
index 4de42bca..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/maxLength.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    {
-        "description": "maxLength validation",
-        "schema": {"maxLength": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "two supplementary Unicode code points is long enough",
-                "data": "\uD83D\uDCA9\uD83D\uDCA9",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/maximum.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/maximum.json
deleted file mode 100644
index 86c7b89c..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/maximum.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-    {
-        "description": "maximum validation",
-        "schema": {"maximum": 3.0},
-        "tests": [
-            {
-                "description": "below the maximum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "exclusiveMaximum validation",
-        "schema": {
-            "maximum": 3.0,
-            "exclusiveMaximum": true
-        },
-        "tests": [
-            {
-                "description": "below the maximum is still valid",
-                "data": 2.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 3.0,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/minItems.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/minItems.json
deleted file mode 100644
index ed511881..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/minItems.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "minItems validation",
-        "schema": {"minItems": 1},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/minLength.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/minLength.json
deleted file mode 100644
index 3f09158d..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/minLength.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    {
-        "description": "minLength validation",
-        "schema": {"minLength": 2},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "one supplementary Unicode code point is not long enough",
-                "data": "\uD83D\uDCA9",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/minimum.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/minimum.json
deleted file mode 100644
index d5bf000b..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/minimum.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-    {
-        "description": "minimum validation",
-        "schema": {"minimum": 1.1},
-        "tests": [
-            {
-                "description": "above the minimum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "below the minimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "exclusiveMinimum validation",
-        "schema": {
-            "minimum": 1.1,
-            "exclusiveMinimum": true
-        },
-        "tests": [
-            {
-                "description": "above the minimum is still valid",
-                "data": 1.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 1.1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/optional/bignum.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/optional/bignum.json
deleted file mode 100644
index ccc7c17f..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/optional/bignum.json
+++ /dev/null
@@ -1,107 +0,0 @@
-[
-    {
-        "description": "integer",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "a bignum is an integer",
-                "data": 12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "a bignum is a number",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "integer",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "a negative bignum is an integer",
-                "data": -12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "a negative bignum is a number",
-                "data": -98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "string",
-        "schema": {"type": "string"},
-        "tests": [
-            {
-                "description": "a bignum is not a string",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "integer comparison",
-        "schema": {"maximum": 18446744073709551615},
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision",
-        "schema": {
-            "maximum": 972783798187987123879878123.18878137,
-            "exclusiveMaximum": true
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "integer comparison",
-        "schema": {"minimum": -18446744073709551615},
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision on negative numbers",
-        "schema": {
-            "minimum": -972783798187987123879878123.18878137,
-            "exclusiveMinimum": true
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/optional/format.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/optional/format.json
deleted file mode 100644
index 3ca7319d..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/optional/format.json
+++ /dev/null
@@ -1,222 +0,0 @@
-[
-    {
-        "description": "validation of regular expressions",
-        "schema": {"format": "regex"},
-        "tests": [
-            {
-                "description": "a valid regular expression",
-                "data": "([abc])+\\s+$",
-                "valid": true
-            },
-            {
-                "description": "a regular expression with unclosed parens is invalid",
-                "data": "^(abc]",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of date-time strings",
-        "schema": {"format": "date-time"},
-        "tests": [
-            {
-                "description": "a valid date-time string",
-                "data": "1963-06-19T08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "an invalid date-time string",
-                "data": "06/19/1963 08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350T01:01:01",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of date strings",
-        "schema": {"format": "date"},
-        "tests": [
-            {
-                "description": "a valid date string",
-                "data": "1963-06-19",
-                "valid": true
-            },
-            {
-                "description": "an invalid date string",
-                "data": "06/19/1963",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of time strings",
-        "schema": {"format": "time"},
-        "tests": [
-            {
-                "description": "a valid time string",
-                "data": "08:30:06",
-                "valid": true
-            },
-            {
-                "description": "an invalid time string",
-                "data": "8:30 AM",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of URIs",
-        "schema": {"format": "uri"},
-        "tests": [
-            {
-                "description": "a valid URI",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid protocol-relative URI",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI though valid URI reference",
-                "data": "abc",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of e-mail addresses",
-        "schema": {"format": "email"},
-        "tests": [
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of IP addresses",
-        "schema": {"format": "ip-address"},
-        "tests": [
-            {
-                "description": "a valid IP address",
-                "data": "192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "an IP address with too many components",
-                "data": "127.0.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "an IP address with out-of-range values",
-                "data": "256.256.256.256",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of IPv6 addresses",
-        "schema": {"format": "ipv6"},
-        "tests": [
-            {
-                "description": "a valid IPv6 address",
-                "data": "::1",
-                "valid": true
-            },
-            {
-                "description": "an IPv6 address with out-of-range values",
-                "data": "12345::",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address with too many components",
-                "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address containing illegal characters",
-                "data": "::laptop",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of host names",
-        "schema": {"format": "host-name"},
-        "tests": [
-            {
-                "description": "a valid host name",
-                "data": "www.example.com",
-                "valid": true
-            },
-            {
-                "description": "a host name starting with an illegal character",
-                "data": "-a-host-name-that-starts-with--",
-                "valid": false
-            },
-            {
-                "description": "a host name containing illegal characters",
-                "data": "not_a_valid_host_name",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of CSS colors",
-        "schema": {"format": "color"},
-        "tests": [
-            {
-                "description": "a valid CSS color name",
-                "data": "fuchsia",
-                "valid": true
-            },
-            {
-                "description": "a valid six-digit CSS color code",
-                "data": "#CC8899",
-                "valid": true
-            },
-            {
-                "description": "a valid three-digit CSS color code",
-                "data": "#C89",
-                "valid": true
-            },
-            {
-                "description": "an invalid CSS color code",
-                "data": "#00332520",
-                "valid": false
-            },
-            {
-                "description": "an invalid CSS color name",
-                "data": "puce",
-                "valid": false
-            },
-            {
-                "description": "a CSS color name containing invalid characters",
-                "data": "light_grayish_red-violet",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/optional/jsregex.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/optional/jsregex.json
deleted file mode 100644
index 03fe9772..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/optional/jsregex.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-    {
-        "description": "ECMA 262 regex dialect recognition",
-        "schema": { "format": "regex" },
-        "tests": [
-            {
-                "description": "[^] is a valid regex",
-                "data": "[^]",
-                "valid": true
-            },
-            {
-                "description": "ECMA 262 has no support for lookbehind",
-                "data": "(?<=foo)bar",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/optional/zeroTerminatedFloats.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/optional/zeroTerminatedFloats.json
deleted file mode 100644
index 9b50ea27..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/optional/zeroTerminatedFloats.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-    {
-        "description": "some languages do not distinguish between different types of numeric value",
-        "schema": {
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "a float is not an integer even without fractional part",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/pattern.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/pattern.json
deleted file mode 100644
index 25e72997..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/pattern.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-    {
-        "description": "pattern validation",
-        "schema": {"pattern": "^a*$"},
-        "tests": [
-            {
-                "description": "a matching pattern is valid",
-                "data": "aaa",
-                "valid": true
-            },
-            {
-                "description": "a non-matching pattern is invalid",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": true,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "pattern is not anchored",
-        "schema": {"pattern": "a+"},
-        "tests": [
-            {
-                "description": "matches a substring",
-                "data": "xxaayy",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/patternProperties.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/patternProperties.json
deleted file mode 100644
index 18586e5d..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/patternProperties.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-    {
-        "description":
-            "patternProperties validates properties matching a regex",
-        "schema": {
-            "patternProperties": {
-                "f.*o": {"type": "integer"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "multiple valid matches is valid",
-                "data": {"foo": 1, "foooooo" : 2},
-                "valid": true
-            },
-            {
-                "description": "a single invalid match is invalid",
-                "data": {"foo": "bar", "fooooo": 2},
-                "valid": false
-            },
-            {
-                "description": "multiple invalid matches is invalid",
-                "data": {"foo": "bar", "foooooo" : "baz"},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple simultaneous patternProperties are validated",
-        "schema": {
-            "patternProperties": {
-                "a*": {"type": "integer"},
-                "aaa*": {"maximum": 20}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"a": 21},
-                "valid": true
-            },
-            {
-                "description": "a simultaneous match is valid",
-                "data": {"aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "multiple matches is valid",
-                "data": {"a": 21, "aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "an invalid due to one is invalid",
-                "data": {"a": "bar"},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to the other is invalid",
-                "data": {"aaaa": 31},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to both is invalid",
-                "data": {"aaa": "foo", "aaaa": 31},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "regexes are not anchored by default and are case sensitive",
-        "schema": {
-            "patternProperties": {
-                "[0-9]{2,}": { "type": "boolean" },
-                "X_": { "type": "string" }
-            }
-        },
-        "tests": [
-            {
-                "description": "non recognized members are ignored",
-                "data": { "answer 1": "42" },
-                "valid": true
-            },
-            {
-                "description": "recognized members are accounted for",
-                "data": { "a31b": null },
-                "valid": false
-            },
-            {
-                "description": "regexes are case sensitive",
-                "data": { "a_x_3": 3 },
-                "valid": true
-            },
-            {
-                "description": "regexes are case sensitive, 2",
-                "data": { "a_X_3": 3 },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/properties.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/properties.json
deleted file mode 100644
index cd1644dc..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/properties.json
+++ /dev/null
@@ -1,92 +0,0 @@
-[
-    {
-        "description": "object properties validation",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "both properties present and valid is valid",
-                "data": {"foo": 1, "bar": "baz"},
-                "valid": true
-            },
-            {
-                "description": "one property invalid is invalid",
-                "data": {"foo": 1, "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "both properties invalid is invalid",
-                "data": {"foo": [], "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "doesn't invalidate other properties",
-                "data": {"quux": []},
-                "valid": true
-            },
-            {
-                "description": "ignores non-objects",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "properties, patternProperties, additionalProperties interaction",
-        "schema": {
-            "properties": {
-                "foo": {"type": "array", "maxItems": 3},
-                "bar": {"type": "array"}
-            },
-            "patternProperties": {"f.o": {"minItems": 2}},
-            "additionalProperties": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "property validates property",
-                "data": {"foo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "property invalidates property",
-                "data": {"foo": [1, 2, 3, 4]},
-                "valid": false
-            },
-            {
-                "description": "patternProperty invalidates property",
-                "data": {"foo": []},
-                "valid": false
-            },
-            {
-                "description": "patternProperty validates nonproperty",
-                "data": {"fxo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "patternProperty invalidates nonproperty",
-                "data": {"fxo": []},
-                "valid": false
-            },
-            {
-                "description": "additionalProperty ignores property",
-                "data": {"bar": []},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty validates others",
-                "data": {"quux": 3},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty invalidates others",
-                "data": {"quux": "foo"},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/ref.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/ref.json
deleted file mode 100644
index 903ecb6b..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/ref.json
+++ /dev/null
@@ -1,159 +0,0 @@
-[
-    {
-        "description": "root pointer ref",
-        "schema": {
-            "properties": {
-                "foo": {"$ref": "#"}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"foo": false},
-                "valid": true
-            },
-            {
-                "description": "recursive match",
-                "data": {"foo": {"foo": false}},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": false},
-                "valid": false
-            },
-            {
-                "description": "recursive mismatch",
-                "data": {"foo": {"bar": false}},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to object",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"$ref": "#/properties/foo"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to array",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"$ref": "#/items/0"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "match array",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "mismatch array",
-                "data": [1, "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "escaped pointer ref",
-        "schema": {
-            "tilda~field": {"type": "integer"},
-            "slash/field": {"type": "integer"},
-            "percent%field": {"type": "integer"},
-            "properties": {
-                "tilda": {"$ref": "#/tilda~0field"},
-                "slash": {"$ref": "#/slash~1field"},
-                "percent": {"$ref": "#/percent%25field"}
-            }
-        },
-        "tests": [
-            {
-                "description": "slash invalid",
-                "data": {"slash": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "tilda invalid",
-                "data": {"tilda": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "percent invalid",
-                "data": {"percent": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "slash valid",
-                "data": {"slash": 123},
-                "valid": true
-            },
-            {
-                "description": "tilda valid",
-                "data": {"tilda": 123},
-                "valid": true
-            },
-            {
-                "description": "percent valid",
-                "data": {"percent": 123},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested refs",
-        "schema": {
-            "definitions": {
-                "a": {"type": "integer"},
-                "b": {"$ref": "#/definitions/a"},
-                "c": {"$ref": "#/definitions/b"}
-            },
-            "$ref": "#/definitions/c"
-        },
-        "tests": [
-            {
-                "description": "nested ref valid",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "nested ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "remote ref, containing refs itself",
-        "schema": {"$ref": "http://json-schema.org/draft-03/schema#"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": {"items": {"type": "integer"}},
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": {"items": {"type": 1}},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/refRemote.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/refRemote.json
deleted file mode 100644
index 4ca80473..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/refRemote.json
+++ /dev/null
@@ -1,74 +0,0 @@
-[
-    {
-        "description": "remote ref",
-        "schema": {"$ref": "http://localhost:1234/integer.json"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "fragment within remote ref",
-        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/integer"},
-        "tests": [
-            {
-                "description": "remote fragment valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote fragment invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref within remote ref",
-        "schema": {
-            "$ref": "http://localhost:1234/subSchemas.json#/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "ref within ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "ref within ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "change resolution scope",
-        "schema": {
-            "id": "http://localhost:1234/",
-            "items": {
-                "id": "folder/",
-                "items": {"$ref": "folderInteger.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "changed scope ref valid",
-                "data": [[1]],
-                "valid": true
-            },
-            {
-                "description": "changed scope ref invalid",
-                "data": [["a"]],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/required.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/required.json
deleted file mode 100644
index aaaf0242..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/required.json
+++ /dev/null
@@ -1,53 +0,0 @@
-[
-    {
-        "description": "required validation",
-        "schema": {
-            "properties": {
-                "foo": {"required" : true},
-                "bar": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "present required property is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "non-present required property is invalid",
-                "data": {"bar": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "required default validation",
-        "schema": {
-            "properties": {
-                "foo": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required by default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "required explicitly false validation",
-        "schema": {
-            "properties": {
-                "foo": {"required": false}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required if required is false",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/type.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/type.json
deleted file mode 100644
index 337da120..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/type.json
+++ /dev/null
@@ -1,474 +0,0 @@
-[
-    {
-        "description": "integer type matches integers",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "an integer is an integer",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float is not an integer",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an integer",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an integer",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not an integer",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an integer",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an integer",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "number type matches numbers",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "an integer is a number",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float is a number",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "a string is not a number",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not a number",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a number",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a number",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a number",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "string type matches strings",
-        "schema": {"type": "string"},
-        "tests": [
-            {
-                "description": "1 is not a string",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a string",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is a string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "an object is not a string",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a string",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a string",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a string",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "object type matches objects",
-        "schema": {"type": "object"},
-        "tests": [
-            {
-                "description": "an integer is not an object",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an object",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an object",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is an object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is not an object",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an object",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an object",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "array type matches arrays",
-        "schema": {"type": "array"},
-        "tests": [
-            {
-                "description": "an integer is not an array",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an array",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an array",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an array",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is an array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is not an array",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an array",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "boolean type matches booleans",
-        "schema": {"type": "boolean"},
-        "tests": [
-            {
-                "description": "an integer is not a boolean",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a boolean",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not a boolean",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not a boolean",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a boolean",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is a boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "null is not a boolean",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "null type matches only the null object",
-        "schema": {"type": "null"},
-        "tests": [
-            {
-                "description": "an integer is not null",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not null",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not null",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not null",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not null",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not null",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "any type matches any type",
-        "schema": {"type": "any"},
-        "tests": [
-            {
-                "description": "any type includes integers",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "any type includes float",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "any type includes string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "any type includes object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "any type includes array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "any type includes boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "any type includes null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple types can be specified in an array",
-        "schema": {"type": ["integer", "string"]},
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "types can include schemas",
-        "schema": {
-            "type": [
-                "array",
-                {"type": "object"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "an integer is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a string is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is valid",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": 
-            "when types includes a schema it should fully validate the schema",
-        "schema": {
-            "type": [
-                "integer",
-                {
-                    "properties": {
-                        "foo": {"type": "null"}
-                    }
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "an object is valid only if it is fully valid",
-                "data": {"foo": null},
-                "valid": true
-            },
-            {
-                "description": "an object is invalid otherwise",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "types from separate schemas are merged",
-        "schema": {
-            "type": [
-                {"type": ["string"]},
-                {"type": ["array", "null"]}
-            ]
-        },
-        "tests": [
-            {
-                "description": "an integer is invalid",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "an array is valid",
-                "data": [1, 2, 3],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/uniqueItems.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/uniqueItems.json
deleted file mode 100644
index c1f4ab99..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft3/uniqueItems.json
+++ /dev/null
@@ -1,79 +0,0 @@
-[
-    {
-        "description": "uniqueItems validation",
-        "schema": {"uniqueItems": true},
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is invalid",
-                "data": [1, 1],
-                "valid": false
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": false
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is invalid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": false
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is invalid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": false
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is invalid",
-                "data": [["foo"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are invalid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/additionalItems.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/additionalItems.json
deleted file mode 100644
index 521745c8..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/additionalItems.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-    {
-        "description": "additionalItems as schema",
-        "schema": {
-            "items": [{}],
-            "additionalItems": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "additional items match schema",
-                "data": [ null, 2, 3, 4 ],
-                "valid": true
-            },
-            {
-                "description": "additional items do not match schema",
-                "data": [ null, 2, 3, "foo" ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "items is schema, no additionalItems",
-        "schema": {
-            "items": {},
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "all items match schema",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "array of items with no additionalItems",
-        "schema": {
-            "items": [{}, {}, {}],
-            "additionalItems": false
-        },
-        "tests": [
-            {
-                "description": "no additional items present",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "additional items are not permitted",
-                "data": [ 1, 2, 3, 4 ],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalItems as false without items",
-        "schema": {"additionalItems": false},
-        "tests": [
-            {
-                "description":
-                    "items defaults to empty schema so everything is valid",
-                "data": [ 1, 2, 3, 4, 5 ],
-                "valid": true
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "additionalItems are allowed by default",
-        "schema": {"items": [{"type": "integer"}]},
-        "tests": [
-            {
-                "description": "only the first item is validated",
-                "data": [1, "foo", false],
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/additionalProperties.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/additionalProperties.json
deleted file mode 100644
index 40831f9e..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/additionalProperties.json
+++ /dev/null
@@ -1,88 +0,0 @@
-[
-    {
-        "description":
-            "additionalProperties being false does not allow other properties",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "patternProperties": { "^v": {} },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : "boom"},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": [1, 2, 3],
-                "valid": true
-            },
-            {
-                "description": "patternProperties are not additional properties",
-                "data": {"foo":1, "vroom": 2},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties allows a schema which should validate",
-        "schema": {
-            "properties": {"foo": {}, "bar": {}},
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "no additional properties is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1, "bar" : 2, "quux" : 12},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description":
-            "additionalProperties can exist by itself",
-        "schema": {
-            "additionalProperties": {"type": "boolean"}
-        },
-        "tests": [
-            {
-                "description": "an additional valid property is valid",
-                "data": {"foo" : true},
-                "valid": true
-            },
-            {
-                "description": "an additional invalid property is invalid",
-                "data": {"foo" : 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "additionalProperties are allowed by default",
-        "schema": {"properties": {"foo": {}, "bar": {}}},
-        "tests": [
-            {
-                "description": "additional properties are allowed",
-                "data": {"foo": 1, "bar": 2, "quux": true},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/allOf.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/allOf.json
deleted file mode 100644
index bbb5f89e..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/allOf.json
+++ /dev/null
@@ -1,112 +0,0 @@
-[
-    {
-        "description": "allOf",
-        "schema": {
-            "allOf": [
-                {
-                    "properties": {
-                        "bar": {"type": "integer"}
-                    },
-                    "required": ["bar"]
-                },
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "allOf",
-                "data": {"foo": "baz", "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "mismatch second",
-                "data": {"foo": "baz"},
-                "valid": false
-            },
-            {
-                "description": "mismatch first",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "baz", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf with base schema",
-        "schema": {
-            "properties": {"bar": {"type": "integer"}},
-            "required": ["bar"],
-            "allOf" : [
-                {
-                    "properties": {
-                        "foo": {"type": "string"}
-                    },
-                    "required": ["foo"]
-                },
-                {
-                    "properties": {
-                        "baz": {"type": "null"}
-                    },
-                    "required": ["baz"]
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": "quux", "bar": 2, "baz": null},
-                "valid": true
-            },
-            {
-                "description": "mismatch base schema",
-                "data": {"foo": "quux", "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch first allOf",
-                "data": {"bar": 2, "baz": null},
-                "valid": false
-            },
-            {
-                "description": "mismatch second allOf",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "mismatch both",
-                "data": {"bar": 2},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "allOf simple types",
-        "schema": {
-            "allOf": [
-                {"maximum": 30},
-                {"minimum": 20}
-            ]
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": 25,
-                "valid": true
-            },
-            {
-                "description": "mismatch one",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/anyOf.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/anyOf.json
deleted file mode 100644
index a58714af..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/anyOf.json
+++ /dev/null
@@ -1,68 +0,0 @@
-[
-    {
-        "description": "anyOf",
-        "schema": {
-            "anyOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first anyOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second anyOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both anyOf valid",
-                "data": 3,
-                "valid": true
-            },
-            {
-                "description": "neither anyOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "anyOf with base schema",
-        "schema": {
-            "type": "string",
-            "anyOf" : [
-                {
-                    "maxLength": 2
-                },
-                {
-                    "minLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one anyOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both anyOf invalid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/default.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/default.json
deleted file mode 100644
index 17629779..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/default.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
-    {
-        "description": "invalid type for default",
-        "schema": {
-            "properties": {
-                "foo": {
-                    "type": "integer",
-                    "default": []
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"foo": 13},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid string value for default",
-        "schema": {
-            "properties": {
-                "bar": {
-                    "type": "string",
-                    "minLength": 4,
-                    "default": "bad"
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid when property is specified",
-                "data": {"bar": "good"},
-                "valid": true
-            },
-            {
-                "description": "still valid when the invalid default is used",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/definitions.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/definitions.json
deleted file mode 100644
index cf935a32..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/definitions.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-    {
-        "description": "valid definition",
-        "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},
-        "tests": [
-            {
-                "description": "valid definition schema",
-                "data": {
-                    "definitions": {
-                        "foo": {"type": "integer"}
-                    }
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid definition",
-        "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},
-        "tests": [
-            {
-                "description": "invalid definition schema",
-                "data": {
-                    "definitions": {
-                        "foo": {"type": 1}
-                    }
-                },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/dependencies.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/dependencies.json
deleted file mode 100644
index 7b9b16a7..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/dependencies.json
+++ /dev/null
@@ -1,113 +0,0 @@
-[
-    {
-        "description": "dependencies",
-        "schema": {
-            "dependencies": {"bar": ["foo"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"bar": 2},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies",
-        "schema": {
-            "dependencies": {"quux": ["foo", "bar"]}
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {"foo": 1, "bar": 2, "quux": 3},
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {"foo": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {"bar": 1, "quux": 2},
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {"quux": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "multiple dependencies subschema",
-        "schema": {
-            "dependencies": {
-                "bar": {
-                    "properties": {
-                        "foo": {"type": "integer"},
-                        "bar": {"type": "integer"}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "no dependency",
-                "data": {"foo": "quux"},
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {"foo": "quux", "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {"foo": 2, "bar": "quux"},
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {"foo": "quux", "bar": "quux"},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/enum.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/enum.json
deleted file mode 100644
index f124436a..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/enum.json
+++ /dev/null
@@ -1,72 +0,0 @@
-[
-    {
-        "description": "simple enum validation",
-        "schema": {"enum": [1, 2, 3]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": 4,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "heterogeneous enum validation",
-        "schema": {"enum": [6, "foo", [], true, {"foo": 12}]},
-        "tests": [
-            {
-                "description": "one of the enum is valid",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "something else is invalid",
-                "data": null,
-                "valid": false
-            },
-            {
-                "description": "objects are deep compared",
-                "data": {"foo": false},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "enums in properties",
-        "schema": {
-           "type":"object",
-		     "properties": {
-		        "foo": {"enum":["foo"]},
-		        "bar": {"enum":["bar"]}
-		     },
-		     "required": ["bar"]
-		  },
-        "tests": [
-            {
-                "description": "both properties are valid",
-                "data": {"foo":"foo", "bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing optional property is valid",
-                "data": {"bar":"bar"},
-                "valid": true
-            },
-            {
-                "description": "missing required property is invalid",
-                "data": {"foo":"foo"},
-                "valid": false
-            },
-            {
-                "description": "missing all properties is invalid",
-                "data": {},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/items.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/items.json
deleted file mode 100644
index f5e18a13..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/items.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-    {
-        "description": "a schema given for items",
-        "schema": {
-            "items": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "valid items",
-                "data": [ 1, 2, 3 ],
-                "valid": true
-            },
-            {
-                "description": "wrong type of items",
-                "data": [1, "x"],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": {"foo" : "bar"},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "an array of schemas for items",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"type": "string"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "correct types",
-                "data": [ 1, "foo" ],
-                "valid": true
-            },
-            {
-                "description": "wrong types",
-                "data": [ "foo", 1 ],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/maxItems.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/maxItems.json
deleted file mode 100644
index 3b53a6b3..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/maxItems.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "maxItems validation",
-        "schema": {"maxItems": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": [1, 2, 3],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "foobar",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/maxLength.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/maxLength.json
deleted file mode 100644
index 811d35b2..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/maxLength.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    {
-        "description": "maxLength validation",
-        "schema": {"maxLength": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": "f",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 100,
-                "valid": true
-            },
-            {
-                "description": "two supplementary Unicode code points is long enough",
-                "data": "\uD83D\uDCA9\uD83D\uDCA9",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/maxProperties.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/maxProperties.json
deleted file mode 100644
index d282446a..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/maxProperties.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "maxProperties validation",
-        "schema": {"maxProperties": 2},
-        "tests": [
-            {
-                "description": "shorter is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "too long is invalid",
-                "data": {"foo": 1, "bar": 2, "baz": 3},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": "foobar",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/maximum.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/maximum.json
deleted file mode 100644
index 86c7b89c..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/maximum.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-    {
-        "description": "maximum validation",
-        "schema": {"maximum": 3.0},
-        "tests": [
-            {
-                "description": "below the maximum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "above the maximum is invalid",
-                "data": 3.5,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "exclusiveMaximum validation",
-        "schema": {
-            "maximum": 3.0,
-            "exclusiveMaximum": true
-        },
-        "tests": [
-            {
-                "description": "below the maximum is still valid",
-                "data": 2.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 3.0,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/minItems.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/minItems.json
deleted file mode 100644
index ed511881..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/minItems.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "minItems validation",
-        "schema": {"minItems": 1},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": [1],
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "ignores non-arrays",
-                "data": "",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/minLength.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/minLength.json
deleted file mode 100644
index 3f09158d..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/minLength.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    {
-        "description": "minLength validation",
-        "schema": {"minLength": 2},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": "fo",
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": "f",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "one supplementary Unicode code point is not long enough",
-                "data": "\uD83D\uDCA9",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/minProperties.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/minProperties.json
deleted file mode 100644
index a72c7d29..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/minProperties.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-    {
-        "description": "minProperties validation",
-        "schema": {"minProperties": 1},
-        "tests": [
-            {
-                "description": "longer is valid",
-                "data": {"foo": 1, "bar": 2},
-                "valid": true
-            },
-            {
-                "description": "exact length is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "too short is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": "",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/minimum.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/minimum.json
deleted file mode 100644
index d5bf000b..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/minimum.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-    {
-        "description": "minimum validation",
-        "schema": {"minimum": 1.1},
-        "tests": [
-            {
-                "description": "above the minimum is valid",
-                "data": 2.6,
-                "valid": true
-            },
-            {
-                "description": "below the minimum is invalid",
-                "data": 0.6,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "x",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "exclusiveMinimum validation",
-        "schema": {
-            "minimum": 1.1,
-            "exclusiveMinimum": true
-        },
-        "tests": [
-            {
-                "description": "above the minimum is still valid",
-                "data": 1.2,
-                "valid": true
-            },
-            {
-                "description": "boundary point is invalid",
-                "data": 1.1,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/multipleOf.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/multipleOf.json
deleted file mode 100644
index ca3b7618..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/multipleOf.json
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-    {
-        "description": "by int",
-        "schema": {"multipleOf": 2},
-        "tests": [
-            {
-                "description": "int by int",
-                "data": 10,
-                "valid": true
-            },
-            {
-                "description": "int by int fail",
-                "data": 7,
-                "valid": false
-            },
-            {
-                "description": "ignores non-numbers",
-                "data": "foo",
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "by number",
-        "schema": {"multipleOf": 1.5},
-        "tests": [
-            {
-                "description": "zero is multiple of anything",
-                "data": 0,
-                "valid": true
-            },
-            {
-                "description": "4.5 is multiple of 1.5",
-                "data": 4.5,
-                "valid": true
-            },
-            {
-                "description": "35 is not multiple of 1.5",
-                "data": 35,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "by small number",
-        "schema": {"multipleOf": 0.0001},
-        "tests": [
-            {
-                "description": "0.0075 is multiple of 0.0001",
-                "data": 0.0075,
-                "valid": true
-            },
-            {
-                "description": "0.00751 is not multiple of 0.0001",
-                "data": 0.00751,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/not.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/not.json
deleted file mode 100644
index cbb7f46b..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/not.json
+++ /dev/null
@@ -1,96 +0,0 @@
-[
-    {
-        "description": "not",
-        "schema": {
-            "not": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "allowed",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "disallowed",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not multiple types",
-        "schema": {
-            "not": {"type": ["integer", "boolean"]}
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "other mismatch",
-                "data": true,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "not more complex schema",
-        "schema": {
-            "not": {
-                "type": "object",
-                "properties": {
-                    "foo": {
-                        "type": "string"
-                    }
-                }
-             }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "other match",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"foo": "bar"},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "forbidden property",
-        "schema": {
-            "properties": {
-                "foo": { 
-                    "not": {}
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "property present",
-                "data": {"foo": 1, "bar": 2},
-                "valid": false
-            },
-            {
-                "description": "property absent",
-                "data": {"bar": 1, "baz": 2},
-                "valid": true
-            }
-        ]
-    }
-
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/oneOf.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/oneOf.json
deleted file mode 100644
index 1eaa4e47..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/oneOf.json
+++ /dev/null
@@ -1,68 +0,0 @@
-[
-    {
-        "description": "oneOf",
-        "schema": {
-            "oneOf": [
-                {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "first oneOf valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "second oneOf valid",
-                "data": 2.5,
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "neither oneOf valid",
-                "data": 1.5,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "oneOf with base schema",
-        "schema": {
-            "type": "string",
-            "oneOf" : [
-                {
-                    "minLength": 2
-                },
-                {
-                    "maxLength": 4
-                }
-            ]
-        },
-        "tests": [
-            {
-                "description": "mismatch base schema",
-                "data": 3,
-                "valid": false
-            },
-            {
-                "description": "one oneOf valid",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "both oneOf valid",
-                "data": "foo",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/optional/bignum.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/optional/bignum.json
deleted file mode 100644
index ccc7c17f..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/optional/bignum.json
+++ /dev/null
@@ -1,107 +0,0 @@
-[
-    {
-        "description": "integer",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "a bignum is an integer",
-                "data": 12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "a bignum is a number",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "integer",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "a negative bignum is an integer",
-                "data": -12345678910111213141516171819202122232425262728293031,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "number",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "a negative bignum is a number",
-                "data": -98249283749234923498293171823948729348710298301928331,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "string",
-        "schema": {"type": "string"},
-        "tests": [
-            {
-                "description": "a bignum is not a string",
-                "data": 98249283749234923498293171823948729348710298301928331,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "integer comparison",
-        "schema": {"maximum": 18446744073709551615},
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision",
-        "schema": {
-            "maximum": 972783798187987123879878123.18878137,
-            "exclusiveMaximum": true
-        },
-        "tests": [
-            {
-                "description": "comparison works for high numbers",
-                "data": 972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "integer comparison",
-        "schema": {"minimum": -18446744073709551615},
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -18446744073709551600,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "float comparison with high precision on negative numbers",
-        "schema": {
-            "minimum": -972783798187987123879878123.18878137,
-            "exclusiveMinimum": true
-        },
-        "tests": [
-            {
-                "description": "comparison works for very negative numbers",
-                "data": -972783798187987123879878123.188781371,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/optional/format.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/optional/format.json
deleted file mode 100644
index aacfd119..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/optional/format.json
+++ /dev/null
@@ -1,148 +0,0 @@
-[
-    {
-        "description": "validation of date-time strings",
-        "schema": {"format": "date-time"},
-        "tests": [
-            {
-                "description": "a valid date-time string",
-                "data": "1963-06-19T08:30:06.283185Z",
-                "valid": true
-            },
-            {
-                "description": "an invalid date-time string",
-                "data": "06/19/1963 08:30:06 PST",
-                "valid": false
-            },
-            {
-                "description": "only RFC3339 not all of ISO 8601 are valid",
-                "data": "2013-350T01:01:01",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of URIs",
-        "schema": {"format": "uri"},
-        "tests": [
-            {
-                "description": "a valid URI",
-                "data": "http://foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "a valid protocol-relative URI",
-                "data": "//foo.bar/?baz=qux#quux",
-                "valid": true
-            },
-            {
-                "description": "an invalid URI",
-                "data": "\\\\WINDOWS\\fileshare",
-                "valid": false
-            },
-            {
-                "description": "an invalid URI though valid URI reference",
-                "data": "abc",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of e-mail addresses",
-        "schema": {"format": "email"},
-        "tests": [
-            {
-                "description": "a valid e-mail address",
-                "data": "joe.bloggs@example.com",
-                "valid": true
-            },
-            {
-                "description": "an invalid e-mail address",
-                "data": "2962",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of IP addresses",
-        "schema": {"format": "ipv4"},
-        "tests": [
-            {
-                "description": "a valid IP address",
-                "data": "192.168.0.1",
-                "valid": true
-            },
-            {
-                "description": "an IP address with too many components",
-                "data": "127.0.0.0.1",
-                "valid": false
-            },
-            {
-                "description": "an IP address with out-of-range values",
-                "data": "256.256.256.256",
-                "valid": false
-            },
-            {
-                "description": "an IP address without 4 components",
-                "data": "127.0",
-                "valid": false
-            },
-            {
-                "description": "an IP address as an integer",
-                "data": "0x7f000001",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of IPv6 addresses",
-        "schema": {"format": "ipv6"},
-        "tests": [
-            {
-                "description": "a valid IPv6 address",
-                "data": "::1",
-                "valid": true
-            },
-            {
-                "description": "an IPv6 address with out-of-range values",
-                "data": "12345::",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address with too many components",
-                "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1",
-                "valid": false
-            },
-            {
-                "description": "an IPv6 address containing illegal characters",
-                "data": "::laptop",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "validation of host names",
-        "schema": {"format": "hostname"},
-        "tests": [
-            {
-                "description": "a valid host name",
-                "data": "www.example.com",
-                "valid": true
-            },
-            {
-                "description": "a host name starting with an illegal character",
-                "data": "-a-host-name-that-starts-with--",
-                "valid": false
-            },
-            {
-                "description": "a host name containing illegal characters",
-                "data": "not_a_valid_host_name",
-                "valid": false
-            },
-            {
-                "description": "a host name with a component too long",
-                "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component",
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/optional/zeroTerminatedFloats.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/optional/zeroTerminatedFloats.json
deleted file mode 100644
index 9b50ea27..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/optional/zeroTerminatedFloats.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-    {
-        "description": "some languages do not distinguish between different types of numeric value",
-        "schema": {
-            "type": "integer"
-        },
-        "tests": [
-            {
-                "description": "a float is not an integer even without fractional part",
-                "data": 1.0,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/pattern.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/pattern.json
deleted file mode 100644
index 25e72997..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/pattern.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-    {
-        "description": "pattern validation",
-        "schema": {"pattern": "^a*$"},
-        "tests": [
-            {
-                "description": "a matching pattern is valid",
-                "data": "aaa",
-                "valid": true
-            },
-            {
-                "description": "a non-matching pattern is invalid",
-                "data": "abc",
-                "valid": false
-            },
-            {
-                "description": "ignores non-strings",
-                "data": true,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "pattern is not anchored",
-        "schema": {"pattern": "a+"},
-        "tests": [
-            {
-                "description": "matches a substring",
-                "data": "xxaayy",
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/patternProperties.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/patternProperties.json
deleted file mode 100644
index 18586e5d..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/patternProperties.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-    {
-        "description":
-            "patternProperties validates properties matching a regex",
-        "schema": {
-            "patternProperties": {
-                "f.*o": {"type": "integer"}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "multiple valid matches is valid",
-                "data": {"foo": 1, "foooooo" : 2},
-                "valid": true
-            },
-            {
-                "description": "a single invalid match is invalid",
-                "data": {"foo": "bar", "fooooo": 2},
-                "valid": false
-            },
-            {
-                "description": "multiple invalid matches is invalid",
-                "data": {"foo": "bar", "foooooo" : "baz"},
-                "valid": false
-            },
-            {
-                "description": "ignores non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple simultaneous patternProperties are validated",
-        "schema": {
-            "patternProperties": {
-                "a*": {"type": "integer"},
-                "aaa*": {"maximum": 20}
-            }
-        },
-        "tests": [
-            {
-                "description": "a single valid match is valid",
-                "data": {"a": 21},
-                "valid": true
-            },
-            {
-                "description": "a simultaneous match is valid",
-                "data": {"aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "multiple matches is valid",
-                "data": {"a": 21, "aaaa": 18},
-                "valid": true
-            },
-            {
-                "description": "an invalid due to one is invalid",
-                "data": {"a": "bar"},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to the other is invalid",
-                "data": {"aaaa": 31},
-                "valid": false
-            },
-            {
-                "description": "an invalid due to both is invalid",
-                "data": {"aaa": "foo", "aaaa": 31},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "regexes are not anchored by default and are case sensitive",
-        "schema": {
-            "patternProperties": {
-                "[0-9]{2,}": { "type": "boolean" },
-                "X_": { "type": "string" }
-            }
-        },
-        "tests": [
-            {
-                "description": "non recognized members are ignored",
-                "data": { "answer 1": "42" },
-                "valid": true
-            },
-            {
-                "description": "recognized members are accounted for",
-                "data": { "a31b": null },
-                "valid": false
-            },
-            {
-                "description": "regexes are case sensitive",
-                "data": { "a_x_3": 3 },
-                "valid": true
-            },
-            {
-                "description": "regexes are case sensitive, 2",
-                "data": { "a_X_3": 3 },
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/properties.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/properties.json
deleted file mode 100644
index cd1644dc..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/properties.json
+++ /dev/null
@@ -1,92 +0,0 @@
-[
-    {
-        "description": "object properties validation",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"type": "string"}
-            }
-        },
-        "tests": [
-            {
-                "description": "both properties present and valid is valid",
-                "data": {"foo": 1, "bar": "baz"},
-                "valid": true
-            },
-            {
-                "description": "one property invalid is invalid",
-                "data": {"foo": 1, "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "both properties invalid is invalid",
-                "data": {"foo": [], "bar": {}},
-                "valid": false
-            },
-            {
-                "description": "doesn't invalidate other properties",
-                "data": {"quux": []},
-                "valid": true
-            },
-            {
-                "description": "ignores non-objects",
-                "data": [],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description":
-            "properties, patternProperties, additionalProperties interaction",
-        "schema": {
-            "properties": {
-                "foo": {"type": "array", "maxItems": 3},
-                "bar": {"type": "array"}
-            },
-            "patternProperties": {"f.o": {"minItems": 2}},
-            "additionalProperties": {"type": "integer"}
-        },
-        "tests": [
-            {
-                "description": "property validates property",
-                "data": {"foo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "property invalidates property",
-                "data": {"foo": [1, 2, 3, 4]},
-                "valid": false
-            },
-            {
-                "description": "patternProperty invalidates property",
-                "data": {"foo": []},
-                "valid": false
-            },
-            {
-                "description": "patternProperty validates nonproperty",
-                "data": {"fxo": [1, 2]},
-                "valid": true
-            },
-            {
-                "description": "patternProperty invalidates nonproperty",
-                "data": {"fxo": []},
-                "valid": false
-            },
-            {
-                "description": "additionalProperty ignores property",
-                "data": {"bar": []},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty validates others",
-                "data": {"quux": 3},
-                "valid": true
-            },
-            {
-                "description": "additionalProperty invalidates others",
-                "data": {"quux": "foo"},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/ref.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/ref.json
deleted file mode 100644
index 7e805522..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/ref.json
+++ /dev/null
@@ -1,159 +0,0 @@
-[
-    {
-        "description": "root pointer ref",
-        "schema": {
-            "properties": {
-                "foo": {"$ref": "#"}
-            },
-            "additionalProperties": false
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"foo": false},
-                "valid": true
-            },
-            {
-                "description": "recursive match",
-                "data": {"foo": {"foo": false}},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": false},
-                "valid": false
-            },
-            {
-                "description": "recursive mismatch",
-                "data": {"foo": {"bar": false}},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to object",
-        "schema": {
-            "properties": {
-                "foo": {"type": "integer"},
-                "bar": {"$ref": "#/properties/foo"}
-            }
-        },
-        "tests": [
-            {
-                "description": "match",
-                "data": {"bar": 3},
-                "valid": true
-            },
-            {
-                "description": "mismatch",
-                "data": {"bar": true},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "relative pointer ref to array",
-        "schema": {
-            "items": [
-                {"type": "integer"},
-                {"$ref": "#/items/0"}
-            ]
-        },
-        "tests": [
-            {
-                "description": "match array",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "mismatch array",
-                "data": [1, "foo"],
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "escaped pointer ref",
-        "schema": {
-            "tilda~field": {"type": "integer"},
-            "slash/field": {"type": "integer"},
-            "percent%field": {"type": "integer"},
-            "properties": {
-                "tilda": {"$ref": "#/tilda~0field"},
-                "slash": {"$ref": "#/slash~1field"},
-                "percent": {"$ref": "#/percent%25field"}
-            }
-        },
-        "tests": [
-            {
-                "description": "slash invalid",
-                "data": {"slash": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "tilda invalid",
-                "data": {"tilda": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "percent invalid",
-                "data": {"percent": "aoeu"},
-                "valid": false
-            },
-            {
-                "description": "slash valid",
-                "data": {"slash": 123},
-                "valid": true
-            },
-            {
-                "description": "tilda valid",
-                "data": {"tilda": 123},
-                "valid": true
-            },
-            {
-                "description": "percent valid",
-                "data": {"percent": 123},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "nested refs",
-        "schema": {
-            "definitions": {
-                "a": {"type": "integer"},
-                "b": {"$ref": "#/definitions/a"},
-                "c": {"$ref": "#/definitions/b"}
-            },
-            "$ref": "#/definitions/c"
-        },
-        "tests": [
-            {
-                "description": "nested ref valid",
-                "data": 5,
-                "valid": true
-            },
-            {
-                "description": "nested ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "remote ref, containing refs itself",
-        "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": {"minLength": 1},
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": {"minLength": -1},
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/refRemote.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/refRemote.json
deleted file mode 100644
index 4ca80473..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/refRemote.json
+++ /dev/null
@@ -1,74 +0,0 @@
-[
-    {
-        "description": "remote ref",
-        "schema": {"$ref": "http://localhost:1234/integer.json"},
-        "tests": [
-            {
-                "description": "remote ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "fragment within remote ref",
-        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/integer"},
-        "tests": [
-            {
-                "description": "remote fragment valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "remote fragment invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "ref within remote ref",
-        "schema": {
-            "$ref": "http://localhost:1234/subSchemas.json#/refToInteger"
-        },
-        "tests": [
-            {
-                "description": "ref within ref valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "ref within ref invalid",
-                "data": "a",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "change resolution scope",
-        "schema": {
-            "id": "http://localhost:1234/",
-            "items": {
-                "id": "folder/",
-                "items": {"$ref": "folderInteger.json"}
-            }
-        },
-        "tests": [
-            {
-                "description": "changed scope ref valid",
-                "data": [[1]],
-                "valid": true
-            },
-            {
-                "description": "changed scope ref invalid",
-                "data": [["a"]],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/required.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/required.json
deleted file mode 100644
index 612f73f3..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/required.json
+++ /dev/null
@@ -1,39 +0,0 @@
-[
-    {
-        "description": "required validation",
-        "schema": {
-            "properties": {
-                "foo": {},
-                "bar": {}
-            },
-            "required": ["foo"]
-        },
-        "tests": [
-            {
-                "description": "present required property is valid",
-                "data": {"foo": 1},
-                "valid": true
-            },
-            {
-                "description": "non-present required property is invalid",
-                "data": {"bar": 1},
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "required default validation",
-        "schema": {
-            "properties": {
-                "foo": {}
-            }
-        },
-        "tests": [
-            {
-                "description": "not required by default",
-                "data": {},
-                "valid": true
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/type.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/type.json
deleted file mode 100644
index db42a44d..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/type.json
+++ /dev/null
@@ -1,330 +0,0 @@
-[
-    {
-        "description": "integer type matches integers",
-        "schema": {"type": "integer"},
-        "tests": [
-            {
-                "description": "an integer is an integer",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float is not an integer",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an integer",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an integer",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not an integer",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an integer",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an integer",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "number type matches numbers",
-        "schema": {"type": "number"},
-        "tests": [
-            {
-                "description": "an integer is a number",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a float is a number",
-                "data": 1.1,
-                "valid": true
-            },
-            {
-                "description": "a string is not a number",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not a number",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a number",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a number",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a number",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "string type matches strings",
-        "schema": {"type": "string"},
-        "tests": [
-            {
-                "description": "1 is not a string",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a string",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is a string",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "an object is not a string",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a string",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not a string",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not a string",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "object type matches objects",
-        "schema": {"type": "object"},
-        "tests": [
-            {
-                "description": "an integer is not an object",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an object",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an object",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is an object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "an array is not an object",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not an object",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an object",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "array type matches arrays",
-        "schema": {"type": "array"},
-        "tests": [
-            {
-                "description": "an integer is not an array",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not an array",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not an array",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not an array",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is an array",
-                "data": [],
-                "valid": true
-            },
-            {
-                "description": "a boolean is not an array",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is not an array",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "boolean type matches booleans",
-        "schema": {"type": "boolean"},
-        "tests": [
-            {
-                "description": "an integer is not a boolean",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not a boolean",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not a boolean",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not a boolean",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not a boolean",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is a boolean",
-                "data": true,
-                "valid": true
-            },
-            {
-                "description": "null is not a boolean",
-                "data": null,
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "null type matches only the null object",
-        "schema": {"type": "null"},
-        "tests": [
-            {
-                "description": "an integer is not null",
-                "data": 1,
-                "valid": false
-            },
-            {
-                "description": "a float is not null",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "a string is not null",
-                "data": "foo",
-                "valid": false
-            },
-            {
-                "description": "an object is not null",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is not null",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is not null",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is null",
-                "data": null,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple types can be specified in an array",
-        "schema": {"type": ["integer", "string"]},
-        "tests": [
-            {
-                "description": "an integer is valid",
-                "data": 1,
-                "valid": true
-            },
-            {
-                "description": "a string is valid",
-                "data": "foo",
-                "valid": true
-            },
-            {
-                "description": "a float is invalid",
-                "data": 1.1,
-                "valid": false
-            },
-            {
-                "description": "an object is invalid",
-                "data": {},
-                "valid": false
-            },
-            {
-                "description": "an array is invalid",
-                "data": [],
-                "valid": false
-            },
-            {
-                "description": "a boolean is invalid",
-                "data": true,
-                "valid": false
-            },
-            {
-                "description": "null is invalid",
-                "data": null,
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/uniqueItems.json b/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/uniqueItems.json
deleted file mode 100644
index c1f4ab99..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tests/draft4/uniqueItems.json
+++ /dev/null
@@ -1,79 +0,0 @@
-[
-    {
-        "description": "uniqueItems validation",
-        "schema": {"uniqueItems": true},
-        "tests": [
-            {
-                "description": "unique array of integers is valid",
-                "data": [1, 2],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of integers is invalid",
-                "data": [1, 1],
-                "valid": false
-            },
-            {
-                "description": "numbers are unique if mathematically unequal",
-                "data": [1.0, 1.00, 1],
-                "valid": false
-            },
-            {
-                "description": "unique array of objects is valid",
-                "data": [{"foo": "bar"}, {"foo": "baz"}],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of objects is invalid",
-                "data": [{"foo": "bar"}, {"foo": "bar"}],
-                "valid": false
-            },
-            {
-                "description": "unique array of nested objects is valid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : false}}}
-                ],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of nested objects is invalid",
-                "data": [
-                    {"foo": {"bar" : {"baz" : true}}},
-                    {"foo": {"bar" : {"baz" : true}}}
-                ],
-                "valid": false
-            },
-            {
-                "description": "unique array of arrays is valid",
-                "data": [["foo"], ["bar"]],
-                "valid": true
-            },
-            {
-                "description": "non-unique array of arrays is invalid",
-                "data": [["foo"], ["foo"]],
-                "valid": false
-            },
-            {
-                "description": "1 and true are unique",
-                "data": [1, true],
-                "valid": true
-            },
-            {
-                "description": "0 and false are unique",
-                "data": [0, false],
-                "valid": true
-            },
-            {
-                "description": "unique heterogeneous types are valid",
-                "data": [{}, [1], true, null, 1],
-                "valid": true
-            },
-            {
-                "description": "non-unique heterogeneous types are invalid",
-                "data": [{}, [1], true, null, {}, 1],
-                "valid": false
-            }
-        ]
-    }
-]
diff --git a/src/sioclient/lib/rapidjson/bin/jsonschema/tox.ini b/src/sioclient/lib/rapidjson/bin/jsonschema/tox.ini
deleted file mode 100644
index 5301222a..00000000
--- a/src/sioclient/lib/rapidjson/bin/jsonschema/tox.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[tox]
-minversion = 1.6
-envlist = py27
-skipsdist = True
-
-[testenv]
-deps = jsonschema
-commands = {envpython} bin/jsonschema_suite check
diff --git a/src/sioclient/lib/rapidjson/bin/types/booleans.json b/src/sioclient/lib/rapidjson/bin/types/booleans.json
deleted file mode 100644
index 2dcbb5fe..00000000
--- a/src/sioclient/lib/rapidjson/bin/types/booleans.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  true,
-  true,
-  false,
-  false,
-  true,
-  true,
-  true,
-  false,
-  false,
-  true,
-  false,
-  false,
-  true,
-  false,
-  false,
-  false,
-  true,
-  false,
-  false,
-  true,
-  true,
-  false,
-  true,
-  true,
-  true,
-  false,
-  false,
-  false,
-  true,
-  false,
-  true,
-  false,
-  false,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  false,
-  false,
-  true,
-  false,
-  false,
-  false,
-  true,
-  true,
-  false,
-  true,
-  true,
-  false,
-  true,
-  false,
-  true,
-  true,
-  true,
-  false,
-  false,
-  false,
-  true,
-  false,
-  false,
-  false,
-  true,
-  true,
-  false,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  false,
-  false,
-  false,
-  false,
-  false,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  false,
-  false,
-  false,
-  true,
-  false,
-  false,
-  false,
-  true,
-  true,
-  true,
-  false,
-  false,
-  true,
-  false
-]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/types/floats.json b/src/sioclient/lib/rapidjson/bin/types/floats.json
deleted file mode 100644
index 12b94a11..00000000
--- a/src/sioclient/lib/rapidjson/bin/types/floats.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  135.747111636,
-  123.377054008,
-  140.527504552,
-  -72.299143906,
-  -23.851678949,
-  73.586193519,
-  -158.299382442,
-  177.477876032,
-  32.268518982,
-  -139.560009969,
-  115.203105183,
-  -106.025823607,
-  167.224138231,
-  103.378383732,
-  -97.498486285,
-  18.184723416,
-  69.137075711,
-  33.849002681,
-  -120.185228215,
-  -20.841408615,
-  -172.659492727,
-  -2.691464061,
-  22.426164066,
-  -98.416909437,
-  -31.603082708,
-  -85.072296561,
-  108.620987395,
-  -43.127078238,
-  -126.473562057,
-  -158.595489097,
-  -57.890678254,
-  -13.254016573,
-  -85.024504709,
-  171.663552644,
-  -146.495558248,
-  -10.606748276,
-  -118.786969354,
-  153.352057804,
-  -45.215545083,
-  37.038725288,
-  106.344071897,
-  -64.607402031,
-  85.148030911,
-  28.897784566,
-  39.51082061,
-  20.450382102,
-  -113.174943618,
-  71.60785784,
-  -168.202648062,
-  -157.338200017,
-  10.879588527,
-  -114.261694831,
-  -5.622927072,
-  -173.330830616,
-  -29.47002003,
-  -39.829034201,
-  50.031545162,
-  82.815735508,
-  -119.188760828,
-  -48.455928081,
-  163.964263034,
-  46.30378861,
-  -26.248889762,
-  -47.354615322,
-  155.388677633,
-  -166.710356904,
-  42.987233558,
-  144.275297374,
-  37.394383186,
-  -122.550388725,
-  177.469945914,
-  101.104677413,
-  109.429869885,
-  -104.919625624,
-  147.522756541,
-  -81.294703727,
-  122.744731363,
-  81.803603684,
-  26.321556167,
-  147.045441354,
-  147.256895816,
-  -174.211095908,
-  52.518769316,
-  -78.58250334,
-  -173.356685435,
-  -107.728209264,
-  -69.982325771,
-  -113.776095893,
-  -35.785267074,
-  -105.748545976,
-  -30.206523864,
-  -76.185311723,
-  -126.400112781,
-  -26.864958639,
-  56.840053629,
-  93.781553535,
-  -116.002949803,
-  -46.617140948,
-  176.846840093,
-  -144.24821335
-]
diff --git a/src/sioclient/lib/rapidjson/bin/types/guids.json b/src/sioclient/lib/rapidjson/bin/types/guids.json
deleted file mode 100644
index 9d7f5dbc..00000000
--- a/src/sioclient/lib/rapidjson/bin/types/guids.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  "d35bf0d4-8d8f-4e17-a5c3-ad9bfd675266",
-  "db402774-eeb6-463b-9986-c458c44d8b5a",
-  "2a2e4101-b5f2-40b8-8750-e03f01661e60",
-  "76787cfa-f4eb-4d62-aaad-e1d588d00ad5",
-  "fd73894b-b500-4a7c-888c-06b5bd9cec65",
-  "cce1862a-cf31-4ef2-9e23-f1d23b4e6163",
-  "00a98bb0-2b6e-4368-8512-71c21aa87db7",
-  "ab9a8d69-cec7-4550-bd35-3ed678e22782",
-  "f18b48e1-5114-4fbe-9652-579e8d66950e",
-  "4efe3baa-7ac5-4d6a-a839-6b9cfe825764",
-  "b4aec119-5b0a-434c-b388-109816c482a5",
-  "e0ef0cbb-127a-4a28-9831-5741b4295275",
-  "d50286a5-cb7b-4c9e-be99-f214439bae8c",
-  "a981094c-f1ac-42ed-a9fa-86404c7210ff",
-  "2a34ee57-5815-4829-b77b-eeebaa8fe340",
-  "a0530d44-48f8-4eff-b9ea-8810c4308351",
-  "c6f91509-83e1-4ea1-9680-e667fbfd56ee",
-  "cab11402-dcdd-4454-b190-6da124947395",
-  "283d159c-2b18-4856-b4c7-5059252eaa15",
-  "146157c6-72a8-4051-9991-cb6ea6743d81",
-  "aef6f269-7306-4bd2-83f7-6d5605b5dc9a",
-  "37fe6027-d638-4017-80a9-e7b0567b278e",
-  "5003d731-33fb-4159-af61-d76348a44079",
-  "e0e06979-5f80-4713-9fe0-8a4d60dc89f8",
-  "7e85bdc3-0345-4cb6-9398-ccab06e79976",
-  "f2ebf5af-6568-4ffe-a46d-403863fd4b66",
-  "e0b5bb1c-b4dd-4535-9a9e-3c73f1167d46",
-  "c852d20b-6bcb-4b12-bd57-308296c64c5a",
-  "7ac3ae82-1818-49cd-a8a4-5ac77dfafd46",
-  "138004a9-76e2-4ad7-bd42-e74dabdbb803",
-  "ab25b5be-96be-45b0-b765-947b40ec36a6",
-  "08404734-fd57-499e-a4cf-71e9ec782ede",
-  "8dfdeb16-248b-4a21-bf89-2e22b11a4101",
-  "a0e44ef0-3b09-41e8-ad5d-ed8e6a1a2a67",
-  "a7981e49-188d-414a-9779-b1ad91e599d1",
-  "329186c0-bf27-4208-baf7-c0a0a5a2d5b7",
-  "cb5f3381-d33e-4b30-b1a9-f482623cad33",
-  "15031262-ca73-4e3c-bd0a-fcf89bdf0caf",
-  "6d7333d1-2e8c-4d78-bfde-5be47e70eb13",
-  "acaa160c-670a-4e8f-ac45-49416e77d5f9",
-  "228f87eb-cde4-4106-808b-2dbf3c7b6d2e",
-  "2ff830a3-5445-4d8e-b161-bddd30666697",
-  "f488bedd-ff6e-4108-b9a7-07f6da62f476",
-  "2e12b846-0a34-478e-adf7-a438493803e6",
-  "6686b8ef-7446-4d86-bd8c-df24119e3bfe",
-  "e474a5c5-5793-4d41-b4ab-5423acc56ef1",
-  "ac046573-e718-44dc-a0dc-9037eeaba6a9",
-  "6b0e9099-cf53-4d5a-8a71-977528628fcf",
-  "d51a3f22-0ff9-4087-ba9b-fcee2a2d8ade",
-  "bdc01286-3511-4d22-bfb8-76d01203d366",
-  "ca44eb84-17ff-4f27-8f1e-1bd25f4e8725",
-  "4e9a8c2f-be0b-4913-92d2-c801b9a50d04",
-  "7685d231-dadd-4041-9165-898397438ab7",
-  "86f0bf26-d66a-44d8-99f5-d6768addae3b",
-  "2ca1167c-72ba-45a0-aa42-faf033db0d0b",
-  "199a1182-ea55-49ff-ba51-71c29cdd0aac",
-  "be6a4dd2-c821-4aa0-8b83-d64d6644b5b2",
-  "4c5f4781-7f80-4daa-9c20-76b183000514",
-  "513b31bd-54fb-4d12-a427-42a7c13ff8e1",
-  "8e211bcb-d76c-4012-83ad-74dd7d23b687",
-  "44d5807e-0501-4f66-8779-e244d4fdca0a",
-  "db8cd555-0563-4b7b-b00c-eada300a7065",
-  "cb14d0c9-46cc-4797-bd3a-752b05629f07",
-  "4f68b3ef-ac9b-47a0-b6d7-57f398a5c6a5",
-  "77221aae-1bcf-471c-be45-7f31f733f9d6",
-  "42a7cac8-9e80-4c45-8c71-511d863c98ea",
-  "f9018d22-b82c-468c-bdb5-8864d5964801",
-  "75f4e9b8-62a2-4f21-ad8a-e19eff0419bc",
-  "9b7385c8-8653-4184-951c-b0ac1b36b42e",
-  "571018aa-ffbf-4b42-a16d-07b57a7f5f0e",
-  "35de4a2f-6bf1-45aa-b820-2a27ea833e44",
-  "0b8edb20-3bb4-4cb4-b089-31957466dbab",
-  "97da4778-9a7b-4140-a545-968148c81fb7",
-  "969f326c-8f2a-47c5-b41c-d9c2f06c9b9d",
-  "ae211037-8b53-4b17-bfc8-c06fc7774409",
-  "12c5c3c4-0bd5-45d3-bc1d-d04a3c65d3e6",
-  "ec02024f-ce43-4dd3-8169-a59f7baee043",
-  "5b6afe77-ce48-47ca-90a0-25cd10ca5ffd",
-  "2e3a61d4-6b8f-4d2f-ba86-878b4012efd8",
-  "19a88a67-a5d3-4647-898f-1cde07bce040",
-  "6db6f420-b5c8-48b9-bbb2-8864fe6fed65",
-  "5a45dbde-7b53-4f6b-b864-e3b63be3708a",
-  "c878321b-8a02-4239-9981-15760c2e7d15",
-  "4e36687f-8bf6-4b12-b496-3a8e382d067e",
-  "a59a63cd-43c0-4c6e-b208-6dbca86f8176",
-  "303308c4-2e4a-45b5-8bf3-3e66e9ad05a1",
-  "8b58fdf1-43a6-4c98-9547-6361b50791af",
-  "a3563591-72ed-42b5-8e41-bac1d76d70cf",
-  "38db8c78-3739-4f6e-8313-de4138082114",
-  "86615bea-7e73-4daf-95da-ae6b9eee1bbb",
-  "35d38e3e-076e-40dd-9aa8-05be2603bd59",
-  "9f84c62d-b454-4ba3-8c19-a01878985cdc",
-  "6721bbae-d765-4a06-8289-6fe46a1bf943",
-  "0837796f-d0dd-4e50-9b7c-1983e6cc7c48",
-  "021eb7d7-e869-49b9-80c3-9dd16ce2d981",
-  "819c56f8-e040-475d-aad5-c6d5e98b20aa",
-  "3a61ef02-735e-4229-937d-b3777a3f4e1f",
-  "79dfab84-12e6-4ec8-bfc8-460ae71e4eca",
-  "a106fabf-e149-476c-8053-b62388b6eb57",
-  "9a3900a5-bfb4-4de0-baa5-253a8bd0b634"
-]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/types/integers.json b/src/sioclient/lib/rapidjson/bin/types/integers.json
deleted file mode 100644
index 5dd05e09..00000000
--- a/src/sioclient/lib/rapidjson/bin/types/integers.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  8125686,
-  8958709,
-  5976222,
-  1889524,
-  7968493,
-  1357486,
-  118415,
-  7081097,
-  4635968,
-  7555332,
-  2270233,
-  3428352,
-  8699968,
-  2087333,
-  7861337,
-  7554440,
-  2017031,
-  7981692,
-  6060687,
-  1877715,
-  3297474,
-  8373177,
-  6158629,
-  7853641,
-  3004441,
-  9650406,
-  2695251,
-  1180761,
-  4988426,
-  6043805,
-  8063373,
-  6103218,
-  2848339,
-  8188690,
-  9235573,
-  5949816,
-  6116081,
-  6471138,
-  3354531,
-  4787414,
-  9660600,
-  942529,
-  7278535,
-  7967399,
-  554292,
-  1436493,
-  267319,
-  2606657,
-  7900601,
-  4276634,
-  7996757,
-  8544466,
-  7266469,
-  3301373,
-  4005350,
-  6437652,
-  7717672,
-  7126292,
-  8588394,
-  2127902,
-  7410190,
-  1517806,
-  4583602,
-  3123440,
-  7747613,
-  5029464,
-  9834390,
-  3087227,
-  4913822,
-  7550487,
-  4518144,
-  5862588,
-  1778599,
-  9493290,
-  5588455,
-  3638706,
-  7394293,
-  4294719,
-  3837830,
-  6381878,
-  7175866,
-  8575492,
-  1415229,
-  1453733,
-  6972404,
-  9782571,
-  4234063,
-  7117418,
-  7293130,
-  8057071,
-  9345285,
-  7626648,
-  3358911,
-  4574537,
-  9371826,
-  7627107,
-  6154093,
-  5392367,
-  5398105,
-  6956377
-]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/types/mixed.json b/src/sioclient/lib/rapidjson/bin/types/mixed.json
deleted file mode 100644
index 43e9a1d7..00000000
--- a/src/sioclient/lib/rapidjson/bin/types/mixed.json
+++ /dev/null
@@ -1,592 +0,0 @@
-[
-  {
-    "favoriteFruit": "banana",
-    "greeting": "Hello, Kim! You have 10 unread messages.",
-    "friends": [
-      {
-        "name": "Higgins Rodriquez",
-        "id": 0
-      },
-      {
-        "name": "James Floyd",
-        "id": 1
-      },
-      {
-        "name": "Gay Stewart",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "pariatur",
-      "ad",
-      "eiusmod",
-      "sit",
-      "et",
-      "velit",
-      "culpa"
-    ],
-    "longitude": -57.919246,
-    "latitude": -36.022812,
-    "registered": "Friday, March 21, 2014 9:13 PM",
-    "about": "Laborum nulla aliquip ullamco proident excepteur est officia ipsum. Eiusmod exercitation minim ex do labore reprehenderit aliqua minim qui excepteur reprehenderit cupidatat. Sint enim exercitation duis id consequat nisi enim magna. Commodo aliqua id ipsum sit magna enim. Veniam officia in labore fugiat veniam ea laboris ex veniam duis.\r\n",
-    "address": "323 Pulaski Street, Ronco, North Carolina, 7701",
-    "phone": "+1 (919) 438-2678",
-    "email": "kim.griffith@cipromox.biz",
-    "company": "CIPROMOX",
-    "name": {
-      "last": "Griffith",
-      "first": "Kim"
-    },
-    "eyeColor": "green",
-    "age": 26,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$1,283.55",
-    "isActive": false,
-    "guid": "10ab0392-c5e2-48a3-9473-aa725bad892d",
-    "index": 0,
-    "_id": "551b91198238a0bcf9a41133"
-  },
-  {
-    "favoriteFruit": "banana",
-    "greeting": "Hello, Skinner! You have 9 unread messages.",
-    "friends": [
-      {
-        "name": "Rhonda Justice",
-        "id": 0
-      },
-      {
-        "name": "Audra Castaneda",
-        "id": 1
-      },
-      {
-        "name": "Vicky Chavez",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "dolore",
-      "enim",
-      "sit",
-      "non",
-      "exercitation",
-      "fugiat",
-      "adipisicing"
-    ],
-    "longitude": -60.291407,
-    "latitude": -84.619318,
-    "registered": "Friday, February 7, 2014 3:17 AM",
-    "about": "Consectetur eiusmod laboris dolore est ullamco nulla in velit quis esse Lorem. Amet aliqua sunt aute occaecat veniam officia in duis proident aliqua cupidatat mollit. Sint eu qui anim duis ut anim duis eu cillum. Cillum nostrud adipisicing tempor Lorem commodo sit in ad qui non et irure qui. Labore eu aliquip id duis eiusmod veniam.\r\n",
-    "address": "347 Autumn Avenue, Fidelis, Puerto Rico, 543",
-    "phone": "+1 (889) 457-2319",
-    "email": "skinner.maddox@moltonic.co.uk",
-    "company": "MOLTONIC",
-    "name": {
-      "last": "Maddox",
-      "first": "Skinner"
-    },
-    "eyeColor": "green",
-    "age": 22,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$3,553.10",
-    "isActive": false,
-    "guid": "cfbc2fb6-2641-4388-b06d-ec0212cfac1e",
-    "index": 1,
-    "_id": "551b91197e0abe92d6642700"
-  },
-  {
-    "favoriteFruit": "strawberry",
-    "greeting": "Hello, Reynolds! You have 5 unread messages.",
-    "friends": [
-      {
-        "name": "Brady Valdez",
-        "id": 0
-      },
-      {
-        "name": "Boyer Golden",
-        "id": 1
-      },
-      {
-        "name": "Gladys Knapp",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "commodo",
-      "eiusmod",
-      "cupidatat",
-      "et",
-      "occaecat",
-      "proident",
-      "Lorem"
-    ],
-    "longitude": 140.866287,
-    "latitude": 1.401032,
-    "registered": "Monday, October 20, 2014 8:01 AM",
-    "about": "Deserunt elit consequat ea dolor pariatur aute consectetur et nulla ipsum ad. Laboris occaecat ipsum ad duis et esse ea ut voluptate. Ex magna consequat pariatur amet. Quis excepteur non mollit dolore cillum dolor ex esse veniam esse deserunt non occaecat veniam. Sit amet proident proident amet. Nisi est id ut ut adipisicing esse fugiat non dolor aute.\r\n",
-    "address": "872 Montague Terrace, Haena, Montana, 3106",
-    "phone": "+1 (974) 410-2655",
-    "email": "reynolds.sanford@combot.biz",
-    "company": "COMBOT",
-    "name": {
-      "last": "Sanford",
-      "first": "Reynolds"
-    },
-    "eyeColor": "green",
-    "age": 21,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$3,664.47",
-    "isActive": true,
-    "guid": "f9933a9c-c41a-412f-a18d-e727c569870b",
-    "index": 2,
-    "_id": "551b91197f170b65413a06e3"
-  },
-  {
-    "favoriteFruit": "banana",
-    "greeting": "Hello, Neva! You have 7 unread messages.",
-    "friends": [
-      {
-        "name": "Clara Cotton",
-        "id": 0
-      },
-      {
-        "name": "Ray Gates",
-        "id": 1
-      },
-      {
-        "name": "Jacobs Reese",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "magna",
-      "labore",
-      "incididunt",
-      "velit",
-      "ea",
-      "et",
-      "eiusmod"
-    ],
-    "longitude": -133.058479,
-    "latitude": 87.803677,
-    "registered": "Friday, May 9, 2014 5:41 PM",
-    "about": "Do duis occaecat ut officia occaecat officia nostrud reprehenderit ex excepteur aute anim in reprehenderit. Cupidatat nulla eiusmod nulla non minim veniam aute nulla deserunt adipisicing consectetur veniam. Sit consequat ex laboris aliqua labore consectetur tempor proident consequat est. Fugiat quis esse culpa aliquip. Excepteur laborum aliquip sunt eu cupidatat magna eiusmod amet nisi labore aliquip. Ut consectetur esse aliquip exercitation nulla ex occaecat elit do ex eiusmod deserunt. Ex eu voluptate minim deserunt fugiat minim est occaecat ad Lorem nisi.\r\n",
-    "address": "480 Eagle Street, Fostoria, Oklahoma, 2614",
-    "phone": "+1 (983) 439-3000",
-    "email": "neva.barker@pushcart.us",
-    "company": "PUSHCART",
-    "name": {
-      "last": "Barker",
-      "first": "Neva"
-    },
-    "eyeColor": "brown",
-    "age": 36,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$3,182.24",
-    "isActive": true,
-    "guid": "52489849-78e1-4b27-8b86-e3e5ab2b7dc8",
-    "index": 3,
-    "_id": "551b9119a13061c083c878d5"
-  },
-  {
-    "favoriteFruit": "banana",
-    "greeting": "Hello, Rodgers! You have 6 unread messages.",
-    "friends": [
-      {
-        "name": "Marguerite Conway",
-        "id": 0
-      },
-      {
-        "name": "Margarita Cunningham",
-        "id": 1
-      },
-      {
-        "name": "Carmela Gallagher",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "ipsum",
-      "magna",
-      "amet",
-      "elit",
-      "sit",
-      "occaecat",
-      "elit"
-    ],
-    "longitude": -125.436981,
-    "latitude": 19.868524,
-    "registered": "Tuesday, July 8, 2014 8:09 PM",
-    "about": "In cillum esse tempor do magna id ad excepteur ex nostrud mollit deserunt aliqua. Minim aliqua commodo commodo consectetur exercitation nulla nisi dolore aliqua in. Incididunt deserunt mollit nostrud excepteur. Ipsum fugiat anim deserunt Lorem aliquip nisi consequat eu minim in ex duis.\r\n",
-    "address": "989 Varanda Place, Duryea, Palau, 3972",
-    "phone": "+1 (968) 578-2974",
-    "email": "rodgers.conner@frenex.net",
-    "company": "FRENEX",
-    "name": {
-      "last": "Conner",
-      "first": "Rodgers"
-    },
-    "eyeColor": "blue",
-    "age": 23,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$1,665.17",
-    "isActive": true,
-    "guid": "ed3b2374-5afe-4fca-9325-8a7bbc9f81a0",
-    "index": 4,
-    "_id": "551b91197bcedb1b56a241ce"
-  },
-  {
-    "favoriteFruit": "strawberry",
-    "greeting": "Hello, Mari! You have 10 unread messages.",
-    "friends": [
-      {
-        "name": "Irwin Boyd",
-        "id": 0
-      },
-      {
-        "name": "Dejesus Flores",
-        "id": 1
-      },
-      {
-        "name": "Lane Mcmahon",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "esse",
-      "aliquip",
-      "excepteur",
-      "dolor",
-      "ex",
-      "commodo",
-      "anim"
-    ],
-    "longitude": -17.038176,
-    "latitude": 17.154663,
-    "registered": "Sunday, April 6, 2014 4:46 AM",
-    "about": "Excepteur veniam occaecat sint nulla magna in in officia elit. Eiusmod qui dolor fugiat tempor in minim esse officia minim consequat. Lorem ullamco labore proident ipsum id pariatur fugiat consectetur anim cupidatat qui proident non ipsum.\r\n",
-    "address": "563 Hendrickson Street, Westwood, South Dakota, 4959",
-    "phone": "+1 (980) 434-3976",
-    "email": "mari.fleming@beadzza.org",
-    "company": "BEADZZA",
-    "name": {
-      "last": "Fleming",
-      "first": "Mari"
-    },
-    "eyeColor": "blue",
-    "age": 21,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$1,948.04",
-    "isActive": true,
-    "guid": "6bd02166-3b1f-4ed8-84c9-ed96cbf12abc",
-    "index": 5,
-    "_id": "551b9119b359ff6d24846f77"
-  },
-  {
-    "favoriteFruit": "strawberry",
-    "greeting": "Hello, Maxine! You have 7 unread messages.",
-    "friends": [
-      {
-        "name": "Sullivan Stark",
-        "id": 0
-      },
-      {
-        "name": "Underwood Mclaughlin",
-        "id": 1
-      },
-      {
-        "name": "Kristy Carlson",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "commodo",
-      "ipsum",
-      "quis",
-      "non",
-      "est",
-      "mollit",
-      "exercitation"
-    ],
-    "longitude": -105.40635,
-    "latitude": 37.197993,
-    "registered": "Tuesday, January 20, 2015 12:30 AM",
-    "about": "Proident ullamco Lorem est consequat consectetur non eiusmod esse nostrud pariatur eiusmod enim exercitation eiusmod. Consequat duis elit elit minim ullamco et dolor eu minim do tempor esse consequat excepteur. Mollit dolor do voluptate nostrud quis anim cillum velit tempor eiusmod adipisicing tempor do culpa. Eu magna dolor sit amet nisi do laborum dolore nisi. Deserunt ipsum et deserunt non nisi.\r\n",
-    "address": "252 Boulevard Court, Brenton, Tennessee, 9444",
-    "phone": "+1 (950) 466-3377",
-    "email": "maxine.moreno@zentia.tv",
-    "company": "ZENTIA",
-    "name": {
-      "last": "Moreno",
-      "first": "Maxine"
-    },
-    "eyeColor": "brown",
-    "age": 24,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$1,200.24",
-    "isActive": false,
-    "guid": "ce307a37-ca1f-43f5-b637-dca2605712be",
-    "index": 6,
-    "_id": "551b91195a6164b2e35f6dc8"
-  },
-  {
-    "favoriteFruit": "strawberry",
-    "greeting": "Hello, Helga! You have 5 unread messages.",
-    "friends": [
-      {
-        "name": "Alicia Vance",
-        "id": 0
-      },
-      {
-        "name": "Vinson Phelps",
-        "id": 1
-      },
-      {
-        "name": "Francisca Kelley",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "nostrud",
-      "eiusmod",
-      "dolore",
-      "officia",
-      "sint",
-      "non",
-      "qui"
-    ],
-    "longitude": -7.275151,
-    "latitude": 75.54202,
-    "registered": "Wednesday, October 1, 2014 6:35 PM",
-    "about": "Quis duis ullamco velit qui. Consectetur non adipisicing id magna anim. Deserunt est officia qui esse. Et do pariatur incididunt anim ad mollit non. Et eiusmod sunt fugiat elit mollit ad excepteur anim nisi laboris eiusmod aliquip aliquip.\r\n",
-    "address": "981 Bush Street, Beaulieu, Vermont, 3775",
-    "phone": "+1 (956) 506-3807",
-    "email": "helga.burch@synkgen.name",
-    "company": "SYNKGEN",
-    "name": {
-      "last": "Burch",
-      "first": "Helga"
-    },
-    "eyeColor": "blue",
-    "age": 22,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$3,827.89",
-    "isActive": false,
-    "guid": "ff5dfea0-1052-4ef2-8b66-4dc1aad0a4fb",
-    "index": 7,
-    "_id": "551b911946be8358ae40e90e"
-  },
-  {
-    "favoriteFruit": "banana",
-    "greeting": "Hello, Shaw! You have 5 unread messages.",
-    "friends": [
-      {
-        "name": "Christian Cardenas",
-        "id": 0
-      },
-      {
-        "name": "Cohen Pennington",
-        "id": 1
-      },
-      {
-        "name": "Mary Lindsay",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "occaecat",
-      "ut",
-      "occaecat",
-      "magna",
-      "exercitation",
-      "incididunt",
-      "irure"
-    ],
-    "longitude": -89.102972,
-    "latitude": 89.489596,
-    "registered": "Thursday, August 21, 2014 5:00 PM",
-    "about": "Amet cupidatat quis velit aute Lorem consequat pariatur mollit deserunt et sint culpa excepteur duis. Enim proident duis qui ex tempor sunt nostrud occaecat. Officia sit veniam mollit eiusmod minim do aute eiusmod fugiat qui anim adipisicing in laboris. Do tempor reprehenderit sunt laborum esse irure dolor ad consectetur aute sit id ipsum. Commodo et voluptate anim consequat do. Minim laborum ad veniam ad minim incididunt excepteur excepteur aliqua.\r\n",
-    "address": "237 Pierrepont Street, Herbster, New York, 3490",
-    "phone": "+1 (976) 455-2880",
-    "email": "shaw.zamora@shadease.me",
-    "company": "SHADEASE",
-    "name": {
-      "last": "Zamora",
-      "first": "Shaw"
-    },
-    "eyeColor": "blue",
-    "age": 38,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$3,440.82",
-    "isActive": false,
-    "guid": "ac5fdb0e-e1fb-427e-881d-da461be0d1ca",
-    "index": 8,
-    "_id": "551b9119af0077bc28a2de25"
-  },
-  {
-    "favoriteFruit": "apple",
-    "greeting": "Hello, Melissa! You have 5 unread messages.",
-    "friends": [
-      {
-        "name": "Marion Villarreal",
-        "id": 0
-      },
-      {
-        "name": "Kate Rose",
-        "id": 1
-      },
-      {
-        "name": "Hines Simon",
-        "id": 2
-      }
-    ],
-    "range": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ],
-    "tags": [
-      "amet",
-      "veniam",
-      "mollit",
-      "ad",
-      "cupidatat",
-      "deserunt",
-      "Lorem"
-    ],
-    "longitude": -52.735052,
-    "latitude": 16.258838,
-    "registered": "Wednesday, April 16, 2014 7:56 PM",
-    "about": "Aute ut culpa eiusmod tempor duis dolor tempor incididunt. Nisi non proident excepteur eiusmod incididunt nisi minim irure sit. In veniam commodo deserunt proident reprehenderit et consectetur ullamco quis nulla cupidatat.\r\n",
-    "address": "642 Halsey Street, Blandburg, Kansas, 6761",
-    "phone": "+1 (941) 539-3851",
-    "email": "melissa.vaughn@memora.io",
-    "company": "MEMORA",
-    "name": {
-      "last": "Vaughn",
-      "first": "Melissa"
-    },
-    "eyeColor": "brown",
-    "age": 24,
-    "picture": "http://placehold.it/32x32",
-    "balance": "$2,399.44",
-    "isActive": true,
-    "guid": "1769f022-a7f1-4a69-bf4c-f5a5ebeab2d1",
-    "index": 9,
-    "_id": "551b9119b607c09c7ffc3b8a"
-  }
-]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/types/nulls.json b/src/sioclient/lib/rapidjson/bin/types/nulls.json
deleted file mode 100644
index 7a636ec8..00000000
--- a/src/sioclient/lib/rapidjson/bin/types/nulls.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null,
-  null
-]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/types/paragraphs.json b/src/sioclient/lib/rapidjson/bin/types/paragraphs.json
deleted file mode 100644
index 8ab3e1c5..00000000
--- a/src/sioclient/lib/rapidjson/bin/types/paragraphs.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  "Commodo ullamco cupidatat nisi sit proident ex. Cillum pariatur occaecat in officia do commodo nisi cillum tempor minim. Ad dolor ut et aliquip fugiat eu officia cupidatat occaecat consectetur eiusmod veniam enim officia.\r\n",
-  "Adipisicing cillum laborum nisi irure. Cillum dolor proident duis nulla qui mollit dolore reprehenderit mollit. Irure nulla dolor ipsum irure nulla quis laboris do.\r\n",
-  "Est adipisicing consectetur incididunt in. Occaecat ea magna ex consequat irure sit laborum cillum officia magna sunt do exercitation aliquip. Laboris id aute in dolore reprehenderit voluptate non deserunt laborum.\r\n",
-  "Consectetur eu aute est est occaecat adipisicing sint enim dolor eu. Tempor amet id non mollit eu consectetur cillum duis. Eu labore velit nulla ipsum commodo consequat aliquip. Cupidatat commodo dolore mollit enim sit excepteur nisi duis laboris deserunt esse.\r\n",
-  "Incididunt ullamco est fugiat enim fugiat. Do sit mollit anim ad excepteur eu laboris exercitation officia labore nulla ut. Voluptate non voluptate cillum sit et voluptate anim duis velit consequat aliquip dolor. Elit et et esse laboris consectetur officia eiusmod aliquip nisi est. Qui labore dolore ad dolor.\r\n",
-  "Anim adipisicing est irure proident sit officia ullamco voluptate sunt consectetur duis mollit excepteur veniam. Nostrud ut duis aute exercitation officia et quis elit commodo elit tempor aute aliquip enim. Est officia non cillum consequat voluptate ipsum sit voluptate nulla id.\r\n",
-  "Ipsum enim consectetur aliquip nulla commodo ut ex aliqua elit duis do. Officia et sunt aliqua dolor minim voluptate veniam esse elit enim. Adipisicing reprehenderit duis ex magna non in fugiat sunt ipsum nostrud fugiat aliquip. Labore voluptate id officia voluptate eu. Magna do nostrud excepteur sunt aliqua adipisicing qui.\r\n",
-  "Est occaecat non non cupidatat laborum qui. Veniam sit est voluptate labore sit irure consectetur fugiat. Anim enim enim fugiat exercitation anim ad proident esse in aliqua. Laboris ut aute culpa ullamco.\r\n",
-  "Sit et aliquip cupidatat deserunt eiusmod sint aliquip occaecat nostrud aliqua elit commodo ut magna. Amet sit est deserunt id duis in officia pariatur cupidatat ex. Mollit duis est consequat nulla aute velit ipsum sit consectetur pariatur ut non ex ipsum. Tempor esse velit pariatur reprehenderit et nostrud commodo laborum mollit labore.\r\n",
-  "Aliquip irure quis esse aliquip. Ex non deserunt culpa aliqua ad anim occaecat ad. Lorem consectetur mollit eu consectetur est non nisi non ipsum. Qui veniam ullamco officia est ut excepteur. Nulla elit dolore cupidatat aliqua enim Lorem elit consequat eiusmod non aliqua eu in. Pariatur in culpa labore sint ipsum consectetur occaecat ad ex ipsum laboris aliquip officia. Non officia eiusmod nisi officia id id laboris deserunt sunt enim magna mollit sit.\r\n",
-  "Mollit velit laboris laborum nulla aliquip consequat Lorem non incididunt irure. Eu voluptate sint do consectetur tempor sit Lorem in. Laborum eiusmod nisi Lorem ipsum dolore do aute laborum occaecat aute sunt. Sit laborum in ea do ipsum officia irure cillum irure nisi laboris. Ad anim deserunt excepteur ea veniam eiusmod culpa velit veniam. Commodo incididunt ea Lorem eu enim esse nisi incididunt mollit.\r\n",
-  "Velit proident sunt aute dolore reprehenderit culpa. Pariatur reprehenderit commodo ad ea voluptate anim nulla ipsum eu irure fugiat aliqua et. Adipisicing incididunt anim excepteur voluptate minim qui culpa. Sunt veniam enim reprehenderit magna magna. Sit ad amet deserunt ut aute dolore ad minim.\r\n",
-  "Esse ullamco sunt mollit mollit. Eu enim dolore laboris cupidatat. Cupidatat adipisicing non aute exercitation fugiat. Non ut cillum labore fugiat aliquip ex duis quis consectetur ut nisi Lorem amet qui. Proident veniam amet qui reprehenderit duis qui. Nisi culpa sit occaecat ullamco occaecat laborum fugiat ut. Non duis deserunt culpa duis.\r\n",
-  "Id ipsum eiusmod laboris non est ipsum deserunt labore duis reprehenderit deserunt. Sint tempor fugiat eiusmod nostrud in ut laborum esse in nostrud sit deserunt nostrud reprehenderit. Cupidatat aliqua qui anim consequat eu quis consequat consequat elit ipsum pariatur. Cupidatat in dolore velit quis. Exercitation cillum ullamco ex consectetur commodo tempor incididunt exercitation labore ad dolore. Minim incididunt consequat adipisicing esse eu eu voluptate.\r\n",
-  "Anim sint eiusmod nisi anim do deserunt voluptate ut cillum eiusmod esse ex reprehenderit laborum. Dolore nulla excepteur duis excepteur. Magna nisi nostrud duis non commodo velit esse ipsum Lorem incididunt. Nulla enim consequat ad aliqua. Incididunt irure culpa nostrud ea aute ex sit non ad esse.\r\n",
-  "Ullamco nostrud cupidatat adipisicing anim fugiat mollit eu. Et ut eu in nulla consequat. Sunt do pariatur culpa non est.\r\n",
-  "Pariatur incididunt reprehenderit non qui excepteur cillum exercitation nisi occaecat ad. Lorem aliquip laborum commodo reprehenderit sint. Laboris qui ut veniam magna quis et et ullamco voluptate. Tempor reprehenderit deserunt consequat nisi. Esse duis sint in tempor. Amet aute cupidatat in sint et.\r\n",
-  "Est officia nisi dolore consequat irure et excepteur. Sit qui elit tempor magna qui cillum anim amet proident exercitation proident. Eu cupidatat laborum consectetur duis ullamco irure nulla. Adipisicing culpa non reprehenderit anim aute.\r\n",
-  "Eu est laborum culpa velit dolore non sunt. Tempor magna veniam ea sit non qui Lorem qui exercitation aliqua aliqua et excepteur eiusmod. Culpa aute anim proident culpa adipisicing duis tempor elit aliquip elit nulla laboris esse dolore. Sit adipisicing non dolor eiusmod occaecat cupidatat.\r\n",
-  "Culpa velit eu esse sunt. Laborum irure aliqua reprehenderit velit ipsum fugiat officia dolor ut aute officia deserunt. Ipsum sit quis fugiat nostrud aliqua cupidatat ex pariatur et. Cillum proident est irure nisi dolor aliqua deserunt esse occaecat velit dolor.\r\n",
-  "Exercitation nulla officia sit eiusmod cillum eu incididunt officia exercitation qui Lorem deserunt. Voluptate Lorem minim commodo laborum esse in duis excepteur do duis aliquip nisi voluptate consectetur. Amet tempor officia enim ex esse minim reprehenderit.\r\n",
-  "Laboris sint deserunt ad aute incididunt. Anim officia sunt elit qui laborum labore commodo irure non. Mollit adipisicing ullamco do aute nulla eu laborum et quis sint aute adipisicing amet. Aliqua officia irure nostrud duis ex.\r\n",
-  "Eiusmod ipsum aliqua reprehenderit esse est non aute id veniam eiusmod. Elit consequat ad sit tempor elit eu incididunt quis irure ad. Eu incididunt veniam consequat Lorem nostrud cillum officia ea consequat ad cillum. Non nisi irure cupidatat incididunt pariatur incididunt. Duis velit officia ad cillum qui. Aliquip consequat sint aute nisi cillum. Officia commodo nisi incididunt laborum nisi voluptate aliquip Lorem cupidatat anim consequat sit laboris.\r\n",
-  "Veniam cupidatat et incididunt mollit do ex voluptate veniam nostrud labore esse. Eiusmod irure sint fugiat esse. Aute irure consectetur ut mollit nulla sint esse. Lorem ut quis ex proident nostrud mollit nostrud ea duis duis in magna anim consectetur.\r\n",
-  "Irure culpa esse qui do dolor fugiat veniam ad. Elit commodo aute elit magna incididunt tempor pariatur velit irure pariatur cillum et ea ad. Ad consequat ea et ad minim ut sunt qui commodo voluptate. Laboris est aliquip anim reprehenderit eu officia et exercitation. Occaecat laboris cupidatat Lorem ullamco in nostrud commodo ipsum in quis esse ex.\r\n",
-  "Incididunt officia quis voluptate eiusmod esse nisi ipsum quis commodo. Eiusmod dolore tempor occaecat sit exercitation aliqua minim consequat minim mollit qui ad nisi. Aute quis irure adipisicing veniam nisi nisi velit deserunt incididunt anim nostrud.\r\n",
-  "Voluptate exercitation exercitation id minim excepteur excepteur mollit. Fugiat aute proident nulla ullamco ea. Nisi ea culpa duis dolore veniam anim tempor officia in dolore exercitation exercitation. Dolore quis cillum adipisicing sunt do nulla esse proident ad sint.\r\n",
-  "Laborum ut mollit sint commodo nulla laborum deserunt Lorem magna commodo mollit tempor deserunt ut. Qui aliquip commodo ea id. Consectetur dolor fugiat dolor excepteur eiusmod. Eu excepteur ex aute ex ex elit ex esse officia cillum exercitation. Duis ut labore ea nostrud excepteur. Reprehenderit labore aute sunt nisi quis Lorem officia. Ad aliquip cupidatat voluptate exercitation voluptate ad irure magna quis.\r\n",
-  "Tempor velit veniam sit labore elit minim do elit cillum eiusmod sunt excepteur nisi. Aliquip est deserunt excepteur duis fugiat incididunt veniam fugiat. Pariatur sit irure labore et minim non. Cillum quis aute anim sint laboris laboris ullamco exercitation nostrud. Nulla pariatur id laborum minim nisi est adipisicing irure.\r\n",
-  "Irure exercitation laboris nostrud in do consectetur ad. Magna aliqua Lorem culpa exercitation sint do culpa incididunt mollit eu exercitation. Elit tempor Lorem dolore enim deserunt. Anim et ullamco sint ullamco mollit cillum officia et. Proident incididunt laboris aliquip laborum sint veniam deserunt eu consequat deserunt voluptate laboris. Anim Lorem non laborum exercitation voluptate. Cupidatat reprehenderit culpa Lorem fugiat enim minim consectetur tempor quis ad reprehenderit laboris irure.\r\n",
-  "Deserunt elit mollit nostrud occaecat labore reprehenderit laboris ex. Esse reprehenderit adipisicing cillum minim in esse aliquip excepteur ex et nisi cillum quis. Cillum labore ut ex sunt. Occaecat proident et mollit magna consequat irure esse. Dolor do enim esse nisi ad.\r\n",
-  "Pariatur est anim cillum minim elit magna adipisicing quis tempor proident nisi laboris incididunt cupidatat. Nulla est adipisicing sit adipisicing id nostrud amet qui consequat eiusmod tempor voluptate ad. Adipisicing non magna sit occaecat magna mollit ad ex nulla velit ea pariatur. Irure labore ad ea exercitation ex cillum.\r\n",
-  "Lorem fugiat eu eu cillum nulla tempor sint. Lorem id officia nulla velit labore ut duis ad tempor non. Excepteur quis aute adipisicing nisi nisi consectetur aliquip enim Lorem id ullamco cillum sint voluptate. Qui aliquip incididunt tempor aliqua voluptate labore reprehenderit. Veniam eiusmod elit occaecat voluptate tempor culpa consectetur ea ut exercitation eiusmod exercitation qui.\r\n",
-  "Aliqua esse pariatur nulla veniam velit ea. Aliquip consectetur tempor ex magna sit aliquip exercitation veniam. Dolor ullamco minim commodo pariatur. Et amet reprehenderit dolore proident elit tempor eiusmod eu incididunt enim ullamco. Adipisicing id officia incididunt esse dolor sunt cupidatat do deserunt mollit do non. Magna ut officia fugiat adipisicing quis ea cillum laborum dolore ad nostrud magna minim est. Dolor voluptate officia proident enim ea deserunt eu voluptate dolore proident laborum officia ea.\r\n",
-  "Culpa aute consequat esse fugiat cupidatat minim voluptate voluptate eiusmod irure anim elit. Do eiusmod culpa laboris consequat incididunt minim nostrud eiusmod commodo velit ea ullamco proident. Culpa pariatur magna ut mollit nisi. Ea officia do magna deserunt minim nisi tempor ea deserunt veniam cillum exercitation esse.\r\n",
-  "Anim ullamco nostrud commodo Lorem. Do sunt laborum exercitation proident proident magna. Lorem officia laborum laborum dolor sunt duis commodo Lorem. Officia aute adipisicing ea cupidatat ea dolore. Aliquip adipisicing pariatur consectetur aliqua sit amet officia reprehenderit laborum culpa. Occaecat Lorem eu nisi do Lorem occaecat enim eiusmod laboris id quis. Ad mollit adipisicing sunt adipisicing esse.\r\n",
-  "Laborum quis sit adipisicing cupidatat. Veniam Lorem eiusmod esse esse sint nisi labore elit et. Deserunt aliqua mollit ut commodo aliqua non incididunt ipsum reprehenderit consectetur. Eiusmod nulla minim laboris Lorem ea Lorem aute tempor pariatur in sit. Incididunt culpa ut do irure amet irure cupidatat est anim anim culpa occaecat. Est velit consectetur eiusmod veniam reprehenderit officia sunt occaecat eiusmod ut sunt occaecat amet.\r\n",
-  "Elit minim aute fugiat nulla ex quis. Labore fugiat sint nostrud amet quis culpa excepteur in. Consectetur exercitation cupidatat laborum sit. Aute nisi eu aliqua est deserunt eiusmod commodo dolor id. Mollit laborum esse sint ipsum voluptate reprehenderit velit et. Veniam aliquip enim in veniam Lorem voluptate quis deserunt consequat qui commodo ut excepteur aute.\r\n",
-  "Dolore deserunt veniam aute nisi labore sunt et voluptate irure nisi anim ea. Magna nisi quis anim mollit nisi est dolor do ex aliquip elit aliquip ipsum minim. Dolore est officia nostrud eiusmod ex laborum ea amet est. Officia culpa non est et tempor consectetur exercitation tempor eiusmod enim. Ea tempor laboris qui amet ex nisi culpa dolore consectetur incididunt sunt sunt. Lorem aliquip incididunt magna do et ullamco ex elit aliqua eiusmod qui. Commodo amet dolor sint incididunt ex veniam non Lorem fugiat.\r\n",
-  "Officia culpa enim voluptate dolore commodo. Minim commodo aliqua minim ex sint excepteur cupidatat adipisicing eu irure. Anim magna deserunt anim Lorem non.\r\n",
-  "Cupidatat aliquip nulla excepteur sunt cupidatat cupidatat laborum cupidatat exercitation. Laboris minim ex cupidatat culpa elit. Amet enim reprehenderit aliqua laborum est tempor exercitation cupidatat ex dolore do. Do incididunt labore fugiat commodo consectetur nisi incididunt irure sit culpa sit. Elit aute occaecat qui excepteur velit proident cillum qui aliqua ex do ex. Dolore irure ex excepteur veniam id proident mollit Lorem.\r\n",
-  "Ad commodo cillum duis deserunt elit officia consectetur veniam eiusmod. Reprehenderit et veniam ad commodo reprehenderit magna elit laboris sunt non quis. Adipisicing dolor aute proident ea magna sunt et proident in consectetur.\r\n",
-  "Veniam exercitation esse esse veniam est nisi. Minim velit incididunt sint aute dolor anim. Fugiat cupidatat id ad nisi in voluptate dolor culpa eiusmod magna eiusmod amet id. Duis aliquip labore et ex amet amet aliquip laborum eiusmod ipsum. Quis qui ut duis duis. Minim in voluptate reprehenderit aliqua.\r\n",
-  "Elit ut pariatur dolor veniam ipsum consequat. Voluptate Lorem mollit et esse dolore mollit Lorem ad. Elit nostrud eu Lorem labore mollit minim cupidatat officia quis minim dolore incididunt. In cillum aute cillum ut.\r\n",
-  "Commodo laborum deserunt ut cupidatat pariatur ullamco in esse anim exercitation cillum duis. Consectetur incididunt sit esse Lorem in aute. Eiusmod mollit Lorem consequat minim reprehenderit laborum enim excepteur irure nisi elit. Laborum esse proident aute aute proident adipisicing laborum. Pariatur tempor duis incididunt qui velit pariatur ut officia ea mollit labore dolore. Cillum pariatur minim ullamco sunt incididunt culpa id ullamco exercitation consectetur. Ea exercitation consequat reprehenderit ut ullamco velit eu ad velit magna excepteur eiusmod.\r\n",
-  "Eu deserunt magna laboris laborum laborum in consequat dolore. Officia proident consectetur proident do occaecat minim pariatur officia ipsum sit non velit officia cillum. Laborum excepteur labore eu minim eiusmod. Sit anim dolore cillum ad do minim culpa sit est ad.\r\n",
-  "Cupidatat dolor nostrud Lorem sint consequat quis. Quis labore sint incididunt officia tempor. Fugiat nostrud in elit reprehenderit dolor. Nisi sit enim officia minim est adipisicing nulla aute labore nulla nostrud cupidatat est. Deserunt dolore qui irure Lorem esse voluptate velit qui nostrud.\r\n",
-  "Fugiat Lorem amet nulla nisi qui amet laboris enim cillum. Dolore occaecat exercitation id labore velit do commodo ut cupidatat laborum velit fugiat mollit. Ut et aliqua pariatur occaecat. Lorem occaecat dolore quis esse enim cupidatat exercitation ut tempor sit laboris fugiat adipisicing. Est tempor ex irure consectetur ipsum magna labore. Lorem non quis qui minim nisi magna amet aliquip ex cillum fugiat tempor.\r\n",
-  "Aliquip eiusmod laborum ipsum deserunt velit esse do magna excepteur consectetur exercitation sit. Minim ullamco reprehenderit commodo nostrud exercitation id irure ex qui ullamco sit esse laboris. Nulla cillum non minim qui cillum nisi aute proident. Dolor anim culpa elit quis excepteur aliqua eiusmod. Elit ea est excepteur consectetur sunt eiusmod enim id commodo irure amet et pariatur laboris. Voluptate magna ad magna dolore cillum cillum irure laboris ipsum officia id Lorem veniam.\r\n",
-  "Esse sunt elit est aliquip cupidatat commodo deserunt. Deserunt pariatur ipsum qui ad esse esse magna qui cillum laborum. Exercitation veniam pariatur elit amet enim.\r\n",
-  "Esse quis in id elit nulla occaecat incididunt. Et amet Lorem mollit in veniam do. Velit mollit Lorem consequat commodo Lorem aliquip cupidatat. Minim consequat nostrud nulla in nostrud.\r\n",
-  "Cillum nulla et eu est nostrud quis elit cupidatat dolor enim excepteur exercitation nisi voluptate. Nulla dolore non ex velit et qui tempor proident id deserunt nisi eu. Tempor ad Lorem ipsum reprehenderit in anim. Anim dolore ullamco enim deserunt quis ex id exercitation velit. Magna exercitation fugiat mollit pariatur ipsum ex consectetur nostrud. Id dolore officia nostrud excepteur laborum. Magna incididunt elit ipsum pariatur adipisicing enim duis est qui commodo velit aute.\r\n",
-  "Quis esse ex qui nisi dolor. Ullamco laborum dolor esse laboris eiusmod ea magna laboris ea esse ut. Dolore ipsum pariatur veniam sint mollit. Lorem ea proident fugiat ullamco ut nisi culpa eu exercitation exercitation aliquip veniam laborum consectetur.\r\n",
-  "Pariatur veniam laboris sit aliquip pariatur tempor aute sunt id et ut. Laboris excepteur eiusmod nisi qui quis elit enim ut cupidatat. Et et laborum in fugiat veniam consectetur ipsum laboris duis excepteur ullamco aliqua dolor Lorem. Aliqua ex amet sint anim cupidatat nisi ipsum anim et sunt deserunt. Occaecat culpa ut tempor cillum pariatur ex tempor.\r\n",
-  "Dolor deserunt eiusmod magna do officia voluptate excepteur est cupidatat. Veniam qui cupidatat amet anim est qui consectetur sit commodo commodo ea ad. Enim ad adipisicing qui nostrud. Non nulla esse ullamco nulla et ex.\r\n",
-  "Id ullamco ea consectetur est incididunt deserunt et esse. Elit nostrud voluptate eiusmod ut. Excepteur adipisicing qui cupidatat consequat labore id. Qui dolor aliqua do dolore do cupidatat labore ex consectetur ea sit cillum. Sint veniam eiusmod in consectetur consequat fugiat et mollit ut fugiat esse dolor adipisicing.\r\n",
-  "Ea magna proident labore duis pariatur. Esse cillum aliquip dolor duis fugiat ea ex officia ea irure. Sint elit nisi pariatur sunt nostrud exercitation ullamco culpa magna do.\r\n",
-  "Minim aliqua voluptate dolor consequat sint tempor deserunt amet magna excepteur. Irure do voluptate magna velit. Nostrud in reprehenderit magna officia nostrud. Cupidatat nulla irure laboris non fugiat ex ex est cupidatat excepteur officia aute velit duis. Sit voluptate id ea exercitation deserunt culpa voluptate nostrud est adipisicing incididunt. Amet proident laborum commodo magna ipsum quis.\r\n",
-  "Ipsum consectetur consectetur excepteur tempor eiusmod ea fugiat aute velit magna in officia sunt. Sit ut sunt dolore cupidatat dolor adipisicing. Veniam nisi adipisicing esse reprehenderit amet aliqua voluptate ex commodo occaecat est voluptate mollit sunt. Pariatur aliqua qui qui in dolor. Fugiat reprehenderit sit nostrud do sint esse. Tempor sit irure adipisicing ea pariatur duis est sit est incididunt laboris quis do. Et voluptate anim minim aliquip excepteur consequat nisi anim pariatur aliquip ut ipsum dolor magna.\r\n",
-  "Cillum sit labore excepteur magna id aliqua exercitation consequat laborum Lorem id pariatur nostrud. Lorem qui est labore sint cupidatat sint excepteur nulla in eu aliqua et. Adipisicing velit do enim occaecat laboris quis excepteur ipsum dolor occaecat Lorem dolore id exercitation.\r\n",
-  "Incididunt in laborum reprehenderit eiusmod irure ex. Elit duis consequat minim magna. Esse consectetur aliquip cillum excepteur excepteur fugiat. Sint tempor consequat minim reprehenderit consectetur adipisicing dolor id Lorem elit non. Occaecat esse quis mollit ea et sint aute fugiat qui tempor. Adipisicing tempor duis non dolore irure elit deserunt qui do.\r\n",
-  "Labore fugiat eiusmod sint laborum sit duis occaecat. Magna in laborum non cillum excepteur nostrud sit proident pariatur voluptate voluptate adipisicing exercitation occaecat. Ad non dolor aute ex sint do do minim exercitation veniam laborum irure magna ea. Magna do non quis sit consequat Lorem aliquip.\r\n",
-  "Velit anim do laborum laboris laborum Lorem. Sunt do Lorem amet ipsum est sint velit sit do voluptate mollit veniam enim. Commodo do deserunt in pariatur ut elit sint elit deserunt ea. Ad dolor anim consequat aliquip ut mollit nostrud tempor sunt mollit elit. Reprehenderit laboris labore excepteur occaecat veniam adipisicing cupidatat esse. Ad enim aliquip ea minim excepteur magna. Sint velit veniam pariatur qui dolor est adipisicing ex laboris.\r\n",
-  "Ea cupidatat ex nulla in sunt est sit dolor enim ad. Eu tempor consequat cupidatat consequat ex incididunt sint culpa. Est Lorem Lorem non cupidatat sunt ut aliqua non nostrud do ullamco. Reprehenderit ad ad nulla nostrud do nulla in. Ipsum adipisicing commodo mollit ipsum exercitation. Aliqua ea anim anim est elit. Ea incididunt consequat minim ad sunt eu cillum.\r\n",
-  "Tempor quis excepteur eiusmod cupidatat ipsum occaecat id et occaecat. Eiusmod magna aliquip excepteur id amet elit. Ullamco dolore amet anim dolor enim ea magna magna elit. Occaecat magna pariatur in deserunt consectetur officia aliquip ullamco ex aute anim. Minim laborum eu sit elit officia esse do irure pariatur tempor et reprehenderit ullamco labore.\r\n",
-  "Sit tempor eu minim dolore velit pariatur magna duis reprehenderit ea nulla in. Amet est do consectetur commodo do adipisicing adipisicing in amet. Cillum id ut commodo do pariatur duis aliqua nisi sint ad irure officia reprehenderit. Mollit labore id enim fugiat ullamco irure mollit cupidatat. Quis nisi amet labore eu dolor occaecat commodo aliqua laboris deserunt excepteur deserunt officia. Aliqua non ut sit ad. Laborum veniam ad velit minim dolore ea id magna dolor qui in.\r\n",
-  "Dolore nostrud ipsum aliqua pariatur id reprehenderit enim ad eiusmod qui. Deserunt anim commodo pariatur excepteur velit eu irure nulla ex labore ipsum aliqua minim aute. Id consequat amet tempor aliquip ex elit adipisicing est do. Eu enim Lorem consectetur minim id irure nulla culpa. Consectetur do consequat aute tempor anim. Qui ad non elit dolor est adipisicing nisi amet cillum sunt quis anim laboris incididunt. Incididunt proident adipisicing labore Lorem.\r\n",
-  "Et reprehenderit ea officia veniam. Aliquip ullamco consequat elit nisi magna mollit id elit. Amet amet sint velit labore ad nisi. Consectetur tempor id dolor aliqua esse deserunt amet. Qui laborum enim proident voluptate aute eu aute aute sit sit incididunt eu. Sunt ullamco nisi nostrud labore commodo non consectetur quis do duis minim irure. Tempor sint dolor sint aliquip dolore nostrud fugiat.\r\n",
-  "Aute ullamco quis nisi ut excepteur nostrud duis elit. Veniam ex ad incididunt veniam voluptate. Commodo dolore ullamco sit sint adipisicing proident amet aute duis deserunt.\r\n",
-  "Labore velit eu cillum nisi. Laboris do cupidatat et non duis cillum. Ullamco dolor tempor cupidatat voluptate laborum ullamco ea duis.\r\n",
-  "Deserunt consequat aliqua duis aliquip nostrud nostrud dolore nisi. Culpa do sint laborum consectetur ipsum quis laborum laborum pariatur eiusmod. Consectetur laboris ad ad ut quis. Ullamco laboris qui velit id laborum voluptate qui aute nostrud aliquip ea.\r\n",
-  "Ad cillum anim ex est consectetur mollit id in. Non enim aliquip consequat qui deserunt commodo cillum ad laborum fugiat. Dolor deserunt amet laborum tempor adipisicing voluptate dolor pariatur dolor cillum. Eu mollit ex sunt officia veniam qui est sunt proident. Non aliqua qui elit eu cupidatat ex enim ex proident. Lorem sit minim ullamco officia cupidatat duis minim. Exercitation laborum deserunt voluptate culpa tempor quis nulla id pariatur.\r\n",
-  "Nostrud quis consectetur ut aliqua excepteur elit consectetur occaecat. Occaecat voluptate Lorem pariatur consequat ullamco fugiat minim. Anim voluptate eu eu cillum tempor dolore aliquip aliqua. Fugiat incididunt ut tempor amet minim. Voluptate nostrud minim pariatur non excepteur ullamco.\r\n",
-  "Dolore nulla velit officia exercitation irure laboris incididunt anim in laborum in fugiat ut proident. Fugiat aute id consequat fugiat officia ut. Labore sint amet proident amet sint nisi laboris amet id ullamco culpa quis consequat proident. Magna do fugiat veniam dolore elit irure minim. Esse ullamco excepteur labore tempor labore fugiat dolore nisi cupidatat irure dolor pariatur. Magna excepteur laboris nisi eiusmod sit pariatur mollit.\r\n",
-  "In enim aliquip officia ea ad exercitation cillum culpa occaecat dolore Lorem. Irure cillum commodo adipisicing sunt pariatur ea duis fugiat exercitation laboris culpa ullamco aute. Ut voluptate exercitation qui dolor. Irure et duis elit consequat deserunt proident.\r\n",
-  "Officia ea Lorem sunt culpa id et tempor excepteur enim deserunt proident. Dolore aliquip dolor laboris cillum proident velit. Et culpa occaecat exercitation cupidatat irure sint adipisicing excepteur pariatur incididunt ad occaecat. Qui proident ipsum cillum minim. Quis ut culpa irure aliqua minim fugiat. In voluptate cupidatat fugiat est laborum dolor esse in pariatur voluptate.\r\n",
-  "Voluptate enim ipsum officia aute ea adipisicing nisi ut ex do aliquip amet. Reprehenderit enim voluptate tempor ex adipisicing culpa. Culpa occaecat voluptate dolor mollit ipsum exercitation labore et tempor sit ea consectetur aliqua. Elit elit sit minim ea ea commodo do tempor cupidatat irure dolore. Occaecat esse adipisicing anim eiusmod commodo fugiat mollit amet. Incididunt tempor tempor qui occaecat cupidatat in.\r\n",
-  "Ut qui anim velit enim aliquip do ut nulla labore. Mollit ut commodo ut eiusmod consectetur laboris aliqua qui voluptate culpa fugiat incididunt elit. Lorem ullamco esse elit elit. Labore amet incididunt ea nulla aliquip eiusmod. Sit nulla est voluptate officia ipsum aute aute cillum tempor deserunt. Laboris commodo eiusmod labore sunt aute excepteur ea consectetur reprehenderit veniam nisi. Culpa nisi sint sunt sint tempor laboris dolore cupidatat.\r\n",
-  "Duis cillum qui nisi duis amet velit ad cillum ut elit aute sint ad. Amet laboris pariatur excepteur ipsum Lorem aliqua veniam Lorem quis mollit cupidatat aliqua exercitation. Pariatur ex ullamco sit commodo cillum eiusmod ut proident elit cillum. Commodo ut ipsum excepteur occaecat sint elit consequat ex dolor adipisicing consectetur id ut ad. Velit sit eiusmod est esse tempor incididunt consectetur eiusmod duis commodo veniam.\r\n",
-  "Ut sunt qui officia anim laboris exercitation Lorem quis laborum do eiusmod officia. Enim consectetur occaecat fugiat cillum cillum. Dolore dolore nostrud in commodo fugiat mollit consequat occaecat non et et elit ullamco. Sit voluptate minim ut est culpa velit nulla fugiat reprehenderit eu aliquip adipisicing labore. Sit minim minim do dolor dolor. Lorem Lorem labore exercitation magna veniam eiusmod do.\r\n",
-  "Fugiat dolor adipisicing quis aliquip aute dolore. Qui proident anim elit veniam ex aliquip eiusmod ipsum sunt pariatur est. Non fugiat duis do est officia adipisicing.\r\n",
-  "Nulla deserunt do laboris cupidatat veniam do consectetur ipsum elit veniam in mollit eu. Ea in consequat cupidatat laboris sint fugiat irure. In commodo esse reprehenderit deserunt minim velit ullamco enim eu cupidatat tempor ex. Ullamco in non id culpa amet occaecat culpa nostrud id. Non occaecat culpa magna incididunt.\r\n",
-  "Enim laboris ex mollit reprehenderit eiusmod exercitation magna. Exercitation Lorem ex mollit non non culpa labore enim. Adipisicing labore dolore incididunt do amet aliquip excepteur ad et nostrud officia aute veniam voluptate. Fugiat enim eiusmod Lorem esse. Minim ullamco commodo consequat ex commodo aliqua eu nulla eu. Veniam non enim nulla ut Lorem nostrud minim sint duis.\r\n",
-  "Enim duis consectetur in ullamco cillum veniam nulla amet. Exercitation nisi sunt sunt duis in culpa nisi magna ex id ipsum laboris reprehenderit qui. Officia pariatur qui ex fugiat veniam et sunt sit nostrud. Veniam ullamco tempor fugiat minim Lorem proident velit in eiusmod elit. Enim minim excepteur aute aliquip ex magna commodo dolore qui et labore. Proident eu aliquip cillum dolor. Nostrud ipsum ut irure consequat fugiat nulla proident occaecat laborum.\r\n",
-  "Amet duis eiusmod sunt adipisicing esse ex nostrud consectetur voluptate cillum. Ipsum occaecat sit et anim velit irure ea incididunt cupidatat ullamco in nisi quis. Esse officia ipsum commodo qui quis qui do. Commodo aliquip amet aute sit sit ut cupidatat elit nostrud.\r\n",
-  "Laboris laboris sit mollit cillum nulla deserunt commodo culpa est commodo anim id anim sit. Officia id consectetur velit incididunt est dolor sunt ipsum magna aliqua consectetur. Eiusmod pariatur minim deserunt cupidatat veniam Lorem aliquip sunt proident eu Lorem sit dolor fugiat. Proident qui ut ex in incididunt nulla nulla dolor ex laboris ea ad.\r\n",
-  "Ex incididunt enim labore nulla cupidatat elit. Quis ut incididunt incididunt non irure commodo do mollit cillum anim excepteur. Qui consequat laborum dolore elit tempor aute ut nulla pariatur eu ullamco veniam. Nisi non velit labore in commodo excepteur culpa nulla tempor cillum. Ipsum qui sit sint reprehenderit ut labore incididunt dolor aliquip sunt. Reprehenderit occaecat tempor nisi laborum.\r\n",
-  "Lorem officia ullamco eu occaecat in magna eiusmod consectetur nisi aliqua mollit esse. Ullamco ex aute nostrud pariatur do enim cillum sint do fugiat nostrud culpa tempor. Do aliquip excepteur nostrud culpa eu pariatur eiusmod cillum excepteur do. Est sunt non quis cillum voluptate ex.\r\n",
-  "Deserunt consectetur tempor irure mollit qui tempor et. Labore enim eu irure laboris in. Nisi in tempor ex occaecat amet cupidatat laboris occaecat amet minim ut magna incididunt id. Consequat cillum laborum commodo mollit. Et magna culpa sunt dolore consequat laboris et sit. Deserunt qui voluptate excepteur dolor. Eu qui amet est proident.\r\n",
-  "Eu elit minim eiusmod occaecat eu nostrud dolor qui ut elit. Sunt dolore proident ea eu do eiusmod fugiat incididunt pariatur duis amet Lorem nisi ut. Adipisicing quis veniam cupidatat Lorem sint culpa sunt veniam sint. Excepteur eu exercitation est magna pariatur veniam dolore qui fugiat labore proident eiusmod cillum. Commodo reprehenderit elit proident duis sint magna.\r\n",
-  "Ut aliquip pariatur deserunt nostrud commodo ad proident est exercitation. Sit minim do ea enim sint officia nisi incididunt laborum. Ex amet duis commodo fugiat. Ut aute tempor deserunt irure occaecat aliquip voluptate cillum aute elit qui nostrud.\r\n",
-  "Irure et quis consectetur sit est do sunt aliquip eu. Cupidatat pariatur consequat dolore consectetur. Adipisicing magna velit mollit occaecat do id. Nisi pariatur cupidatat cillum incididunt excepteur consectetur excepteur do laborum deserunt irure pariatur cillum.\r\n",
-  "Adipisicing esse incididunt cillum est irure consequat irure ad aute voluptate. Incididunt do occaecat nostrud do ipsum pariatur Lorem qui laboris et pariatur. Est exercitation dolor culpa ad velit ut et.\r\n",
-  "Sit eiusmod id enim ad ex dolor pariatur do. Ullamco occaecat quis dolor minim non elit labore amet est. Commodo velit eu nulla eiusmod ullamco. Incididunt anim pariatur aute eiusmod veniam tempor enim officia elit id. Elit Lorem est commodo dolore nostrud. Labore et consectetur do exercitation veniam laboris incididunt aliqua proident dolore ea officia cupidatat. Velit laboris aliquip deserunt labore commodo.\r\n",
-  "Proident nostrud labore eu nostrud. Excepteur ut in velit labore ea proident labore ea sint cillum. Incididunt ipsum consectetur officia irure sit pariatur veniam id velit officia mollit. Adipisicing magna voluptate velit excepteur enim consectetur incididunt voluptate tempor occaecat fugiat velit excepteur labore. Do do incididunt qui nisi voluptate enim. Laboris aute sit voluptate cillum pariatur minim excepteur ullamco mollit deserunt.\r\n",
-  "Excepteur laborum adipisicing nisi elit fugiat tempor. Elit laboris qui enim labore duis. Proident tempor in consectetur proident excepteur do ex laboris sit.\r\n",
-  "Dolore do ea incididunt do duis dolore eu labore nisi cupidatat voluptate amet incididunt minim. Nulla pariatur mollit cupidatat adipisicing nulla et. Dolor aliquip in ex magna excepteur. Nulla consequat minim consequat ullamco dolor laboris ullamco eu reprehenderit duis nostrud pariatur.\r\n",
-  "Id nisi labore duis qui. Incididunt laboris tempor aute do sit. Occaecat excepteur est mollit ea in mollit ullamco est amet reprehenderit.\r\n",
-  "Aute labore ipsum velit non voluptate eiusmod et reprehenderit cupidatat occaecat. Lorem tempor tempor consectetur exercitation qui nostrud sunt cillum quis ut non dolore. Reprehenderit consequat reprehenderit laborum qui pariatur anim et officia est cupidatat enim velit velit.\r\n",
-  "Commodo ex et fugiat cupidatat non adipisicing commodo. Minim ad dolore fugiat mollit cupidatat aliqua sunt dolor sit. Labore esse labore velit aute enim. Nulla duis incididunt est aliquip consectetur elit qui incididunt minim minim labore amet sit cillum.\r\n"
-]
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/bin/types/readme.txt b/src/sioclient/lib/rapidjson/bin/types/readme.txt
deleted file mode 100644
index da1dae67..00000000
--- a/src/sioclient/lib/rapidjson/bin/types/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Test data obtained from https://github.com/xpol/lua-rapidjson/tree/master/performance
diff --git a/src/sioclient/lib/rapidjson/contrib/natvis/LICENSE b/src/sioclient/lib/rapidjson/contrib/natvis/LICENSE
deleted file mode 100644
index f57da96c..00000000
--- a/src/sioclient/lib/rapidjson/contrib/natvis/LICENSE
+++ /dev/null
@@ -1,45 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 Bart Muzzin
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Derived from:
-
-The MIT License (MIT)
-
-Copyright (c) 2015 mojmir svoboda
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/src/sioclient/lib/rapidjson/contrib/natvis/README.md b/src/sioclient/lib/rapidjson/contrib/natvis/README.md
deleted file mode 100644
index 9685c7f7..00000000
--- a/src/sioclient/lib/rapidjson/contrib/natvis/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# rapidjson.natvis
-
-This file can be used as a [Visual Studio Visualizer](https://docs.microsoft.com/en-gb/visualstudio/debugger/create-custom-views-of-native-objects) to aid in visualizing rapidjson structures within the Visual Studio debugger. Natvis visualizers are supported in Visual Studio 2012 and later. To install, copy the file into this directory:
-
-`%USERPROFILE%\Documents\Visual Studio 2012\Visualizers`
-
-Each version of Visual Studio has a similar directory, it must be copied into each directory to be used with that particular version. In Visual Studio 2015 and later, this can be done without restarting Visual Studio (a new debugging session must be started).
diff --git a/src/sioclient/lib/rapidjson/contrib/natvis/rapidjson.natvis b/src/sioclient/lib/rapidjson/contrib/natvis/rapidjson.natvis
deleted file mode 100644
index a804b7bf..00000000
--- a/src/sioclient/lib/rapidjson/contrib/natvis/rapidjson.natvis
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-	<!-- rapidjson::GenericValue - basic support -->
-	<Type Name="rapidjson::GenericValue&lt;*,*&gt;">
-		<DisplayString Condition="(data_.f.flags &amp; kTypeMask) == kNullType">null</DisplayString>
-		<DisplayString Condition="data_.f.flags == kTrueFlag">true</DisplayString>
-		<DisplayString Condition="data_.f.flags == kFalseFlag">false</DisplayString>
-		<DisplayString Condition="data_.f.flags == kShortStringFlag">{data_.ss.str}</DisplayString>
-		<DisplayString Condition="(data_.f.flags &amp; kTypeMask) == kStringType">{(const char*)((size_t)data_.s.str &amp; 0x0000FFFFFFFFFFFF)}</DisplayString>
-		<DisplayString Condition="(data_.f.flags &amp; kNumberIntFlag) == kNumberIntFlag">{data_.n.i.i}</DisplayString>
-		<DisplayString Condition="(data_.f.flags &amp; kNumberUintFlag) == kNumberUintFlag">{data_.n.u.u}</DisplayString>
-		<DisplayString Condition="(data_.f.flags &amp; kNumberInt64Flag) == kNumberInt64Flag">{data_.n.i64}</DisplayString>
-		<DisplayString Condition="(data_.f.flags &amp; kNumberUint64Flag) == kNumberUint64Flag">{data_.n.u64}</DisplayString>
-		<DisplayString Condition="(data_.f.flags &amp; kNumberDoubleFlag) == kNumberDoubleFlag">{data_.n.d}</DisplayString>
-		<DisplayString Condition="data_.f.flags == kObjectType">Object members={data_.o.size}</DisplayString>
-		<DisplayString Condition="data_.f.flags == kArrayType">Array members={data_.a.size}</DisplayString>
-		<Expand>
-			<Item Condition="data_.f.flags == kObjectType" Name="[size]">data_.o.size</Item>
-			<Item Condition="data_.f.flags == kObjectType" Name="[capacity]">data_.o.capacity</Item>
-			<ArrayItems Condition="data_.f.flags == kObjectType">
-				<Size>data_.o.size</Size>
-				<!-- NOTE: Rapidjson stores some extra data in the high bits of pointers, which is why the mask -->
-				<ValuePointer>(rapidjson::GenericMember&lt;$T1,$T2&gt;*)(((size_t)data_.o.members) &amp; 0x0000FFFFFFFFFFFF)</ValuePointer>
-			</ArrayItems>
-
-			<Item Condition="data_.f.flags == kArrayType" Name="[size]">data_.a.size</Item>
-			<Item Condition="data_.f.flags == kArrayType" Name="[capacity]">data_.a.capacity</Item>
-			<ArrayItems Condition="data_.f.flags == kArrayType">
-				<Size>data_.a.size</Size>
-				<!-- NOTE: Rapidjson stores some extra data in the high bits of pointers, which is why the mask -->
-				<ValuePointer>(rapidjson::GenericValue&lt;$T1,$T2&gt;*)(((size_t)data_.a.elements) &amp; 0x0000FFFFFFFFFFFF)</ValuePointer>
-			</ArrayItems>
-
-		</Expand>
-	</Type>
-
-</AutoVisualizer>
-
diff --git a/src/sioclient/lib/rapidjson/doc/CMakeLists.txt b/src/sioclient/lib/rapidjson/doc/CMakeLists.txt
deleted file mode 100644
index c5345ba6..00000000
--- a/src/sioclient/lib/rapidjson/doc/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-find_package(Doxygen)
-
-IF(NOT DOXYGEN_FOUND)
-    MESSAGE(STATUS "No Doxygen found. Documentation won't be built")
-ELSE()
-    file(GLOB SOURCES ${CMAKE_CURRENT_LIST_DIR}/../include/*)
-    file(GLOB MARKDOWN_DOC ${CMAKE_CURRENT_LIST_DIR}/../doc/*.md)
-    list(APPEND MARKDOWN_DOC ${CMAKE_CURRENT_LIST_DIR}/../readme.md)
-
-    CONFIGURE_FILE(Doxyfile.in Doxyfile @ONLY)
-    CONFIGURE_FILE(Doxyfile.zh-cn.in Doxyfile.zh-cn @ONLY)
-
-    file(GLOB DOXYFILES ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile*)
-    
-    add_custom_command(OUTPUT html
-        COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-        COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.zh-cn
-        COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/html
-        DEPENDS ${MARKDOWN_DOC} ${SOURCES} ${DOXYFILES}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../
-        )
-
-    add_custom_target(doc ALL DEPENDS html)
-    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
-        DESTINATION ${DOC_INSTALL_DIR}
-        COMPONENT doc)
-ENDIF()
diff --git a/src/sioclient/lib/rapidjson/doc/Doxyfile.in b/src/sioclient/lib/rapidjson/doc/Doxyfile.in
deleted file mode 100644
index 6e79f937..00000000
--- a/src/sioclient/lib/rapidjson/doc/Doxyfile.in
+++ /dev/null
@@ -1,2369 +0,0 @@
-# Doxyfile 1.8.7
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = RapidJSON
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         =
-
-# 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 a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "A fast JSON parser/generator for C++ with both SAX/DOM style API"
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
-# the documentation. The maximum height of the logo should not exceed 55 pixels
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
-# to the output directory.
-
-PROJECT_LOGO           =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
-# new page for each member. If set to NO, the documentation of a member will be
-# part of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
-# or globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = YES
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO these classes will be included in the various overviews. This option has
-# no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
-# todo list. This list is created by putting \todo commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
-# test list. This list is created by putting \test commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       = $(RAPIDJSON_SECTIONS)
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES the list
-# will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = NO
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. Do not use file names with spaces, bibtex cannot handle them. See
-# also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO doxygen will only warn about wrong or incomplete parameter
-# documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = readme.md \
-                         CHANGELOG.md \
-                         include/rapidjson/rapidjson.h \
-                         include/ \
-                         doc/features.md \
-                         doc/tutorial.md \
-                         doc/pointer.md \
-                         doc/stream.md \
-                         doc/encoding.md \
-                         doc/dom.md \
-                         doc/sax.md \
-                         doc/schema.md \
-                         doc/performance.md \
-                         doc/internals.md \
-                         doc/faq.md
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
-
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.inc \
-                         *.md
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                = ./include/rapidjson/msinttypes/
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        = internal
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             = ./doc
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER ) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE = readme.md
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = NO
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = NO
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            = ./doc/misc/header.html
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            = ./doc/misc/footer.html
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
-# defined cascading style sheet that is included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet file to the output directory. For an example
-# see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  = ./doc/misc/doxygenextra.css
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the stylesheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler ( hhc.exe). If non-empty
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated (
-# YES) or that it should be included in the master .chm file ( NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated (
-# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = YES
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using prerendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
-# replace them by respectively the title of the page, the current date and time,
-# only the current date, the version number of doxygen, the project name (see
-# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
-# Definitions (see http://autogen.sf.net) file that captures the structure of
-# the code including all documentation. Note that this feature is still
-# experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
-# in the source code. If set to NO only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = YES
-
-# If the SEARCH_INCLUDES tag is set to YES the includes files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             = \
-	RAPIDJSON_DOXYGEN_RUNNING \
-	RAPIDJSON_NAMESPACE_BEGIN="namespace rapidjson {" \
-	RAPIDJSON_NAMESPACE_END="}" \
-	RAPIDJSON_REMOVEFPTR_(x)=x \
-	RAPIDJSON_ENABLEIF_RETURN(cond,returntype)="RAPIDJSON_REMOVEFPTR_ returntype" \
-	RAPIDJSON_DISABLEIF_RETURN(cond,returntype)="RAPIDJSON_REMOVEFPTR_ returntype"
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      = \
-	RAPIDJSON_NOEXCEPT
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
-# class index. If set to NO only the inherited external classes will be listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
-# the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES, the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font n the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif and svg.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/src/sioclient/lib/rapidjson/doc/Doxyfile.zh-cn.in b/src/sioclient/lib/rapidjson/doc/Doxyfile.zh-cn.in
deleted file mode 100644
index 6a08f72d..00000000
--- a/src/sioclient/lib/rapidjson/doc/Doxyfile.zh-cn.in
+++ /dev/null
@@ -1,2369 +0,0 @@
-# Doxyfile 1.8.7
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = RapidJSON
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         =
-
-# 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 a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "一个C++快速JSON解析器及生成器，包含SAX/DOM风格API"
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
-# the documentation. The maximum height of the logo should not exceed 55 pixels
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
-# to the output directory.
-
-PROJECT_LOGO           =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = Chinese
-
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
-# new page for each member. If set to NO, the documentation of a member will be
-# part of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
-# or globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = YES
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO these classes will be included in the various overviews. This option has
-# no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
-# todo list. This list is created by putting \todo commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
-# test list. This list is created by putting \test commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       = $(RAPIDJSON_SECTIONS)
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES the list
-# will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = NO
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. Do not use file names with spaces, bibtex cannot handle them. See
-# also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO doxygen will only warn about wrong or incomplete parameter
-# documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = readme.zh-cn.md \
-                         CHANGELOG.md \
-                         include/rapidjson/rapidjson.h \
-                         include/ \
-                         doc/features.zh-cn.md \
-                         doc/tutorial.zh-cn.md \
-                         doc/pointer.zh-cn.md \
-                         doc/stream.zh-cn.md \
-                         doc/encoding.zh-cn.md \
-                         doc/dom.zh-cn.md \
-                         doc/sax.zh-cn.md \
-                         doc/schema.zh-cn.md \
-                         doc/performance.zh-cn.md \
-                         doc/internals.zh-cn.md \
-                         doc/faq.zh-cn.md
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
-
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.inc \
-                         *.md
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                = ./include/rapidjson/msinttypes/
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        = internal
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             = ./doc
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER ) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE = readme.zh-cn.md
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = NO
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = NO
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html/zh-cn
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            = ./doc/misc/header.html
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            = ./doc/misc/footer.html
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
-# defined cascading style sheet that is included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet file to the output directory. For an example
-# see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  = ./doc/misc/doxygenextra.css
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the stylesheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler ( hhc.exe). If non-empty
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated (
-# YES) or that it should be included in the master .chm file ( NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated (
-# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = YES
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using prerendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
-# replace them by respectively the title of the page, the current date and time,
-# only the current date, the version number of doxygen, the project name (see
-# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
-# Definitions (see http://autogen.sf.net) file that captures the structure of
-# the code including all documentation. Note that this feature is still
-# experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
-# in the source code. If set to NO only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = YES
-
-# If the SEARCH_INCLUDES tag is set to YES the includes files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             = \
-	RAPIDJSON_DOXYGEN_RUNNING \
-	RAPIDJSON_NAMESPACE_BEGIN="namespace rapidjson {" \
-	RAPIDJSON_NAMESPACE_END="}" \
-	RAPIDJSON_REMOVEFPTR_(x)=x \
-	RAPIDJSON_ENABLEIF_RETURN(cond,returntype)="RAPIDJSON_REMOVEFPTR_ returntype" \
-	RAPIDJSON_DISABLEIF_RETURN(cond,returntype)="RAPIDJSON_REMOVEFPTR_ returntype"
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      = \
-	RAPIDJSON_NOEXCEPT
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
-# class index. If set to NO only the inherited external classes will be listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
-# the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES, the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font n the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif and svg.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/architecture.dot b/src/sioclient/lib/rapidjson/doc/diagram/architecture.dot
deleted file mode 100644
index c816c871..00000000
--- a/src/sioclient/lib/rapidjson/doc/diagram/architecture.dot
+++ /dev/null
@@ -1,50 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	nodesep=0.5
-	penwidth=0.5
-	colorscheme=spectral7
-	
-	node [shape=box, fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5, style=filled, fillcolor=white]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "SAX"
-		style=filled
-		fillcolor=6
-
-		Reader -> Writer [style=invis]
-	}
-
-	subgraph cluster2 {
-		margin="10,10"
-		labeljust="left"
-		label = "DOM"
-		style=filled
-		fillcolor=7
-
-		Value
-		Document
-	}
-
-	Handler [label="<<concept>>\nHandler"]
-
-	{
-		edge [arrowtail=onormal, dir=back]
-		Value -> Document
-		Handler -> Document
-		Handler -> Writer
-	}
-
-	{
-		edge [arrowhead=vee, style=dashed, constraint=false]
-		Reader -> Handler [label="calls"]
-		Value -> Handler [label="calls"]
-		Document -> Reader [label="uses"]
-	}
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/architecture.png b/src/sioclient/lib/rapidjson/doc/diagram/architecture.png
deleted file mode 100644
index 556c7e72..00000000
Binary files a/src/sioclient/lib/rapidjson/doc/diagram/architecture.png and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/insituparsing.dot b/src/sioclient/lib/rapidjson/doc/diagram/insituparsing.dot
deleted file mode 100644
index eca0e385..00000000
--- a/src/sioclient/lib/rapidjson/doc/diagram/insituparsing.dot
+++ /dev/null
@@ -1,65 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-	
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, arrowhead=normal]
-
-	{
-		node [shape=record, fontsize="8", margin="0.04", height=0.2, color=gray]
-		oldjson [label="\{|\"|m|s|g|\"|:|\"|H|e|l|l|o|\\|n|W|o|r|l|d|!|\"|,|\"|\\|u|0|0|7|3|t|a|r|s|\"|:|1|0|\}", xlabel="Before Parsing"]
-		//newjson [label="\{|\"|<a>m|s|g|\\0|:|\"|<b>H|e|l|l|o|\\n|W|o|r|l|d|!|\\0|\"|,|\"|<c>s|t|a|r|s|\\0|t|a|r|s|:|1|0|\}", xlabel="After Parsing"]
-		newjson [shape=plaintext, label=<
-<table BORDER="0" CELLBORDER="1" CELLSPACING="0" CELLPADDING="2"><tr>
-<td>{</td>
-<td>"</td><td port="a">m</td><td>s</td><td>g</td><td bgcolor="yellow">\\0</td>
-<td>:</td>
-<td>"</td><td port="b">H</td><td>e</td><td>l</td><td>l</td><td>o</td><td bgcolor="yellow">\\n</td><td bgcolor="yellow">W</td><td bgcolor="yellow">o</td><td bgcolor="yellow">r</td><td bgcolor="yellow">l</td><td bgcolor="yellow">d</td><td bgcolor="yellow">!</td><td bgcolor="yellow">\\0</td><td>"</td>
-<td>,</td>
-<td>"</td><td port="c" bgcolor="yellow">s</td><td bgcolor="yellow">t</td><td bgcolor="yellow">a</td><td bgcolor="yellow">r</td><td bgcolor="yellow">s</td><td bgcolor="yellow">\\0</td><td>t</td><td>a</td><td>r</td><td>s</td>
-<td>:</td>
-<td>1</td><td>0</td>
-<td>}</td>
-</tr></table>
->, xlabel="After Parsing"]
-	}
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Document by In situ Parsing"
-		style=filled
-		fillcolor=gray95
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-		
-		root [label="{object|}", fillcolor=3]
-
-		{			
-			msg [label="{string|<a>}", fillcolor=5]
-			helloworld [label="{string|<a>}", fillcolor=5]
-			stars [label="{string|<a>}", fillcolor=5]
-			ten [label="{number|10}", fillcolor=6]
-		}
-	}
-
-	oldjson -> root [label=" ParseInsitu()" lhead="cluster1"]
-	edge [arrowhead=vee]
-	root -> { msg; stars }
-
-	edge [arrowhead="none"]
-	msg  -> helloworld
-	stars -> ten
-
-	{
-		edge [arrowhead=vee, arrowtail=dot, arrowsize=0.5, dir=both, tailclip=false]
-		msg:a:c -> newjson:a
-		helloworld:a:c -> newjson:b
-		stars:a:c -> newjson:c
-	}
-
-	//oldjson -> newjson [style=invis]
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/insituparsing.png b/src/sioclient/lib/rapidjson/doc/diagram/insituparsing.png
deleted file mode 100644
index 4400c884..00000000
Binary files a/src/sioclient/lib/rapidjson/doc/diagram/insituparsing.png and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/iterative-parser-states-diagram.dot b/src/sioclient/lib/rapidjson/doc/diagram/iterative-parser-states-diagram.dot
deleted file mode 100644
index 82ebfe1f..00000000
--- a/src/sioclient/lib/rapidjson/doc/diagram/iterative-parser-states-diagram.dot
+++ /dev/null
@@ -1,62 +0,0 @@
-digraph {
-    fontname="Inconsolata, Consolas"
-    fontsize=10
-    margin="0,0"
-    penwidth=0.0
-    
-    node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-    edge [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-
-    node [shape = doublecircle]; Start; Finish;
-    node [shape = box; style = "rounded, filled"; fillcolor=white ];
-
-    Start -> ArrayInitial [label=" ["];
-    Start -> ObjectInitial [label=" {"];
-
-    subgraph clusterArray {
-        margin="10,10"
-        style=filled
-        fillcolor=gray95
-        label = "Array"
-        
-        ArrayInitial; Element; ElementDelimiter; ArrayFinish;
-    }
-
-    subgraph clusterObject {
-        margin="10,10"
-        style=filled
-        fillcolor=gray95
-        label = "Object"
-
-        ObjectInitial; MemberKey; KeyValueDelimiter; MemberValue; MemberDelimiter; ObjectFinish;
-    }
-
-    ArrayInitial -> ArrayInitial [label="["];
-    ArrayInitial -> ArrayFinish [label=" ]"];
-    ArrayInitial -> ObjectInitial [label="{", constraint=false];
-    ArrayInitial -> Element [label="string\nfalse\ntrue\nnull\nnumber"];
-
-    Element -> ArrayFinish [label="]"];
-    Element -> ElementDelimiter [label=","];
-
-    ElementDelimiter -> ArrayInitial [label=" ["];
-    ElementDelimiter -> ObjectInitial [label="{"];
-    ElementDelimiter -> Element [label="string\nfalse\ntrue\nnull\nnumber"];
-
-    ObjectInitial -> ObjectFinish [label=" }"];
-    ObjectInitial -> MemberKey [label=" string "];
-
-    MemberKey -> KeyValueDelimiter [label=":"];
-
-    KeyValueDelimiter -> ArrayInitial [label="["];
-    KeyValueDelimiter -> ObjectInitial [label=" {"];
-    KeyValueDelimiter -> MemberValue [label=" string\n false\n true\n null\n number"];
-
-    MemberValue -> ObjectFinish [label="}"];
-    MemberValue -> MemberDelimiter [label=","];
-
-    MemberDelimiter -> MemberKey [label=" string "];
-
-    ArrayFinish -> Finish;
-    ObjectFinish -> Finish;
-}
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/iterative-parser-states-diagram.png b/src/sioclient/lib/rapidjson/doc/diagram/iterative-parser-states-diagram.png
deleted file mode 100644
index f315494d..00000000
Binary files a/src/sioclient/lib/rapidjson/doc/diagram/iterative-parser-states-diagram.png and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/makefile b/src/sioclient/lib/rapidjson/doc/diagram/makefile
deleted file mode 100644
index 34839776..00000000
--- a/src/sioclient/lib/rapidjson/doc/diagram/makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-%.pdf: %.dot
-	dot $< -Tpdf -o $@
-
-%.png: %.dot
-	dot $< -Tpng -o $@
-
-DOTFILES = $(basename $(wildcard *.dot))
-all: $(addsuffix .png, $(DOTFILES)) $(addsuffix .pdf, $(DOTFILES))
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/move1.dot b/src/sioclient/lib/rapidjson/doc/diagram/move1.dot
deleted file mode 100644
index a7c1464a..00000000
--- a/src/sioclient/lib/rapidjson/doc/diagram/move1.dot
+++ /dev/null
@@ -1,47 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, arrowhead=normal]
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Before"
-		style=filled
-		fillcolor=gray95
-
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-
-		{
-			rank = same
-			b1 [label="{b:number|456}", fillcolor=6]
-			a1 [label="{a:number|123}", fillcolor=6]
-		}
-
-		a1 -> b1 [style="dashed", label="Move", dir=back]
-	}
-
-	subgraph cluster2 {
-		margin="10,10"
-		labeljust="left"
-		label = "After"
-		style=filled
-		fillcolor=gray95
-
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-
-		{
-			rank = same
-			b2 [label="{b:null|}", fillcolor=1]
-			a2 [label="{a:number|456}", fillcolor=6]
-		}
-		a2 -> b2 [style=invis, dir=back]
-	}
-	b1 -> b2 [style=invis]
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/move1.png b/src/sioclient/lib/rapidjson/doc/diagram/move1.png
deleted file mode 100644
index ab322d08..00000000
Binary files a/src/sioclient/lib/rapidjson/doc/diagram/move1.png and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/move2.dot b/src/sioclient/lib/rapidjson/doc/diagram/move2.dot
deleted file mode 100644
index 2319871b..00000000
--- a/src/sioclient/lib/rapidjson/doc/diagram/move2.dot
+++ /dev/null
@@ -1,62 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, arrowhead=normal]
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Before Copying (Hypothetic)"
-		style=filled
-		fillcolor=gray95
-
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-
-		c1 [label="{contacts:array|}", fillcolor=4]
-		c11 [label="{|}"]
-		c12 [label="{|}"]
-		c13 [shape="none", label="...", style="solid"]
-		o1 [label="{o:object|}", fillcolor=3]
-		ghost [label="{o:object|}", style=invis]
-
-		c1 -> o1 [style="dashed", label="AddMember", constraint=false]
-
-		edge [arrowhead=vee]
-		c1 -> { c11; c12; c13 }
-		o1 -> ghost [style=invis]
-	}
-
-	subgraph cluster2 {
-		margin="10,10"
-		labeljust="left"
-		label = "After Copying (Hypothetic)"
-		style=filled
-		fillcolor=gray95
-
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-
-		c2 [label="{contacts:array|}", fillcolor=4]
-		c3 [label="{array|}", fillcolor=4]
-		c21 [label="{|}"]
-		c22 [label="{|}"]
-		c23 [shape=none, label="...", style="solid"]
-		o2 [label="{o:object|}", fillcolor=3]
-		cs [label="{string|\"contacts\"}", fillcolor=5]
-		c31 [label="{|}"]
-		c32 [label="{|}"]
-		c33 [shape="none", label="...", style="solid"]
-
-		edge [arrowhead=vee]
-		c2 -> { c21; c22; c23 }
-		o2 -> cs
-		cs -> c3 [arrowhead=none]
-		c3 -> { c31; c32; c33 }
-	}
-	ghost -> o2 [style=invis]
-}
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/move2.png b/src/sioclient/lib/rapidjson/doc/diagram/move2.png
deleted file mode 100644
index 8d4fc5bc..00000000
Binary files a/src/sioclient/lib/rapidjson/doc/diagram/move2.png and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/move3.dot b/src/sioclient/lib/rapidjson/doc/diagram/move3.dot
deleted file mode 100644
index 57adb4f9..00000000
--- a/src/sioclient/lib/rapidjson/doc/diagram/move3.dot
+++ /dev/null
@@ -1,60 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-	forcelabels=true
-
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, arrowhead=normal]
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Before Moving"
-		style=filled
-		fillcolor=gray95
-
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-
-		c1 [label="{contacts:array|}", fillcolor=4]
-		c11 [label="{|}"]
-		c12 [label="{|}"]
-		c13 [shape=none, label="...", style="solid"]
-		o1 [label="{o:object|}", fillcolor=3]
-		ghost [label="{o:object|}", style=invis]
-
-		c1 -> o1 [style="dashed", constraint=false, label="AddMember"]
-
-		edge [arrowhead=vee]
-		c1 -> { c11; c12; c13 }
-		o1 -> ghost [style=invis]
-	}
-
-	subgraph cluster2 {
-		margin="10,10"
-		labeljust="left"
-		label = "After Moving"
-		style=filled
-		fillcolor=gray95
-
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-
-		c2 [label="{contacts:null|}", fillcolor=1]
-		c3 [label="{array|}", fillcolor=4]
-		c21 [label="{|}"]
-		c22 [label="{|}"]
-		c23 [shape="none", label="...", style="solid"]
-		o2 [label="{o:object|}", fillcolor=3]
-		cs [label="{string|\"contacts\"}", fillcolor=5]
-		c2 -> o2 [style="dashed", constraint=false, label="AddMember", style=invis]
-
-		edge [arrowhead=vee]
-		c3 -> { c21; c22; c23 }
-		o2 -> cs
-		cs -> c3 [arrowhead=none]
-	}
-	ghost -> o2 [style=invis]
-}
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/move3.png b/src/sioclient/lib/rapidjson/doc/diagram/move3.png
deleted file mode 100644
index 558470f1..00000000
Binary files a/src/sioclient/lib/rapidjson/doc/diagram/move3.png and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/normalparsing.dot b/src/sioclient/lib/rapidjson/doc/diagram/normalparsing.dot
deleted file mode 100644
index b15941ba..00000000
--- a/src/sioclient/lib/rapidjson/doc/diagram/normalparsing.dot
+++ /dev/null
@@ -1,56 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-	
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, arrowhead=normal]
-
-	{
-		node [shape=record, fontsize="8", margin="0.04", height=0.2, color=gray]
-		normaljson [label="\{|\"|m|s|g|\"|:|\"|H|e|l|l|o|\\|n|W|o|r|l|d|!|\"|,|\"|\\|u|0|0|7|3|t|a|r|s\"|:|1|0|\}"]
-
-		{
-			rank = same
-			msgstring  [label="m|s|g|\\0"]
-			helloworldstring  [label="H|e|l|l|o|\\n|W|o|r|l|d|!|\\0"]
-			starsstring [label="s|t|a|r|s\\0"]
-		}
-	}
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Document by Normal Parsing"
-		style=filled
-		fillcolor=gray95
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-		
-		root [label="{object|}", fillcolor=3]
-
-		{			
-			msg [label="{string|<a>}", fillcolor=5]
-			helloworld [label="{string|<a>}", fillcolor=5]
-			stars [label="{string|<a>}", fillcolor=5]
-			ten [label="{number|10}", fillcolor=6]
-		}
-	}
-
-	normaljson -> root [label=" Parse()" lhead="cluster1"]
-	edge [arrowhead=vee]
-	root -> { msg; stars }
-
-	edge [arrowhead="none"]
-	msg  -> helloworld
-	stars -> ten
-
-	edge [arrowhead=vee, arrowtail=dot, arrowsize=0.5, dir=both, tailclip=false]
-	msg:a:c -> msgstring:w
-	helloworld:a:c -> helloworldstring:w
-	stars:a:c -> starsstring:w
-
-	msgstring -> helloworldstring -> starsstring [style=invis]
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/normalparsing.png b/src/sioclient/lib/rapidjson/doc/diagram/normalparsing.png
deleted file mode 100644
index 702512ca..00000000
Binary files a/src/sioclient/lib/rapidjson/doc/diagram/normalparsing.png and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/simpledom.dot b/src/sioclient/lib/rapidjson/doc/diagram/simpledom.dot
deleted file mode 100644
index 959cdbb4..00000000
--- a/src/sioclient/lib/rapidjson/doc/diagram/simpledom.dot
+++ /dev/null
@@ -1,54 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-	
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, arrowhead=normal]
-
-	{
-		node [shape=record, fontsize="8", margin="0.04", height=0.2, color=gray]
-		srcjson [label="\{|\"|p|r|o|j|e|c|t|\"|:|\"|r|a|p|i|d|j|s|o|n|\"|,|\"|s|t|a|r|s|\"|:|1|0|\}"]
-		dstjson [label="\{|\"|p|r|o|j|e|c|t|\"|:|\"|r|a|p|i|d|j|s|o|n|\"|,|\"|s|t|a|r|s|\"|:|1|1|\}"]
-	}
-
-	{
-		node [shape="box", style="filled", fillcolor="gray95"]
-		Document2 [label="(Modified) Document"]
-		Writer
-	}
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Document"
-		style=filled
-		fillcolor=gray95
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-		
-		root [label="{object|}", fillcolor=3]
-
-		{			
-			project [label="{string|\"project\"}", fillcolor=5]
-			rapidjson [label="{string|\"rapidjson\"}", fillcolor=5]
-			stars [label="{string|\"stars\"}", fillcolor=5]
-			ten [label="{number|10}", fillcolor=6]
-		}
-
-		edge [arrowhead=vee]
-		root -> { project; stars }
-
-		edge [arrowhead="none"]
-		project -> rapidjson
-		stars -> ten
-	}
-
-	srcjson -> root [label=" Parse()", lhead="cluster1"]
-
-	ten -> Document2 [label=" Increase \"stars\"", ltail="cluster1" ]
-	Document2  -> Writer [label=" Traverse DOM by Accept()"]
-	Writer -> dstjson [label=" Output to StringBuffer"]
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/simpledom.png b/src/sioclient/lib/rapidjson/doc/diagram/simpledom.png
deleted file mode 100644
index 38d9c5dc..00000000
Binary files a/src/sioclient/lib/rapidjson/doc/diagram/simpledom.png and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/tutorial.dot b/src/sioclient/lib/rapidjson/doc/diagram/tutorial.dot
deleted file mode 100644
index 138ddc38..00000000
--- a/src/sioclient/lib/rapidjson/doc/diagram/tutorial.dot
+++ /dev/null
@@ -1,58 +0,0 @@
-digraph {
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.2
-	penwidth=0.5
-	
-	node [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-	edge [fontname="Inconsolata, Consolas", fontsize=10]
-
-	subgraph cluster1 {
-		margin="10,10"
-		labeljust="left"
-		label = "Document"
-		style=filled
-		fillcolor=gray95
-		node [shape=Mrecord, style=filled, colorscheme=spectral7]
-		
-		root [label="{object|}", fillcolor=3]
-
-		{			
-			hello [label="{string|\"hello\"}", fillcolor=5]
-			t [label="{string|\"t\"}", fillcolor=5]
-			f [label="{string|\"f\"}", fillcolor=5]
-			n [label="{string|\"n\"}", fillcolor=5]
-			i [label="{string|\"i\"}", fillcolor=5]
-			pi [label="{string|\"pi\"}", fillcolor=5]
-			a [label="{string|\"a\"}", fillcolor=5]
-
-			world [label="{string|\"world\"}", fillcolor=5]
-			true [label="{true|}", fillcolor=7]
-			false [label="{false|}", fillcolor=2]
-			null [label="{null|}", fillcolor=1]
-			i1 [label="{number|123}", fillcolor=6]
-			pi1 [label="{number|3.1416}", fillcolor=6]
-			array [label="{array|size=4}", fillcolor=4]
-
-			a1 [label="{number|1}", fillcolor=6]
-			a2 [label="{number|2}", fillcolor=6]
-			a3 [label="{number|3}", fillcolor=6]
-			a4 [label="{number|4}", fillcolor=6]
-		}
-
-		edge [arrowhead=vee]
-		root -> { hello; t; f; n; i; pi; a }		
-		array -> { a1; a2; a3; a4 }
-
-		edge [arrowhead=none]
-		hello -> world
-		t -> true
-		f -> false
-		n -> null
-		i -> i1
-		pi -> pi1
-		a -> array
-	}
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/tutorial.png b/src/sioclient/lib/rapidjson/doc/diagram/tutorial.png
deleted file mode 100644
index 8a12924a..00000000
Binary files a/src/sioclient/lib/rapidjson/doc/diagram/tutorial.png and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/utilityclass.dot b/src/sioclient/lib/rapidjson/doc/diagram/utilityclass.dot
deleted file mode 100644
index 1492a8a7..00000000
--- a/src/sioclient/lib/rapidjson/doc/diagram/utilityclass.dot
+++ /dev/null
@@ -1,73 +0,0 @@
-digraph {
-	rankdir=LR
-	compound=true
-	fontname="Inconsolata, Consolas"
-	fontsize=10
-	margin="0,0"
-	ranksep=0.3
-	nodesep=0.15
-	penwidth=0.5
-	colorscheme=spectral7
-	
-	node [shape=box, fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5, style=filled, fillcolor=white]
-	edge [fontname="Inconsolata, Consolas", fontsize=10, penwidth=0.5]
-
-	subgraph cluster0 {
-		style=filled
-		fillcolor=4
-
-		Encoding [label="<<concept>>\nEncoding"]
-
-		edge [arrowtail=onormal, dir=back]
-		Encoding -> { UTF8; UTF16; UTF32; ASCII; AutoUTF }
-		UTF16 -> { UTF16LE; UTF16BE }
-		UTF32 -> { UTF32LE; UTF32BE }
-	}
-
-	subgraph cluster1 {
-		style=filled
-		fillcolor=5
-
-		Stream [label="<<concept>>\nStream"]
-		InputByteStream [label="<<concept>>\nInputByteStream"]
-		OutputByteStream [label="<<concept>>\nOutputByteStream"]
-
-		edge [arrowtail=onormal, dir=back]
-		Stream -> { 
-			StringStream; InsituStringStream; StringBuffer; 
-			EncodedInputStream; EncodedOutputStream; 
-			AutoUTFInputStream; AutoUTFOutputStream 
-			InputByteStream; OutputByteStream
-		}
-
-		InputByteStream ->	{ MemoryStream; FlieReadStream }
-		OutputByteStream -> { MemoryBuffer; FileWriteStream } 
-	}
-
-	subgraph cluster2 {
-		style=filled
-		fillcolor=3
-
-		Allocator [label="<<concept>>\nAllocator"]
-
-		edge [arrowtail=onormal, dir=back]
-		Allocator -> { CrtAllocator; MemoryPoolAllocator }
-	}
-
-	{
-		edge [arrowtail=odiamond, arrowhead=vee, dir=both]
-		EncodedInputStream -> InputByteStream
-		EncodedOutputStream -> OutputByteStream
-		AutoUTFInputStream -> InputByteStream
-		AutoUTFOutputStream -> OutputByteStream
-		MemoryPoolAllocator -> Allocator [label="base", tailport=s]
-	}
-
-	{
-		edge [arrowhead=vee, style=dashed]
-		AutoUTFInputStream -> AutoUTF
-		AutoUTFOutputStream -> AutoUTF
-	}
-
-	//UTF32LE -> Stream [style=invis]
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/doc/diagram/utilityclass.png b/src/sioclient/lib/rapidjson/doc/diagram/utilityclass.png
deleted file mode 100644
index ce029a4d..00000000
Binary files a/src/sioclient/lib/rapidjson/doc/diagram/utilityclass.png and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/doc/dom.md b/src/sioclient/lib/rapidjson/doc/dom.md
deleted file mode 100644
index 0079b64b..00000000
--- a/src/sioclient/lib/rapidjson/doc/dom.md
+++ /dev/null
@@ -1,280 +0,0 @@
-# DOM
-
-Document Object Model(DOM) is an in-memory representation of JSON for query and manipulation. The basic usage of DOM is described in [Tutorial](doc/tutorial.md). This section will describe some details and more advanced usages.
-
-[TOC]
-
-# Template {#Template}
-
-In the tutorial,  `Value` and `Document` was used. Similarly to `std::string`, these are actually `typedef` of template classes:
-
-~~~~~~~~~~cpp
-namespace rapidjson {
-
-template <typename Encoding, typename Allocator = MemoryPoolAllocator<> >
-class GenericValue {
-    // ...
-};
-
-template <typename Encoding, typename Allocator = MemoryPoolAllocator<> >
-class GenericDocument : public GenericValue<Encoding, Allocator> {
-    // ...
-};
-
-typedef GenericValue<UTF8<> > Value;
-typedef GenericDocument<UTF8<> > Document;
-
-} // namespace rapidjson
-~~~~~~~~~~
-
-User can customize these template parameters.
-
-## Encoding {#Encoding}
-
-The `Encoding` parameter specifies the encoding of JSON String value in memory. Possible options are `UTF8`, `UTF16`, `UTF32`. Note that, these 3 types are also template class. `UTF8<>` is `UTF8<char>`, which means using char to store the characters. You may refer to [Encoding](doc/encoding.md) for details.
-
-Suppose a Windows application would query localization strings stored in JSON files. Unicode-enabled functions in Windows use UTF-16 (wide character) encoding. No matter what encoding was used in JSON files, we can store the strings in UTF-16 in memory.
-
-~~~~~~~~~~cpp
-using namespace rapidjson;
-
-typedef GenericDocument<UTF16<> > WDocument;
-typedef GenericValue<UTF16<> > WValue;
-
-FILE* fp = fopen("localization.json", "rb"); // non-Windows use "r"
-
-char readBuffer[256];
-FileReadStream bis(fp, readBuffer, sizeof(readBuffer));
-
-AutoUTFInputStream<unsigned, FileReadStream> eis(bis);  // wraps bis into eis
-
-WDocument d;
-d.ParseStream<0, AutoUTF<unsigned> >(eis);
-
-const WValue locale(L"ja"); // Japanese
-
-MessageBoxW(hWnd, d[locale].GetString(), L"Test", MB_OK);
-~~~~~~~~~~
-
-## Allocator {#Allocator}
-
-The `Allocator` defines which allocator class is used when allocating/deallocating memory for `Document`/`Value`. `Document` owns, or references to an `Allocator` instance. On the other hand, `Value` does not do so, in order to reduce memory consumption.
-
-The default allocator used in `GenericDocument` is `MemoryPoolAllocator`. This allocator actually allocate memory sequentially, and cannot deallocate one by one. This is very suitable when parsing a JSON into a DOM tree.
-
-Another allocator is `CrtAllocator`, of which CRT is short for C RunTime library. This allocator simply calls the standard `malloc()`/`realloc()`/`free()`. When there is a lot of add and remove operations, this allocator may be preferred. But this allocator is far less efficient than `MemoryPoolAllocator`.
-
-# Parsing {#Parsing}
-
-`Document` provides several functions for parsing. In below, (1) is the fundamental function, while the others are helpers which call (1).
-
-~~~~~~~~~~cpp
-using namespace rapidjson;
-
-// (1) Fundamental
-template <unsigned parseFlags, typename SourceEncoding, typename InputStream>
-GenericDocument& GenericDocument::ParseStream(InputStream& is);
-
-// (2) Using the same Encoding for stream
-template <unsigned parseFlags, typename InputStream>
-GenericDocument& GenericDocument::ParseStream(InputStream& is);
-
-// (3) Using default parse flags
-template <typename InputStream>
-GenericDocument& GenericDocument::ParseStream(InputStream& is);
-
-// (4) In situ parsing
-template <unsigned parseFlags>
-GenericDocument& GenericDocument::ParseInsitu(Ch* str);
-
-// (5) In situ parsing, using default parse flags
-GenericDocument& GenericDocument::ParseInsitu(Ch* str);
-
-// (6) Normal parsing of a string
-template <unsigned parseFlags, typename SourceEncoding>
-GenericDocument& GenericDocument::Parse(const Ch* str);
-
-// (7) Normal parsing of a string, using same Encoding of Document
-template <unsigned parseFlags>
-GenericDocument& GenericDocument::Parse(const Ch* str);
-
-// (8) Normal parsing of a string, using default parse flags
-GenericDocument& GenericDocument::Parse(const Ch* str);
-~~~~~~~~~~
-
-The examples of [tutorial](doc/tutorial.md) uses (8) for normal parsing of string. The examples of [stream](doc/stream.md) uses the first three. *In situ* parsing will be described soon.
-
-The `parseFlags` are combination of the following bit-flags:
-
-Parse flags                   | Meaning
-------------------------------|-----------------------------------
-`kParseNoFlags`               | No flag is set.
-`kParseDefaultFlags`          | Default parse flags. It is equal to macro `RAPIDJSON_PARSE_DEFAULT_FLAGS`, which is defined as `kParseNoFlags`.
-`kParseInsituFlag`            | In-situ(destructive) parsing.
-`kParseValidateEncodingFlag`  | Validate encoding of JSON strings.
-`kParseIterativeFlag`         | Iterative(constant complexity in terms of function call stack size) parsing.
-`kParseStopWhenDoneFlag`      | After parsing a complete JSON root from stream, stop further processing the rest of stream. When this flag is used, parser will not generate `kParseErrorDocumentRootNotSingular` error. Using this flag for parsing multiple JSONs in the same stream.
-`kParseFullPrecisionFlag`     | Parse number in full precision (slower). If this flag is not set, the normal precision (faster) is used. Normal precision has maximum 3 [ULP](http://en.wikipedia.org/wiki/Unit_in_the_last_place) error.
-`kParseCommentsFlag`          | Allow one-line `// ...` and multi-line `/* ... */` comments (relaxed JSON syntax).
-`kParseNumbersAsStringsFlag`  | Parse numerical type values as strings.
-`kParseTrailingCommasFlag`    | Allow trailing commas at the end of objects and arrays (relaxed JSON syntax).
-`kParseNanAndInfFlag`         | Allow parsing `NaN`, `Inf`, `Infinity`, `-Inf` and `-Infinity` as `double` values (relaxed JSON syntax).
-
-By using a non-type template parameter, instead of a function parameter, C++ compiler can generate code which is optimized for specified combinations, improving speed, and reducing code size (if only using a single specialization). The downside is the flags needed to be determined in compile-time.
-
-The `SourceEncoding` parameter defines what encoding is in the stream. This can be differed to the `Encoding` of the `Document`. See [Transcoding and Validation](#TranscodingAndValidation) section for details.
-
-And the `InputStream` is type of input stream.
-
-## Parse Error {#ParseError}
-
-When the parse processing succeeded, the `Document` contains the parse results. When there is an error, the original DOM is *unchanged*. And the error state of parsing can be obtained by `bool HasParseError()`,  `ParseErrorCode GetParseError()` and `size_t GetErrorOffset()`.
-
-Parse Error Code                            | Description
---------------------------------------------|---------------------------------------------------
-`kParseErrorNone`                           | No error.
-`kParseErrorDocumentEmpty`                  | The document is empty.
-`kParseErrorDocumentRootNotSingular`        | The document root must not follow by other values.
-`kParseErrorValueInvalid`                   | Invalid value.
-`kParseErrorObjectMissName`                 | Missing a name for object member.
-`kParseErrorObjectMissColon`                | Missing a colon after a name of object member.
-`kParseErrorObjectMissCommaOrCurlyBracket`  | Missing a comma or `}` after an object member.
-`kParseErrorArrayMissCommaOrSquareBracket`  | Missing a comma or `]` after an array element.
-`kParseErrorStringUnicodeEscapeInvalidHex`  | Incorrect hex digit after `\\u` escape in string.
-`kParseErrorStringUnicodeSurrogateInvalid`  | The surrogate pair in string is invalid.
-`kParseErrorStringEscapeInvalid`            | Invalid escape character in string.
-`kParseErrorStringMissQuotationMark`        | Missing a closing quotation mark in string.
-`kParseErrorStringInvalidEncoding`          | Invalid encoding in string.
-`kParseErrorNumberTooBig`                   | Number too big to be stored in `double`.
-`kParseErrorNumberMissFraction`             | Miss fraction part in number.
-`kParseErrorNumberMissExponent`             | Miss exponent in number.
-
-The offset of error is defined as the character number from beginning of stream. Currently RapidJSON does not keep track of line number.
-
-To get an error message, RapidJSON provided a English messages in `rapidjson/error/en.h`. User can customize it for other locales, or use a custom localization system.
-
-Here shows an example of parse error handling.
-
-~~~~~~~~~~cpp
-#include "rapidjson/document.h"
-#include "rapidjson/error/en.h"
-
-// ...
-Document d;
-if (d.Parse(json).HasParseError()) {
-    fprintf(stderr, "\nError(offset %u): %s\n", 
-        (unsigned)d.GetErrorOffset(),
-        GetParseError_En(d.GetParseError()));
-    // ...
-}
-~~~~~~~~~~
-
-## In Situ Parsing {#InSituParsing}
-
-From [Wikipedia](http://en.wikipedia.org/wiki/In_situ):
-
-> *In situ* ... is a Latin phrase that translates literally to "on site" or "in position". It means "locally", "on site", "on the premises" or "in place" to describe an event where it takes place, and is used in many different contexts.
-> ...
-> (In computer science) An algorithm is said to be an in situ algorithm, or in-place algorithm, if the extra amount of memory required to execute the algorithm is O(1), that is, does not exceed a constant no matter how large the input. For example, heapsort is an in situ sorting algorithm.
-
-In normal parsing process, a large overhead is to decode JSON strings and copy them to other buffers. *In situ* parsing decodes those JSON string at the place where it is stored. It is possible in JSON because the length of decoded string is always shorter than or equal to the one in JSON. In this context, decoding a JSON string means to process the escapes, such as `"\n"`, `"\u1234"`, etc., and add a null terminator (`'\0'`)at the end of string.
-
-The following diagrams compare normal and *in situ* parsing. The JSON string values contain pointers to the decoded string.
-
-![normal parsing](diagram/normalparsing.png)
-
-In normal parsing, the decoded string are copied to freshly allocated buffers. `"\\n"` (2 characters) is decoded as `"\n"` (1 character). `"\\u0073"` (6 characters) is decoded as `"s"` (1 character).
-
-![instiu parsing](diagram/insituparsing.png)
-
-*In situ* parsing just modified the original JSON. Updated characters are highlighted in the diagram. If the JSON string does not contain escape character, such as `"msg"`, the parsing process merely replace the closing double quotation mark with a null character.
-
-Since *in situ* parsing modify the input, the parsing API needs `char*` instead of `const char*`.
-
-~~~~~~~~~~cpp
-// Read whole file into a buffer
-FILE* fp = fopen("test.json", "r");
-fseek(fp, 0, SEEK_END);
-size_t filesize = (size_t)ftell(fp);
-fseek(fp, 0, SEEK_SET);
-char* buffer = (char*)malloc(filesize + 1);
-size_t readLength = fread(buffer, 1, filesize, fp);
-buffer[readLength] = '\0';
-fclose(fp);
-
-// In situ parsing the buffer into d, buffer will also be modified
-Document d;
-d.ParseInsitu(buffer);
-
-// Query/manipulate the DOM here...
-
-free(buffer);
-// Note: At this point, d may have dangling pointers pointed to the deallocated buffer.
-~~~~~~~~~~
-
-The JSON strings are marked as const-string. But they may not be really "constant". The life cycle of it depends on the JSON buffer.
-
-In situ parsing minimizes allocation overheads and memory copying. Generally this improves cache coherence, which is an important factor of performance in modern computer.
-
-There are some limitations of *in situ* parsing:
-
-1. The whole JSON is in memory.
-2. The source encoding in stream and target encoding in document must be the same.
-3. The buffer need to be retained until the document is no longer used.
-4. If the DOM need to be used for long period after parsing, and there are few JSON strings in the DOM, retaining the buffer may be a memory waste.
-
-*In situ* parsing is mostly suitable for short-term JSON that only need to be processed once, and then be released from memory. In practice, these situation is very common, for example, deserializing JSON to C++ objects, processing web requests represented in JSON, etc.
-
-## Transcoding and Validation {#TranscodingAndValidation}
-
-RapidJSON supports conversion between Unicode formats (officially termed UCS Transformation Format) internally. During DOM parsing, the source encoding of the stream can be different from the encoding of the DOM. For example, the source stream contains a UTF-8 JSON, while the DOM is using UTF-16 encoding. There is an example code in [EncodedInputStream](doc/stream.md).
-
-When writing a JSON from DOM to output stream, transcoding can also be used. An example is in [EncodedOutputStream](doc/stream.md).
-
-During transcoding, the source string is decoded to into Unicode code points, and then the code points are encoded in the target format. During decoding, it will validate the byte sequence in the source string. If it is not a valid sequence, the parser will be stopped with `kParseErrorStringInvalidEncoding` error.
-
-When the source encoding of stream is the same as encoding of DOM, by default, the parser will *not* validate the sequence. User may use `kParseValidateEncodingFlag` to force validation.
-
-# Techniques {#Techniques}
-
-Some techniques about using DOM API is discussed here.
-
-## DOM as SAX Event Publisher
-
-In RapidJSON, stringifying a DOM with `Writer` may be look a little bit weird.
-
-~~~~~~~~~~cpp
-// ...
-Writer<StringBuffer> writer(buffer);
-d.Accept(writer);
-~~~~~~~~~~
-
-Actually, `Value::Accept()` is responsible for publishing SAX events about the value to the handler. With this design, `Value` and `Writer` are decoupled. `Value` can generate SAX events, and `Writer` can handle those events.
-
-User may create custom handlers for transforming the DOM into other formats. For example, a handler which converts the DOM into XML.
-
-For more about SAX events and handler, please refer to [SAX](doc/sax.md).
-
-## User Buffer {#UserBuffer}
-
-Some applications may try to avoid memory allocations whenever possible.
-
-`MemoryPoolAllocator` can support this by letting user to provide a buffer. The buffer can be on the program stack, or a "scratch buffer" which is statically allocated (a static/global array) for storing temporary data.
-
-`MemoryPoolAllocator` will use the user buffer to satisfy allocations. When the user buffer is used up, it will allocate a chunk of memory from the base allocator (by default the `CrtAllocator`).
-
-Here is an example of using stack memory. The first allocator is for storing values, while the second allocator is for storing temporary data during parsing.
-
-~~~~~~~~~~cpp
-typedef GenericDocument<UTF8<>, MemoryPoolAllocator<>, MemoryPoolAllocator<>> DocumentType;
-char valueBuffer[4096];
-char parseBuffer[1024];
-MemoryPoolAllocator<> valueAllocator(valueBuffer, sizeof(valueBuffer));
-MemoryPoolAllocator<> parseAllocator(parseBuffer, sizeof(parseBuffer));
-DocumentType d(&valueAllocator, sizeof(parseBuffer), &parseAllocator);
-d.Parse(json);
-~~~~~~~~~~
-
-If the total size of allocation is less than 4096+1024 bytes during parsing, this code does not invoke any heap allocation (via `new` or `malloc()`) at all.
-
-User can query the current memory consumption in bytes via `MemoryPoolAllocator::Size()`. And then user can determine a suitable size of user buffer.
diff --git a/src/sioclient/lib/rapidjson/doc/dom.zh-cn.md b/src/sioclient/lib/rapidjson/doc/dom.zh-cn.md
deleted file mode 100644
index 9743b7ac..00000000
--- a/src/sioclient/lib/rapidjson/doc/dom.zh-cn.md
+++ /dev/null
@@ -1,284 +0,0 @@
-# DOM
-
-文档对象模型（Document Object Model, DOM）是一种罝于内存中的 JSON 表示方式，以供查询及操作。我们己于 [教程](doc/tutorial.zh-cn.md) 中介绍了 DOM 的基本用法，本节将讲述一些细节及高级用法。
-
-[TOC]
-
-# 模板 {#Template}
-
-教程中使用了 `Value` 和 `Document` 类型。与 `std::string` 相似，这些类型其实是两个模板类的 `typedef`：
-
-~~~~~~~~~~cpp
-namespace rapidjson {
-
-template <typename Encoding, typename Allocator = MemoryPoolAllocator<> >
-class GenericValue {
-    // ...
-};
-
-template <typename Encoding, typename Allocator = MemoryPoolAllocator<> >
-class GenericDocument : public GenericValue<Encoding, Allocator> {
-    // ...
-};
-
-typedef GenericValue<UTF8<> > Value;
-typedef GenericDocument<UTF8<> > Document;
-
-} // namespace rapidjson
-~~~~~~~~~~
-
-使用者可以自定义这些模板参数。
-
-## 编码 {#Encoding}
-
-`Encoding` 参数指明在内存中的 JSON String 使用哪种编码。可行的选项有 `UTF8`、`UTF16`、`UTF32`。要注意这 3 个类型其实也是模板类。`UTF8<>` 等同 `UTF8<char>`，这代表它使用 `char` 来存储字符串。更多细节可以参考 [编码](doc/encoding.zh-cn.md)。
-
-这里是一个例子。假设一个 Windows 应用软件希望查询存储于 JSON 中的本地化字符串。Windows 中含 Unicode 的函数使用 UTF-16（宽字符）编码。无论 JSON 文件使用哪种编码，我们都可以把字符串以 UTF-16 形式存储在内存。
-
-~~~~~~~~~~cpp
-using namespace rapidjson;
-
-typedef GenericDocument<UTF16<> > WDocument;
-typedef GenericValue<UTF16<> > WValue;
-
-FILE* fp = fopen("localization.json", "rb"); // 非 Windows 平台使用 "r"
-
-char readBuffer[256];
-FileReadStream bis(fp, readBuffer, sizeof(readBuffer));
-
-AutoUTFInputStream<unsigned, FileReadStream> eis(bis);  // 包装 bis 成 eis
-
-WDocument d;
-d.ParseStream<0, AutoUTF<unsigned> >(eis);
-
-const WValue locale(L"ja"); // Japanese
-
-MessageBoxW(hWnd, d[locale].GetString(), L"Test", MB_OK);
-~~~~~~~~~~
-
-## 分配器 {#Allocator}
-
-`Allocator` 定义当 `Document`/`Value` 分配或释放内存时使用那个分配类。`Document` 拥有或引用到一个 `Allocator` 实例。而为了节省内存，`Value` 没有这么做。
-
-`GenericDocument` 的缺省分配器是 `MemoryPoolAllocator`。此分配器实际上会顺序地分配内存，并且不能逐一释放。当要解析一个 JSON 并生成 DOM，这种分配器是非常合适的。
-
-RapidJSON 还提供另一个分配器 `CrtAllocator`，当中 CRT 是 C 运行库（C RunTime library）的缩写。此分配器简单地读用标准的 `malloc()`/`realloc()`/`free()`。当我们需要许多增减操作，这种分配器会更为适合。然而这种分配器远远比 `MemoryPoolAllocator` 低效。
-
-# 解析 {#Parsing}
-
-`Document` 提供几个解析函数。以下的 (1) 是根本的函数，其他都是调用 (1) 的协助函数。
-
-~~~~~~~~~~cpp
-using namespace rapidjson;
-
-// (1) 根本
-template <unsigned parseFlags, typename SourceEncoding, typename InputStream>
-GenericDocument& GenericDocument::ParseStream(InputStream& is);
-
-// (2) 使用流的编码
-template <unsigned parseFlags, typename InputStream>
-GenericDocument& GenericDocument::ParseStream(InputStream& is);
-
-// (3) 使用缺省标志
-template <typename InputStream>
-GenericDocument& GenericDocument::ParseStream(InputStream& is);
-
-// (4) 原位解析
-template <unsigned parseFlags>
-GenericDocument& GenericDocument::ParseInsitu(Ch* str);
-
-// (5) 原位解析，使用缺省标志
-GenericDocument& GenericDocument::ParseInsitu(Ch* str);
-
-// (6) 正常解析一个字符串
-template <unsigned parseFlags, typename SourceEncoding>
-GenericDocument& GenericDocument::Parse(const Ch* str);
-
-// (7) 正常解析一个字符串，使用 Document 的编码
-template <unsigned parseFlags>
-GenericDocument& GenericDocument::Parse(const Ch* str);
-
-// (8) 正常解析一个字符串，使用缺省标志
-GenericDocument& GenericDocument::Parse(const Ch* str);
-~~~~~~~~~~
-
-[教程](doc/tutorial.zh-cn.md) 中的例使用 (8) 去正常解析字符串。而 [流](doc/stream.zh-cn.md) 的例子使用前 3 个函数。我们将稍后介绍原位（*In situ*） 解析。
-
-`parseFlags` 是以下位标置的组合：
-
-解析位标志                    | 意义
-------------------------------|-----------------------------------
-`kParseNoFlags`               | 没有任何标志。
-`kParseDefaultFlags`          | 缺省的解析选项。它等于 `RAPIDJSON_PARSE_DEFAULT_FLAGS` 宏，此宏定义为 `kParseNoFlags`。
-`kParseInsituFlag`            | 原位（破坏性）解析。
-`kParseValidateEncodingFlag`  | 校验 JSON 字符串的编码。
-`kParseIterativeFlag`         | 迭代式（调用堆栈大小为常数复杂度）解析。
-`kParseStopWhenDoneFlag`      | 当从流解析了一个完整的 JSON 根节点之后，停止继续处理余下的流。当使用了此标志，解析器便不会产生 `kParseErrorDocumentRootNotSingular` 错误。可使用本标志去解析同一个流里的多个 JSON。
-`kParseFullPrecisionFlag`     | 使用完整的精确度去解析数字（较慢）。如不设置此标节，则会使用正常的精确度（较快）。正常精确度会有最多 3 个 [ULP](http://en.wikipedia.org/wiki/Unit_in_the_last_place) 的误差。
-`kParseCommentsFlag`          | 容许单行 `// ...` 及多行 `/* ... */` 注释（放宽的 JSON 语法）。
-`kParseNumbersAsStringsFlag`  | 把数字类型解析成字符串。
-`kParseTrailingCommasFlag`    | 容许在对象和数组结束前含有逗号（放宽的 JSON 语法）。
-`kParseNanAndInfFlag`         | 容许 `NaN`、`Inf`、`Infinity`、`-Inf` 及 `-Infinity` 作为 `double` 值（放宽的 JSON 语法）。
-
-由于使用了非类型模板参数，而不是函数参数，C++ 编译器能为个别组合生成代码，以改善性能及减少代码尺寸（当只用单种特化）。缺点是需要在编译期决定标志。
-
-`SourceEncoding` 参数定义流使用了什么编码。这与 `Document` 的 `Encoding` 不相同。细节可参考 [转码和校验](#TranscodingAndValidation) 一节。
-
-此外 `InputStream` 是输入流的类型。
-
-## 解析错误 {#ParseError}
-
-当解析过程顺利完成，`Document` 便会含有解析结果。当过程出现错误，原来的 DOM 会*维持不变*。可使用 `bool HasParseError()`、`ParseErrorCode GetParseError()` 及 `size_t GetErrorOffset()` 获取解析的错误状态。
-
-解析错误代号                                | 描述
---------------------------------------------|---------------------------------------------------
-`kParseErrorNone`                           | 无错误。
-`kParseErrorDocumentEmpty`                  | 文档是空的。
-`kParseErrorDocumentRootNotSingular`        | 文档的根后面不能有其它值。
-`kParseErrorValueInvalid`                   | 不合法的值。
-`kParseErrorObjectMissName`                 | Object 成员缺少名字。
-`kParseErrorObjectMissColon`                | Object 成员名字后缺少冒号。
-`kParseErrorObjectMissCommaOrCurlyBracket`  | Object 成员后缺少逗号或 `}`。
-`kParseErrorArrayMissCommaOrSquareBracket`  | Array 元素后缺少逗号或 `]` 。
-`kParseErrorStringUnicodeEscapeInvalidHex`  | String 中的 `\\u` 转义符后含非十六进位数字。
-`kParseErrorStringUnicodeSurrogateInvalid`  | String 中的代理对（surrogate pair）不合法。
-`kParseErrorStringEscapeInvalid`            | String 含非法转义字符。
-`kParseErrorStringMissQuotationMark`        | String 缺少关闭引号。
-`kParseErrorStringInvalidEncoding`          | String 含非法编码。
-`kParseErrorNumberTooBig`                   | Number 的值太大，不能存储于 `double`。
-`kParseErrorNumberMissFraction`             | Number 缺少了小数部分。
-`kParseErrorNumberMissExponent`             | Number 缺少了指数。
-
-错误的偏移量定义为从流开始至错误处的字符数量。目前 RapidJSON 不记录错误行号。
-
-要取得错误讯息，RapidJSON 在 `rapidjson/error/en.h` 中提供了英文错误讯息。使用者可以修改它用于其他语言环境，或使用一个自定义的本地化系统。
-
-以下是一个处理错误的例子。
-
-~~~~~~~~~~cpp
-#include "rapidjson/document.h"
-#include "rapidjson/error/en.h"
-
-// ...
-Document d;
-if (d.Parse(json).HasParseError()) {
-    fprintf(stderr, "\nError(offset %u): %s\n", 
-        (unsigned)d.GetErrorOffset(),
-        GetParseError_En(d.GetParseErrorCode()));
-    // ...
-}
-~~~~~~~~~~
-
-## 原位解析 {#InSituParsing}
-
-根据 [维基百科](http://en.wikipedia.org/wiki/In_situ):
-
-> *In situ* ... is a Latin phrase that translates literally to "on site" or "in position". It means "locally", "on site", "on the premises" or "in place" to describe an event where it takes place, and is used in many different contexts.
-> ...
-> (In computer science) An algorithm is said to be an in situ algorithm, or in-place algorithm, if the extra amount of memory required to execute the algorithm is O(1), that is, does not exceed a constant no matter how large the input. For example, heapsort is an in situ sorting algorithm.
-
-> 翻译：*In situ*……是一个拉丁文片语，字面上的意思是指「现场」、「在位置」。在许多不同语境中，它描述一个事件发生的位置，意指「本地」、「现场」、「在处所」、「就位」。
-> ……
-> （在计算机科学中）一个算法若称为原位算法，或在位算法，是指执行该算法所需的额外内存空间是 O(1) 的，换句话说，无论输入大小都只需要常数空间。例如，堆排序是一个原位排序算法。
-
-在正常的解析过程中，对 JSON string 解码并复制至其他缓冲区是一个很大的开销。原位解析（*in situ* parsing）把这些 JSON string 直接解码于它原来存储的地方。由于解码后的 string 长度总是短于或等于原来储存于 JSON 的 string，所以这是可行的。在这个语境下，对 JSON string 进行解码是指处理转义符，如 `"\n"`、`"\u1234"` 等，以及在 string 末端加入空终止符号 (`'\0'`)。
-
-以下的图比较正常及原位解析。JSON string 值包含指向解码后的字符串。
-
-![正常解析](diagram/normalparsing.png)
-
-在正常解析中，解码后的字符串被复制至全新分配的缓冲区中。`"\\n"`（2 个字符）被解码成 `"\n"`（1 个字符）。`"\\u0073"`（6 个字符）被解码成 `"s"`（1 个字符）。
-
-![原位解析](diagram/insituparsing.png)
-
-原位解析直接修改了原来的 JSON。图中高亮了被更新的字符。若 JSON string 不含转义符，例如 `"msg"`，那么解析过程仅仅是以空字符代替结束双引号。
-
-由于原位解析修改了输入，其解析 API 需要 `char*` 而非 `const char*`。
-
-~~~~~~~~~~cpp
-// 把整个文件读入 buffer
-FILE* fp = fopen("test.json", "r");
-fseek(fp, 0, SEEK_END);
-size_t filesize = (size_t)ftell(fp);
-fseek(fp, 0, SEEK_SET);
-char* buffer = (char*)malloc(filesize + 1);
-size_t readLength = fread(buffer, 1, filesize, fp);
-buffer[readLength] = '\0';
-fclose(fp);
-
-// 原位解析 buffer 至 d，buffer 内容会被修改。
-Document d;
-d.ParseInsitu(buffer);
-
-// 在此查询、修改 DOM……
-
-free(buffer);
-// 注意：在这个位置，d 可能含有指向已被释放的 buffer 的悬空指针
-~~~~~~~~~~
-
-JSON string 会被打上 const-string 的标志。但它们可能并非真正的「常数」。它的生命周期取决于存储 JSON 的缓冲区。
-
-原位解析把分配开销及内存复制减至最小。通常这样做能改善缓存一致性，而这对现代计算机来说是一个重要的性能因素。
-
-原位解析有以下限制：
-
-1. 整个 JSON 须存储在内存之中。
-2. 流的来源缓码与文档的目标编码必须相同。
-3. 需要保留缓冲区，直至文档不再被使用。
-4. 若 DOM 需要在解析后被长期使用，而 DOM 内只有很少 JSON string，保留缓冲区可能造成内存浪费。
-
-原位解析最适合用于短期的、用完即弃的 JSON。实际应用中，这些场合是非常普遍的，例如反序列化 JSON 至 C++ 对象、处理以 JSON 表示的 web 请求等。
-
-## 转码与校验 {#TranscodingAndValidation}
-
-RapidJSON 内部支持不同 Unicode 格式（正式的术语是 UCS 变换格式）间的转换。在 DOM 解析时，流的来源编码与 DOM 的编码可以不同。例如，来源流可能含有 UTF-8 的 JSON，而 DOM 则使用 UTF-16 编码。在 [EncodedInputStream](doc/stream.zh-cn.md) 一节里有一个例子。
-
-当从 DOM 输出一个 JSON 至输出流之时，也可以使用转码功能。在 [EncodedOutputStream](doc/stream.zh-cn.md) 一节里有一个例子。
-
-在转码过程中，会把来源 string 解码成 Unicode 码点，然后把码点编码成目标格式。在解码时，它会校验来源 string 的字节序列是否合法。若遇上非合法序列，解析器会停止并返回 `kParseErrorStringInvalidEncoding` 错误。
-
-当来源编码与 DOM 的编码相同，解析器缺省地 * 不会 * 校验序列。使用者可开启 `kParseValidateEncodingFlag` 去强制校验。
-
-# 技巧 {#Techniques}
-
-这里讨论一些 DOM API 的使用技巧。
-
-## 把 DOM 作为 SAX 事件发表者
-
-在 RapidJSON 中，利用 `Writer` 把 DOM 生成 JSON 的做法，看来有点奇怪。
-
-~~~~~~~~~~cpp
-// ...
-Writer<StringBuffer> writer(buffer);
-d.Accept(writer);
-~~~~~~~~~~
-
-实际上，`Value::Accept()` 是负责发布该值相关的 SAX 事件至处理器的。通过这个设计，`Value` 及 `Writer` 解除了偶合。`Value` 可生成 SAX 事件，而 `Writer` 则可以处理这些事件。
-
-使用者可以创建自定义的处理器，去把 DOM 转换成其它格式。例如，一个把 DOM 转换成 XML 的处理器。
-
-要知道更多关于 SAX 事件与处理器，可参阅 [SAX](doc/sax.zh-cn.md)。
-
-## 使用者缓冲区 {#UserBuffer}
-
-许多应用软件可能需要尽量减少内存分配。
-
-`MemoryPoolAllocator` 可以帮助这方面，它容许使用者提供一个缓冲区。该缓冲区可能置于程序堆栈，或是一个静态分配的「草稿缓冲区（scratch buffer）」（一个静态／全局的数组），用于储存临时数据。
-
-`MemoryPoolAllocator` 会先用使用者缓冲区去解决分配请求。当使用者缓冲区用完，就会从基础分配器（缺省为 `CrtAllocator`）分配一块内存。
-
-以下是使用堆栈内存的例子，第一个分配器用于存储值，第二个用于解析时的临时缓冲。
-
-~~~~~~~~~~cpp
-typedef GenericDocument<UTF8<>, MemoryPoolAllocator<>, MemoryPoolAllocator<>> DocumentType;
-char valueBuffer[4096];
-char parseBuffer[1024];
-MemoryPoolAllocator<> valueAllocator(valueBuffer, sizeof(valueBuffer));
-MemoryPoolAllocator<> parseAllocator(parseBuffer, sizeof(parseBuffer));
-DocumentType d(&valueAllocator, sizeof(parseBuffer), &parseAllocator);
-d.Parse(json);
-~~~~~~~~~~
-
-若解析时分配总量少于 4096+1024 字节时，这段代码不会造成任何堆内存分配（经 `new` 或 `malloc()`）。
-
-使用者可以通过 `MemoryPoolAllocator::Size()` 查询当前已分的内存大小。那么使用者可以拟定使用者缓冲区的合适大小。
diff --git a/src/sioclient/lib/rapidjson/doc/encoding.md b/src/sioclient/lib/rapidjson/doc/encoding.md
deleted file mode 100644
index e663aeac..00000000
--- a/src/sioclient/lib/rapidjson/doc/encoding.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# Encoding
-
-According to [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf),
-
-> (in Introduction) JSON text is a sequence of Unicode code points.
-
-The earlier [RFC4627](http://www.ietf.org/rfc/rfc4627.txt) stated that,
-
-> (in §3) JSON text SHALL be encoded in Unicode.  The default encoding is UTF-8.
-
-> (in §6) JSON may be represented using UTF-8, UTF-16, or UTF-32. When JSON is written in UTF-8, JSON is 8bit compatible.  When JSON is written in UTF-16 or UTF-32, the binary content-transfer-encoding must be used.
-
-RapidJSON supports various encodings. It can also validate the encodings of JSON, and transcoding JSON among encodings. All these features are implemented internally, without the need for external libraries (e.g. [ICU](http://site.icu-project.org/)).
-
-[TOC]
-
-# Unicode {#Unicode}
-From [Unicode's official website](http://www.unicode.org/standard/WhatIsUnicode.html):
-> Unicode provides a unique number for every character, 
-> no matter what the platform,
-> no matter what the program,
-> no matter what the language.
-
-Those unique numbers are called code points, which is in the range `0x0` to `0x10FFFF`.
-
-## Unicode Transformation Format {#UTF}
-
-There are various encodings for storing Unicode code points. These are called Unicode Transformation Format (UTF). RapidJSON supports the most commonly used UTFs, including
-
-* UTF-8: 8-bit variable-width encoding. It maps a code point to 1–4 bytes.
-* UTF-16: 16-bit variable-width encoding. It maps a code point to 1–2 16-bit code units (i.e., 2–4 bytes).
-* UTF-32: 32-bit fixed-width encoding. It directly maps a code point to a single 32-bit code unit (i.e. 4 bytes).
-
-For UTF-16 and UTF-32, the byte order (endianness) does matter. Within computer memory, they are often stored in the computer's endianness. However, when it is stored in file or transferred over network, we need to state the byte order of the byte sequence, either little-endian (LE) or big-endian (BE). 
-
-RapidJSON provide these encodings via the structs in `rapidjson/encodings.h`:
-
-~~~~~~~~~~cpp
-namespace rapidjson {
-
-template<typename CharType = char>
-struct UTF8;
-
-template<typename CharType = wchar_t>
-struct UTF16;
-
-template<typename CharType = wchar_t>
-struct UTF16LE;
-
-template<typename CharType = wchar_t>
-struct UTF16BE;
-
-template<typename CharType = unsigned>
-struct UTF32;
-
-template<typename CharType = unsigned>
-struct UTF32LE;
-
-template<typename CharType = unsigned>
-struct UTF32BE;
-
-} // namespace rapidjson
-~~~~~~~~~~
-
-For processing text in memory, we normally use `UTF8`, `UTF16` or `UTF32`. For processing text via I/O, we may use `UTF8`, `UTF16LE`, `UTF16BE`, `UTF32LE` or `UTF32BE`.
-
-When using the DOM-style API, the `Encoding` template parameter in `GenericValue<Encoding>` and `GenericDocument<Encoding>` indicates the encoding to be used to represent JSON string in memory. So normally we will use `UTF8`, `UTF16` or `UTF32` for this template parameter. The choice depends on operating systems and other libraries that the application is using. For example, Windows API represents Unicode characters in UTF-16, while most Linux distributions and applications prefer UTF-8.
-
-Example of UTF-16 DOM declaration:
-
-~~~~~~~~~~cpp
-typedef GenericDocument<UTF16<> > WDocument;
-typedef GenericValue<UTF16<> > WValue;
-~~~~~~~~~~
-
-For a detail example, please check the example in [DOM's Encoding](doc/stream.md) section.
-
-## Character Type {#CharacterType}
-
-As shown in the declaration, each encoding has a `CharType` template parameter. Actually, it may be a little bit confusing, but each `CharType` stores a code unit, not a character (code point). As mentioned in previous section, a code point may be encoded to 1–4 code units for UTF-8.
-
-For `UTF16(LE|BE)`, `UTF32(LE|BE)`, the `CharType` must be integer type of at least 2 and 4 bytes  respectively.
-
-Note that C++11 introduces `char16_t` and `char32_t`, which can be used for `UTF16` and `UTF32` respectively.
-
-## AutoUTF {#AutoUTF}
-
-Previous encodings are statically bound in compile-time. In other words, user must know exactly which encodings will be used in the memory or streams. However, sometimes we may need to read/write files of different encodings. The encoding needed to be decided in runtime.
-
-`AutoUTF` is an encoding designed for this purpose. It chooses which encoding to be used according to the input or output stream. Currently, it should be used with `EncodedInputStream` and `EncodedOutputStream`.
-
-## ASCII {#ASCII}
-
-Although the JSON standards did not mention about [ASCII](http://en.wikipedia.org/wiki/ASCII), sometimes we would like to write 7-bit ASCII JSON for applications that cannot handle UTF-8. Since any JSON can represent unicode characters in escaped sequence `\uXXXX`, JSON can always be encoded in ASCII.
-
-Here is an example for writing a UTF-8 DOM into ASCII:
-
-~~~~~~~~~~cpp
-using namespace rapidjson;
-Document d; // UTF8<>
-// ...
-StringBuffer buffer;
-Writer<StringBuffer, Document::EncodingType, ASCII<> > writer(buffer);
-d.Accept(writer);
-std::cout << buffer.GetString();
-~~~~~~~~~~
-
-ASCII can be used in input stream. If the input stream contains bytes with values above 127, it will cause `kParseErrorStringInvalidEncoding` error.
-
-ASCII *cannot* be used in memory (encoding of `Document` or target encoding of `Reader`), as it cannot represent Unicode code points.
-
-# Validation & Transcoding {#ValidationTranscoding}
-
-When RapidJSON parses a JSON, it can validate the input JSON, whether it is a valid sequence of a specified encoding. This option can be turned on by adding `kParseValidateEncodingFlag` in `parseFlags` template parameter.
-
-If the input encoding and output encoding is different, `Reader` and `Writer` will automatically transcode (convert) the text. In this case, `kParseValidateEncodingFlag` is not necessary, as it must decode the input sequence. And if the sequence was unable to be decoded, it must be invalid.
-
-## Transcoder {#Transcoder}
-
-Although the encoding functions in RapidJSON are designed for JSON parsing/generation, user may abuse them for transcoding of non-JSON strings.
-
-Here is an example for transcoding a string from UTF-8 to UTF-16:
-
-~~~~~~~~~~cpp
-#include "rapidjson/encodings.h"
-
-using namespace rapidjson;
-
-const char* s = "..."; // UTF-8 string
-StringStream source(s);
-GenericStringBuffer<UTF16<> > target;
-
-bool hasError = false;
-while (source.Peek() != '\0')
-    if (!Transcoder<UTF8<>, UTF16<> >::Transcode(source, target)) {
-        hasError = true;
-        break;
-    }
-
-if (!hasError) {
-    const wchar_t* t = target.GetString();
-    // ...
-}
-~~~~~~~~~~
-
-You may also use `AutoUTF` and the associated streams for setting source/target encoding in runtime.
diff --git a/src/sioclient/lib/rapidjson/doc/encoding.zh-cn.md b/src/sioclient/lib/rapidjson/doc/encoding.zh-cn.md
deleted file mode 100644
index 808ba525..00000000
--- a/src/sioclient/lib/rapidjson/doc/encoding.zh-cn.md
+++ /dev/null
@@ -1,152 +0,0 @@
-# 编码
-
-根据 [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf)：
-
-> (in Introduction) JSON text is a sequence of Unicode code points.
-> 
-> 翻译：JSON 文本是 Unicode 码点的序列。
-
-较早的 [RFC4627](http://www.ietf.org/rfc/rfc4627.txt) 申明：
-
-> (in §3) JSON text SHALL be encoded in Unicode.  The default encoding is UTF-8.
-> 
-> 翻译：JSON 文本应该以 Unicode 编码。缺省的编码为 UTF-8。
-
-> (in §6) JSON may be represented using UTF-8, UTF-16, or UTF-32. When JSON is written in UTF-8, JSON is 8bit compatible.  When JSON is written in UTF-16 or UTF-32, the binary content-transfer-encoding must be used.
-> 
-> 翻译：JSON 可使用 UTF-8、UTF-16 或 UTF-32 表示。当 JSON 以 UTF-8 写入，该 JSON 是 8 位兼容的。当 JSON 以 UTF-16 或 UTF-32 写入，就必须使用二进制的内容传送编码。
-
-RapidJSON 支持多种编码。它也能检查 JSON 的编码，以及在不同编码中进行转码。所有这些功能都是在内部实现，无需使用外部的程序库（如 [ICU](http://site.icu-project.org/)）。
-
-[TOC]
-
-# Unicode {#Unicode}
-根据 [Unicode 的官方网站](http://www.unicode.org/standard/translations/t-chinese.html)：
->Unicode 给每个字符提供了一个唯一的数字，
-不论是什么平台、
-不论是什么程序、
-不论是什么语言。
-
-这些唯一数字称为码点（code point），其范围介乎 `0x0` 至 `0x10FFFF` 之间。
-
-## Unicode 转换格式 {#UTF}
-
-存储 Unicode 码点有多种编码方式。这些称为 Unicode 转换格式（Unicode Transformation Format, UTF）。RapidJSON 支持最常用的 UTF，包括：
-
-* UTF-8：8 位可变长度编码。它把一个码点映射至 1 至 4 个字节。
-* UTF-16：16 位可变长度编码。它把一个码点映射至 1 至 2 个 16 位编码单元（即 2 至 4 个字节）。
-* UTF-32：32 位固定长度编码。它直接把码点映射至单个 32 位编码单元（即 4 字节）。
-
-对于 UTF-16 及 UTF-32 来说，字节序（endianness）是有影响的。在内存中，它们通常都是以该计算机的字节序来存储。然而，当要储存在文件中或在网上传输，我们需要指明字节序列的字节序，是小端（little endian, LE）还是大端（big-endian, BE）。 
-
-RapidJSON 通过 `rapidjson/encodings.h` 中的 struct 去提供各种编码：
-
-~~~~~~~~~~cpp
-namespace rapidjson {
-
-template<typename CharType = char>
-struct UTF8;
-
-template<typename CharType = wchar_t>
-struct UTF16;
-
-template<typename CharType = wchar_t>
-struct UTF16LE;
-
-template<typename CharType = wchar_t>
-struct UTF16BE;
-
-template<typename CharType = unsigned>
-struct UTF32;
-
-template<typename CharType = unsigned>
-struct UTF32LE;
-
-template<typename CharType = unsigned>
-struct UTF32BE;
-
-} // namespace rapidjson
-~~~~~~~~~~
-
-对于在内存中的文本，我们正常会使用 `UTF8`、`UTF16` 或 `UTF32`。对于处理经过 I/O 的文本，我们可使用 `UTF8`、`UTF16LE`、`UTF16BE`、`UTF32LE` 或 `UTF32BE`。
-
-当使用 DOM 风格的 API，`GenericValue<Encoding>` 及 `GenericDocument<Encoding>` 里的 `Encoding` 模板参数是用于指明内存中存储的 JSON 字符串使用哪种编码。因此通常我们会在此参数中使用 `UTF8`、`UTF16` 或 `UTF32`。如何选择，视乎应用软件所使用的操作系统及其他程序库。例如，Windows API 使用 UTF-16 表示 Unicode 字符，而多数的 Linux 发行版本及应用软件则更喜欢 UTF-8。
-
-使用 UTF-16 的 DOM 声明例子：
-
-~~~~~~~~~~cpp
-typedef GenericDocument<UTF16<> > WDocument;
-typedef GenericValue<UTF16<> > WValue;
-~~~~~~~~~~
-
-可以在 [DOM's Encoding](doc/stream.zh-cn.md) 一节看到更详细的使用例子。
-
-## 字符类型 {#CharacterType}
-
-从之前的声明中可以看到，每个编码都有一个 `CharType` 模板参数。这可能比较容易混淆，实际上，每个 `CharType` 存储一个编码单元，而不是一个字符（码点）。如之前所谈及，在 UTF-8 中一个码点可能会编码成 1 至 4 个编码单元。
-
-对于 `UTF16(LE|BE)` 及 `UTF32(LE|BE)` 来说，`CharType` 必须分别是一个至少 2 及 4 字节的整数类型。
-
-注意 C++11 新添了 `char16_t` 及 `char32_t` 类型，也可分别用于 `UTF16` 及 `UTF32`。
-
-## AutoUTF {#AutoUTF}
-
-上述所介绍的编码都是在编译期静态挷定的。换句话说，使用者必须知道内存或流之中使用了哪种编码。然而，有时候我们可能需要读写不同编码的文件，而且这些编码需要在运行时才能决定。
-
-`AutoUTF` 是为此而设计的编码。它根据输入或输出流来选择使用哪种编码。目前它应该与 `EncodedInputStream` 及 `EncodedOutputStream` 结合使用。
-
-## ASCII {#ASCII}
-
-虽然 JSON 标准并未提及 [ASCII](http://en.wikipedia.org/wiki/ASCII)，有时候我们希望写入 7 位的 ASCII JSON，以供未能处理 UTF-8 的应用程序使用。由于任 JSON 都可以把 Unicode 字符表示为 `\uXXXX` 转义序列，JSON 总是可用 ASCII 来编码。
-
-以下的例子把 UTF-8 的 DOM 写成 ASCII 的 JSON：
-
-~~~~~~~~~~cpp
-using namespace rapidjson;
-Document d; // UTF8<>
-// ...
-StringBuffer buffer;
-Writer<StringBuffer, Document::EncodingType, ASCII<> > writer(buffer);
-d.Accept(writer);
-std::cout << buffer.GetString();
-~~~~~~~~~~
-
-ASCII 可用于输入流。当输入流包含大于 127 的字节，就会导致 `kParseErrorStringInvalidEncoding` 错误。
-
-ASCII * 不能 * 用于内存（`Document` 的编码，或 `Reader` 的目标编码)，因为它不能表示 Unicode 码点。
-
-# 校验及转码 {#ValidationTranscoding}
-
-当 RapidJSON 解析一个 JSON 时，它能校验输入 JSON，判断它是否所标明编码的合法序列。要开启此选项，请把 `kParseValidateEncodingFlag` 加入 `parseFlags` 模板参数。
-
-若输入编码和输出编码并不相同，`Reader` 及 `Writer` 会算把文本转码。在这种情况下，并不需要 `kParseValidateEncodingFlag`，因为它必须解码输入序列。若序列不能被解码，它必然是不合法的。
-
-## 转码器 {#Transcoder}
-
-虽然 RapidJSON 的编码功能是为 JSON 解析／生成而设计，使用者也可以“滥用”它们来为非 JSON 字符串转码。
-
-以下的例子把 UTF-8 字符串转码成 UTF-16：
-
-~~~~~~~~~~cpp
-#include "rapidjson/encodings.h"
-
-using namespace rapidjson;
-
-const char* s = "..."; // UTF-8 string
-StringStream source(s);
-GenericStringBuffer<UTF16<> > target;
-
-bool hasError = false;
-while (source.Peek() != '\0')
-    if (!Transcoder<UTF8<>, UTF16<> >::Transcode(source, target)) {
-        hasError = true;
-        break;
-    }
-
-if (!hasError) {
-    const wchar_t* t = target.GetString();
-    // ...
-}
-~~~~~~~~~~
-
-你也可以用 `AutoUTF` 及对应的流来在运行时设置内源／目的之编码。
diff --git a/src/sioclient/lib/rapidjson/doc/faq.md b/src/sioclient/lib/rapidjson/doc/faq.md
deleted file mode 100644
index 1d738c02..00000000
--- a/src/sioclient/lib/rapidjson/doc/faq.md
+++ /dev/null
@@ -1,289 +0,0 @@
-# FAQ
-
-[TOC]
-
-## General
-
-1. What is RapidJSON?
-
-   RapidJSON is a C++ library for parsing and generating JSON. You may check all [features](doc/features.md) of it.
-
-2. Why is RapidJSON named so?
-
-   It is inspired by [RapidXML](http://rapidxml.sourceforge.net/), which is a fast XML DOM parser.
-
-3. Is RapidJSON similar to RapidXML?
-
-   RapidJSON borrowed some designs of RapidXML, including *in situ* parsing, header-only library. But the two APIs are completely different. Also RapidJSON provide many features that are not in RapidXML.
-
-4. Is RapidJSON free?
-
-   Yes, it is free under MIT license. It can be used in commercial applications. Please check the details in [license.txt](https://github.com/Tencent/rapidjson/blob/master/license.txt).
-
-5. Is RapidJSON small? What are its dependencies? 
-
-   Yes. A simple executable which parses a JSON and prints its statistics is less than 30KB on Windows.
-
-   RapidJSON depends on C++ standard library only.
-
-6. How to install RapidJSON?
-
-   Check [Installation section](https://miloyip.github.io/rapidjson/).
-
-7. Can RapidJSON run on my platform?
-
-   RapidJSON has been tested in many combinations of operating systems, compilers and CPU architecture by the community. But we cannot ensure that it can be run on your particular platform. Building and running the unit test suite will give you the answer.
-
-8. Does RapidJSON support C++03? C++11?
-
-   RapidJSON was firstly implemented for C++03. Later it added optional support of some C++11 features (e.g., move constructor, `noexcept`). RapidJSON shall be compatible with C++03 or C++11 compliant compilers.
-
-9. Does RapidJSON really work in real applications?
-
-   Yes. It is deployed in both client and server real applications. A community member reported that RapidJSON in their system parses 50 million JSONs daily.
-
-10. How RapidJSON is tested?
-
-   RapidJSON contains a unit test suite for automatic testing. [Travis](https://travis-ci.org/Tencent/rapidjson/)(for Linux) and [AppVeyor](https://ci.appveyor.com/project/Tencent/rapidjson/)(for Windows) will compile and run the unit test suite for all modifications. The test process also uses Valgrind (in Linux) to detect memory leaks.
-
-11. Is RapidJSON well documented?
-
-   RapidJSON provides user guide and API documentationn.
-
-12. Are there alternatives?
-
-   Yes, there are a lot alternatives. For example, [nativejson-benchmark](https://github.com/miloyip/nativejson-benchmark) has a listing of open-source C/C++ JSON libraries. [json.org](http://www.json.org/) also has a list.
-
-## JSON
-
-1. What is JSON?
-
-   JSON (JavaScript Object Notation) is a lightweight data-interchange format. It uses human readable text format. More details of JSON can be referred to [RFC7159](http://www.ietf.org/rfc/rfc7159.txt) and [ECMA-404](http://www.ecma-international.org/publications/standards/Ecma-404.htm).
-
-2. What are applications of JSON?
-
-   JSON are commonly used in web applications for transferring structured data. It is also used as a file format for data persistence.
-
-2. Does RapidJSON conform to the JSON standard?
-
-   Yes. RapidJSON is fully compliance with [RFC7159](http://www.ietf.org/rfc/rfc7159.txt) and [ECMA-404](http://www.ecma-international.org/publications/standards/Ecma-404.htm). It can handle corner cases, such as supporting null character and surrogate pairs in JSON strings.
-
-3. Does RapidJSON support relaxed syntax?
-
-   Currently no. RapidJSON only support the strict standardized format. Support on related syntax is under discussion in this [issue](https://github.com/Tencent/rapidjson/issues/36).
-
-## DOM and SAX
-
-1. What is DOM style API?
-
-   Document Object Model (DOM) is an in-memory representation of JSON for query and manipulation.
-
-2. What is SAX style API?
-
-   SAX is an event-driven API for parsing and generation.
-
-3. Should I choose DOM or SAX?
-
-   DOM is easy for query and manipulation. SAX is very fast and memory-saving but often more difficult to be applied.
-
-4. What is *in situ* parsing?
-
-   *in situ* parsing decodes the JSON strings directly into the input JSON. This is an optimization which can reduce memory consumption and improve performance, but the input JSON will be modified. Check [in-situ parsing](doc/dom.md) for details.
-
-5. When does parsing generate an error?
-
-   The parser generates an error when the input JSON contains invalid syntax, or a value can not be represented (a number is too big), or the handler of parsers terminate the parsing. Check [parse error](doc/dom.md) for details.
-
-6. What error information is provided? 
-
-   The error is stored in `ParseResult`, which includes the error code and offset (number of characters from the beginning of JSON). The error code can be translated into human-readable error message.
-
-7. Why not just using `double` to represent JSON number?
-
-   Some applications use 64-bit unsigned/signed integers. And these integers cannot be converted into `double` without loss of precision. So the parsers detects whether a JSON number is convertible to different types of integers and/or `double`.
-
-8. How to clear-and-minimize a document or value?
-
-   Call one of the `SetXXX()` methods - they call destructor which deallocates DOM data:
-
-   ~~~~~~~~~~cpp
-   Document d;
-   ...
-   d.SetObject();  // clear and minimize
-   ~~~~~~~~~~
-
-   Alternatively, use equivalent of the [C++ swap with temporary idiom](https://en.wikibooks.org/wiki/More_C%2B%2B_Idioms/Clear-and-minimize):
-   ~~~~~~~~~~cpp
-   Value(kObjectType).Swap(d);
-   ~~~~~~~~~~
-   or equivalent, but slightly longer to type:
-   ~~~~~~~~~~cpp
-   d.Swap(Value(kObjectType).Move()); 
-   ~~~~~~~~~~
-
-9. How to insert a document node into another document?
-
-   Let's take the following two DOM trees represented as JSON documents:
-   ~~~~~~~~~~cpp
-   Document person;
-   person.Parse("{\"person\":{\"name\":{\"first\":\"Adam\",\"last\":\"Thomas\"}}}");
-   
-   Document address;
-   address.Parse("{\"address\":{\"city\":\"Moscow\",\"street\":\"Quiet\"}}");
-   ~~~~~~~~~~
-   Let's assume we want to merge them in such way that the whole `address` document becomes a node of the `person`:
-   ~~~~~~~~~~js
-   { "person": {
-      "name": { "first": "Adam", "last": "Thomas" },
-      "address": { "city": "Moscow", "street": "Quiet" }
-      }
-   }
-   ~~~~~~~~~~
-
-   The most important requirement to take care of document and value life-cycle as well as consistent memory management using the right allocator during the value transfer.
-   
-   Simple yet most efficient way to achieve that is to modify the `address` definition above to initialize it with allocator of the `person` document, then we just add the root member of the value:
-   ~~~~~~~~~~cpp
-   Document address(person.GetAllocator());
-   ...
-   person["person"].AddMember("address", address["address"], person.GetAllocator());
-   ~~~~~~~~~~
-Alternatively, if we don't want to explicitly refer to the root value of `address` by name, we can refer to it via iterator:
-   ~~~~~~~~~~cpp
-   auto addressRoot = address.MemberBegin();
-   person["person"].AddMember(addressRoot->name, addressRoot->value, person.GetAllocator());
-   ~~~~~~~~~~
-   
-   Second way is to deep-clone the value from the address document:
-   ~~~~~~~~~~cpp
-   Value addressValue = Value(address["address"], person.GetAllocator());
-   person["person"].AddMember("address", addressValue, person.GetAllocator());
-   ~~~~~~~~~~
-
-## Document/Value (DOM)
-
-1. What is move semantics? Why?
-
-   Instead of copy semantics, move semantics is used in `Value`. That means, when assigning a source value to a target value, the ownership of source value is moved to the target value.
-
-   Since moving is faster than copying, this design decision forces user to aware of the copying overhead.
-
-2. How to copy a value?
-
-   There are two APIs: constructor with allocator, and `CopyFrom()`. See [Deep Copy Value](doc/tutorial.md) for an example.
-
-3. Why do I need to provide the length of string?
-
-   Since C string is null-terminated, the length of string needs to be computed via `strlen()`, with linear runtime complexity. This incurs an unnecessary overhead of many operations, if the user already knows the length of string.
-
-   Also, RapidJSON can handle `\u0000` (null character) within a string. If a string contains null characters, `strlen()` cannot return the true length of it. In such case user must provide the length of string explicitly.
-
-4. Why do I need to provide allocator parameter in many DOM manipulation API?
-
-   Since the APIs are member functions of `Value`, we do not want to save an allocator pointer in every `Value`.
-
-5. Does it convert between numerical types?
-
-   When using `GetInt()`, `GetUint()`, ... conversion may occur. For integer-to-integer conversion, it only convert when it is safe (otherwise it will assert). However, when converting a 64-bit signed/unsigned integer to double, it will convert but be aware that it may lose precision. A number with fraction, or an integer larger than 64-bit, can only be obtained by `GetDouble()`.
-
-## Reader/Writer (SAX)
-
-1. Why don't we just `printf` a JSON? Why do we need a `Writer`? 
-
-   Most importantly, `Writer` will ensure the output JSON is well-formed. Calling SAX events incorrectly (e.g. `StartObject()` pairing with `EndArray()`) will assert. Besides, `Writer` will escapes strings (e.g., `\n`). Finally, the numeric output of `printf()` may not be a valid JSON number, especially in some locale with digit delimiters. And the number-to-string conversion in `Writer` is implemented with very fast algorithms, which outperforms than `printf()` or `iostream`.
-
-2. Can I pause the parsing process and resume it later?
-
-   This is not directly supported in the current version due to performance consideration. However, if the execution environment supports multi-threading, user can parse a JSON in a separate thread, and pause it by blocking in the input stream.
-
-## Unicode
-
-1. Does it support UTF-8, UTF-16 and other format?
-
-   Yes. It fully support UTF-8, UTF-16 (LE/BE), UTF-32 (LE/BE) and ASCII. 
-
-2. Can it validate the encoding?
-
-   Yes, just pass `kParseValidateEncodingFlag` to `Parse()`. If there is invalid encoding in the stream, it will generate `kParseErrorStringInvalidEncoding` error.
-
-3. What is surrogate pair? Does RapidJSON support it?
-
-   JSON uses UTF-16 encoding when escaping unicode character, e.g. `\u5927` representing Chinese character "big". To handle characters other than those in basic multilingual plane (BMP), UTF-16 encodes those characters with two 16-bit values, which is called UTF-16 surrogate pair. For example, the Emoji character U+1F602 can be encoded as `\uD83D\uDE02` in JSON.
-
-   RapidJSON fully support parsing/generating UTF-16 surrogates. 
-
-4. Can it handle `\u0000` (null character) in JSON string?
-
-   Yes. RapidJSON fully support null character in JSON string. However, user need to be aware of it and using `GetStringLength()` and related APIs to obtain the true length of string.
-
-5. Can I output `\uxxxx` for all non-ASCII character?
-
-   Yes, use `ASCII<>` as output encoding template parameter in `Writer` can enforce escaping those characters.
-
-## Stream
-
-1. I have a big JSON file. Should I load the whole file to memory?
-
-   User can use `FileReadStream` to read the file chunk-by-chunk. But for *in situ* parsing, the whole file must be loaded.
-
-2. Can I parse JSON while it is streamed from network?
-
-   Yes. User can implement a custom stream for this. Please refer to the implementation of `FileReadStream`.
-
-3. I don't know what encoding will the JSON be. How to handle them?
-
-   You may use `AutoUTFInputStream` which detects the encoding of input stream automatically. However, it will incur some performance overhead.
-
-4. What is BOM? How RapidJSON handle it?
-
-   [Byte order mark (BOM)](http://en.wikipedia.org/wiki/Byte_order_mark) sometimes reside at the beginning of file/stream to indicate the UTF encoding type of it.
-
-   RapidJSON's `EncodedInputStream` can detect/consume BOM. `EncodedOutputStream` can optionally write a BOM. See [Encoded Streams](doc/stream.md) for example.
-
-5. Why little/big endian is related?
-
-   little/big endian of stream is an issue for UTF-16 and UTF-32 streams, but not UTF-8 stream.
-
-## Performance
-
-1. Is RapidJSON really fast?
-
-   Yes. It may be the fastest open source JSON library. There is a [benchmark](https://github.com/miloyip/nativejson-benchmark) for evaluating performance of C/C++ JSON libraries.
-
-2. Why is it fast?
-
-   Many design decisions of RapidJSON is aimed at time/space performance. These may reduce user-friendliness of APIs. Besides, it also employs low-level optimizations (intrinsics, SIMD) and special algorithms (custom double-to-string, string-to-double conversions).
-
-3. What is SIMD? How it is applied in RapidJSON?
-
-   [SIMD](http://en.wikipedia.org/wiki/SIMD) instructions can perform parallel computation in modern CPUs. RapidJSON support Intel's SSE2/SSE4.2 and ARM's Neon to accelerate whitespace/tabspace/carriage-return/line-feed skipping. This improves performance of parsing indent formatted JSON. Define `RAPIDJSON_SSE2`, `RAPIDJSON_SSE42` or `RAPIDJSON_NEON` macro to enable this feature. However, running the executable on a machine without such instruction set support will make it crash.
-
-4. Does it consume a lot of memory?
-
-   The design of RapidJSON aims at reducing memory footprint.
-
-   In the SAX API, `Reader` consumes memory proportional to maximum depth of JSON tree, plus maximum length of JSON string.
-
-   In the DOM API, each `Value` consumes exactly 16/24 bytes for 32/64-bit architecture respectively. RapidJSON also uses a special memory allocator to minimize overhead of allocations.
-
-5. What is the purpose of being high performance?
-
-   Some applications need to process very large JSON files. Some server-side applications need to process huge amount of JSONs. Being high performance can improve both latency and throughput. In a broad sense, it will also save energy.
-
-## Gossip
-
-1. Who are the developers of RapidJSON?
-
-   Milo Yip ([miloyip](https://github.com/miloyip)) is the original author of RapidJSON. Many contributors from the world have improved RapidJSON.  Philipp A. Hartmann ([pah](https://github.com/pah)) has implemented a lot of improvements, setting up automatic testing and also involves in a lot of discussions for the community. Don Ding ([thebusytypist](https://github.com/thebusytypist)) implemented the iterative parser. Andrii Senkovych ([jollyroger](https://github.com/jollyroger)) completed the CMake migration. Kosta ([Kosta-Github](https://github.com/Kosta-Github)) provided a very neat short-string optimization. Thank you for all other contributors and community members as well.
-
-2. Why do you develop RapidJSON?
-
-   It was just a hobby project initially in 2011. Milo Yip is a game programmer and he just knew about JSON at that time and would like to apply JSON in future projects. As JSON seems very simple he would like to write a header-only and fast library.
-
-3. Why there is a long empty period of development?
-
-   It is basically due to personal issues, such as getting new family members. Also, Milo Yip has spent a lot of spare time on translating "Game Engine Architecture" by Jason Gregory into Chinese.
-
-4. Why did the repository move from Google Code to GitHub?
-
-   This is the trend. And GitHub is much more powerful and convenient.
diff --git a/src/sioclient/lib/rapidjson/doc/faq.zh-cn.md b/src/sioclient/lib/rapidjson/doc/faq.zh-cn.md
deleted file mode 100644
index f279acfe..00000000
--- a/src/sioclient/lib/rapidjson/doc/faq.zh-cn.md
+++ /dev/null
@@ -1,290 +0,0 @@
-# 常见问题
-
-[TOC]
-
-## 一般问题
-
-1. RapidJSON 是什么？
-
-   RapidJSON 是一个 C++ 库，用于解析及生成 JSON。读者可参考它的所有 [特点](doc/features.zh-cn.md)。
-
-2. 为什么称作 RapidJSON？
-
-   它的灵感来自于 [RapidXML](http://rapidxml.sourceforge.net/)，RapidXML 是一个高速的 XML DOM 解析器。
-
-3. RapidJSON 与 RapidXML 相似么？
-
-   RapidJSON 借镜了 RapidXML 的一些设计, 包括原位（*in situ*）解析、只有头文件的库。但两者的 API 是完全不同的。此外 RapidJSON 也提供许多 RapidXML 没有的特点。
-
-4. RapidJSON 是免费的么？
-
-   是的，它在 MIT 特許條款下免费。它可用于商业软件。详情请参看 [license.txt](https://github.com/Tencent/rapidjson/blob/master/license.txt)。
-
-5. RapidJSON 很小么？它有何依赖？
-
-   是的。在 Windows 上，一个解析 JSON 并打印出统计的可执行文件少于 30KB。
-
-   RapidJSON 仅依赖于 C++ 标准库。
-
-6. 怎样安装 RapidJSON？
-
-   见 [安装一节](../readme.zh-cn.md#安装)。
-
-7. RapidJSON 能否运行于我的平台？
-
-   社区已在多个操作系统／编译器／CPU 架构的组合上测试 RapidJSON。但我们无法确保它能运行于你特定的平台上。只需要生成及执行单元测试便能获取答案。
-
-8. RapidJSON 支持 C++03 么？C++11 呢？
-
-   RapidJSON 开始时在 C++03 上实现。后来加入了可选的 C++11 特性支持（如转移构造函数、`noexcept`）。RapidJSON 应该兼容所有遵从 C++03 或 C++11 的编译器。
-
-9. RapidJSON 是否真的用于实际应用？
-
-   是的。它被配置于前台及后台的真实应用中。一个社区成员说 RapidJSON 在他们的系统中每日解析 5 千万个 JSON。
-
-10. RapidJSON 是如何被测试的？
-
-   RapidJSON 包含一组单元测试去执行自动测试。[Travis](https://travis-ci.org/Tencent/rapidjson/)（供 Linux 平台）及 [AppVeyor](https://ci.appveyor.com/project/Tencent/rapidjson/)（供 Windows 平台）会对所有修改进行编译及执行单元测试。在 Linux 下还会使用 Valgrind 去检测内存泄漏。
-
-11. RapidJSON 是否有完整的文档？
-
-   RapidJSON 提供了使用手册及 API 说明文档。
-
-12. 有没有其他替代品？
-
-   有许多替代品。例如 [nativejson-benchmark](https://github.com/miloyip/nativejson-benchmark) 列出了一些开源的 C/C++ JSON 库。[json.org](http://www.json.org/) 也有一个列表。
-
-## JSON
-
-1. 什么是 JSON？
-
-   JSON (JavaScript Object Notation) 是一个轻量的数据交换格式。它使用人类可读的文本格式。更多关于 JSON 的细节可考 [RFC7159](http://www.ietf.org/rfc/rfc7159.txt) 及 [ECMA-404](http://www.ecma-international.org/publications/standards/Ecma-404.htm)。
-
-2. JSON 有什么应用场合？
-
-   JSON 常用于网页应用程序，以传送结构化数据。它也可作为文件格式用于数据持久化。
-
-2. RapidJSON 是否符合 JSON 标准？
-
-   是。RapidJSON 完全符合 [RFC7159](http://www.ietf.org/rfc/rfc7159.txt) 及 [ECMA-404](http://www.ecma-international.org/publications/standards/Ecma-404.htm)。它能处理一些特殊情况，例如支持 JSON 字符串中含有空字符及代理对（surrogate pair）。
-
-3. RapidJSON 是否支持宽松的语法？
-
-   现时不支持。RapidJSON 只支持严格的标准格式。宽松语法现时在这 [issue](https://github.com/Tencent/rapidjson/issues/36) 中进行讨论。
-
-## DOM 与 SAX
-
-1. 什么是 DOM 风格 API？
-
-   Document Object Model（DOM）是一个储存于内存的 JSON 表示方式，用于查询及修改 JSON。
-
-2. 什么是 SAX 风格 API?
-
-   SAX 是一个事件驱动的 API，用于解析及生成 JSON。
-
-3. 我应用 DOM 还是 SAX？
-
-   DOM 易于查询及修改。SAX 则是非常快及省内存的，但通常较难使用。
-
-4. 什么是原位（*in situ*）解析？
-
-   原位解析会把 JSON 字符串直接解码至输入的 JSON 中。这是一个优化，可减少内存消耗及提升性能，但输入的 JSON 会被更改。进一步细节请参考 [原位解析](doc/dom.zh-cn.md) 。
-
-5. 什么时候会产生解析错误？
-
-   当输入的 JSON 包含非法语法，或不能表示一个值（如 Number 太大），或解析器的处理器中断解析过程，解析器都会产生一个错误。详情请参考 [解析错误](doc/dom.zh-cn.md)。
-
-6. 有什么错误信息？
-
-   错误信息存储在 `ParseResult`，它包含错误代号及偏移值（从 JSON 开始至错误处的字符数目）。可以把错误代号翻译为人类可读的错误讯息。
-
-7. 为何不只使用 `double` 去表示 JSON number？
-
-   一些应用需要使用 64 位无号／有号整数。这些整数不能无损地转换成 `double`。因此解析器会检测一个 JSON number 是否能转换至各种整数类型及 `double`。
-
-8. 如何清空并最小化 `document` 或 `value` 的容量？
-
-   调用 `SetXXX()` 方法 - 这些方法会调用析构函数，并重建空的 Object 或 Array:
-
-   ~~~~~~~~~~cpp
-   Document d;
-   ...
-   d.SetObject();  // clear and minimize
-   ~~~~~~~~~~
-
-   另外，也可以参考在 [C++ swap with temporary idiom](https://en.wikibooks.org/wiki/More_C%2B%2B_Idioms/Clear-and-minimize) 中的一种等价的方法:
-   ~~~~~~~~~~cpp
-   Value(kObjectType).Swap(d);
-   ~~~~~~~~~~
-   或者，使用这个稍微长一点的代码也能完成同样的事情:
-   ~~~~~~~~~~cpp
-   d.Swap(Value(kObjectType).Move()); 
-   ~~~~~~~~~~
-
-9. 如何将一个 `document` 节点插入到另一个 `document` 中？
-
-   比如有以下两个 document(DOM):
-   ~~~~~~~~~~cpp
-   Document person;
-   person.Parse("{\"person\":{\"name\":{\"first\":\"Adam\",\"last\":\"Thomas\"}}}");
-   
-   Document address;
-   address.Parse("{\"address\":{\"city\":\"Moscow\",\"street\":\"Quiet\"}}");
-   ~~~~~~~~~~
-   假设我们希望将整个 `address` 插入到 `person` 中，作为其的一个子节点:
-   ~~~~~~~~~~js
-   { "person": {
-      "name": { "first": "Adam", "last": "Thomas" },
-      "address": { "city": "Moscow", "street": "Quiet" }
-      }
-   }
-   ~~~~~~~~~~
-
-   在插入节点的过程中需要注意 `document` 和 `value` 的生命周期并且正确地使用 allocator 进行内存分配和管理。
-
-   一个简单有效的方法就是修改上述 `address` 变量的定义，让其使用 `person` 的 allocator 初始化，然后将其添加到根节点。
-
-   ~~~~~~~~~~cpp
-   Documnet address(person.GetAllocator());
-   ...
-   person["person"].AddMember("address", address["address"], person.GetAllocator());
-   ~~~~~~~~~~
-   当然，如果你不想通过显式地写出 `address` 的 key 来得到其值，可以使用迭代器来实现:
-   ~~~~~~~~~~cpp
-   auto addressRoot = address.MemberBegin();
-   person["person"].AddMember(addressRoot->name, addressRoot->value, person.GetAllocator());
-   ~~~~~~~~~~
-   
-   此外，还可以通过深拷贝 address document 来实现:
-   ~~~~~~~~~~cpp
-   Value addressValue = Value(address["address"], person.GetAllocator());
-   person["person"].AddMember("address", addressValue, person.GetAllocator());
-   ~~~~~~~~~~
-
-## Document/Value (DOM)
-
-1. 什么是转移语义？为什么？
-
-   `Value` 不用复制语义，而使用了转移语义。这是指，当把来源值赋值于目标值时，来源值的所有权会转移至目标值。
-
-   由于转移快于复制，此设计决定强迫使用者注意到复制的消耗。
-
-2. 怎样去复制一个值？
-
-   有两个 API 可用：含 allocator 的构造函数，以及 `CopyFrom()`。可参考 [深复制 Value](doc/tutorial.zh-cn.md) 里的用例。
-
-3. 为什么我需要提供字符串的长度？
-
-   由于 C 字符串是空字符结尾的，需要使用 `strlen()` 去计算其长度，这是线性复杂度的操作。若使用者已知字符串的长度，对很多操作来说会造成不必要的消耗。
-
-   此外，RapidJSON 可处理含有 `\u0000`（空字符）的字符串。若一个字符串含有空字符，`strlen()` 便不能返回真正的字符串长度。在这种情况下使用者必须明确地提供字符串长度。
-
-4. 为什么在许多 DOM 操作 API 中要提供分配器作为参数？
-
-   由于这些 API 是 `Value` 的成员函数，我们不希望为每个 `Value` 储存一个分配器指针。
-
-5. 它会转换各种数值类型么？
-
-   当使用 `GetInt()`、`GetUint()` 等 API 时，可能会发生转换。对于整数至整数转换，仅当保证转换安全才会转换（否则会断言失败）。然而，当把一个 64 位有号／无号整数转换至 double 时，它会转换，但有可能会损失精度。含有小数的数字、或大于 64 位的整数，都只能使用 `GetDouble()` 获取其值。
-
-## Reader/Writer (SAX)
-
-1. 为什么不仅仅用 `printf` 输出一个 JSON？为什么需要 `Writer`？
-
-   最重要的是，`Writer` 能确保输出的 JSON 是格式正确的。错误地调用 SAX 事件（如 `StartObject()` 错配 `EndArray()`）会造成断言失败。此外，`Writer` 会把字符串进行转义（如 `\n`）。最后，`printf()` 的数值输出可能并不是一个合法的 JSON number，特别是某些 locale 会有数字分隔符。而且 `Writer` 的数值字符串转换是使用非常快的算法来实现的，胜过 `printf()` 及 `iostream`。
-
-2. 我能否暂停解析过程，并在稍后继续？
-
-   基于性能考虑，目前版本并不直接支持此功能。然而，若执行环境支持多线程，使用者可以在另一线程解析 JSON，并通过阻塞输入流去暂停。
-
-## Unicode
-
-1. 它是否支持 UTF-8、UTF-16 及其他格式？
-
-   是。它完全支持 UTF-8、UTF-16（大端／小端）、UTF-32（大端／小端）及 ASCII。
-
-2. 它能否检测编码的合法性？
-
-   能。只需把 `kParseValidateEncodingFlag` 参考传给 `Parse()`。若发现在输入流中有非法的编码，它就会产生 `kParseErrorStringInvalidEncoding` 错误。
-
-3. 什么是代理对（surrogate pair)？RapidJSON 是否支持？
-
-   JSON 使用 UTF-16 编码去转义 Unicode 字符，例如 `\u5927` 表示中文字“大”。要处理基本多文种平面（basic multilingual plane，BMP）以外的字符时，UTF-16 会把那些字符编码成两个 16 位值，这称为 UTF-16 代理对。例如，绘文字字符 U+1F602 在 JSON 中可被编码成 `\uD83D\uDE02`。
-
-   RapidJSON 完全支持解析及生成 UTF-16 代理对。 
-
-4. 它能否处理 JSON 字符串中的 `\u0000`（空字符）？
-
-   能。RapidJSON 完全支持 JSON 字符串中的空字符。然而，使用者需要注意到这件事，并使用 `GetStringLength()` 及相关 API 去取得字符串真正长度。
-
-5. 能否对所有非 ASCII 字符输出成 `\uxxxx` 形式？
-
-   可以。只要在 `Writer` 中使用 `ASCII<>` 作为输出编码参数，就可以强逼转义那些字符。
-
-## 流
-
-1. 我有一个很大的 JSON 文件。我应否把它整个载入内存中？
-
-   使用者可使用 `FileReadStream` 去逐块读入文件。但若使用于原位解析，必须载入整个文件。
-
-2. 我能否解析一个从网络上串流进来的 JSON？
-
-   可以。使用者可根据 `FileReadStream` 的实现，去实现一个自定义的流。
-
-3. 我不知道一些 JSON 将会使用哪种编码。怎样处理它们？
-
-   你可以使用 `AutoUTFInputStream`，它能自动检测输入流的编码。然而，它会带来一些性能开销。
-
-4. 什么是 BOM？RapidJSON 怎样处理它？
-
-   [字节顺序标记（byte order mark, BOM）](http://en.wikipedia.org/wiki/Byte_order_mark) 有时会出现于文件／流的开始，以表示其 UTF 编码类型。
-
-   RapidJSON 的 `EncodedInputStream` 可检测／跳过 BOM。`EncodedOutputStream` 可选择是否写入 BOM。可参考 [编码流](doc/stream.zh-cn.md) 中的例子。
-
-5. 为什么会涉及大端／小端？
-
-   流的大端／小端是 UTF-16 及 UTF-32 流要处理的问题，而 UTF-8 不需要处理。
-
-## 性能
-
-1. RapidJSON 是否真的快？
-
-   是。它可能是最快的开源 JSON 库。有一个 [评测](https://github.com/miloyip/nativejson-benchmark) 评估 C/C++ JSON 库的性能。
-
-2. 为什么它会快？
-
-   RapidJSON 的许多设计是针对时间／空间性能来设计的，这些决定可能会影响 API 的易用性。此外，它也使用了许多底层优化（内部函数／intrinsic、SIMD）及特别的算法（自定义的 double 至字符串转换、字符串至 double 的转换）。
-
-3. 什是是 SIMD？它如何用于 RapidJSON？
-
-   [SIMD](http://en.wikipedia.org/wiki/SIMD) 指令可以在现代 CPU 中执行并行运算。RapidJSON 支持使用 Intel 的 SSE2/SSE4.2 和 ARM 的 Neon 来加速对空白符、制表符、回车符和换行符的过滤处理。在解析含缩进的 JSON 时，这能提升性能。只要定义名为 `RAPIDJSON_SSE2` ，`RAPIDJSON_SSE42` 或 `RAPIDJSON_NEON` 的宏，就能启动这个功能。然而，若在不支持这些指令集的机器上执行这些可执行文件，会导致崩溃。
-
-4. 它会消耗许多内存么？
-
-   RapidJSON 的设计目标是减低内存占用。
-
-   在 SAX API 中，`Reader` 消耗的内存与 JSON 树深度加上最长 JSON 字符成正比。
-
-   在 DOM API 中，每个 `Value` 在 32/64 位架构下分别消耗 16/24 字节。RapidJSON 也使用一个特殊的内存分配器去减少分配的额外开销。
-
-5. 高性能的意义何在？
-
-   有些应用程序需要处理非常大的 JSON 文件。而有些后台应用程序需要处理大量的 JSON。达到高性能同时改善延时及吞吐量。更广义来说，这也可以节省能源。
-
-## 八挂
-
-1. 谁是 RapidJSON 的开发者？
-
-   叶劲峰（Milo Yip，[miloyip](https://github.com/miloyip)）是 RapidJSON 的原作者。全世界许多贡献者一直在改善 RapidJSON。Philipp A. Hartmann（[pah](https://github.com/pah)）实现了许多改进，也设置了自动化测试，而且还参与许多社区讨论。丁欧南（Don Ding，[thebusytypist](https://github.com/thebusytypist)）实现了迭代式解析器。Andrii Senkovych（[jollyroger](https://github.com/jollyroger)）完成了向 CMake 的迁移。Kosta（[Kosta-Github](https://github.com/Kosta-Github)）提供了一个非常灵巧的短字符串优化。也需要感谢其他献者及社区成员。
-
-2. 为何你要开发 RapidJSON？
-
-   在 2011 年开始这项目是，它仅一个兴趣项目。Milo Yip 是一个游戏程序员，他在那时候认识到 JSON 并希望在未来的项目中使用。由于 JSON 好像很简单，他希望写一个仅有头文件并且快速的程序库。
-
-3. 为什么开发中段有一段长期空档？
-
-   主要是个人因素，例如加入新家庭成员。另外，Milo Yip 也花了许多业馀时间去翻译 Jason Gregory 的《Game Engine Architecture》至中文版《游戏引擎架构》。
-
-4. 为什么这个项目从 Google Code 搬到 GitHub？
-
-   这是大势所趋，而且 GitHub 更为强大及方便。
diff --git a/src/sioclient/lib/rapidjson/doc/features.md b/src/sioclient/lib/rapidjson/doc/features.md
deleted file mode 100644
index 0d79e7f8..00000000
--- a/src/sioclient/lib/rapidjson/doc/features.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# Features
-
-## General
-
-* Cross-platform
- * Compilers: Visual Studio, gcc, clang, etc.
- * Architectures: x86, x64, ARM, etc.
- * Operating systems: Windows, Mac OS X, Linux, iOS, Android, etc.
-* Easy installation
- * Header files only library. Just copy the headers to your project.
-* Self-contained, minimal dependences
- * No STL, BOOST, etc.
- * Only included `<cstdio>`, `<cstdlib>`, `<cstring>`, `<inttypes.h>`, `<new>`, `<stdint.h>`. 
-* Without C++ exception, RTTI
-* High performance
- * Use template and inline functions to reduce function call overheads.
- * Internal optimized Grisu2 and floating point parsing implementations.
- * Optional SSE2/SSE4.2 support.
-
-## Standard compliance
-
-* RapidJSON should be fully RFC4627/ECMA-404 compliance.
-* Support JSON Pointer (RFC6901).
-* Support JSON Schema Draft v4.
-* Support Unicode surrogate.
-* Support null character (`"\u0000"`)
- * For example, `["Hello\u0000World"]` can be parsed and handled gracefully. There is API for getting/setting lengths of string.
-* Support optional relaxed syntax.
- * Single line (`// ...`) and multiple line (`/* ... */`) comments (`kParseCommentsFlag`). 
- * Trailing commas at the end of objects and arrays (`kParseTrailingCommasFlag`).
- * `NaN`, `Inf`, `Infinity`, `-Inf` and `-Infinity` as `double` values (`kParseNanAndInfFlag`)
-* [NPM compliant](http://github.com/Tencent/rapidjson/blob/master/doc/npm.md).
-
-## Unicode
-
-* Support UTF-8, UTF-16, UTF-32 encodings, including little endian and big endian.
- * These encodings are used in input/output streams and in-memory representation.
-* Support automatic detection of encodings in input stream.
-* Support transcoding between encodings internally.
- * For example, you can read a UTF-8 file and let RapidJSON transcode the JSON strings into UTF-16 in the DOM.
-* Support encoding validation internally.
- * For example, you can read a UTF-8 file, and let RapidJSON check whether all JSON strings are valid UTF-8 byte sequence.
-* Support custom character types.
- * By default the character types are `char` for UTF8, `wchar_t` for UTF16, `uint32_t` for UTF32.
-* Support custom encodings.
-
-## API styles
-
-* SAX (Simple API for XML) style API
- * Similar to [SAX](http://en.wikipedia.org/wiki/Simple_API_for_XML), RapidJSON provides a event sequential access parser API (`rapidjson::GenericReader`). It also provides a generator API (`rapidjson::Writer`) which consumes the same set of events.
-* DOM (Document Object Model) style API
- * Similar to [DOM](http://en.wikipedia.org/wiki/Document_Object_Model) for HTML/XML, RapidJSON can parse JSON into a DOM representation (`rapidjson::GenericDocument`), for easy manipulation, and finally stringify back to JSON if needed.
- * The DOM style API (`rapidjson::GenericDocument`) is actually implemented with SAX style API (`rapidjson::GenericReader`). SAX is faster but sometimes DOM is easier. Users can pick their choices according to scenarios.
-
-## Parsing
-
-* Recursive (default) and iterative parser
- * Recursive parser is faster but prone to stack overflow in extreme cases.
- * Iterative parser use custom stack to keep parsing state.
-* Support *in situ* parsing.
- * Parse JSON string values in-place at the source JSON, and then the DOM points to addresses of those strings.
- * Faster than convention parsing: no allocation for strings, no copy (if string does not contain escapes), cache-friendly.
-* Support 32-bit/64-bit signed/unsigned integer and `double` for JSON number type.
-* Support parsing multiple JSONs in input stream (`kParseStopWhenDoneFlag`).
-* Error Handling
- * Support comprehensive error code if parsing failed.
- * Support error message localization.
-
-## DOM (Document)
-
-* RapidJSON checks range of numerical values for conversions.
-* Optimization for string literal
- * Only store pointer instead of copying
-* Optimization for "short" strings
- * Store short string in `Value` internally without additional allocation.
- * For UTF-8 string: maximum 11 characters in 32-bit, 21 characters in 64-bit (13 characters in x86-64).
-* Optionally support `std::string` (define `RAPIDJSON_HAS_STDSTRING=1`)
-
-## Generation
-
-* Support `rapidjson::PrettyWriter` for adding newlines and indentations.
-
-## Stream
-
-* Support `rapidjson::GenericStringBuffer` for storing the output JSON as string.
-* Support `rapidjson::FileReadStream` and `rapidjson::FileWriteStream` for input/output `FILE` object.
-* Support custom streams.
-
-## Memory
-
-* Minimize memory overheads for DOM.
- * Each JSON value occupies exactly 16/20 bytes for most 32/64-bit machines (excluding text string).
-* Support fast default allocator.
- * A stack-based allocator (allocate sequentially, prohibit to free individual allocations, suitable for parsing).
- * User can provide a pre-allocated buffer. (Possible to parse a number of JSONs without any CRT allocation)
-* Support standard CRT(C-runtime) allocator.
-* Support custom allocators.
-
-## Miscellaneous
-
-* Some C++11 support (optional)
- * Rvalue reference
- * `noexcept` specifier
- * Range-based for loop
diff --git a/src/sioclient/lib/rapidjson/doc/features.zh-cn.md b/src/sioclient/lib/rapidjson/doc/features.zh-cn.md
deleted file mode 100644
index 7662cc13..00000000
--- a/src/sioclient/lib/rapidjson/doc/features.zh-cn.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# 特点
-
-## 总体
-
-* 跨平台
- * 编译器：Visual Studio、gcc、clang 等
- * 架构：x86、x64、ARM 等
- * 操作系统：Windows、Mac OS X、Linux、iOS、Android 等
-* 容易安装
- * 只有头文件的库。只需把头文件复制至你的项目中。
-* 独立、最小依赖
- * 不需依赖 STL、BOOST 等。
- * 只包含 `<cstdio>`, `<cstdlib>`, `<cstring>`, `<inttypes.h>`, `<new>`, `<stdint.h>`。 
-* 没使用 C++ 异常、RTTI
-* 高性能
- * 使用模版及内联函数去降低函数调用开销。
- * 内部经优化的 Grisu2 及浮点数解析实现。
- * 可选的 SSE2/SSE4.2 支持。
-
-## 符合标准
-
-* RapidJSON 应完全符合 RFC4627/ECMA-404 标准。
-* 支持 JSON Pointer (RFC6901).
-* 支持 JSON Schema Draft v4.
-* 支持 Unicode 代理对（surrogate pair）。
-* 支持空字符（`"\u0000"`）。
- * 例如，可以优雅地解析及处理 `["Hello\u0000World"]`。含读写字符串长度的 API。
-* 支持可选的放宽语法
- * 单行（`// ...`）及多行（`/* ... */`） 注释 (`kParseCommentsFlag`)。
- * 在对象和数组结束前含逗号 (`kParseTrailingCommasFlag`)。
- * `NaN`、`Inf`、`Infinity`、`-Inf` 及 `-Infinity` 作为 `double` 值 (`kParseNanAndInfFlag`)
-* [NPM 兼容](https://github.com/Tencent/rapidjson/blob/master/doc/npm.md).
-
-## Unicode
-
-* 支持 UTF-8、UTF-16、UTF-32 编码，包括小端序和大端序。
- * 这些编码用于输入输出流，以及内存中的表示。
-* 支持从输入流自动检测编码。
-* 内部支持编码的转换。
- * 例如，你可以读取一个 UTF-8 文件，让 RapidJSON 把 JSON 字符串转换至 UTF-16 的 DOM。
-* 内部支持编码校验。
- * 例如，你可以读取一个 UTF-8 文件，让 RapidJSON 检查是否所有 JSON 字符串是合法的 UTF-8 字节序列。
-* 支持自定义的字符类型。
- * 预设的字符类型是：UTF-8 为 `char`，UTF-16 为 `wchar_t`，UTF32 为 `uint32_t`。
-* 支持自定义的编码。
-
-## API 风格
-
-* SAX（Simple API for XML）风格 API
- * 类似于 [SAX](http://en.wikipedia.org/wiki/Simple_API_for_XML), RapidJSON 提供一个事件循序访问的解析器 API（`rapidjson::GenericReader`）。RapidJSON 也提供一个生成器 API（`rapidjson::Writer`），可以处理相同的事件集合。
-* DOM（Document Object Model）风格 API
- * 类似于 HTML／XML 的 [DOM](http://en.wikipedia.org/wiki/Document_Object_Model)，RapidJSON 可把 JSON 解析至一个 DOM 表示方式（`rapidjson::GenericDocument`），以方便操作。如有需要，可把 DOM 转换（stringify）回 JSON。
- * DOM 风格 API（`rapidjson::GenericDocument`）实际上是由 SAX 风格 API（`rapidjson::GenericReader`）实现的。SAX 更快，但有时 DOM 更易用。用户可根据情况作出选择。
-
-## 解析
-
-* 递归式（预设）及迭代式解析器
- * 递归式解析器较快，但在极端情况下可出现堆栈溢出。
- * 迭代式解析器使用自定义的堆栈去维持解析状态。
-* 支持原位（*in situ*）解析。
- * 把 JSON 字符串的值解析至原 JSON 之中，然后让 DOM 指向那些字符串。
- * 比常规分析更快：不需字符串的内存分配、不需复制（如字符串不含转义符）、缓存友好。
-* 对于 JSON 数字类型，支持 32-bit/64-bit 的有号／无号整数，以及 `double`。
-* 错误处理
- * 支持详尽的解析错误代号。
- * 支持本地化错误信息。
-
-## DOM (Document)
-
-* RapidJSON 在类型转换时会检查数值的范围。
-* 字符串字面量的优化
- * 只储存指针，不作复制
-* 优化“短”字符串
- * 在 `Value` 内储存短字符串，无需额外分配。
- * 对 UTF-8 字符串来说，32 位架构下可存储最多 11 字符，64 位下 21 字符（x86-64 下 13 字符）。
-* 可选地支持 `std::string`（定义 `RAPIDJSON_HAS_STDSTRING=1`）
-
-## 生成
-
-* 支持 `rapidjson::PrettyWriter` 去加入换行及缩进。
-
-## 输入输出流
-
-* 支持 `rapidjson::GenericStringBuffer`，把输出的 JSON 储存于字符串内。
-* 支持 `rapidjson::FileReadStream` 及 `rapidjson::FileWriteStream`，使用 `FILE` 对象作输入输出。
-* 支持自定义输入输出流。
-
-## 内存
-
-* 最小化 DOM 的内存开销。
- * 对大部分 32／64 位机器而言，每个 JSON 值只占 16 或 20 字节（不包含字符串）。
-* 支持快速的预设分配器。
- * 它是一个堆栈形式的分配器（顺序分配，不容许单独释放，适合解析过程之用）。
- * 使用者也可提供一个预分配的缓冲区。（有可能达至无需 CRT 分配就能解析多个 JSON）
-* 支持标准 CRT（C-runtime）分配器。
-* 支持自定义分配器。
-
-## 其他
-
-* 一些 C++11 的支持（可选）
- * 右值引用（rvalue reference）
- * `noexcept` 修饰符
- * 范围 for 循环
diff --git a/src/sioclient/lib/rapidjson/doc/internals.md b/src/sioclient/lib/rapidjson/doc/internals.md
deleted file mode 100644
index 706f98cb..00000000
--- a/src/sioclient/lib/rapidjson/doc/internals.md
+++ /dev/null
@@ -1,368 +0,0 @@
-# Internals
-
-This section records some design and implementation details.
-
-[TOC]
-
-# Architecture {#Architecture}
-
-## SAX and DOM
-
-The basic relationships of SAX and DOM is shown in the following UML diagram.
-
-![Architecture UML class diagram](diagram/architecture.png)
-
-The core of the relationship is the `Handler` concept. From the SAX side, `Reader` parses a JSON from a stream and publish events to a `Handler`. `Writer` implements the `Handler` concept to handle the same set of events. From the DOM side, `Document` implements the `Handler` concept to build a DOM according to the events. `Value` supports a `Value::Accept(Handler&)` function, which traverses the DOM to publish events.
-
-With this design, SAX is not dependent on DOM. Even `Reader` and `Writer` have no dependencies between them. This provides flexibility to chain event publisher and handlers. Besides, `Value` does not depends on SAX as well. So, in addition to stringify a DOM to JSON, user may also stringify it to a XML writer, or do anything else.
-
-## Utility Classes
-
-Both SAX and DOM APIs depends on 3 additional concepts: `Allocator`, `Encoding` and `Stream`. Their inheritance hierarchy is shown as below.
-
-![Utility classes UML class diagram](diagram/utilityclass.png)
-
-# Value {#Value}
-
-`Value` (actually a typedef of `GenericValue<UTF8<>>`) is the core of DOM API. This section describes the design of it.
-
-## Data Layout {#DataLayout}
-
-`Value` is a [variant type](http://en.wikipedia.org/wiki/Variant_type). In RapidJSON's context, an instance of `Value` can contain 1 of 6 JSON value types. This is possible by using `union`. Each `Value` contains two members: `union Data data_` and a`unsigned flags_`. The `flags_` indicates the JSON type, and also additional information. 
-
-The following tables show the data layout of each type. The 32-bit/64-bit columns indicates the size of the field in bytes.
-
-| Null              |                                  |32-bit|64-bit|
-|-------------------|----------------------------------|:----:|:----:|
-| (unused)          |                                  |4     |8     | 
-| (unused)          |                                  |4     |4     |
-| (unused)          |                                  |4     |4     |
-| `unsigned flags_` | `kNullType kNullFlag`            |4     |4     |
-
-| Bool              |                                                    |32-bit|64-bit|
-|-------------------|----------------------------------------------------|:----:|:----:|
-| (unused)          |                                                    |4     |8     | 
-| (unused)          |                                                    |4     |4     |
-| (unused)          |                                                    |4     |4     |
-| `unsigned flags_` | `kBoolType` (either `kTrueFlag` or `kFalseFlag`) |4     |4     |
-
-| String              |                                     |32-bit|64-bit|
-|---------------------|-------------------------------------|:----:|:----:|
-| `Ch* str`           | Pointer to the string (may own)     |4     |8     | 
-| `SizeType length`   | Length of string                    |4     |4     |
-| (unused)            |                                     |4     |4     |
-| `unsigned flags_`   | `kStringType kStringFlag ...`       |4     |4     |
-
-| Object              |                                     |32-bit|64-bit|
-|---------------------|-------------------------------------|:----:|:----:|
-| `Member* members`   | Pointer to array of members (owned) |4     |8     | 
-| `SizeType size`     | Number of members                   |4     |4     |
-| `SizeType capacity` | Capacity of members                 |4     |4     |
-| `unsigned flags_`   | `kObjectType kObjectFlag`           |4     |4     |
-
-| Array               |                                     |32-bit|64-bit|
-|---------------------|-------------------------------------|:----:|:----:|
-| `Value* values`     | Pointer to array of values (owned)  |4     |8     | 
-| `SizeType size`     | Number of values                    |4     |4     |
-| `SizeType capacity` | Capacity of values                  |4     |4     |
-| `unsigned flags_`   | `kArrayType kArrayFlag`             |4     |4     |
-
-| Number (Int)        |                                     |32-bit|64-bit|
-|---------------------|-------------------------------------|:----:|:----:|
-| `int i`             | 32-bit signed integer               |4     |4     | 
-| (zero padding)      | 0                                   |4     |4     |
-| (unused)            |                                     |4     |8     |
-| `unsigned flags_`   | `kNumberType kNumberFlag kIntFlag kInt64Flag ...` |4     |4     |
-
-| Number (UInt)       |                                     |32-bit|64-bit|
-|---------------------|-------------------------------------|:----:|:----:|
-| `unsigned u`        | 32-bit unsigned integer             |4     |4     | 
-| (zero padding)      | 0                                   |4     |4     |
-| (unused)            |                                     |4     |8     |
-| `unsigned flags_`   | `kNumberType kNumberFlag kUIntFlag kUInt64Flag ...` |4     |4     |
-
-| Number (Int64)      |                                     |32-bit|64-bit|
-|---------------------|-------------------------------------|:----:|:----:|
-| `int64_t i64`       | 64-bit signed integer               |8     |8     | 
-| (unused)            |                                     |4     |8     |
-| `unsigned flags_`   | `kNumberType kNumberFlag kInt64Flag ...`          |4     |4     |
-
-| Number (Uint64)     |                                     |32-bit|64-bit|
-|---------------------|-------------------------------------|:----:|:----:|
-| `uint64_t i64`      | 64-bit unsigned integer             |8     |8     | 
-| (unused)            |                                     |4     |8     |
-| `unsigned flags_`   | `kNumberType kNumberFlag kInt64Flag ...`          |4     |4     |
-
-| Number (Double)     |                                     |32-bit|64-bit|
-|---------------------|-------------------------------------|:----:|:----:|
-| `uint64_t i64`      | Double precision floating-point     |8     |8     | 
-| (unused)            |                                     |4     |8     |
-| `unsigned flags_`   | `kNumberType kNumberFlag kDoubleFlag` |4     |4     |
-
-Here are some notes:
-* To reduce memory consumption for 64-bit architecture, `SizeType` is typedef as `unsigned` instead of `size_t`.
-* Zero padding for 32-bit number may be placed after or before the actual type, according to the endianness. This makes possible for interpreting a 32-bit integer as a 64-bit integer, without any conversion.
-* An `Int` is always an `Int64`, but the converse is not always true.
-
-## Flags {#Flags}
-
-The 32-bit `flags_` contains both JSON type and other additional information. As shown in the above tables, each JSON type contains redundant `kXXXType` and `kXXXFlag`. This design is for optimizing the operation of testing bit-flags (`IsNumber()`) and obtaining a sequential number for each type (`GetType()`).
-
-String has two optional flags. `kCopyFlag` means that the string owns a copy of the string. `kInlineStrFlag` means using [Short-String Optimization](#ShortString).
-
-Number is a bit more complicated. For normal integer values, it can contains `kIntFlag`, `kUintFlag`,  `kInt64Flag` and/or `kUint64Flag`, according to the range of the integer. For numbers with fraction, and integers larger than 64-bit range, they will be stored as `double` with `kDoubleFlag`.
-
-## Short-String Optimization {#ShortString}
-
- [Kosta](https://github.com/Kosta-Github) provided a very neat short-string optimization. The optimization idea is given as follow. Excluding the `flags_`, a `Value` has 12 or 16 bytes (32-bit or 64-bit) for storing actual data. Instead of storing a pointer to a string, it is possible to store short strings in these space internally. For encoding with 1-byte character type (e.g. `char`), it can store maximum 11 or 15 characters string inside the `Value` type.
-
-| ShortString (Ch=char) |                                   |32-bit|64-bit|
-|---------------------|-------------------------------------|:----:|:----:|
-| `Ch str[MaxChars]`  | String buffer                       |11    |15    | 
-| `Ch invLength`      | MaxChars - Length                   |1     |1     |
-| `unsigned flags_`   | `kStringType kStringFlag ...`       |4     |4     |
-
-A special technique is applied. Instead of storing the length of string directly, it stores (MaxChars - length). This make it possible to store 11 characters with trailing `\0`.
-
-This optimization can reduce memory usage for copy-string. It can also improve cache-coherence thus improve runtime performance.
-
-# Allocator {#InternalAllocator}
-
-`Allocator` is a concept in RapidJSON:
-~~~cpp
-concept Allocator {
-    static const bool kNeedFree;    //!< Whether this allocator needs to call Free().
-
-    // Allocate a memory block.
-    // \param size of the memory block in bytes.
-    // \returns pointer to the memory block.
-    void* Malloc(size_t size);
-
-    // Resize a memory block.
-    // \param originalPtr The pointer to current memory block. Null pointer is permitted.
-    // \param originalSize The current size in bytes. (Design issue: since some allocator may not book-keep this, explicitly pass to it can save memory.)
-    // \param newSize the new size in bytes.
-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize);
-
-    // Free a memory block.
-    // \param pointer to the memory block. Null pointer is permitted.
-    static void Free(void *ptr);
-};
-~~~
-
-Note that `Malloc()` and `Realloc()` are member functions but `Free()` is static member function.
-
-## MemoryPoolAllocator {#MemoryPoolAllocator}
-
-`MemoryPoolAllocator` is the default allocator for DOM. It allocate but do not free memory. This is suitable for building a DOM tree.
-
-Internally, it allocates chunks of memory from the base allocator (by default `CrtAllocator`) and stores the chunks as a singly linked list. When user requests an allocation, it allocates memory from the following order:
-
-1. User supplied buffer if it is available. (See [User Buffer section in DOM](doc/dom.md))
-2. If user supplied buffer is full, use the current memory chunk.
-3. If the current block is full, allocate a new block of memory.
-
-# Parsing Optimization {#ParsingOptimization}
-
-## Skip Whitespaces with SIMD {#SkipwhitespaceWithSIMD}
-
-When parsing JSON from a stream, the parser need to skip 4 whitespace characters:
-
-1. Space (`U+0020`)
-2. Character Tabulation (`U+000B`)
-3. Line Feed (`U+000A`)
-4. Carriage Return (`U+000D`)
-
-A simple implementation will be simply:
-~~~cpp
-void SkipWhitespace(InputStream& s) {
-    while (s.Peek() == ' ' || s.Peek() == '\n' || s.Peek() == '\r' || s.Peek() == '\t')
-        s.Take();
-}
-~~~
-
-However, this requires 4 comparisons and a few branching for each character. This was found to be a hot spot.
-
-To accelerate this process, SIMD was applied to compare 16 characters with 4 white spaces for each iteration. Currently RapidJSON supports SSE2, SSE4.2 and ARM Neon instructions for this. And it is only activated for UTF-8 memory streams, including string stream or *in situ* parsing.
-
-To enable this optimization, need to define `RAPIDJSON_SSE2`, `RAPIDJSON_SSE42` or `RAPIDJSON_NEON` before including `rapidjson.h`. Some compilers can detect the setting, as in `perftest.h`:
-
-~~~cpp
-// __SSE2__ and __SSE4_2__ are recognized by gcc, clang, and the Intel compiler.
-// We use -march=native with gmake to enable -msse2 and -msse4.2, if supported.
-// Likewise, __ARM_NEON is used to detect Neon.
-#if defined(__SSE4_2__)
-#  define RAPIDJSON_SSE42
-#elif defined(__SSE2__)
-#  define RAPIDJSON_SSE2
-#elif defined(__ARM_NEON)
-#  define RAPIDJSON_NEON
-#endif
-~~~
-
-Note that, these are compile-time settings. Running the executable on a machine without such instruction set support will make it crash.
-
-### Page boundary issue
-
-In an early version of RapidJSON, [an issue](https://code.google.com/archive/p/rapidjson/issues/104) reported that the `SkipWhitespace_SIMD()` causes crash very rarely (around 1 in 500,000). After investigation, it is suspected that `_mm_loadu_si128()` accessed bytes after `'\0'`, and across a protected page boundary.
-
-In [Intel® 64 and IA-32 Architectures Optimization Reference Manual
-](http://www.intel.com/content/www/us/en/architecture-and-technology/64-ia-32-architectures-optimization-manual.html), section 10.2.1:
-
-> To support algorithms requiring unaligned 128-bit SIMD memory accesses, memory buffer allocation by a caller function should consider adding some pad space so that a callee function can safely use the address pointer safely with unaligned 128-bit SIMD memory operations.
-> The minimal padding size should be the width of the SIMD register that might be used in conjunction with unaligned SIMD memory access.
-
-This is not feasible as RapidJSON should not enforce such requirement.
-
-To fix this issue, currently the routine process bytes up to the next aligned address. After tha, use aligned read to perform SIMD processing. Also see [#85](https://github.com/Tencent/rapidjson/issues/85).
-
-## Local Stream Copy {#LocalStreamCopy}
-
-During optimization, it is found that some compilers cannot localize some member data access of streams into local variables or registers. Experimental results show that for some stream types, making a copy of the stream and used it in inner-loop can improve performance. For example, the actual (non-SIMD) implementation of `SkipWhitespace()` is implemented as:
-
-~~~cpp
-template<typename InputStream>
-void SkipWhitespace(InputStream& is) {
-    internal::StreamLocalCopy<InputStream> copy(is);
-    InputStream& s(copy.s);
-
-    while (s.Peek() == ' ' || s.Peek() == '\n' || s.Peek() == '\r' || s.Peek() == '\t')
-        s.Take();
-}
-~~~
-
-Depending on the traits of stream, `StreamLocalCopy` will make (or not make) a copy of the stream object, use it locally and copy the states of stream back to the original stream.
-
-## Parsing to Double {#ParsingDouble}
-
-Parsing string into `double` is difficult. The standard library function `strtod()` can do the job but it is slow. By default, the parsers use normal precision setting. This has has maximum 3 [ULP](http://en.wikipedia.org/wiki/Unit_in_the_last_place) error and implemented in `internal::StrtodNormalPrecision()`.
-
-When using `kParseFullPrecisionFlag`, the parsers calls `internal::StrtodFullPrecision()` instead, and this function actually implemented 3 versions of conversion methods.
-1. [Fast-Path](http://www.exploringbinary.com/fast-path-decimal-to-floating-point-conversion/).
-2. Custom DIY-FP implementation as in [double-conversion](https://github.com/floitsch/double-conversion).
-3. Big Integer Method as in (Clinger, William D. How to read floating point numbers accurately. Vol. 25. No. 6. ACM, 1990).
-
-If the first conversion methods fail, it will try the second, and so on.
-
-# Generation Optimization {#GenerationOptimization}
-
-## Integer-to-String conversion {#itoa}
-
-The naive algorithm for integer-to-string conversion involves division per each decimal digit. We have implemented various implementations and evaluated them in [itoa-benchmark](https://github.com/miloyip/itoa-benchmark).
-
-Although SSE2 version is the fastest but the difference is minor by comparing to the first running-up `branchlut`. And `branchlut` is pure C++ implementation so we adopt `branchlut` in RapidJSON.
-
-## Double-to-String conversion {#dtoa}
-
-Originally RapidJSON uses `snprintf(..., ..., "%g")`  to achieve double-to-string conversion. This is not accurate as the default precision is 6. Later we also find that this is slow and there is an alternative.
-
-Google's V8 [double-conversion](https://github.com/floitsch/double-conversion
-) implemented a newer, fast algorithm called Grisu3 (Loitsch, Florian. "Printing floating-point numbers quickly and accurately with integers." ACM Sigplan Notices 45.6 (2010): 233-243.).
-
-However, since it is not header-only so that we implemented a header-only version of Grisu2. This algorithm guarantees that the result is always accurate. And in most of cases it produces the shortest (optimal) string representation.
-
-The header-only conversion function has been evaluated in [dtoa-benchmark](https://github.com/miloyip/dtoa-benchmark).
-
-# Parser {#Parser}
-
-## Iterative Parser {#IterativeParser}
-
-The iterative parser is a recursive descent LL(1) parser
-implemented in a non-recursive manner.
-
-### Grammar {#IterativeParserGrammar}
-
-The grammar used for this parser is based on strict JSON syntax:
-~~~~~~~~~~
-S -> array | object
-array -> [ values ]
-object -> { members }
-values -> non-empty-values | ε
-non-empty-values -> value addition-values
-addition-values -> ε | , non-empty-values
-members -> non-empty-members | ε
-non-empty-members -> member addition-members
-addition-members -> ε | , non-empty-members
-member -> STRING : value
-value -> STRING | NUMBER | NULL | BOOLEAN | object | array
-~~~~~~~~~~
-
-Note that left factoring is applied to non-terminals `values` and `members`
-to make the grammar be LL(1).
-
-### Parsing Table {#IterativeParserParsingTable}
-
-Based on the grammar, we can construct the FIRST and FOLLOW set.
-
-The FIRST set of non-terminals is listed below:
-
-|    NON-TERMINAL   |               FIRST              |
-|:-----------------:|:--------------------------------:|
-|       array       |                 [                |
-|       object      |                 {                |
-|       values      | ε STRING NUMBER NULL BOOLEAN { [ |
-|  addition-values  |              ε COMMA             |
-|      members      |             ε STRING             |
-|  addition-members |              ε COMMA             |
-|       member      |              STRING              |
-|       value       |  STRING NUMBER NULL BOOLEAN { [  |
-|         S         |                [ {               |
-| non-empty-members |              STRING              |
-|  non-empty-values |  STRING NUMBER NULL BOOLEAN { [  |
-
-The FOLLOW set is listed below:
-
-|    NON-TERMINAL   |  FOLLOW |
-|:-----------------:|:-------:|
-|         S         |    $    |
-|       array       | , $ } ] |
-|       object      | , $ } ] |
-|       values      |    ]    |
-|  non-empty-values |    ]    |
-|  addition-values  |    ]    |
-|      members      |    }    |
-| non-empty-members |    }    |
-|  addition-members |    }    |
-|       member      |   , }   |
-|       value       |  , } ]  |
-
-Finally the parsing table can be constructed from FIRST and FOLLOW set:
-
-|    NON-TERMINAL   |           [           |           {           |          ,          | : | ] | } |          STRING         |         NUMBER        |          NULL         |        BOOLEAN        |
-|:-----------------:|:---------------------:|:---------------------:|:-------------------:|:-:|:-:|:-:|:-----------------------:|:---------------------:|:---------------------:|:---------------------:|
-|         S         |         array         |         object        |                     |   |   |   |                         |                       |                       |                       |
-|       array       |       [ values ]      |                       |                     |   |   |   |                         |                       |                       |                       |
-|       object      |                       |      { members }      |                     |   |   |   |                         |                       |                       |                       |
-|       values      |    non-empty-values   |    non-empty-values   |                     |   | ε |   |     non-empty-values    |    non-empty-values   |    non-empty-values   |    non-empty-values   |
-|  non-empty-values | value addition-values | value addition-values |                     |   |   |   |  value addition-values  | value addition-values | value addition-values | value addition-values |
-|  addition-values  |                       |                       |  , non-empty-values |   | ε |   |                         |                       |                       |                       |
-|      members      |                       |                       |                     |   |   | ε |    non-empty-members    |                       |                       |                       |
-| non-empty-members |                       |                       |                     |   |   |   | member addition-members |                       |                       |                       |
-|  addition-members |                       |                       | , non-empty-members |   |   | ε |                         |                       |                       |                       |
-|       member      |                       |                       |                     |   |   |   |      STRING : value     |                       |                       |                       |
-|       value       |         array         |         object        |                     |   |   |   |          STRING         |         NUMBER        |          NULL         |        BOOLEAN        |
-
-There is a great [tool](http://hackingoff.com/compilers/predict-first-follow-set) for above grammar analysis.
-
-### Implementation {#IterativeParserImplementation}
-
-Based on the parsing table, a direct(or conventional) implementation
-that pushes the production body in reverse order
-while generating a production could work.
-
-In RapidJSON, several modifications(or adaptations to current design) are made to a direct implementation.
-
-First, the parsing table is encoded in a state machine in RapidJSON.
-States are constructed by the head and body of production.
-State transitions are constructed by production rules.
-Besides, extra states are added for productions involved with `array` and `object`.
-In this way the generation of array values or object members would be a single state transition,
-rather than several pop/push operations in the direct implementation.
-This also makes the estimation of stack size more easier.
-
-The state diagram is shown as follows:
-
-![State Diagram](diagram/iterative-parser-states-diagram.png)
-
-Second, the iterative parser also keeps track of array's value count and object's member count
-in its internal stack, which may be different from a conventional implementation.
diff --git a/src/sioclient/lib/rapidjson/doc/internals.zh-cn.md b/src/sioclient/lib/rapidjson/doc/internals.zh-cn.md
deleted file mode 100644
index ca3d297a..00000000
--- a/src/sioclient/lib/rapidjson/doc/internals.zh-cn.md
+++ /dev/null
@@ -1,363 +0,0 @@
-# 内部架构
-
-本部分记录了一些设计和实现细节。
-
-[TOC]
-
-# 架构 {#Architecture}
-
-## SAX 和 DOM
-
-下面的 UML 图显示了 SAX 和 DOM 的基本关系。
-
-![架构 UML 类图](diagram/architecture.png)
-
-关系的核心是 `Handler` 概念。在 SAX 一边，`Reader` 从流解析 JSON 并将事件发送到 `Handler`。`Writer` 实现了 `Handler` 概念，用于处理相同的事件。在 DOM 一边，`Document` 实现了 `Handler` 概念，用于通过这些时间来构建 DOM。`Value` 支持了 `Value::Accept(Handler&)` 函数，它可以将 DOM 转换为事件进行发送。
-
-在这个设计，SAX 是不依赖于 DOM 的。甚至 `Reader` 和 `Writer` 之间也没有依赖。这提供了连接事件发送器和处理器的灵活性。除此之外，`Value` 也是不依赖于 SAX 的。所以，除了将 DOM 序列化为 JSON 之外，用户也可以将其序列化为 XML，或者做任何其他事情。
-
-## 工具类
-
-SAX 和 DOM API 都依赖于3个额外的概念：`Allocator`、`Encoding` 和 `Stream`。它们的继承层次结构如下图所示。
-
-![工具类 UML 类图](diagram/utilityclass.png)
-
-# 值（Value） {#Value}
-
-`Value` （实际上被定义为 `GenericValue<UTF8<>>`）是 DOM API 的核心。本部分描述了它的设计。
-
-## 数据布局 {#DataLayout}
-
-`Value` 是[可变类型](http://en.wikipedia.org/wiki/Variant_type)。在 RapidJSON 的上下文中，一个 `Value` 的实例可以包含6种 JSON 数据类型之一。通过使用 `union` ，这是可能实现的。每一个 `Value` 包含两个成员：`union Data data_` 和 `unsigned flags_`。`flags_` 表明了 JSON 类型，以及附加的信息。
-
-下表显示了所有类型的数据布局。32位/64位列表明了字段所占用的字节数。
-
-| Null              |                                  | 32位 | 64位 |
-|-------------------|----------------------------------|:----:|:----:|
-| （未使用）        |                                  |4     |8     |
-| （未使用）        |                                  |4     |4     |
-| （未使用）        |                                  |4     |4     |
-| `unsigned flags_` | `kNullType kNullFlag`            |4     |4     |
-
-| Bool              |                                                    | 32位 | 64位 |
-|-------------------|----------------------------------------------------|:----:|:----:|
-| （未使用）        |                                                    |4     |8     |
-| （未使用）        |                                                    |4     |4     |
-| （未使用）        |                                                    |4     |4     |
-| `unsigned flags_` | `kBoolType` (either `kTrueFlag` or `kFalseFlag`)   |4     |4     |
-
-| String              |                                     | 32位 | 64位 |
-|---------------------|-------------------------------------|:----:|:----:|
-| `Ch* str`           | 指向字符串的指针（可能拥有所有权）  |4     |8     |
-| `SizeType length`   | 字符串长度                          |4     |4     |
-| （未使用）          |                                     |4     |4     |
-| `unsigned flags_`   | `kStringType kStringFlag ...`       |4     |4     |
-
-| Object              |                                     | 32位 | 64位 |
-|---------------------|-------------------------------------|:----:|:----:|
-| `Member* members`   | 指向成员数组的指针（拥有所有权）    |4     |8     |
-| `SizeType size`     | 成员数量                            |4     |4     |
-| `SizeType capacity` | 成员容量                            |4     |4     |
-| `unsigned flags_`   | `kObjectType kObjectFlag`           |4     |4     |
-
-| Array               |                                     | 32位 | 64位 |
-|---------------------|-------------------------------------|:----:|:----:|
-| `Value* values`     | 指向值数组的指针（拥有所有权）      |4     |8     |
-| `SizeType size`     | 值数量                              |4     |4     |
-| `SizeType capacity` | 值容量                              |4     |4     |
-| `unsigned flags_`   | `kArrayType kArrayFlag`             |4     |4     |
-
-| Number (Int)        |                                     | 32位 | 64位 |
-|---------------------|-------------------------------------|:----:|:----:|
-| `int i`             | 32位有符号整数                      |4     |4     |
-| （零填充）          | 0                                   |4     |4     |
-| （未使用）          |                                     |4     |8     |
-| `unsigned flags_`   | `kNumberType kNumberFlag kIntFlag kInt64Flag ...` |4     |4     |
-
-| Number (UInt)       |                                     | 32位 | 64位 |
-|---------------------|-------------------------------------|:----:|:----:|
-| `unsigned u`        | 32位无符号整数                      |4     |4     |
-| （零填充）          | 0                                   |4     |4     |
-| （未使用）          |                                     |4     |8     |
-| `unsigned flags_`   | `kNumberType kNumberFlag kUIntFlag kUInt64Flag ...` |4     |4     |
-
-| Number (Int64)      |                                     | 32位 | 64位 |
-|---------------------|-------------------------------------|:----:|:----:|
-| `int64_t i64`       | 64位有符号整数                      |8     |8     |
-| （未使用）          |                                     |4     |8     |
-| `unsigned flags_`   | `kNumberType kNumberFlag kInt64Flag ...`          |4     |4     |
-
-| Number (Uint64)     |                                     | 32位 | 64位 |
-|---------------------|-------------------------------------|:----:|:----:|
-| `uint64_t i64`      | 64位无符号整数                      |8     |8     |
-| （未使用）          |                                     |4     |8     |
-| `unsigned flags_`   | `kNumberType kNumberFlag kInt64Flag ...`          |4     |4     |
-
-| Number (Double)     |                                     | 32位 | 64位 |
-|---------------------|-------------------------------------|:----:|:----:|
-| `uint64_t i64`      | 双精度浮点数                        |8     |8     |
-| （未使用）          |                                     |4     |8     |
-| `unsigned flags_`   |`kNumberType kNumberFlag kDoubleFlag`|4     |4     |
-
-这里有一些需要注意的地方：
-* 为了减少在64位架构上的内存消耗，`SizeType` 被定义为 `unsigned` 而不是 `size_t`。
-* 32位整数的零填充可能被放在实际类型的前面或后面，这依赖于字节序。这使得它可以将32位整数不经过任何转换就可以解释为64位整数。
-* `Int` 永远是 `Int64`，反之不然。
-
-## 标志 {#Flags}
-
-32位的 `flags_` 包含了 JSON 类型和其他信息。如前文中的表所述，每一种 JSON 类型包含了冗余的 `kXXXType` 和 `kXXXFlag`。这个设计是为了优化测试位标志（`IsNumber()`）和获取每一种类型的序列号（`GetType()`）。
-
-字符串有两个可选的标志。`kCopyFlag` 表明这个字符串拥有字符串拷贝的所有权。而 `kInlineStrFlag` 意味着使用了[短字符串优化](#ShortString)。
-
-数字更加复杂一些。对于普通的整数值，它可以包含 `kIntFlag`、`kUintFlag`、 `kInt64Flag` 和/或 `kUint64Flag`，这由整数的范围决定。带有小数或者超过64位所能表达的范围的整数的数字会被存储为带有 `kDoubleFlag` 的 `double`。
-
-## 短字符串优化 {#ShortString}
-
-[Kosta](https://github.com/Kosta-Github) 提供了很棒的短字符串优化。这个优化的xxx如下所述。除去 `flags_` ，`Value` 有12或16字节（对于32位或64位）来存储实际的数据。这为在其内部直接存储短字符串而不是存储字符串的指针创造了可能。对于1字节的字符类型（例如 `char`），它可以在 `Value` 类型内部存储至多11或15个字符的字符串。
-
-|ShortString (Ch=char)|                                     | 32位 | 64位 |
-|---------------------|-------------------------------------|:----:|:----:|
-| `Ch str[MaxChars]`  | 字符串缓冲区                        |11    |15    |
-| `Ch invLength`      | MaxChars - Length                   |1     |1     |
-| `unsigned flags_`   | `kStringType kStringFlag ...`       |4     |4     |
-
-这里使用了一项特殊的技术。它存储了 (MaxChars - length) 而不直接存储字符串的长度。这使得存储11个字符并且带有后缀 `\0` 成为可能。
-
-这个优化可以减少字符串拷贝内存占用。它也改善了缓存一致性，并进一步提高了运行时性能。
-
-# 分配器（Allocator） {#InternalAllocator}
-
-`Allocator` 是 RapidJSON 中的概念：
-~~~cpp
-concept Allocator {
-    static const bool kNeedFree;    //!< 表明这个分配器是否需要调用 Free()。
-
-    // 申请内存块。
-    // \param size 内存块的大小，以字节记。
-    // \returns 指向内存块的指针。
-    void* Malloc(size_t size);
-
-    // 调整内存块的大小。
-    // \param originalPtr 当前内存块的指针。空指针是被允许的。
-    // \param originalSize 当前大小，以字节记。（设计问题：因为有些分配器可能不会记录它，显示的传递它可以节约内存。）
-    // \param newSize 新大小，以字节记。
-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize);
-
-    // 释放内存块。
-    // \param ptr 指向内存块的指针。空指针是被允许的。
-    static void Free(void *ptr);
-};
-~~~
-
-需要注意的是 `Malloc()` 和 `Realloc()` 是成员函数而 `Free()` 是静态成员函数。
-
-## MemoryPoolAllocator {#MemoryPoolAllocator}
-
-`MemoryPoolAllocator` 是 DOM 的默认内存分配器。它只申请内存而不释放内存。这对于构建 DOM 树非常合适。
-
-在它的内部，它从基础的内存分配器申请内存块（默认为 `CrtAllocator`）并将这些内存块存储为单向链表。当用户请求申请内存，它会遵循下列步骤来申请内存：
-
-1. 如果可用，使用用户提供的缓冲区。（见 [User Buffer section in DOM](doc/dom.md)）
-2. 如果用户提供的缓冲区已满，使用当前内存块。
-3. 如果当前内存块已满，申请新的内存块。
-
-# 解析优化 {#ParsingOptimization}
-
-## 使用 SIMD 跳过空格 {#SkipwhitespaceWithSIMD}
-
-当从流中解析 JSON 时，解析器需要跳过4种空格字符：
-
-1. 空格 (`U+0020`)
-2. 制表符 (`U+000B`)
-3. 换行 (`U+000A`)
-4. 回车 (`U+000D`)
-
-这是一份简单的实现：
-~~~cpp
-void SkipWhitespace(InputStream& s) {
-    while (s.Peek() == ' ' || s.Peek() == '\n' || s.Peek() == '\r' || s.Peek() == '\t')
-        s.Take();
-}
-~~~
-
-但是，这需要对每个字符进行4次比较以及一些分支。这被发现是一个热点。
-
-为了加速这一处理，RapidJSON 使用 SIMD 来在一次迭代中比较16个字符和4个空格。目前 RapidJSON 支持 SSE2 ， SSE4.2 和 ARM Neon 指令。同时它也只会对 UTF-8 内存流启用，包括字符串流或 *原位* 解析。
-
-你可以通过在包含 `rapidjson.h` 之前定义 `RAPIDJSON_SSE2` ， `RAPIDJSON_SSE42` 或 `RAPIDJSON_NEON` 来启用这个优化。一些编译器可以检测这个设置，如 `perftest.h`：
-
-~~~cpp
-// __SSE2__ 和 __SSE4_2__ 可被 gcc、clang 和 Intel 编译器识别：
-// 如果支持的话，我们在 gmake 中使用了 -march=native 来启用 -msse2 和 -msse4.2
-// 同样的， __ARM_NEON 被用于识别Neon
-#if defined(__SSE4_2__)
-#  define RAPIDJSON_SSE42
-#elif defined(__SSE2__)
-#  define RAPIDJSON_SSE2
-#elif defined(__ARM_NEON)
-#  define RAPIDJSON_NEON
-#endif
-~~~
-
-需要注意的是，这是编译期的设置。在不支持这些指令的机器上运行可执行文件会使它崩溃。
-
-### 页面对齐问题
-
-在 RapidJSON 的早期版本中，被报告了[一个问题](https://code.google.com/archive/p/rapidjson/issues/104)：`SkipWhitespace_SIMD()` 会罕见地导致崩溃（约五十万分之一的几率）。在调查之后，怀疑是 `_mm_loadu_si128()` 访问了 `'\0'` 之后的内存，并越过被保护的页面边界。
-
-在 [Intel® 64 and IA-32 Architectures Optimization Reference Manual
-](http://www.intel.com/content/www/us/en/architecture-and-technology/64-ia-32-architectures-optimization-manual.html) 中，章节 10.2.1：
-
-> 为了支持需要费对齐的128位 SIMD 内存访问的算法，调用者的内存缓冲区申请应当考虑添加一些填充空间，这样被调用的函数可以安全地将地址指针用于未对齐的128位 SIMD 内存操作。
-> 在结合非对齐的 SIMD 内存操作中，最小的对齐大小应该等于 SIMD 寄存器的大小。
-
-对于 RapidJSON 来说，这显然是不可行的，因为 RapidJSON 不应当强迫用户进行内存对齐。
-
-为了修复这个问题，当前的代码会先按字节处理直到下一个对齐的地址。在这之后，使用对齐读取来进行 SIMD 处理。见 [#85](https://github.com/Tencent/rapidjson/issues/85)。
-
-## 局部流拷贝 {#LocalStreamCopy}
-
-在优化的过程中，我们发现一些编译器不能将访问流的一些成员数据放入局部变量或者寄存器中。测试结果显示，对于一些流类型，创建流的拷贝并将其用于内层循环中可以改善性能。例如，实际（非 SIMD）的 `SkipWhitespace()` 被实现为：
-
-~~~cpp
-template<typename InputStream>
-void SkipWhitespace(InputStream& is) {
-    internal::StreamLocalCopy<InputStream> copy(is);
-    InputStream& s(copy.s);
-
-    while (s.Peek() == ' ' || s.Peek() == '\n' || s.Peek() == '\r' || s.Peek() == '\t')
-        s.Take();
-}
-~~~
-
-基于流的特征，`StreamLocalCopy` 会创建（或不创建）流对象的拷贝，在局部使用它并将流的状态拷贝回原来的流。
-
-## 解析为双精度浮点数 {#ParsingDouble}
-
-将字符串解析为 `double` 并不简单。标准库函数 `strtod()` 可以胜任这项工作，但它比较缓慢。默认情况下，解析器使用默认的精度设置。这最多有 3[ULP](http://en.wikipedia.org/wiki/Unit_in_the_last_place) 的误差，并实现在 `internal::StrtodNormalPrecision()` 中。
-
-当使用 `kParseFullPrecisionFlag` 时，编译器会改为调用 `internal::StrtodFullPrecision()` ，这个函数会自动调用三个版本的转换。
-1. [Fast-Path](http://www.exploringbinary.com/fast-path-decimal-to-floating-point-conversion/)。
-2. [double-conversion](https://github.com/floitsch/double-conversion) 中的自定义 DIY-FP 实现。
-3. （Clinger, William D. How to read floating point numbers accurately. Vol. 25. No. 6. ACM, 1990） 中的大整数算法。
-
-如果第一个转换方法失败，则尝试使用第二种方法，以此类推。
-
-# 生成优化 {#GenerationOptimization}
-
-## 整数到字符串的转换 {#itoa}
-
-整数到字符串转换的朴素算法需要对每一个十进制位进行一次处罚。我们实现了若干版本并在 [itoa-benchmark](https://github.com/miloyip/itoa-benchmark) 中对它们进行了评估。
-
-虽然 SSE2 版本是最快的，但它和第二快的 `branchlut` 差距不大。而且 `branchlut` 是纯C++实现，所以我们在 RapidJSON 中使用了 `branchlut`。
-
-## 双精度浮点数到字符串的转换 {#dtoa}
-
-原来 RapidJSON 使用 `snprintf(..., ..., "%g")` 来进行双精度浮点数到字符串的转换。这是不准确的，因为默认的精度是6。随后我们发现它很缓慢，而且有其它的替代品。
-
-Google 的 V8 [double-conversion](https://github.com/floitsch/double-conversion
-) 实现了更新的、快速的被称为 Grisu3 的算法（Loitsch, Florian. "Printing floating-point numbers quickly and accurately with integers." ACM Sigplan Notices 45.6 (2010): 233-243.）。
-
-然而，这个实现不是仅头文件的，所以我们实现了一个仅头文件的 Grisu2 版本。这个算法保证了结果永远精确。而且在大多数情况下，它会生成最短的（可选）字符串表示。
-
-这个仅头文件的转换函数在 [dtoa-benchmark](https://github.com/miloyip/dtoa-benchmark) 中进行评估。
-
-# 解析器 {#Parser}
-
-## 迭代解析 {#IterativeParser}
-
-迭代解析器是一个以非递归方式实现的递归下降的 LL(1) 解析器。
-
-### 语法 {#IterativeParserGrammar}
-
-解析器使用的语法是基于严格 JSON 语法的：
-~~~~~~~~~~
-S -> array | object
-array -> [ values ]
-object -> { members }
-values -> non-empty-values | ε
-non-empty-values -> value addition-values
-addition-values -> ε | , non-empty-values
-members -> non-empty-members | ε
-non-empty-members -> member addition-members
-addition-members -> ε | , non-empty-members
-member -> STRING : value
-value -> STRING | NUMBER | NULL | BOOLEAN | object | array
-~~~~~~~~~~
-
-注意到左因子被加入了非终结符的 `values` 和 `members` 来保证语法是 LL(1) 的。
-
-### 解析表 {#IterativeParserParsingTable}
-
-基于这份语法，我们可以构造 FIRST 和 FOLLOW 集合。
-
-非终结符的 FIRST 集合如下所示：
-
-|    NON-TERMINAL   |               FIRST              |
-|:-----------------:|:--------------------------------:|
-|       array       |                 [                |
-|       object      |                 {                |
-|       values      | ε STRING NUMBER NULL BOOLEAN { [ |
-|  addition-values  |              ε COMMA             |
-|      members      |             ε STRING             |
-|  addition-members |              ε COMMA             |
-|       member      |              STRING              |
-|       value       |  STRING NUMBER NULL BOOLEAN { [  |
-|         S         |                [ {               |
-| non-empty-members |              STRING              |
-|  non-empty-values |  STRING NUMBER NULL BOOLEAN { [  |
-
-FOLLOW 集合如下所示：
-
-|    NON-TERMINAL   |  FOLLOW |
-|:-----------------:|:-------:|
-|         S         |    $    |
-|       array       | , $ } ] |
-|       object      | , $ } ] |
-|       values      |    ]    |
-|  non-empty-values |    ]    |
-|  addition-values  |    ]    |
-|      members      |    }    |
-| non-empty-members |    }    |
-|  addition-members |    }    |
-|       member      |   , }   |
-|       value       |  , } ]  |
-
-最终可以从 FIRST 和 FOLLOW 集合生成解析表：
-
-|    NON-TERMINAL   |           [           |           {           |          ,          | : | ] | } |          STRING         |         NUMBER        |          NULL         |        BOOLEAN        |
-|:-----------------:|:---------------------:|:---------------------:|:-------------------:|:-:|:-:|:-:|:-----------------------:|:---------------------:|:---------------------:|:---------------------:|
-|         S         |         array         |         object        |                     |   |   |   |                         |                       |                       |                       |
-|       array       |       [ values ]      |                       |                     |   |   |   |                         |                       |                       |                       |
-|       object      |                       |      { members }      |                     |   |   |   |                         |                       |                       |                       |
-|       values      |    non-empty-values   |    non-empty-values   |                     |   | ε |   |     non-empty-values    |    non-empty-values   |    non-empty-values   |    non-empty-values   |
-|  non-empty-values | value addition-values | value addition-values |                     |   |   |   |  value addition-values  | value addition-values | value addition-values | value addition-values |
-|  addition-values  |                       |                       |  , non-empty-values |   | ε |   |                         |                       |                       |                       |
-|      members      |                       |                       |                     |   |   | ε |    non-empty-members    |                       |                       |                       |
-| non-empty-members |                       |                       |                     |   |   |   | member addition-members |                       |                       |                       |
-|  addition-members |                       |                       | , non-empty-members |   |   | ε |                         |                       |                       |                       |
-|       member      |                       |                       |                     |   |   |   |      STRING : value     |                       |                       |                       |
-|       value       |         array         |         object        |                     |   |   |   |          STRING         |         NUMBER        |          NULL         |        BOOLEAN        |
-
-对于上面的语法分析，这里有一个很棒的[工具](http://hackingoff.com/compilers/predict-first-follow-set)。
-
-### 实现 {#IterativeParserImplementation}
-
-基于这份解析表，一个直接的（常规的）将规则反向入栈的实现可以正常工作。
-
-在 RapidJSON 中，对直接的实现进行了一些修改：
-
-首先，在 RapidJSON 中，这份解析表被编码为状态机。
-规则由头部和主体组成。
-状态转换由规则构造。
-除此之外，额外的状态被添加到与 `array` 和 `object` 有关的规则。
-通过这种方式，生成数组值或对象成员可以只用一次状态转移便可完成，
-而不需要在直接的实现中的多次出栈/入栈操作。
-这也使得估计栈的大小更加容易。
-
-状态图如如下所示：
-
-![状态图](diagram/iterative-parser-states-diagram.png)
-
-第二，迭代解析器也在内部栈保存了数组的值个数和对象成员的数量，这也与传统的实现不同。
diff --git a/src/sioclient/lib/rapidjson/doc/logo/rapidjson.png b/src/sioclient/lib/rapidjson/doc/logo/rapidjson.png
deleted file mode 100644
index b3b2f80c..00000000
Binary files a/src/sioclient/lib/rapidjson/doc/logo/rapidjson.png and /dev/null differ
diff --git a/src/sioclient/lib/rapidjson/doc/logo/rapidjson.svg b/src/sioclient/lib/rapidjson/doc/logo/rapidjson.svg
deleted file mode 100644
index 9708d5a0..00000000
--- a/src/sioclient/lib/rapidjson/doc/logo/rapidjson.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="217.15039"
-   height="60.831055"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="rapidjson.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3801">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3803" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3805" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3801"
-       id="linearGradient3807"
-       x1="81.25"
-       y1="52.737183"
-       x2="122.25"
-       y2="52.737183"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2378503,0,0,1.1662045,-226.99279,64.427324)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3801"
-       id="linearGradient3935"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.4768835,0,0,2.2904698,246.48785,81.630301)"
-       x1="81.25"
-       y1="52.737183"
-       x2="115.96579"
-       y2="48.439766" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3801"
-       id="linearGradient3947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2378503,0,0,1.1662045,-226.99279,-10.072676)"
-       x1="81.25"
-       y1="52.737183"
-       x2="122.25"
-       y2="52.737183" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="207.8959"
-     inkscape:cy="-3.2283687"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     fit-margin-top="10"
-     fit-margin-left="10"
-     fit-margin-right="10"
-     fit-margin-bottom="10" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-39.132812,-38.772339)">
-    <text
-       sodipodi:linespacing="125%"
-       id="text3939"
-       y="79.862183"
-       x="147.5"
-       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Microsoft JhengHei;-inkscape-font-specification:Microsoft JhengHei"
-       xml:space="preserve"><tspan
-         style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Inconsolata;-inkscape-font-specification:Inconsolata"
-         y="79.862183"
-         x="147.5"
-         id="tspan3941"
-         sodipodi:role="line"><tspan
-           id="tspan3943"
-           style="font-size:42px;font-style:oblique;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Segoe UI;-inkscape-font-specification:Segoe UI Oblique">Rapid</tspan><tspan
-           id="tspan3945"
-           style="font-weight:bold;-inkscape-font-specification:Inconsolata Bold">JSON</tspan></tspan></text>
-  </g>
-</svg>
diff --git a/src/sioclient/lib/rapidjson/doc/misc/DoxygenLayout.xml b/src/sioclient/lib/rapidjson/doc/misc/DoxygenLayout.xml
deleted file mode 100644
index b7c95866..00000000
--- a/src/sioclient/lib/rapidjson/doc/misc/DoxygenLayout.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<doxygenlayout version="1.0">
-  <!-- Generated by doxygen 1.8.7 -->
-  <!-- Navigation index tabs for HTML output -->
-  <navindex>
-    <tab type="mainpage" visible="yes" title=""/>
-    <tab type="pages" visible="yes" title="" intro=""/>
-    <tab type="modules" visible="yes" title="" intro=""/>
-    <tab type="namespaces" visible="yes" title="">
-      <tab type="namespacelist" visible="yes" title="" intro=""/>
-      <tab type="namespacemembers" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="classes" visible="yes" title="">
-      <tab type="classlist" visible="yes" title="" intro=""/>
-      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
-      <tab type="hierarchy" visible="yes" title="" intro=""/>
-      <tab type="classmembers" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="files" visible="yes" title="">
-      <tab type="filelist" visible="yes" title="" intro=""/>
-      <tab type="globals" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="examples" visible="yes" title="" intro=""/>  
-  </navindex>
-
-  <!-- Layout definition for a class page -->
-  <class>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <inheritancegraph visible="$CLASS_GRAPH"/>
-    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
-    <memberdecl>
-      <nestedclasses visible="yes" title=""/>
-      <publictypes title=""/>
-      <services title=""/>
-      <interfaces title=""/>
-      <publicslots title=""/>
-      <signals title=""/>
-      <publicmethods title=""/>
-      <publicstaticmethods title=""/>
-      <publicattributes title=""/>
-      <publicstaticattributes title=""/>
-      <protectedtypes title=""/>
-      <protectedslots title=""/>
-      <protectedmethods title=""/>
-      <protectedstaticmethods title=""/>
-      <protectedattributes title=""/>
-      <protectedstaticattributes title=""/>
-      <packagetypes title=""/>
-      <packagemethods title=""/>
-      <packagestaticmethods title=""/>
-      <packageattributes title=""/>
-      <packagestaticattributes title=""/>
-      <properties title=""/>
-      <events title=""/>
-      <privatetypes title=""/>
-      <privateslots title=""/>
-      <privatemethods title=""/>
-      <privatestaticmethods title=""/>
-      <privateattributes title=""/>
-      <privatestaticattributes title=""/>
-      <friends title=""/>
-      <related title="" subtitle=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <inlineclasses title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <services title=""/>
-      <interfaces title=""/>
-      <constructors title=""/>
-      <functions title=""/>
-      <related title=""/>
-      <variables title=""/>
-      <properties title=""/>
-      <events title=""/>
-    </memberdef>
-    <allmemberslink visible="yes"/>
-    <usedfiles visible="$SHOW_USED_FILES"/>
-    <authorsection visible="yes"/>
-  </class>
-
-  <!-- Layout definition for a namespace page -->
-  <namespace>
-    <briefdescription visible="yes"/>
-    <memberdecl>
-      <nestednamespaces visible="yes" title=""/>
-      <constantgroups visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <inlineclasses title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </namespace>
-
-  <!-- Layout definition for a file page -->
-  <file>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <includegraph visible="$INCLUDE_GRAPH"/>
-    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
-    <sourcelink visible="yes"/>
-    <memberdecl>
-      <classes visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <constantgroups visible="yes" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <inlineclasses title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-    </memberdef>
-    <authorsection/>
-  </file>
-
-  <!-- Layout definition for a group page -->
-  <group>
-    <briefdescription visible="yes"/>
-    <groupgraph visible="$GROUP_GRAPHS"/>
-    <memberdecl>
-      <nestedgroups visible="yes" title=""/>
-      <dirs visible="yes" title=""/>
-      <files visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <enumvalues title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <signals title=""/>
-      <publicslots title=""/>
-      <protectedslots title=""/>
-      <privateslots title=""/>
-      <events title=""/>
-      <properties title=""/>
-      <friends title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <pagedocs/>
-      <inlineclasses title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <enumvalues title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <signals title=""/>
-      <publicslots title=""/>
-      <protectedslots title=""/>
-      <privateslots title=""/>
-      <events title=""/>
-      <properties title=""/>
-      <friends title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </group>
-
-  <!-- Layout definition for a directory page -->
-  <directory>
-    <briefdescription visible="yes"/>
-    <directorygraph visible="yes"/>
-    <memberdecl>
-      <dirs visible="yes"/>
-      <files visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-  </directory>
-</doxygenlayout>
diff --git a/src/sioclient/lib/rapidjson/doc/misc/doxygenextra.css b/src/sioclient/lib/rapidjson/doc/misc/doxygenextra.css
deleted file mode 100644
index bd673758..00000000
--- a/src/sioclient/lib/rapidjson/doc/misc/doxygenextra.css
+++ /dev/null
@@ -1,274 +0,0 @@
-body code {
-	margin: 0;
-	border: 1px solid #ddd;
-	background-color: #f8f8f8;
-	border-radius: 3px;
-	padding: 0;
-}
-
-a {
-	color: #4183c4;
-}
-
-a.el {
-	font-weight: normal;
-}
-
-body, table, div, p, dl {
-	color: #333333;
-	font-family: Helvetica, arial, freesans, clean, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';
-	font-size: 15px;
-	font-style: normal;
-	font-variant: normal;
-	font-weight: normal;
-	line-height: 25.5px;
-}
-
-body {
-	background-color: #eee;
-}
-
-div.header {
-	background-image: none;
-	background-color: white;
-	margin: 0px;
-	border: 0px;
-}
-
-div.headertitle {
-	width: 858px;
-	margin: 30px;
-	padding: 0px;
-}
-
-div.toc {
-	background-color: #f8f8f8;
-	border-color: #ddd;
-	margin-right: 10px;
-	margin-left: 20px;
-}
-div.toc h3 {
-	color: #333333;
-	font-family: Helvetica, arial, freesans, clean, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';
-	font-size: 18px;
-	font-style: normal;
-	font-variant: normal;
-	font-weight: normal;
-}
-div.toc li {
-	color: #333333;
-	font-family: Helvetica, arial, freesans, clean, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';
-	font-size: 12px;
-	font-style: normal;
-	font-variant: normal;
-	font-weight: normal;
-}
-
-.title {
-	font-size: 2.5em;
-	line-height: 63.75px;
-	border-bottom: 1px solid #ddd;
-	margin-bottom: 15px;
-	margin-left: 0px;
-	margin-right: 0px;
-	margin-top: 0px;
-}
-
-.summary {
-	float: none !important;
-	width: auto !important;
-	padding-top: 10px;
-	padding-right: 10px !important;
-}
-
-.summary + .headertitle .title {
-	font-size: 1.5em;
-	line-height: 2.0em;
-}
-
-body h1 {
-	font-size: 2em;
-	line-height: 1.7;
-	border-bottom: 1px solid #eee;
-	margin: 1em 0 15px;
-	padding: 0;
-	overflow: hidden;
-}
-
-body h2 {
-	font-size: 1.5em;
-	line-height: 1.7;
-	margin: 1em 0 15px;
-	padding: 0;
-}
-
-pre.fragment {
-	font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
-	font-size: 13px;
-	font-style: normal;
-	font-variant: normal;
-	font-weight: normal;
-	line-height: 19px;
-}
-
-table.doxtable th {
-	background-color: #f8f8f8;
-	color: #333333;
-	font-size: 15px;
-}
-
-table.doxtable td, table.doxtable th {
-	border: 1px solid #ddd;
-}
-
-#doc-content {
-	background-color: #fff;
-	width: 918px;
-	height: auto !important;
-	margin-left: 270px !important;
-}
-
-div.contents {
-	width: 858px;
-	margin: 30px;
-}
-
-div.line {
-	font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
-	font-size: 13px;
-	font-style: normal;
-	font-variant: normal;
-	font-weight: normal;
-	line-height: 19px;	
-}
-
-tt, code, pre {
-	font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
-	font-size: 12px;
-}
-
-div.fragment {
-	background-color: #f8f8f8;
-	border: 1px solid #ddd;
-	font-size: 13px;
-	line-height: 19px;
-	overflow: auto;
-	padding: 6px 10px;
-	border-radius: 3px;
-}
-
-#topbanner {
-	position: fixed;
-	margin: 15px;
-	z-index: 101;
-}
-
-#projectname
-{
-	font-family: Helvetica, arial, freesans, clean, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';
-	font-size: 38px;
-	font-weight: bold;
-	line-height: 63.75px;
-	margin: 0px;
-	padding: 2px 0px;
-}
-    
-#projectbrief
-{
-	font-family: Helvetica, arial, freesans, clean, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';
-	font-size: 16px;
-	line-height: 22.4px;
-	margin: 0px 0px 13px 0px;
-	padding: 2px;
-}
-
-/* side bar and search */
-
-#side-nav
-{
-	padding: 10px 0px 20px 20px;
-	border-top: 60px solid #2980b9;
-	background-color: #343131;
-	width: 250px !important;
-	height: 100% !important;
-	position: fixed;
-}
-
-#nav-tree
-{
-	background-color: transparent;
-	background-image: none;
-	height: 100% !important;
-}
-
-#nav-tree .label
-{
-	font-family: Helvetica, arial, freesans, clean, sans-serif, 'Segoe UI Emoji', 'Segoe UI Symbol';
-	line-height: 25.5px;	
-	font-size: 15px;
-}
-
-#nav-tree
-{
-	color: #b3b3b3;
-}
-
-#nav-tree .selected {
-	background-image: none;
-}
-
-#nav-tree a
-{
-	color: #b3b3b3;
-}
-
-#github
-{
-	position: fixed;
-	left: auto;
-	right: auto;
-	width: 250px;
-}
-
-#MSearchBox
-{
-	margin: 20px;
-	left: 40px;
-	right: auto;
-	position: fixed;
-	width: 180px;
-}
-
-#MSearchField
-{
-	width: 121px;
-}
-
-#MSearchResultsWindow
-{
-	left: 45px !important;
-}
-
-#nav-sync
-{
-	display: none;
-}
-
-.ui-resizable .ui-resizable-handle
-{
-	width: 0px;
-}
-
-#nav-path
-{
-	display: none;
-}
-
-/* external link icon */
-div.contents a[href ^= "http"]:after {
-     content: " " url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAVklEQVR4Xn3PgQkAMQhDUXfqTu7kTtkpd5RA8AInfArtQ2iRXFWT2QedAfttj2FsPIOE1eCOlEuoWWjgzYaB/IkeGOrxXhqB+uA9Bfcm0lAZuh+YIeAD+cAqSz4kCMUAAAAASUVORK5CYII=);
-}
-
-.githublogo {
-	content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NDkxMSwgMjAxMy8xMC8yOS0xMTo0NzoxNiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RERCMUIwOUY4NkNFMTFFM0FBNTJFRTMzNTJEMUJDNDYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RERCMUIwOUU4NkNFMTFFM0FBNTJFRTMzNTJEMUJDNDYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkU1MTc4QTJBOTlBMDExRTI5QTE1QkMxMDQ2QTg5MDREIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkU1MTc4QTJCOTlBMDExRTI5QTE1QkMxMDQ2QTg5MDREIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+jUqS1wAAApVJREFUeNq0l89rE1EQx3e3gVJoSPzZeNEWPKgHoa0HBak0iHiy/4C3WvDmoZ56qJ7txVsPQu8qlqqHIhRKJZceesmhioQEfxTEtsoSpdJg1u/ABJ7Pmc1m8zLwgWTmzcw3L+/te+tHUeQltONgCkyCi2AEDHLsJ6iBMlgHL8FeoqokoA2j4CloRMmtwTmj7erHBXPgCWhG6a3JNXKdCiDl1cidVbXZkJoXQRi5t5BrxwoY71FzU8S4JuAIqFkJ2+BFSlEh525b/hr3+k/AklDkNsf6wTT4yv46KIMNpsy+iMdMc47HNWxbsgVcUn7FmLAzzoFAWDsBx+wVP6bUpp5ewI+DOeUx0Wd9D8F70BTGNjkWtqnhmT1JQAHcUgZd8Lo3rQb1LAT8eJVUfgGvHQigGp+V2Z0iAUUl8QH47kAA1XioxIo+bRN8OG8F/oBjwv+Z1nJgX5jpdzQDw0LCjsPmrcW7I/iHScCAEDj03FtD8A0EyuChHgg4KTlJQF3wZ7WELppnBX+dBFSVpJsOBWi1qiRgSwnOgoyD5hmuJdkWCVhTgnTvW3AgYIFrSbZGh0UW/Io5Vp+DQoK7o80pztWMemZbgxeNwCNwDbw1fIfgGZjhU6xPaJgBV8BdsMw5cbZoHsenwYFxkZzl83xTSKTiviCAfCsJLysH3POfC8m8NegyGAGfLP/VmGmfSChgXroR0RSWjEFv2J/nG84cuKFMf4sTCZqXuJd4KaXFVjEG3+tw4eXbNK/YC9oXXs3O8NY8y99L4BXY5cvLY/Bb2VZ58EOJVcB18DHJq9lRsKr8inyKGVjlmh29mtHs3AHfuhCwy1vXT/Nu2GKQt+UHsGdctyX6eQyNvc+5sfX9Dl7Pe2J/BRgAl2CpwmrsHR0AAAAASUVORK5CYII=);
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/doc/misc/footer.html b/src/sioclient/lib/rapidjson/doc/misc/footer.html
deleted file mode 100644
index 77f11311..00000000
--- a/src/sioclient/lib/rapidjson/doc/misc/footer.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- HTML footer for doxygen 1.8.7-->
-<!-- start footer part -->
-<!--BEGIN GENERATE_TREEVIEW-->
-<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
-  <ul>
-    $navpath
-  </ul>
-</div>
-<!--END GENERATE_TREEVIEW-->
-</body>
-</html>
diff --git a/src/sioclient/lib/rapidjson/doc/misc/header.html b/src/sioclient/lib/rapidjson/doc/misc/header.html
deleted file mode 100644
index a89ba46b..00000000
--- a/src/sioclient/lib/rapidjson/doc/misc/header.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- HTML header for doxygen 1.8.7-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen $doxygenversion"/>
-<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
-<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
-<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="$relpath^jquery.js"></script>
-<script type="text/javascript" src="$relpath^dynsections.js"></script>
-$treeview
-$search
-$mathjax
-<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
-$extrastylesheet
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="topbanner"><a href="https://github.com/Tencent/rapidjson" title="RapidJSON GitHub"><i class="githublogo"></i></a></div>
-$searchbox
-<!--END TITLEAREA-->
-<!-- end header part -->
diff --git a/src/sioclient/lib/rapidjson/doc/npm.md b/src/sioclient/lib/rapidjson/doc/npm.md
deleted file mode 100644
index 6f4e85ad..00000000
--- a/src/sioclient/lib/rapidjson/doc/npm.md
+++ /dev/null
@@ -1,31 +0,0 @@
-## NPM
-
-# package.json {#package}
-
-~~~~~~~~~~js
-{
-  ...
-  "dependencies": {
-    ...
-    "rapidjson": "git@github.com:Tencent/rapidjson.git"
-  },
-  ...
-  "gypfile": true
-}
-~~~~~~~~~~
-
-# binding.gyp {#binding}
-
-~~~~~~~~~~js
-{
-  ...
-  'targets': [
-    {
-      ...
-      'include_dirs': [
-        '<!(node -e \'require("rapidjson")\')'
-      ]
-    }
-  ]
-}
-~~~~~~~~~~
diff --git a/src/sioclient/lib/rapidjson/doc/performance.md b/src/sioclient/lib/rapidjson/doc/performance.md
deleted file mode 100644
index 6f9e1bf8..00000000
--- a/src/sioclient/lib/rapidjson/doc/performance.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Performance
-
-There is a [native JSON benchmark collection] [1] which evaluates speed, memory usage and code size of various operations among 37 JSON libraries.
-
-[1]: https://github.com/miloyip/nativejson-benchmark
-
-The old performance article for RapidJSON 0.1 is provided [here](https://code.google.com/p/rapidjson/wiki/Performance).
-
-Additionally, you may refer to the following third-party benchmarks.
-
-## Third-party benchmarks
-
-* [Basic benchmarks for miscellaneous C++ JSON parsers and generators](https://github.com/mloskot/json_benchmark) by Mateusz Loskot (Jun 2013)
- * [casablanca](https://casablanca.codeplex.com/)
- * [json_spirit](https://github.com/cierelabs/json_spirit)
- * [jsoncpp](http://jsoncpp.sourceforge.net/)
- * [libjson](http://sourceforge.net/projects/libjson/)
- * [rapidjson](https://github.com/Tencent/rapidjson/)
- * [QJsonDocument](http://qt-project.org/doc/qt-5.0/qtcore/qjsondocument.html)
- 
-* [JSON Parser Benchmarking](http://chadaustin.me/2013/01/json-parser-benchmarking/) by Chad Austin (Jan 2013)
- * [sajson](https://github.com/chadaustin/sajson)
- * [rapidjson](https://github.com/Tencent/rapidjson/)
- * [vjson](https://code.google.com/p/vjson/)
- * [YAJL](http://lloyd.github.com/yajl/)
- * [Jansson](http://www.digip.org/jansson/)
diff --git a/src/sioclient/lib/rapidjson/doc/performance.zh-cn.md b/src/sioclient/lib/rapidjson/doc/performance.zh-cn.md
deleted file mode 100644
index 2322c9c4..00000000
--- a/src/sioclient/lib/rapidjson/doc/performance.zh-cn.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# 性能
-
-有一个 [native JSON benchmark collection][1] 项目，能评估 37 个 JSON 库在不同操作下的速度、內存用量及代码大小。
-
-[1]: https://github.com/miloyip/nativejson-benchmark
-
-RapidJSON 0.1 版本的性能测试文章位于 [这里](https://code.google.com/p/rapidjson/wiki/Performance).
-
-此外，你也可以参考以下这些第三方的评测。
-
-## 第三方评测
-
-* [Basic benchmarks for miscellaneous C++ JSON parsers and generators](https://github.com/mloskot/json_benchmark) by Mateusz Loskot (Jun 2013)
- * [casablanca](https://casablanca.codeplex.com/)
- * [json_spirit](https://github.com/cierelabs/json_spirit)
- * [jsoncpp](http://jsoncpp.sourceforge.net/)
- * [libjson](http://sourceforge.net/projects/libjson/)
- * [rapidjson](https://github.com/Tencent/rapidjson/)
- * [QJsonDocument](http://qt-project.org/doc/qt-5.0/qtcore/qjsondocument.html)
- 
-* [JSON Parser Benchmarking](http://chadaustin.me/2013/01/json-parser-benchmarking/) by Chad Austin (Jan 2013)
- * [sajson](https://github.com/chadaustin/sajson)
- * [rapidjson](https://github.com/Tencent/rapidjson/)
- * [vjson](https://code.google.com/p/vjson/)
- * [YAJL](http://lloyd.github.com/yajl/)
- * [Jansson](http://www.digip.org/jansson/)
diff --git a/src/sioclient/lib/rapidjson/doc/pointer.md b/src/sioclient/lib/rapidjson/doc/pointer.md
deleted file mode 100644
index 9a0e5ca0..00000000
--- a/src/sioclient/lib/rapidjson/doc/pointer.md
+++ /dev/null
@@ -1,234 +0,0 @@
-# Pointer
-
-(This feature was released in v1.1.0)
-
-JSON Pointer is a standardized ([RFC6901]) way to select a value inside a JSON Document (DOM). This can be analogous to XPath for XML document. However, JSON Pointer is much simpler, and a single JSON Pointer only pointed to a single value.
-
-Using RapidJSON's implementation of JSON Pointer can simplify some manipulations of the DOM.
-
-[TOC]
-
-# JSON Pointer {#JsonPointer}
-
-A JSON Pointer is a list of zero-to-many tokens, each prefixed by `/`. Each token can be a string or a number. For example, given a JSON:
-~~~javascript
-{
-    "foo" : ["bar", "baz"],
-    "pi" : 3.1416
-}
-~~~
-
-The following JSON Pointers resolve this JSON as:
-
-1. `"/foo"` → `[ "bar", "baz" ]`
-2. `"/foo/0"` → `"bar"`
-3. `"/foo/1"` → `"baz"`
-4. `"/pi"` → `3.1416`
-
-Note that, an empty JSON Pointer `""` (zero token) resolves to the whole JSON.
-
-# Basic Usage {#BasicUsage}
-
-The following example code is self-explanatory.
-
-~~~cpp
-#include "rapidjson/pointer.h"
-
-// ...
-Document d;
-
-// Create DOM by Set()
-Pointer("/project").Set(d, "RapidJSON");
-Pointer("/stars").Set(d, 10);
-
-// { "project" : "RapidJSON", "stars" : 10 }
-
-// Access DOM by Get(). It return nullptr if the value does not exist.
-if (Value* stars = Pointer("/stars").Get(d))
-    stars->SetInt(stars->GetInt() + 1);
-
-// { "project" : "RapidJSON", "stars" : 11 }
-
-// Set() and Create() automatically generate parents if not exist.
-Pointer("/a/b/0").Create(d);
-
-// { "project" : "RapidJSON", "stars" : 11, "a" : { "b" : [ null ] } }
-
-// GetWithDefault() returns reference. And it deep clones the default value.
-Value& hello = Pointer("/hello").GetWithDefault(d, "world");
-
-// { "project" : "RapidJSON", "stars" : 11, "a" : { "b" : [ null ] }, "hello" : "world" }
-
-// Swap() is similar to Set()
-Value x("C++");
-Pointer("/hello").Swap(d, x);
-
-// { "project" : "RapidJSON", "stars" : 11, "a" : { "b" : [ null ] }, "hello" : "C++" }
-// x becomes "world"
-
-// Erase a member or element, return true if the value exists
-bool success = Pointer("/a").Erase(d);
-assert(success);
-
-// { "project" : "RapidJSON", "stars" : 10 }
-~~~
-
-# Helper Functions {#HelperFunctions}
-
-Since object-oriented calling convention may be non-intuitive, RapidJSON also provides helper functions, which just wrap the member functions with free-functions.
-
-The following example does exactly the same as the above one.
-
-~~~cpp
-Document d;
-
-SetValueByPointer(d, "/project", "RapidJSON");
-SetValueByPointer(d, "/stars", 10);
-
-if (Value* stars = GetValueByPointer(d, "/stars"))
-    stars->SetInt(stars->GetInt() + 1);
-
-CreateValueByPointer(d, "/a/b/0");
-
-Value& hello = GetValueByPointerWithDefault(d, "/hello", "world");
-
-Value x("C++");
-SwapValueByPointer(d, "/hello", x);
-
-bool success = EraseValueByPointer(d, "/a");
-assert(success);
-~~~
-
-The conventions are shown here for comparison:
-
-1. `Pointer(source).<Method>(root, ...)`
-2. `<Method>ValueByPointer(root, Pointer(source), ...)`
-3. `<Method>ValueByPointer(root, source, ...)`
-
-# Resolving Pointer {#ResolvingPointer}
-
-`Pointer::Get()` or `GetValueByPointer()` function does not modify the DOM. If the tokens cannot match a value in the DOM, it returns `nullptr`. User can use this to check whether a value exists.
-
-Note that, numerical tokens can represent an array index or member name. The resolving process will match the values according to the types of value.
-
-~~~javascript
-{
-    "0" : 123,
-    "1" : [456]
-}
-~~~
-
-1. `"/0"` → `123`
-2. `"/1/0"` → `456`
-
-The token `"0"` is treated as member name in the first pointer. It is treated as an array index in the second pointer.
-
-The other functions, including `Create()`, `GetWithDefault()`, `Set()` and `Swap()`, will change the DOM. These functions will always succeed. They will create the parent values if they do not exist. If the parent values do not match the tokens, they will also be forced to change their type. Changing the type also mean fully removal of that DOM subtree.
-
-Parsing the above JSON into `d`, 
-
-~~~cpp
-SetValueByPointer(d, "1/a", 789); // { "0" : 123, "1" : { "a" : 789 } }
-~~~
-
-## Resolving Minus Sign Token
-
-Besides, [RFC6901] defines a special token `-` (single minus sign), which represents the pass-the-end element of an array. `Get()` only treats this token as a member name '"-"'. Yet the other functions can resolve this for array, equivalent to calling `Value::PushBack()` to the array.
-
-~~~cpp
-Document d;
-d.Parse("{\"foo\":[123]}");
-SetValueByPointer(d, "/foo/-", 456); // { "foo" : [123, 456] }
-SetValueByPointer(d, "/-", 789);    // { "foo" : [123, 456], "-" : 789 }
-~~~
-
-## Resolving Document and Value
-
-When using `p.Get(root)` or `GetValueByPointer(root, p)`, `root` is a (const) `Value&`. That means, it can be a subtree of the DOM.
-
-The other functions have two groups of signature. One group uses `Document& document` as parameter, another one uses `Value& root`. The first group uses `document.GetAllocator()` for creating values. And the second group needs user to supply an allocator, like the functions in DOM.
-
-All examples above do not require an allocator parameter, because the first parameter is a `Document&`. But if you want to resolve a pointer to a subtree, you need to supply the allocator as in the following example:
-
-~~~cpp
-class Person {
-public:
-    Person() {
-        document_ = new Document();
-        // CreateValueByPointer() here no need allocator
-        SetLocation(CreateValueByPointer(*document_, "/residence"), ...);
-        SetLocation(CreateValueByPointer(*document_, "/office"), ...);
-    };
-
-private:
-    void SetLocation(Value& location, const char* country, const char* addresses[2]) {
-        Value::Allocator& a = document_->GetAllocator();
-        // SetValueByPointer() here need allocator
-        SetValueByPointer(location, "/country", country, a);
-        SetValueByPointer(location, "/address/0", address[0], a);
-        SetValueByPointer(location, "/address/1", address[1], a);
-    }
-
-    // ...
-
-    Document* document_;
-};
-~~~
-
-`Erase()` or `EraseValueByPointer()` does not need allocator. And they return `true` if the value is erased successfully.
-
-# Error Handling {#ErrorHandling}
-
-A `Pointer` parses a source string in its constructor. If there is parsing error, `Pointer::IsValid()` returns `false`. And you can use `Pointer::GetParseErrorCode()` and `GetParseErrorOffset()` to retrieve the error information.
-
-Note that, all resolving functions assumes valid pointer. Resolving with an invalid pointer causes assertion failure.
-
-# URI Fragment Representation {#URIFragment}
-
-In addition to the string representation of JSON pointer that we are using till now, [RFC6901] also defines the URI fragment representation of JSON pointer. URI fragment is specified in [RFC3986] "Uniform Resource Identifier (URI): Generic Syntax".
-
-The main differences are that a the URI fragment always has a `#` (pound sign) in the beginning, and some characters are encoded by percent-encoding in UTF-8 sequence. For example, the following table shows different C/C++ string literals of different representations.
-
-String Representation | URI Fragment Representation | Pointer Tokens (UTF-8)
-----------------------|-----------------------------|------------------------
-`"/foo/0"`            | `"#/foo/0"`                 | `{"foo", 0}`
-`"/a~1b"`             | `"#/a~1b"`                  | `{"a/b"}`
-`"/m~0n"`             | `"#/m~0n"`                  | `{"m~n"}`
-`"/ "`                | `"#/%20"`                   | `{" "}`
-`"/\0"`               | `"#/%00"`                   | `{"\0"}`
-`"/€"`                | `"#/%E2%82%AC"`             | `{"€"}`
-
-RapidJSON fully support URI fragment representation. It automatically detects the pound sign during parsing.
-
-# Stringify
-
-You may also stringify a `Pointer` to a string or other output streams. This can be done by:
-
-~~~
-Pointer p(...);
-StringBuffer sb;
-p.Stringify(sb);
-std::cout << sb.GetString() << std::endl;
-~~~
-
-It can also stringify to URI fragment representation by `StringifyUriFragment()`.
-
-# User-Supplied Tokens {#UserSuppliedTokens}
-
-If a pointer will be resolved multiple times, it should be constructed once, and then apply it to different DOMs or in different times. This reduce time and memory allocation for constructing `Pointer` multiple times.
-
-We can go one step further, to completely eliminate the parsing process and dynamic memory allocation, we can establish the token array directly:
-
-~~~cpp
-#define NAME(s) { s, sizeof(s) / sizeof(s[0]) - 1, kPointerInvalidIndex }
-#define INDEX(i) { #i, sizeof(#i) - 1, i }
-
-static const Pointer::Token kTokens[] = { NAME("foo"), INDEX(123) };
-static const Pointer p(kTokens, sizeof(kTokens) / sizeof(kTokens[0]));
-// Equivalent to static const Pointer p("/foo/123");
-~~~
-
-This may be useful for memory constrained systems.
-
-[RFC3986]: https://tools.ietf.org/html/rfc3986
-[RFC6901]: https://tools.ietf.org/html/rfc6901
diff --git a/src/sioclient/lib/rapidjson/doc/pointer.zh-cn.md b/src/sioclient/lib/rapidjson/doc/pointer.zh-cn.md
deleted file mode 100644
index f58f55f3..00000000
--- a/src/sioclient/lib/rapidjson/doc/pointer.zh-cn.md
+++ /dev/null
@@ -1,234 +0,0 @@
-# Pointer
-
-（本功能于 v1.1.0 发布）
-
-JSON Pointer 是一个标准化（[RFC6901]）的方式去选取一个 JSON Document（DOM）中的值。这类似于 XML 的 XPath。然而，JSON Pointer 简单得多，而且每个 JSON Pointer 仅指向单个值。
-
-使用 RapidJSON 的 JSON Pointer 实现能简化一些 DOM 的操作。
-
-[TOC]
-
-# JSON Pointer {#JsonPointer}
-
-一个 JSON Pointer 由一串（零至多个）token 所组成，每个 token 都有 `/` 前缀。每个 token 可以是一个字符串或数字。例如，给定一个 JSON：
-~~~javascript
-{
-    "foo" : ["bar", "baz"],
-    "pi" : 3.1416
-}
-~~~
-
-以下的 JSON Pointer 解析为：
-
-1. `"/foo"` → `[ "bar", "baz" ]`
-2. `"/foo/0"` → `"bar"`
-3. `"/foo/1"` → `"baz"`
-4. `"/pi"` → `3.1416`
-
-要注意，一个空 JSON Pointer `""` （零个 token）解析为整个 JSON。
-
-# 基本使用方法 {#BasicUsage}
-
-以下的代码范例不解自明。
-
-~~~cpp
-#include "rapidjson/pointer.h"
-
-// ...
-Document d;
-
-// 使用 Set() 创建 DOM
-Pointer("/project").Set(d, "RapidJSON");
-Pointer("/stars").Set(d, 10);
-
-// { "project" : "RapidJSON", "stars" : 10 }
-
-// 使用 Get() 访问 DOM。若该值不存在则返回 nullptr。
-if (Value* stars = Pointer("/stars").Get(d))
-    stars->SetInt(stars->GetInt() + 1);
-
-// { "project" : "RapidJSON", "stars" : 11 }
-
-// Set() 和 Create() 自动生成父值（如果它们不存在）。
-Pointer("/a/b/0").Create(d);
-
-// { "project" : "RapidJSON", "stars" : 11, "a" : { "b" : [ null ] } }
-
-// GetWithDefault() 返回引用。若该值不存在则会深拷贝缺省值。
-Value& hello = Pointer("/hello").GetWithDefault(d, "world");
-
-// { "project" : "RapidJSON", "stars" : 11, "a" : { "b" : [ null ] }, "hello" : "world" }
-
-// Swap() 和 Set() 相似
-Value x("C++");
-Pointer("/hello").Swap(d, x);
-
-// { "project" : "RapidJSON", "stars" : 11, "a" : { "b" : [ null ] }, "hello" : "C++" }
-// x 变成 "world"
-
-// 删去一个成员或元素，若值存在返回 true
-bool success = Pointer("/a").Erase(d);
-assert(success);
-
-// { "project" : "RapidJSON", "stars" : 10 }
-~~~
-
-# 辅助函数 {#HelperFunctions}
-
-由于面向对象的调用习惯可能不符直觉，RapidJSON 也提供了一些辅助函数，它们把成员函数包装成自由函数。
-
-以下的例子与上面例子所做的事情完全相同。
-
-~~~cpp
-Document d;
-
-SetValueByPointer(d, "/project", "RapidJSON");
-SetValueByPointer(d, "/stars", 10);
-
-if (Value* stars = GetValueByPointer(d, "/stars"))
-    stars->SetInt(stars->GetInt() + 1);
-
-CreateValueByPointer(d, "/a/b/0");
-
-Value& hello = GetValueByPointerWithDefault(d, "/hello", "world");
-
-Value x("C++");
-SwapValueByPointer(d, "/hello", x);
-
-bool success = EraseValueByPointer(d, "/a");
-assert(success);
-~~~
-
-以下对比 3 种调用方式：
-
-1. `Pointer(source).<Method>(root, ...)`
-2. `<Method>ValueByPointer(root, Pointer(source), ...)`
-3. `<Method>ValueByPointer(root, source, ...)`
-
-# 解析 Pointer {#ResolvingPointer}
-
-`Pointer::Get()` 或 `GetValueByPointer()` 函数并不修改 DOM。若那些 token 不能匹配 DOM 里的值，这些函数便返回 `nullptr`。使用者可利用这个方法来检查一个值是否存在。
-
-注意，数值 token 可表示数组索引或成员名字。解析过程中会按值的类型来匹配。
-
-~~~javascript
-{
-    "0" : 123,
-    "1" : [456]
-}
-~~~
-
-1. `"/0"` → `123`
-2. `"/1/0"` → `456`
-
-Token `"0"` 在第一个 pointer 中被当作成员名字。它在第二个 pointer 中被当作成数组索引。
-
-其他函数会改变 DOM，包括 `Create()`、`GetWithDefault()`、`Set()`、`Swap()`。这些函数总是成功的。若一些父值不存在，就会创建它们。若父值类型不匹配 token，也会强行改变其类型。改变类型也意味着完全移除其 DOM 子树的内容。
-
-例如，把上面的 JSON 解译至 `d` 之后，
-
-~~~cpp
-SetValueByPointer(d, "1/a", 789); // { "0" : 123, "1" : { "a" : 789 } }
-~~~
-
-## 解析负号 token
-
-另外，[RFC6901] 定义了一个特殊 token `-` （单个负号），用于表示数组最后元素的下一个元素。 `Get()` 只会把此 token 当作成员名字 '"-"'。而其他函数则会以此解析数组，等同于对数组调用 `Value::PushBack()` 。
-
-~~~cpp
-Document d;
-d.Parse("{\"foo\":[123]}");
-SetValueByPointer(d, "/foo/-", 456); // { "foo" : [123, 456] }
-SetValueByPointer(d, "/-", 789);    // { "foo" : [123, 456], "-" : 789 }
-~~~
-
-## 解析 Document 及 Value
-
-当使用 `p.Get(root)` 或 `GetValueByPointer(root, p)`，`root` 是一个（常数） `Value&`。这意味着，它也可以是 DOM 里的一个子树。
-
-其他函数有两组签名。一组使用 `Document& document` 作为参数，另一组使用 `Value& root`。第一组使用 `document.GetAllocator()` 去创建值，而第二组则需要使用者提供一个 allocator，如同 DOM 里的函数。
-
-以上例子都不需要 allocator 参数，因为它的第一个参数是 `Document&`。但如果你需要对一个子树进行解析，就需要如下面的例子般提供 allocator：
-
-~~~cpp
-class Person {
-public:
-    Person() {
-        document_ = new Document();
-        // CreateValueByPointer() here no need allocator
-        SetLocation(CreateValueByPointer(*document_, "/residence"), ...);
-        SetLocation(CreateValueByPointer(*document_, "/office"), ...);
-    };
-
-private:
-    void SetLocation(Value& location, const char* country, const char* addresses[2]) {
-        Value::Allocator& a = document_->GetAllocator();
-        // SetValueByPointer() here need allocator
-        SetValueByPointer(location, "/country", country, a);
-        SetValueByPointer(location, "/address/0", address[0], a);
-        SetValueByPointer(location, "/address/1", address[1], a);
-    }
-
-    // ...
-
-    Document* document_;
-};
-~~~
-
-`Erase()` 或 `EraseValueByPointer()` 不需要 allocator。而且它们成功删除值之后会返回 `true`。
-
-# 错误处理 {#ErrorHandling}
-
-`Pointer` 在其建构函数里会解译源字符串。若有解析错误，`Pointer::IsValid()` 返回 `false`。你可使用 `Pointer::GetParseErrorCode()` 和 `GetParseErrorOffset()` 去获取错信息。
-
-要注意的是，所有解析函数都假设 pointer 是合法的。对一个非法 pointer 解析会做成断言失败。
-
-# URI 片段表示方式 {#URIFragment}
-
-除了我们一直在使用的字符串方式表示 JSON pointer，[RFC6901] 也定义了一个 JSON Pointer 的 URI 片段（fragment）表示方式。URI 片段是定义于 [RFC3986] "Uniform Resource Identifier (URI): Generic Syntax"。
-
-URI 片段的主要分别是必然以 `#` （pound sign）开头，而一些字符也会以百分比编码成 UTF-8 序列。例如，以下的表展示了不同表示法下的 C/C++ 字符串常数。
-
-字符串表示方式 | URI 片段表示方式 | Pointer Tokens （UTF-8）
-----------------------|-----------------------------|------------------------
-`"/foo/0"`            | `"#/foo/0"`                 | `{"foo", 0}`
-`"/a~1b"`             | `"#/a~1b"`                  | `{"a/b"}`
-`"/m~0n"`             | `"#/m~0n"`                  | `{"m~n"}`
-`"/ "`                | `"#/%20"`                   | `{" "}`
-`"/\0"`               | `"#/%00"`                   | `{"\0"}`
-`"/€"`                | `"#/%E2%82%AC"`             | `{"€"}`
-
-RapidJSON 完全支持 URI 片段表示方式。它在解译时会自动检测 `#` 号。
-
-# 字符串化
-
-你也可以把一个 `Pointer` 字符串化，储存于字符串或其他输出流。例如：
-
-~~~
-Pointer p(...);
-StringBuffer sb;
-p.Stringify(sb);
-std::cout << sb.GetString() << std::endl;
-~~~
-
-使用 `StringifyUriFragment()` 可以把 pointer 字符串化为 URI 片段表示法。
-
-# 使用者提供的 tokens {#UserSuppliedTokens}
-
-若一个 pointer 会用于多次解析，它应该只被创建一次，然后再施于不同的 DOM ，或在不同时间做解析。这样可以避免多次创键 `Pointer`，节省时间和内存分配。
-
-我们甚至可以再更进一步，完全消去解析过程及动态内存分配。我们可以直接生成 token 数组：
-
-~~~cpp
-#define NAME(s) { s, sizeof(s) / sizeof(s[0]) - 1, kPointerInvalidIndex }
-#define INDEX(i) { #i, sizeof(#i) - 1, i }
-
-static const Pointer::Token kTokens[] = { NAME("foo"), INDEX(123) };
-static const Pointer p(kTokens, sizeof(kTokens) / sizeof(kTokens[0]));
-// Equivalent to static const Pointer p("/foo/123");
-~~~
-
-这种做法可能适合内存受限的系统。
-
-[RFC3986]: https://tools.ietf.org/html/rfc3986
-[RFC6901]: https://tools.ietf.org/html/rfc6901
diff --git a/src/sioclient/lib/rapidjson/doc/sax.md b/src/sioclient/lib/rapidjson/doc/sax.md
deleted file mode 100644
index 874361ff..00000000
--- a/src/sioclient/lib/rapidjson/doc/sax.md
+++ /dev/null
@@ -1,509 +0,0 @@
-# SAX
-
-The term "SAX" originated from [Simple API for XML](http://en.wikipedia.org/wiki/Simple_API_for_XML). We borrowed this term for JSON parsing and generation.
-
-In RapidJSON, `Reader` (typedef of `GenericReader<...>`) is the SAX-style parser for JSON, and `Writer` (typedef of `GenericWriter<...>`) is the SAX-style generator for JSON.
-
-[TOC]
-
-# Reader {#Reader}
-
-`Reader` parses a JSON from a stream. While it reads characters from the stream, it analyzes the characters according to the syntax of JSON, and publishes events to a handler.
-
-For example, here is a JSON.
-
-~~~~~~~~~~js
-{
-    "hello": "world",
-    "t": true ,
-    "f": false,
-    "n": null,
-    "i": 123,
-    "pi": 3.1416,
-    "a": [1, 2, 3, 4]
-}
-~~~~~~~~~~
-
-When a `Reader` parses this JSON, it publishes the following events to the handler sequentially:
-
-~~~~~~~~~~
-StartObject()
-Key("hello", 5, true)
-String("world", 5, true)
-Key("t", 1, true)
-Bool(true)
-Key("f", 1, true)
-Bool(false)
-Key("n", 1, true)
-Null()
-Key("i")
-UInt(123)
-Key("pi")
-Double(3.1416)
-Key("a")
-StartArray()
-Uint(1)
-Uint(2)
-Uint(3)
-Uint(4)
-EndArray(4)
-EndObject(7)
-~~~~~~~~~~
-
-These events can be easily matched with the JSON, but some event parameters need further explanation. Let's see the `simplereader` example which produces exactly the same output as above:
-
-~~~~~~~~~~cpp
-#include "rapidjson/reader.h"
-#include <iostream>
-
-using namespace rapidjson;
-using namespace std;
-
-struct MyHandler : public BaseReaderHandler<UTF8<>, MyHandler> {
-    bool Null() { cout << "Null()" << endl; return true; }
-    bool Bool(bool b) { cout << "Bool(" << boolalpha << b << ")" << endl; return true; }
-    bool Int(int i) { cout << "Int(" << i << ")" << endl; return true; }
-    bool Uint(unsigned u) { cout << "Uint(" << u << ")" << endl; return true; }
-    bool Int64(int64_t i) { cout << "Int64(" << i << ")" << endl; return true; }
-    bool Uint64(uint64_t u) { cout << "Uint64(" << u << ")" << endl; return true; }
-    bool Double(double d) { cout << "Double(" << d << ")" << endl; return true; }
-    bool String(const char* str, SizeType length, bool copy) { 
-        cout << "String(" << str << ", " << length << ", " << boolalpha << copy << ")" << endl;
-        return true;
-    }
-    bool StartObject() { cout << "StartObject()" << endl; return true; }
-    bool Key(const char* str, SizeType length, bool copy) { 
-        cout << "Key(" << str << ", " << length << ", " << boolalpha << copy << ")" << endl;
-        return true;
-    }
-    bool EndObject(SizeType memberCount) { cout << "EndObject(" << memberCount << ")" << endl; return true; }
-    bool StartArray() { cout << "StartArray()" << endl; return true; }
-    bool EndArray(SizeType elementCount) { cout << "EndArray(" << elementCount << ")" << endl; return true; }
-};
-
-void main() {
-    const char json[] = " { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ";
-
-    MyHandler handler;
-    Reader reader;
-    StringStream ss(json);
-    reader.Parse(ss, handler);
-}
-~~~~~~~~~~
-
-Note that RapidJSON uses templates to statically bind the `Reader` type and the handler type, instead of using classes with virtual functions. This paradigm can improve performance by inlining functions.
-
-## Handler {#Handler}
-
-As shown in the previous example, the user needs to implement a handler which consumes the events (via function calls) from the `Reader`. The handler must contain the following member functions.
-
-~~~~~~~~~~cpp
-class Handler {
-    bool Null();
-    bool Bool(bool b);
-    bool Int(int i);
-    bool Uint(unsigned i);
-    bool Int64(int64_t i);
-    bool Uint64(uint64_t i);
-    bool Double(double d);
-    bool RawNumber(const Ch* str, SizeType length, bool copy);
-    bool String(const Ch* str, SizeType length, bool copy);
-    bool StartObject();
-    bool Key(const Ch* str, SizeType length, bool copy);
-    bool EndObject(SizeType memberCount);
-    bool StartArray();
-    bool EndArray(SizeType elementCount);
-};
-~~~~~~~~~~
-
-`Null()` is called when the `Reader` encounters a JSON null value.
-
-`Bool(bool)` is called when the `Reader` encounters a JSON true or false value.
-
-When the `Reader` encounters a JSON number, it chooses a suitable C++ type mapping. And then it calls *one* function out of `Int(int)`, `Uint(unsigned)`, `Int64(int64_t)`, `Uint64(uint64_t)` and `Double(double)`. If `kParseNumbersAsStrings` is enabled, `Reader` will always calls `RawNumber()` instead.
-
-`String(const char* str, SizeType length, bool copy)` is called when the `Reader` encounters a string. The first parameter is pointer to the string. The second parameter is the length of the string (excluding the null terminator). Note that RapidJSON supports null character `\0` inside a string. If such situation happens, `strlen(str) < length`. The last `copy` indicates whether the handler needs to make a copy of the string. For normal parsing, `copy = true`. Only when *insitu* parsing is used, `copy = false`. And be aware that the character type depends on the target encoding, which will be explained later.
-
-When the `Reader` encounters the beginning of an object, it calls `StartObject()`. An object in JSON is a set of name-value pairs. If the object contains members it first calls `Key()` for the name of member, and then calls functions depending on the type of the value. These calls of name-value pairs repeat until calling `EndObject(SizeType memberCount)`. Note that the `memberCount` parameter is just an aid for the handler; users who do not need this parameter may ignore it.
-
-Arrays are similar to objects, but simpler. At the beginning of an array, the `Reader` calls `BeginArray()`. If there is elements, it calls functions according to the types of element. Similarly, in the last call `EndArray(SizeType elementCount)`, the parameter `elementCount` is just an aid for the handler.
-
-Every handler function returns a `bool`. Normally it should return `true`. If the handler encounters an error, it can return `false` to notify the event publisher to stop further processing.
-
-For example, when we parse a JSON with `Reader` and the handler detects that the JSON does not conform to the required schema, the handler can return `false` and let the `Reader` stop further parsing. This will place the `Reader` in an error state, with error code `kParseErrorTermination`.
-
-## GenericReader {#GenericReader}
-
-As mentioned before, `Reader` is a typedef of a template class `GenericReader`:
-
-~~~~~~~~~~cpp
-namespace rapidjson {
-
-template <typename SourceEncoding, typename TargetEncoding, typename Allocator = MemoryPoolAllocator<> >
-class GenericReader {
-    // ...
-};
-
-typedef GenericReader<UTF8<>, UTF8<> > Reader;
-
-} // namespace rapidjson
-~~~~~~~~~~
-
-The `Reader` uses UTF-8 as both source and target encoding. The source encoding means the encoding in the JSON stream. The target encoding means the encoding of the `str` parameter in `String()` calls. For example, to parse a UTF-8 stream and output UTF-16 string events, you can define a reader by:
-
-~~~~~~~~~~cpp
-GenericReader<UTF8<>, UTF16<> > reader;
-~~~~~~~~~~
-
-Note that, the default character type of `UTF16` is `wchar_t`. So this `reader` needs to call `String(const wchar_t*, SizeType, bool)` of the handler.
-
-The third template parameter `Allocator` is the allocator type for internal data structure (actually a stack).
-
-## Parsing {#SaxParsing}
-
-The main function of `Reader` is used to parse JSON. 
-
-~~~~~~~~~~cpp
-template <unsigned parseFlags, typename InputStream, typename Handler>
-bool Parse(InputStream& is, Handler& handler);
-
-// with parseFlags = kDefaultParseFlags
-template <typename InputStream, typename Handler>
-bool Parse(InputStream& is, Handler& handler);
-~~~~~~~~~~
-
-If an error occurs during parsing, it will return `false`. User can also call `bool HasParseError()`, `ParseErrorCode GetParseErrorCode()` and `size_t GetErrorOffset()` to obtain the error states. In fact, `Document` uses these `Reader` functions to obtain parse errors. Please refer to [DOM](doc/dom.md) for details about parse errors.
-
-## Token-by-Token Parsing {#TokenByTokenParsing}
-
-Some users may wish to parse a JSON input stream a single token at a time, instead of immediately parsing an entire document without stopping. To parse JSON this way, instead of calling `Parse`, you can use the `IterativeParse` set of functions:
-
-~~~~~~~~~~cpp
-    void IterativeParseInit();
-	
-    template <unsigned parseFlags, typename InputStream, typename Handler>
-    bool IterativeParseNext(InputStream& is, Handler& handler);
-
-    bool IterativeParseComplete();
-~~~~~~~~~~
-
-Here is an example of iteratively parsing JSON, token by token:
-
-~~~~~~~~~~cpp
-    reader.IterativeParseInit();
-    while (!reader.IterativeParseComplete()) {
-        reader.IterativeParseNext<kParseDefaultFlags>(is, handler);
-		// Your handler has been called once.
-    }
-~~~~~~~~~~
-
-# Writer {#Writer}
-
-`Reader` converts (parses) JSON into events. `Writer` does exactly the opposite. It converts events into JSON. 
-
-`Writer` is very easy to use. If your application only need to converts some data into JSON, it may be a good choice to use `Writer` directly, instead of building a `Document` and then stringifying it with a `Writer`.
-
-In `simplewriter` example, we do exactly the reverse of `simplereader`.
-
-~~~~~~~~~~cpp
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include <iostream>
-
-using namespace rapidjson;
-using namespace std;
-
-void main() {
-    StringBuffer s;
-    Writer<StringBuffer> writer(s);
-    
-    writer.StartObject();
-    writer.Key("hello");
-    writer.String("world");
-    writer.Key("t");
-    writer.Bool(true);
-    writer.Key("f");
-    writer.Bool(false);
-    writer.Key("n");
-    writer.Null();
-    writer.Key("i");
-    writer.Uint(123);
-    writer.Key("pi");
-    writer.Double(3.1416);
-    writer.Key("a");
-    writer.StartArray();
-    for (unsigned i = 0; i < 4; i++)
-        writer.Uint(i);
-    writer.EndArray();
-    writer.EndObject();
-
-    cout << s.GetString() << endl;
-}
-~~~~~~~~~~
-
-~~~~~~~~~~
-{"hello":"world","t":true,"f":false,"n":null,"i":123,"pi":3.1416,"a":[0,1,2,3]}
-~~~~~~~~~~
-
-There are two `String()` and `Key()` overloads. One is the same as defined in handler concept with 3 parameters. It can handle string with null characters. Another one is the simpler version used in the above example.
-
-Note that, the example code does not pass any parameters in `EndArray()` and `EndObject()`. An `SizeType` can be passed but it will be simply ignored by `Writer`.
-
-You may doubt that, why not just using `sprintf()` or `std::stringstream` to build a JSON?
-
-There are various reasons:
-1. `Writer` must output a well-formed JSON. If there is incorrect event sequence (e.g. `Int()` just after `StartObject()`), it generates assertion fail in debug mode.
-2. `Writer::String()` can handle string escaping (e.g. converting code point `U+000A` to `\n`) and Unicode transcoding.
-3. `Writer` handles number output consistently.
-4. `Writer` implements the event handler concept. It can be used to handle events from `Reader`, `Document` or other event publisher.
-5. `Writer` can be optimized for different platforms.
-
-Anyway, using `Writer` API is even simpler than generating a JSON by ad hoc methods.
-
-## Template {#WriterTemplate}
-
-`Writer` has a minor design difference to `Reader`. `Writer` is a template class, not a typedef. There is no `GenericWriter`. The following is the declaration.
-
-~~~~~~~~~~cpp
-namespace rapidjson {
-
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename Allocator = CrtAllocator<>, unsigned writeFlags = kWriteDefaultFlags>
-class Writer {
-public:
-    Writer(OutputStream& os, Allocator* allocator = 0, size_t levelDepth = kDefaultLevelDepth)
-// ...
-};
-
-} // namespace rapidjson
-~~~~~~~~~~
-
-The `OutputStream` template parameter is the type of output stream. It cannot be deduced and must be specified by user.
-
-The `SourceEncoding` template parameter specifies the encoding to be used in `String(const Ch*, ...)`.
-
-The `TargetEncoding` template parameter specifies the encoding in the output stream.
-
-The `Allocator` is the type of allocator, which is used for allocating internal data structure (a stack).
-
-The `writeFlags` are combination of the following bit-flags:
-
-Parse flags                   | Meaning
-------------------------------|-----------------------------------
-`kWriteNoFlags`               | No flag is set.
-`kWriteDefaultFlags`          | Default write flags. It is equal to macro `RAPIDJSON_WRITE_DEFAULT_FLAGS`, which is defined as `kWriteNoFlags`.
-`kWriteValidateEncodingFlag`  | Validate encoding of JSON strings.
-`kWriteNanAndInfFlag`         | Allow writing of `Infinity`, `-Infinity` and `NaN`.
-
-Besides, the constructor of `Writer` has a `levelDepth` parameter. This parameter affects the initial memory allocated for storing information per hierarchy level.
-
-## PrettyWriter {#PrettyWriter}
-
-While the output of `Writer` is the most condensed JSON without white-spaces, suitable for network transfer or storage, it is not easily readable by human.
-
-Therefore, RapidJSON provides a `PrettyWriter`, which adds indentation and line feeds in the output.
-
-The usage of `PrettyWriter` is exactly the same as `Writer`, expect that `PrettyWriter` provides a `SetIndent(Ch indentChar, unsigned indentCharCount)` function. The default is 4 spaces.
-
-## Completeness and Reset {#CompletenessReset}
-
-A `Writer` can only output a single JSON, which can be any JSON type at the root. Once the singular event for root (e.g. `String()`), or the last matching `EndObject()` or `EndArray()` event, is handled, the output JSON is well-formed and complete. User can detect this state by calling `Writer::IsComplete()`.
-
-When a JSON is complete, the `Writer` cannot accept any new events. Otherwise the output will be invalid (i.e. having more than one root). To reuse the `Writer` object, user can call `Writer::Reset(OutputStream& os)` to reset all internal states of the `Writer` with a new output stream.
-
-# Techniques {#SaxTechniques}
-
-## Parsing JSON to Custom Data Structure {#CustomDataStructure}
-
-`Document`'s parsing capability is completely based on `Reader`. Actually `Document` is a handler which receives events from a reader to build a DOM during parsing.
-
-User may uses `Reader` to build other data structures directly. This eliminates building of DOM, thus reducing memory and improving performance.
-
-In the following `messagereader` example, `ParseMessages()` parses a JSON which should be an object with key-string pairs.
-
-~~~~~~~~~~cpp
-#include "rapidjson/reader.h"
-#include "rapidjson/error/en.h"
-#include <iostream>
-#include <string>
-#include <map>
-
-using namespace std;
-using namespace rapidjson;
-
-typedef map<string, string> MessageMap;
-
-struct MessageHandler
-    : public BaseReaderHandler<UTF8<>, MessageHandler> {
-    MessageHandler() : state_(kExpectObjectStart) {
-    }
-
-    bool StartObject() {
-        switch (state_) {
-        case kExpectObjectStart:
-            state_ = kExpectNameOrObjectEnd;
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    bool String(const char* str, SizeType length, bool) {
-        switch (state_) {
-        case kExpectNameOrObjectEnd:
-            name_ = string(str, length);
-            state_ = kExpectValue;
-            return true;
-        case kExpectValue:
-            messages_.insert(MessageMap::value_type(name_, string(str, length)));
-            state_ = kExpectNameOrObjectEnd;
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    bool EndObject(SizeType) { return state_ == kExpectNameOrObjectEnd; }
-
-    bool Default() { return false; } // All other events are invalid.
-
-    MessageMap messages_;
-    enum State {
-        kExpectObjectStart,
-        kExpectNameOrObjectEnd,
-        kExpectValue,
-    }state_;
-    std::string name_;
-};
-
-void ParseMessages(const char* json, MessageMap& messages) {
-    Reader reader;
-    MessageHandler handler;
-    StringStream ss(json);
-    if (reader.Parse(ss, handler))
-        messages.swap(handler.messages_);   // Only change it if success.
-    else {
-        ParseErrorCode e = reader.GetParseErrorCode();
-        size_t o = reader.GetErrorOffset();
-        cout << "Error: " << GetParseError_En(e) << endl;;
-        cout << " at offset " << o << " near '" << string(json).substr(o, 10) << "...'" << endl;
-    }
-}
-
-int main() {
-    MessageMap messages;
-
-    const char* json1 = "{ \"greeting\" : \"Hello!\", \"farewell\" : \"bye-bye!\" }";
-    cout << json1 << endl;
-    ParseMessages(json1, messages);
-
-    for (MessageMap::const_iterator itr = messages.begin(); itr != messages.end(); ++itr)
-        cout << itr->first << ": " << itr->second << endl;
-
-    cout << endl << "Parse a JSON with invalid schema." << endl;
-    const char* json2 = "{ \"greeting\" : \"Hello!\", \"farewell\" : \"bye-bye!\", \"foo\" : {} }";
-    cout << json2 << endl;
-    ParseMessages(json2, messages);
-
-    return 0;
-}
-~~~~~~~~~~
-
-~~~~~~~~~~
-{ "greeting" : "Hello!", "farewell" : "bye-bye!" }
-farewell: bye-bye!
-greeting: Hello!
-
-Parse a JSON with invalid schema.
-{ "greeting" : "Hello!", "farewell" : "bye-bye!", "foo" : {} }
-Error: Terminate parsing due to Handler error.
- at offset 59 near '} }...'
-~~~~~~~~~~
-
-The first JSON (`json1`) was successfully parsed into `MessageMap`. Since `MessageMap` is a `std::map`, the printing order are sorted by the key. This order is different from the JSON's order.
-
-In the second JSON (`json2`), `foo`'s value is an empty object. As it is an object, `MessageHandler::StartObject()` will be called. However, at that moment `state_ = kExpectValue`, so that function returns `false` and cause the parsing process be terminated. The error code is `kParseErrorTermination`.
-
-## Filtering of JSON {#Filtering}
-
-As mentioned earlier, `Writer` can handle the events published by `Reader`. `condense` example simply set a `Writer` as handler of a `Reader`, so it can remove all white-spaces in JSON. `pretty` example uses the same relationship, but replacing `Writer` by `PrettyWriter`. So `pretty` can be used to reformat a JSON with indentation and line feed.
-
-Actually, we can add intermediate layer(s) to filter the contents of JSON via these SAX-style API. For example, `capitalize` example capitalize all strings in a JSON.
-
-~~~~~~~~~~cpp
-#include "rapidjson/reader.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/error/en.h"
-#include <vector>
-#include <cctype>
-
-using namespace rapidjson;
-
-template<typename OutputHandler>
-struct CapitalizeFilter {
-    CapitalizeFilter(OutputHandler& out) : out_(out), buffer_() {
-    }
-
-    bool Null() { return out_.Null(); }
-    bool Bool(bool b) { return out_.Bool(b); }
-    bool Int(int i) { return out_.Int(i); }
-    bool Uint(unsigned u) { return out_.Uint(u); }
-    bool Int64(int64_t i) { return out_.Int64(i); }
-    bool Uint64(uint64_t u) { return out_.Uint64(u); }
-    bool Double(double d) { return out_.Double(d); }
-    bool RawNumber(const char* str, SizeType length, bool copy) { return out_.RawNumber(str, length, copy); }
-    bool String(const char* str, SizeType length, bool) { 
-        buffer_.clear();
-        for (SizeType i = 0; i < length; i++)
-            buffer_.push_back(std::toupper(str[i]));
-        return out_.String(&buffer_.front(), length, true); // true = output handler need to copy the string
-    }
-    bool StartObject() { return out_.StartObject(); }
-    bool Key(const char* str, SizeType length, bool copy) { return String(str, length, copy); }
-    bool EndObject(SizeType memberCount) { return out_.EndObject(memberCount); }
-    bool StartArray() { return out_.StartArray(); }
-    bool EndArray(SizeType elementCount) { return out_.EndArray(elementCount); }
-
-    OutputHandler& out_;
-    std::vector<char> buffer_;
-};
-
-int main(int, char*[]) {
-    // Prepare JSON reader and input stream.
-    Reader reader;
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-
-    // Prepare JSON writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-    Writer<FileWriteStream> writer(os);
-
-    // JSON reader parse from the input stream and let writer generate the output.
-    CapitalizeFilter<Writer<FileWriteStream> > filter(writer);
-    if (!reader.Parse(is, filter)) {
-        fprintf(stderr, "\nError(%u): %s\n", (unsigned)reader.GetErrorOffset(), GetParseError_En(reader.GetParseErrorCode()));
-        return 1;
-    }
-
-    return 0;
-}
-~~~~~~~~~~
-
-Note that, it is incorrect to simply capitalize the JSON as a string. For example:
-~~~~~~~~~~
-["Hello\nWorld"]
-~~~~~~~~~~
-
-Simply capitalizing the whole JSON would contain incorrect escape character:
-~~~~~~~~~~
-["HELLO\NWORLD"]
-~~~~~~~~~~
-
-The correct result by `capitalize`:
-~~~~~~~~~~
-["HELLO\nWORLD"]
-~~~~~~~~~~
-
-More complicated filters can be developed. However, since SAX-style API can only provide information about a single event at a time, user may need to book-keeping the contextual information (e.g. the path from root value, storage of other related values). Some processing may be easier to be implemented in DOM than SAX.
diff --git a/src/sioclient/lib/rapidjson/doc/sax.zh-cn.md b/src/sioclient/lib/rapidjson/doc/sax.zh-cn.md
deleted file mode 100644
index 740c339f..00000000
--- a/src/sioclient/lib/rapidjson/doc/sax.zh-cn.md
+++ /dev/null
@@ -1,487 +0,0 @@
-# SAX
-
-"SAX" 此术语源于 [Simple API for XML](http://en.wikipedia.org/wiki/Simple_API_for_XML)。我们借了此术语去套用在 JSON 的解析及生成。
-
-在 RapidJSON 中，`Reader`（`GenericReader<...>` 的 typedef）是 JSON 的 SAX 风格解析器，而 `Writer`（`GenericWriter<...>` 的 typedef）则是 JSON 的 SAX 风格生成器。
-
-[TOC]
-
-# Reader {#Reader}
-
-`Reader` 从输入流解析一个 JSON。当它从流中读取字符时，它会基于 JSON 的语法去分析字符，并向处理器发送事件。
-
-例如，以下是一个 JSON。
-
-~~~~~~~~~~js
-{
-    "hello": "world",
-    "t": true ,
-    "f": false,
-    "n": null,
-    "i": 123,
-    "pi": 3.1416,
-    "a": [1, 2, 3, 4]
-}
-~~~~~~~~~~
-
-当一个 `Reader` 解析此 JSON 时，它会顺序地向处理器发送以下的事件：
-
-~~~~~~~~~~
-StartObject()
-Key("hello", 5, true)
-String("world", 5, true)
-Key("t", 1, true)
-Bool(true)
-Key("f", 1, true)
-Bool(false)
-Key("n", 1, true)
-Null()
-Key("i")
-UInt(123)
-Key("pi")
-Double(3.1416)
-Key("a")
-StartArray()
-Uint(1)
-Uint(2)
-Uint(3)
-Uint(4)
-EndArray(4)
-EndObject(7)
-~~~~~~~~~~
-
-除了一些事件参数需要再作解释，这些事件可以轻松地与 JSON 对上。我们可以看看 `simplereader` 例子怎样产生和以上完全相同的结果：
-
-~~~~~~~~~~cpp
-#include "rapidjson/reader.h"
-#include <iostream>
-
-using namespace rapidjson;
-using namespace std;
-
-struct MyHandler : public BaseReaderHandler<UTF8<>, MyHandler> {
-    bool Null() { cout << "Null()" << endl; return true; }
-    bool Bool(bool b) { cout << "Bool(" << boolalpha << b << ")" << endl; return true; }
-    bool Int(int i) { cout << "Int(" << i << ")" << endl; return true; }
-    bool Uint(unsigned u) { cout << "Uint(" << u << ")" << endl; return true; }
-    bool Int64(int64_t i) { cout << "Int64(" << i << ")" << endl; return true; }
-    bool Uint64(uint64_t u) { cout << "Uint64(" << u << ")" << endl; return true; }
-    bool Double(double d) { cout << "Double(" << d << ")" << endl; return true; }
-    bool String(const char* str, SizeType length, bool copy) { 
-        cout << "String(" << str << ", " << length << ", " << boolalpha << copy << ")" << endl;
-        return true;
-    }
-    bool StartObject() { cout << "StartObject()" << endl; return true; }
-    bool Key(const char* str, SizeType length, bool copy) { 
-        cout << "Key(" << str << ", " << length << ", " << boolalpha << copy << ")" << endl;
-        return true;
-    }
-    bool EndObject(SizeType memberCount) { cout << "EndObject(" << memberCount << ")" << endl; return true; }
-    bool StartArray() { cout << "StartArray()" << endl; return true; }
-    bool EndArray(SizeType elementCount) { cout << "EndArray(" << elementCount << ")" << endl; return true; }
-};
-
-void main() {
-    const char json[] = " { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ";
-
-    MyHandler handler;
-    Reader reader;
-    StringStream ss(json);
-    reader.Parse(ss, handler);
-}
-~~~~~~~~~~
-
-注意 RapidJSON 使用模板去静态挷定 `Reader` 类型及处理器的类形，而不是使用含虚函数的类。这个范式可以通过把函数内联而改善性能。
-
-## 处理器 {#Handler}
-
-如前例所示，使用者需要实现一个处理器（handler），用于处理来自 `Reader` 的事件（函数调用）。处理器必须包含以下的成员函数。
-
-~~~~~~~~~~cpp
-class Handler {
-    bool Null();
-    bool Bool(bool b);
-    bool Int(int i);
-    bool Uint(unsigned i);
-    bool Int64(int64_t i);
-    bool Uint64(uint64_t i);
-    bool Double(double d);
-    bool RawNumber(const Ch* str, SizeType length, bool copy);
-    bool String(const Ch* str, SizeType length, bool copy);
-    bool StartObject();
-    bool Key(const Ch* str, SizeType length, bool copy);
-    bool EndObject(SizeType memberCount);
-    bool StartArray();
-    bool EndArray(SizeType elementCount);
-};
-~~~~~~~~~~
-
-当 `Reader` 遇到 JSON null 值时会调用 `Null()`。
-
-当 `Reader` 遇到 JSON true 或 false 值时会调用 `Bool(bool)`。
-
-当 `Reader` 遇到 JSON number，它会选择一个合适的 C++ 类型映射，然后调用 `Int(int)`、`Uint(unsigned)`、`Int64(int64_t)`、`Uint64(uint64_t)` 及 `Double(double)` 的 * 其中之一个 *。 若开启了 `kParseNumbersAsStrings` 选项，`Reader` 便会改为调用 `RawNumber()`。
-
-当 `Reader` 遇到 JSON string，它会调用 `String(const char* str, SizeType length, bool copy)`。第一个参数是字符串的指针。第二个参数是字符串的长度（不包含空终止符号）。注意 RapidJSON 支持字串中含有空字符 `\0`。若出现这种情况，便会有 `strlen(str) < length`。最后的 `copy` 参数表示处理器是否需要复制该字符串。在正常解析时，`copy = true`。仅当使用原位解析时，`copy = false`。此外，还要注意字符的类型与目标编码相关，我们稍后会再谈这一点。
-
-当 `Reader` 遇到 JSON object 的开始之时，它会调用 `StartObject()`。JSON 的 object 是一个键值对（成员）的集合。若 object 包含成员，它会先为成员的名字调用 `Key()`，然后再按值的类型调用函数。它不断调用这些键值对，直至最终调用 `EndObject(SizeType memberCount)`。注意 `memberCount` 参数对处理器来说只是协助性质，使用者可能不需要此参数。
-
-JSON array 与 object 相似，但更简单。在 array 开始时，`Reader` 会调用 `BeginArary()`。若 array 含有元素，它会按元素的类型来读用函数。相似地，最后它会调用 `EndArray(SizeType elementCount)`，其中 `elementCount` 参数对处理器来说只是协助性质。
-
-每个处理器函数都返回一个 `bool`。正常它们应返回 `true`。若处理器遇到错误，它可以返回 `false` 去通知事件发送方停止继续处理。
-
-例如，当我们用 `Reader` 解析一个 JSON 时，处理器检测到该 JSON 并不符合所需的 schema，那么处理器可以返回 `false`，令 `Reader` 停止之后的解析工作。而 `Reader` 会进入一个错误状态，并以 `kParseErrorTermination` 错误码标识。
-
-## GenericReader {#GenericReader}
-
-前面提及，`Reader` 是 `GenericReader` 模板类的 typedef：
-
-~~~~~~~~~~cpp
-namespace rapidjson {
-
-template <typename SourceEncoding, typename TargetEncoding, typename Allocator = MemoryPoolAllocator<> >
-class GenericReader {
-    // ...
-};
-
-typedef GenericReader<UTF8<>, UTF8<> > Reader;
-
-} // namespace rapidjson
-~~~~~~~~~~
-
-`Reader` 使用 UTF-8 作为来源及目标编码。来源编码是指 JSON 流的编码。目标编码是指 `String()` 的 `str` 参数所用的编码。例如，要解析一个 UTF-8 流并输出至 UTF-16 string 事件，你需要这么定义一个 reader：
-
-~~~~~~~~~~cpp
-GenericReader<UTF8<>, UTF16<> > reader;
-~~~~~~~~~~
-
-注意到 `UTF16` 的缺省类型是 `wchar_t`。因此这个 `reader` 需要调用处理器的 `String(const wchar_t*, SizeType, bool)`。
-
-第三个模板参数 `Allocator` 是内部数据结构（实际上是一个堆栈）的分配器类型。
-
-## 解析 {#SaxParsing}
-
-`Reader` 的唯一功能就是解析 JSON。 
-
-~~~~~~~~~~cpp
-template <unsigned parseFlags, typename InputStream, typename Handler>
-bool Parse(InputStream& is, Handler& handler);
-
-// 使用 parseFlags = kDefaultParseFlags
-template <typename InputStream, typename Handler>
-bool Parse(InputStream& is, Handler& handler);
-~~~~~~~~~~
-
-若在解析中出现错误，它会返回 `false`。使用者可调用 `bool HasParseEror()`, `ParseErrorCode GetParseErrorCode()` 及 `size_t GetErrorOffset()` 获取错误状态。实际上 `Document` 使用这些 `Reader` 函数去获取解析错误。请参考 [DOM](doc/dom.zh-cn.md) 去了解有关解析错误的细节。
-
-# Writer {#Writer}
-
-`Reader` 把 JSON 转换（解析）成为事件。`Writer` 做完全相反的事情。它把事件转换成 JSON。
-
-`Writer` 是非常容易使用的。若你的应用程序只需把一些数据转换成 JSON，可能直接使用 `Writer`，会比建立一个 `Document` 然后用 `Writer` 把它转换成 JSON 更加方便。
-
-在 `simplewriter` 例子里，我们做 `simplereader` 完全相反的事情。
-
-~~~~~~~~~~cpp
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include <iostream>
-
-using namespace rapidjson;
-using namespace std;
-
-void main() {
-    StringBuffer s;
-    Writer<StringBuffer> writer(s);
-    
-    writer.StartObject();
-    writer.Key("hello");
-    writer.String("world");
-    writer.Key("t");
-    writer.Bool(true);
-    writer.Key("f");
-    writer.Bool(false);
-    writer.Key("n");
-    writer.Null();
-    writer.Key("i");
-    writer.Uint(123);
-    writer.Key("pi");
-    writer.Double(3.1416);
-    writer.Key("a");
-    writer.StartArray();
-    for (unsigned i = 0; i < 4; i++)
-        writer.Uint(i);
-    writer.EndArray();
-    writer.EndObject();
-
-    cout << s.GetString() << endl;
-}
-~~~~~~~~~~
-
-~~~~~~~~~~
-{"hello":"world","t":true,"f":false,"n":null,"i":123,"pi":3.1416,"a":[0,1,2,3]}
-~~~~~~~~~~
-
-`String()` 及 `Key()` 各有两个重载。一个是如处理器 concept 般，有 3 个参数。它能处理含空字符的字符串。另一个是如上中使用的较简单版本。
-
-注意到，例子代码中的 `EndArray()` 及 `EndObject()` 并没有参数。可以传递一个 `SizeType` 的参数，但它会被 `Writer` 忽略。
-
-你可能会怀疑，为什么不使用 `sprintf()` 或 `std::stringstream` 去建立一个 JSON？
-
-这有几个原因：
-1. `Writer` 必然会输出一个结构良好（well-formed）的 JSON。若然有错误的事件次序（如 `Int()` 紧随 `StartObject()` 出现），它会在调试模式中产生断言失败。
-2. `Writer::String()` 可处理字符串转义（如把码点 `U+000A` 转换成 `\n`）及进行 Unicode 转码。
-3. `Writer` 一致地处理 number 的输出。
-4. `Writer` 实现了事件处理器 concept。可用于处理来自 `Reader`、`Document` 或其他事件发生器。
-5. `Writer` 可对不同平台进行优化。
-
-无论如何，使用 `Writer` API 去生成 JSON 甚至乎比这些临时方法更简单。
-
-## 模板 {#WriterTemplate}
-
-`Writer` 与 `Reader` 有少许设计区别。`Writer` 是一个模板类，而不是一个 typedef。 并没有 `GenericWriter`。以下是 `Writer` 的声明。
-
-~~~~~~~~~~cpp
-namespace rapidjson {
-
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename Allocator = CrtAllocator<> >
-class Writer {
-public:
-    Writer(OutputStream& os, Allocator* allocator = 0, size_t levelDepth = kDefaultLevelDepth)
-// ...
-};
-
-} // namespace rapidjson
-~~~~~~~~~~
-
-`OutputStream` 模板参数是输出流的类型。它的类型不可以被自动推断，必须由使用者提供。
-
-`SourceEncoding` 模板参数指定了 `String(const Ch*, ...)` 的编码。
-
-`TargetEncoding` 模板参数指定输出流的编码。
-
-`Allocator` 是分配器的类型，用于分配内部数据结构（一个堆栈）。
-
-`writeFlags` 是以下位标志的组合：
-
-写入位标志                     | 意义
-------------------------------|-----------------------------------
-`kWriteNoFlags`               | 没有任何标志。
-`kWriteDefaultFlags`          | 缺省的解析选项。它等于 `RAPIDJSON_WRITE_DEFAULT_FLAGS` 宏，此宏定义为  `kWriteNoFlags`。
-`kWriteValidateEncodingFlag`  | 校验 JSON 字符串的编码。
-`kWriteNanAndInfFlag`         | 容许写入 `Infinity`, `-Infinity` 及 `NaN`。
-
-此外，`Writer` 的构造函数有一 `levelDepth` 参数。存储每层阶信息的初始内存分配量受此参数影响。
-
-## PrettyWriter {#PrettyWriter}
-
-`Writer` 所输出的是没有空格字符的最紧凑 JSON，适合网络传输或储存，但不适合人类阅读。
-
-因此，RapidJSON 提供了一个 `PrettyWriter`，它在输出中加入缩进及换行。
-
-`PrettyWriter` 的用法与 `Writer` 几乎一样，不同之处是 `PrettyWriter` 提供了一个 `SetIndent(Ch indentChar, unsigned indentCharCount)` 函数。缺省的缩进是 4 个空格。
-
-## 完整性及重置 {#CompletenessReset}
-
-一个 `Writer` 只可输出单个 JSON，其根节点可以是任何 JSON 类型。当处理完单个根节点事件（如 `String()`），或匹配的最后 `EndObject()` 或 `EndArray()` 事件，输出的 JSON 是结构完整（well-formed）及完整的。使用者可调用 `Writer::IsComplete()` 去检测完整性。
-
-当 JSON 完整时，`Writer` 不能再接受新的事件。不然其输出便会是不合法的（例如有超过一个根节点）。为了重新利用 `Writer` 对象，使用者可调用 `Writer::Reset(OutputStream& os)` 去重置其所有内部状态及设置新的输出流。
-
-# 技巧 {#SaxTechniques}
-
-## 解析 JSON 至自定义结构 {#CustomDataStructure}
-
-`Document` 的解析功能完全依靠 `Reader`。实际上 `Document` 是一个处理器，在解析 JSON 时接收事件去建立一个 DOM。
-
-使用者可以直接使用 `Reader` 去建立其他数据结构。这消除了建立 DOM 的步骤，从而减少了内存开销并改善性能。
-
-在以下的 `messagereader` 例子中，`ParseMessages()` 解析一个 JSON，该 JSON 应该是一个含键值对的 object。
-
-~~~~~~~~~~cpp
-#include "rapidjson/reader.h"
-#include "rapidjson/error/en.h"
-#include <iostream>
-#include <string>
-#include <map>
-
-using namespace std;
-using namespace rapidjson;
-
-typedef map<string, string> MessageMap;
-
-struct MessageHandler
-    : public BaseReaderHandler<UTF8<>, MessageHandler> {
-    MessageHandler() : state_(kExpectObjectStart) {
-    }
-
-    bool StartObject() {
-        switch (state_) {
-        case kExpectObjectStart:
-            state_ = kExpectNameOrObjectEnd;
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    bool String(const char* str, SizeType length, bool) {
-        switch (state_) {
-        case kExpectNameOrObjectEnd:
-            name_ = string(str, length);
-            state_ = kExpectValue;
-            return true;
-        case kExpectValue:
-            messages_.insert(MessageMap::value_type(name_, string(str, length)));
-            state_ = kExpectNameOrObjectEnd;
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    bool EndObject(SizeType) { return state_ == kExpectNameOrObjectEnd; }
-
-    bool Default() { return false; } // All other events are invalid.
-
-    MessageMap messages_;
-    enum State {
-        kExpectObjectStart,
-        kExpectNameOrObjectEnd,
-        kExpectValue,
-    }state_;
-    std::string name_;
-};
-
-void ParseMessages(const char* json, MessageMap& messages) {
-    Reader reader;
-    MessageHandler handler;
-    StringStream ss(json);
-    if (reader.Parse(ss, handler))
-        messages.swap(handler.messages_);   // Only change it if success.
-    else {
-        ParseErrorCode e = reader.GetParseErrorCode();
-        size_t o = reader.GetErrorOffset();
-        cout << "Error: " << GetParseError_En(e) << endl;;
-        cout << " at offset " << o << " near '" << string(json).substr(o, 10) << "...'" << endl;
-    }
-}
-
-int main() {
-    MessageMap messages;
-
-    const char* json1 = "{ \"greeting\" : \"Hello!\", \"farewell\" : \"bye-bye!\" }";
-    cout << json1 << endl;
-    ParseMessages(json1, messages);
-
-    for (MessageMap::const_iterator itr = messages.begin(); itr != messages.end(); ++itr)
-        cout << itr->first << ": " << itr->second << endl;
-
-    cout << endl << "Parse a JSON with invalid schema." << endl;
-    const char* json2 = "{ \"greeting\" : \"Hello!\", \"farewell\" : \"bye-bye!\", \"foo\" : {} }";
-    cout << json2 << endl;
-    ParseMessages(json2, messages);
-
-    return 0;
-}
-~~~~~~~~~~
-
-~~~~~~~~~~
-{ "greeting" : "Hello!", "farewell" : "bye-bye!" }
-farewell: bye-bye!
-greeting: Hello!
-
-Parse a JSON with invalid schema.
-{ "greeting" : "Hello!", "farewell" : "bye-bye!", "foo" : {} }
-Error: Terminate parsing due to Handler error.
- at offset 59 near '} }...'
-~~~~~~~~~~
-
-第一个 JSON（`json1`）被成功地解析至 `MessageMap`。由于 `MessageMap` 是一个 `std::map`，打印次序按键值排序。此次序与 JSON 中的次序不同。
-
-在第二个 JSON（`json2`）中，`foo` 的值是一个空 object。由于它是一个 object，`MessageHandler::StartObject()` 会被调用。然而，在 `state_ = kExpectValue` 的情况下，该函数会返回 `false`，并导致解析过程终止。错误代码是 `kParseErrorTermination`。
-
-## 过滤 JSON {#Filtering}
-
-如前面提及过，`Writer` 可处理 `Reader` 发出的事件。`example/condense/condense.cpp` 例子简单地设置 `Writer` 作为一个 `Reader` 的处理器，因此它能移除 JSON 中的所有空白字符。`example/pretty/pretty.cpp` 例子使用同样的关系，只是以 `PrettyWriter` 取代 `Writer`。因此 `pretty` 能够重新格式化 JSON，加入缩进及换行。
-
-实际上，我们可以使用 SAX 风格 API 去加入（多个）中间层去过滤 JSON 的内容。例如 `capitalize` 例子可以把所有 JSON string 改为大写。
-
-~~~~~~~~~~cpp
-#include "rapidjson/reader.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/error/en.h"
-#include <vector>
-#include <cctype>
-
-using namespace rapidjson;
-
-template<typename OutputHandler>
-struct CapitalizeFilter {
-    CapitalizeFilter(OutputHandler& out) : out_(out), buffer_() {
-    }
-
-    bool Null() { return out_.Null(); }
-    bool Bool(bool b) { return out_.Bool(b); }
-    bool Int(int i) { return out_.Int(i); }
-    bool Uint(unsigned u) { return out_.Uint(u); }
-    bool Int64(int64_t i) { return out_.Int64(i); }
-    bool Uint64(uint64_t u) { return out_.Uint64(u); }
-    bool Double(double d) { return out_.Double(d); }
-    bool RawNumber(const char* str, SizeType length, bool copy) { return out_.RawNumber(str, length, copy); }
-    bool String(const char* str, SizeType length, bool) { 
-        buffer_.clear();
-        for (SizeType i = 0; i < length; i++)
-            buffer_.push_back(std::toupper(str[i]));
-        return out_.String(&buffer_.front(), length, true); // true = output handler need to copy the string
-    }
-    bool StartObject() { return out_.StartObject(); }
-    bool Key(const char* str, SizeType length, bool copy) { return String(str, length, copy); }
-    bool EndObject(SizeType memberCount) { return out_.EndObject(memberCount); }
-    bool StartArray() { return out_.StartArray(); }
-    bool EndArray(SizeType elementCount) { return out_.EndArray(elementCount); }
-
-    OutputHandler& out_;
-    std::vector<char> buffer_;
-};
-
-int main(int, char*[]) {
-    // Prepare JSON reader and input stream.
-    Reader reader;
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-
-    // Prepare JSON writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-    Writer<FileWriteStream> writer(os);
-
-    // JSON reader parse from the input stream and let writer generate the output.
-    CapitalizeFilter<Writer<FileWriteStream> > filter(writer);
-    if (!reader.Parse(is, filter)) {
-        fprintf(stderr, "\nError(%u): %s\n", (unsigned)reader.GetErrorOffset(), GetParseError_En(reader.GetParseErrorCode()));
-        return 1;
-    }
-
-    return 0;
-}
-~~~~~~~~~~
-
-注意到，不可简单地把 JSON 当作字符串去改为大写。例如：
-~~~~~~~~~~
-["Hello\nWorld"]
-~~~~~~~~~~
-
-简单地把整个 JSON 转为大写的话会产生错误的转义符：
-~~~~~~~~~~
-["HELLO\NWORLD"]
-~~~~~~~~~~
-
-而 `capitalize` 就会产生正确的结果：
-~~~~~~~~~~
-["HELLO\nWORLD"]
-~~~~~~~~~~
-
-我们还可以开发更复杂的过滤器。然而，由于 SAX 风格 API 在某一时间点只能提供单一事件的信息，使用者需要自行记录一些上下文信息（例如从根节点起的路径、储存其他相关值）。对于处理某些情况，用 DOM 会比 SAX 更容易实现。
-
diff --git a/src/sioclient/lib/rapidjson/doc/schema.md b/src/sioclient/lib/rapidjson/doc/schema.md
deleted file mode 100644
index 238d7a56..00000000
--- a/src/sioclient/lib/rapidjson/doc/schema.md
+++ /dev/null
@@ -1,505 +0,0 @@
-# Schema
-
-(This feature was released in v1.1.0)
-
-JSON Schema is a draft standard for describing the format of JSON data. The schema itself is also JSON data. By validating a JSON structure with JSON Schema, your code can safely access the DOM without manually checking types, or whether a key exists, etc. It can also ensure that the serialized JSON conform to a specified schema.
-
-RapidJSON implemented a JSON Schema validator for [JSON Schema Draft v4](http://json-schema.org/documentation.html). If you are not familiar with JSON Schema, you may refer to [Understanding JSON Schema](http://spacetelescope.github.io/understanding-json-schema/).
-
-[TOC]
-
-# Basic Usage {#Basic}
-
-First of all, you need to parse a JSON Schema into `Document`, and then compile the `Document` into a `SchemaDocument`.
-
-Secondly, construct a `SchemaValidator` with the `SchemaDocument`. It is similar to a `Writer` in the sense of handling SAX events. So, you can use `document.Accept(validator)` to validate a document, and then check the validity.
-
-~~~cpp
-#include "rapidjson/schema.h"
-
-// ...
-
-Document sd;
-if (sd.Parse(schemaJson).HasParseError()) {
-    // the schema is not a valid JSON.
-    // ...       
-}
-SchemaDocument schema(sd); // Compile a Document to SchemaDocument
-// sd is no longer needed here.
-
-Document d;
-if (d.Parse(inputJson).HasParseError()) {
-    // the input is not a valid JSON.
-    // ...       
-}
-
-SchemaValidator validator(schema);
-if (!d.Accept(validator)) {
-    // Input JSON is invalid according to the schema
-    // Output diagnostic information
-    StringBuffer sb;
-    validator.GetInvalidSchemaPointer().StringifyUriFragment(sb);
-    printf("Invalid schema: %s\n", sb.GetString());
-    printf("Invalid keyword: %s\n", validator.GetInvalidSchemaKeyword());
-    sb.Clear();
-    validator.GetInvalidDocumentPointer().StringifyUriFragment(sb);
-    printf("Invalid document: %s\n", sb.GetString());
-}
-~~~
-
-Some notes:
-
-* One `SchemaDocument` can be referenced by multiple `SchemaValidator`s. It will not be modified by `SchemaValidator`s.
-* A `SchemaValidator` may be reused to validate multiple documents. To run it for other documents, call `validator.Reset()` first.
-
-# Validation during parsing/serialization {#Fused}
-
-Unlike most JSON Schema validator implementations, RapidJSON provides a SAX-based schema validator. Therefore, you can parse a JSON from a stream while validating it on the fly. If the validator encounters a JSON value that invalidates the supplied schema, the parsing will be terminated immediately. This design is especially useful for parsing large JSON files.
-
-## DOM parsing {#DOM}
-
-For using DOM in parsing, `Document` needs some preparation and finalizing tasks, in addition to receiving SAX events, thus it needs some work to route the reader, validator and the document. `SchemaValidatingReader` is a helper class that doing such work.
-
-~~~cpp
-#include "rapidjson/filereadstream.h"
-
-// ...
-SchemaDocument schema(sd); // Compile a Document to SchemaDocument
-
-// Use reader to parse the JSON
-FILE* fp = fopen("big.json", "r");
-FileReadStream is(fp, buffer, sizeof(buffer));
-
-// Parse JSON from reader, validate the SAX events, and store in d.
-Document d;
-SchemaValidatingReader<kParseDefaultFlags, FileReadStream, UTF8<> > reader(is, schema);
-d.Populate(reader);
-
-if (!reader.GetParseResult()) {
-    // Not a valid JSON
-    // When reader.GetParseResult().Code() == kParseErrorTermination,
-    // it may be terminated by:
-    // (1) the validator found that the JSON is invalid according to schema; or
-    // (2) the input stream has I/O error.
-
-    // Check the validation result
-    if (!reader.IsValid()) {
-        // Input JSON is invalid according to the schema
-        // Output diagnostic information
-        StringBuffer sb;
-        reader.GetInvalidSchemaPointer().StringifyUriFragment(sb);
-        printf("Invalid schema: %s\n", sb.GetString());
-        printf("Invalid keyword: %s\n", reader.GetInvalidSchemaKeyword());
-        sb.Clear();
-        reader.GetInvalidDocumentPointer().StringifyUriFragment(sb);
-        printf("Invalid document: %s\n", sb.GetString());
-    }
-}
-~~~
-
-## SAX parsing {#SAX}
-
-For using SAX in parsing, it is much simpler. If it only need to validate the JSON without further processing, it is simply:
-
-~~~
-SchemaValidator validator(schema);
-Reader reader;
-if (!reader.Parse(stream, validator)) {
-    if (!validator.IsValid()) {
-        // ...    
-    }
-}
-~~~
-
-This is exactly the method used in the [schemavalidator](example/schemavalidator/schemavalidator.cpp) example. The distinct advantage is low memory usage, no matter how big the JSON was (the memory usage depends on the complexity of the schema).
-
-If you need to handle the SAX events further, then you need to use the template class `GenericSchemaValidator` to set the output handler of the validator:
-
-~~~
-MyHandler handler;
-GenericSchemaValidator<SchemaDocument, MyHandler> validator(schema, handler);
-Reader reader;
-if (!reader.Parse(ss, validator)) {
-    if (!validator.IsValid()) {
-        // ...    
-    }
-}
-~~~
-
-## Serialization {#Serialization}
-
-It is also possible to do validation during serializing. This can ensure the result JSON is valid according to the JSON schema.
-
-~~~
-StringBuffer sb;
-Writer<StringBuffer> writer(sb);
-GenericSchemaValidator<SchemaDocument, Writer<StringBuffer> > validator(s, writer);
-if (!d.Accept(validator)) {
-    // Some problem during Accept(), it may be validation or encoding issues.
-    if (!validator.IsValid()) {
-        // ...
-    }
-}
-~~~
-
-Of course, if your application only needs SAX-style serialization, it can simply send SAX events to `SchemaValidator` instead of `Writer`.
-
-# Remote Schema {#Remote}
-
-JSON Schema supports [`$ref` keyword](http://spacetelescope.github.io/understanding-json-schema/structuring.html), which is a [JSON pointer](doc/pointer.md) referencing to a local or remote schema. Local pointer is prefixed with `#`, while remote pointer is an relative or absolute URI. For example:
-
-~~~js
-{ "$ref": "definitions.json#/address" }
-~~~
-
-As `SchemaDocument` does not know how to resolve such URI, it needs a user-provided `IRemoteSchemaDocumentProvider` instance to do so.
-
-~~~
-class MyRemoteSchemaDocumentProvider : public IRemoteSchemaDocumentProvider {
-public:
-    virtual const SchemaDocument* GetRemoteDocument(const char* uri, SizeType length) {
-        // Resolve the uri and returns a pointer to that schema.
-    }
-};
-
-// ...
-
-MyRemoteSchemaDocumentProvider provider;
-SchemaDocument schema(sd, &provider);
-~~~
-
-# Conformance {#Conformance}
-
-RapidJSON passed 262 out of 263 tests in [JSON Schema Test Suite](https://github.com/json-schema/JSON-Schema-Test-Suite) (Json Schema draft 4).
-
-The failed test is "changed scope ref invalid" of "change resolution scope" in `refRemote.json`. It is due to that `id` schema keyword and URI combining function are not implemented.
-
-Besides, the `format` schema keyword for string values is ignored, since it is not required by the specification.
-
-## Regular Expression {#Regex}
-
-The schema keyword `pattern` and `patternProperties` uses regular expression to match the required pattern.
-
-RapidJSON implemented a simple NFA regular expression engine, which is used by default. It supports the following syntax.
-
-|Syntax|Description|
-|------|-----------|
-|`ab`    | Concatenation |
-|<code>a&#124;b</code>   | Alternation |
-|`a?`    | Zero or one |
-|`a*`    | Zero or more |
-|`a+`    | One or more |
-|`a{3}`  | Exactly 3 times |
-|`a{3,}` | At least 3 times |
-|`a{3,5}`| 3 to 5 times |
-|`(ab)`  | Grouping |
-|`^a`    | At the beginning |
-|`a$`    | At the end |
-|`.`     | Any character |
-|`[abc]` | Character classes |
-|`[a-c]` | Character class range |
-|`[a-z0-9_]` | Character class combination |
-|`[^abc]` | Negated character classes |
-|`[^a-c]` | Negated character class range |
-|`[\b]`   | Backspace (U+0008) |
-|<code>\\&#124;</code>, `\\`, ...  | Escape characters |
-|`\f` | Form feed (U+000C) |
-|`\n` | Line feed (U+000A) |
-|`\r` | Carriage return (U+000D) |
-|`\t` | Tab (U+0009) |
-|`\v` | Vertical tab (U+000B) |
-
-For C++11 compiler, it is also possible to use the `std::regex` by defining `RAPIDJSON_SCHEMA_USE_INTERNALREGEX=0` and `RAPIDJSON_SCHEMA_USE_STDREGEX=1`. If your schemas do not need `pattern` and `patternProperties`, you can set both macros to zero to disable this feature, which will reduce some code size.
-
-# Performance {#Performance}
-
-Most C++ JSON libraries do not yet support JSON Schema. So we tried to evaluate the performance of RapidJSON's JSON Schema validator according to [json-schema-benchmark](https://github.com/ebdrup/json-schema-benchmark), which tests 11 JavaScript libraries running on Node.js.
-
-That benchmark runs validations on [JSON Schema Test Suite](https://github.com/json-schema/JSON-Schema-Test-Suite), in which some test suites and tests are excluded. We made the same benchmarking procedure in [`schematest.cpp`](test/perftest/schematest.cpp).
-
-On a Mac Book Pro (2.8 GHz Intel Core i7), the following results are collected.
-
-|Validator|Relative speed|Number of test runs per second|
-|---------|:------------:|:----------------------------:|
-|RapidJSON|155%|30682|
-|[`ajv`](https://github.com/epoberezkin/ajv)|100%|19770 (± 1.31%)|
-|[`is-my-json-valid`](https://github.com/mafintosh/is-my-json-valid)|70%|13835 (± 2.84%)|
-|[`jsen`](https://github.com/bugventure/jsen)|57.7%|11411 (± 1.27%)|
-|[`schemasaurus`](https://github.com/AlexeyGrishin/schemasaurus)|26%|5145 (± 1.62%)|
-|[`themis`](https://github.com/playlyfe/themis)|19.9%|3935 (± 2.69%)|
-|[`z-schema`](https://github.com/zaggino/z-schema)|7%|1388 (± 0.84%)|
-|[`jsck`](https://github.com/pandastrike/jsck#readme)|3.1%|606 (± 2.84%)|
-|[`jsonschema`](https://github.com/tdegrunt/jsonschema#readme)|0.9%|185 (± 1.01%)|
-|[`skeemas`](https://github.com/Prestaul/skeemas#readme)|0.8%|154 (± 0.79%)|
-|tv4|0.5%|93 (± 0.94%)|
-|[`jayschema`](https://github.com/natesilva/jayschema)|0.1%|21 (± 1.14%)|
-
-That is, RapidJSON is about 1.5x faster than the fastest JavaScript library (ajv). And 1400x faster than the slowest one.
-
-# Schema violation reporting {#Reporting}
-
-(Unreleased as of 2017-09-20)
-
-When validating an instance against a JSON Schema,
-it is often desirable to report not only whether the instance is valid,
-but also the ways in which it violates the schema.
-
-The `SchemaValidator` class
-collects errors encountered during validation
-into a JSON `Value`.
-This error object can then be accessed as `validator.GetError()`.
-
-The structure of the error object is subject to change
-in future versions of RapidJSON,
-as there is no standard schema for violations.
-The details below this point are provisional only.
-
-## General provisions {#ReportingGeneral}
-
-Validation of an instance value against a schema
-produces an error value.
-The error value is always an object.
-An empty object `{}` indicates the instance is valid.
-
-* The name of each member
-  corresponds to the JSON Schema keyword that is violated.
-* The value is either an object describing a single violation,
-  or an array of such objects.
-
-Each violation object contains two string-valued members
-named `instanceRef` and `schemaRef`.
-`instanceRef` contains the URI fragment serialization
-of a JSON Pointer to the instance subobject
-in which the violation was detected.
-`schemaRef` contains the URI of the schema
-and the fragment serialization of a JSON Pointer
-to the subschema that was violated.
-
-Individual violation objects can contain other keyword-specific members.
-These are detailed further.
-
-For example, validating this instance:
-
-~~~json
-{"numbers": [1, 2, "3", 4, 5]}
-~~~
-
-against this schema:
-
-~~~json
-{
-  "type": "object",
-  "properties": {
-    "numbers": {"$ref": "numbers.schema.json"}
-  }
-}
-~~~
-
-where `numbers.schema.json` refers
-(via a suitable `IRemoteSchemaDocumentProvider`)
-to this schema:
-
-~~~json
-{
-  "type": "array",
-  "items": {"type": "number"}
-}
-~~~
-
-produces the following error object:
-
-~~~json
-{
-  "type": {
-    "instanceRef": "#/numbers/2",
-    "schemaRef": "numbers.schema.json#/items",
-    "expected": ["number"],
-    "actual": "string"
-  }
-}
-~~~
-
-## Validation keywords for numbers {#Numbers}
-
-### multipleOf {#multipleof}
-
-* `expected`: required number strictly greater than 0.
-  The value of the `multipleOf` keyword specified in the schema.
-* `actual`: required number.
-  The instance value.
-
-### maximum {#maximum}
-
-* `expected`: required number.
-  The value of the `maximum` keyword specified in the schema.
-* `exclusiveMaximum`: optional boolean.
-  This will be true if the schema specified `"exclusiveMaximum": true`,
-  and will be omitted otherwise.
-* `actual`: required number.
-  The instance value.
-
-### minimum {#minimum}
-
-* `expected`: required number.
-  The value of the `minimum` keyword specified in the schema.
-* `exclusiveMinimum`: optional boolean.
-  This will be true if the schema specified `"exclusiveMinimum": true`,
-  and will be omitted otherwise.
-* `actual`: required number.
-  The instance value.
-
-## Validation keywords for strings {#Strings}
-
-### maxLength {#maxLength}
-
-* `expected`: required number greater than or equal to 0.
-  The value of the `maxLength` keyword specified in the schema.
-* `actual`: required string.
-  The instance value.
-
-### minLength {#minLength}
-
-* `expected`: required number greater than or equal to 0.
-  The value of the `minLength` keyword specified in the schema.
-* `actual`: required string.
-  The instance value.
-
-### pattern {#pattern}
-
-* `actual`: required string.
-  The instance value.
-
-(The expected pattern is not reported
-because the internal representation in `SchemaDocument`
-does not store the pattern in original string form.)
-
-## Validation keywords for arrays {#Arrays}
-
-### additionalItems {#additionalItems}
-
-This keyword is reported
-when the value of `items` schema keyword is an array,
-the value of `additionalItems` is `false`,
-and the instance is an array
-with more items than specified in the `items` array.
-
-* `disallowed`: required integer greater than or equal to 0.
-  The index of the first item that has no corresponding schema.
-
-### maxItems and minItems {#maxItems-minItems}
-
-* `expected`: required integer greater than or equal to 0.
-  The value of `maxItems` (respectively, `minItems`)
-  specified in the schema.
-* `actual`: required integer greater than or equal to 0.
-  Number of items in the instance array.
-
-### uniqueItems {#uniqueItems}
-
-* `duplicates`: required array
-  whose items are integers greater than or equal to 0.
-  Indices of items of the instance that are equal.
-
-(RapidJSON only reports the first two equal items,
-for performance reasons.)
-
-## Validation keywords for objects
-
-### maxProperties and minProperties {#maxProperties-minProperties}
-
-* `expected`: required integer greater than or equal to 0.
-  The value of `maxProperties` (respectively, `minProperties`)
-  specified in the schema.
-* `actual`: required integer greater than or equal to 0.
-  Number of properties in the instance object.
-
-### required {#required}
-
-* `missing`: required array of one or more unique strings.
-  The names of properties
-  that are listed in the value of the `required` schema keyword
-  but not present in the instance object.
-
-### additionalProperties {#additionalProperties}
-
-This keyword is reported
-when the schema specifies `additionalProperties: false`
-and the name of a property of the instance is
-neither listed in the `properties` keyword
-nor matches any regular expression in the `patternProperties` keyword.
-
-* `disallowed`: required string.
-  Name of the offending property of the instance.
-
-(For performance reasons,
-RapidJSON only reports the first such property encountered.)
-
-### dependencies {#dependencies}
-
-* `errors`: required object with one or more properties.
-  Names and values of its properties are described below.
-
-Recall that JSON Schema Draft 04 supports
-*schema dependencies*,
-where presence of a named *controlling* property
-requires the instance object to be valid against a subschema,
-and *property dependencies*,
-where presence of a controlling property
-requires other *dependent* properties to be also present.
-
-For a violated schema dependency,
-`errors` will contain a property
-with the name of the controlling property
-and its value will be the error object
-produced by validating the instance object
-against the dependent schema.
-
-For a violated property dependency,
-`errors` will contain a property
-with the name of the controlling property
-and its value will be an array of one or more unique strings
-listing the missing dependent properties.
-
-## Validation keywords for any instance type {#AnyTypes}
-
-### enum {#enum}
-
-This keyword has no additional properties
-beyond `instanceRef` and `schemaRef`.
-
-* The allowed values are not listed
-  because `SchemaDocument` does not store them in original form.
-* The violating value is not reported
-  because it might be unwieldy.
-
-If you need to report these details to your users,
-you can access the necessary information
-by following `instanceRef` and `schemaRef`.
-
-### type {#type}
-
-* `expected`: required array of one or more unique strings,
-  each of which is one of the seven primitive types
-  defined by the JSON Schema Draft 04 Core specification.
-  Lists the types allowed by the `type` schema keyword.
-* `actual`: required string, also one of seven primitive types.
-  The primitive type of the instance.
-
-### allOf, anyOf, and oneOf {#allOf-anyOf-oneOf}
-
-* `errors`: required array of at least one object.
-  There will be as many items as there are subschemas
-  in the `allOf`, `anyOf` or `oneOf` schema keyword, respectively.
-  Each item will be the error value
-  produced by validating the instance
-  against the corresponding subschema.
-
-For `allOf`, at least one error value will be non-empty.
-For `anyOf`, all error values will be non-empty.
-For `oneOf`, either all error values will be non-empty,
-or more than one will be empty.
-
-### not {#not}
-
-This keyword has no additional properties
-apart from `instanceRef` and `schemaRef`.
diff --git a/src/sioclient/lib/rapidjson/doc/schema.zh-cn.md b/src/sioclient/lib/rapidjson/doc/schema.zh-cn.md
deleted file mode 100644
index c85177f9..00000000
--- a/src/sioclient/lib/rapidjson/doc/schema.zh-cn.md
+++ /dev/null
@@ -1,237 +0,0 @@
-# Schema
-
-（本功能于 v1.1.0 发布）
-
-JSON Schema 是描述 JSON 格式的一个标准草案。一个 schema 本身也是一个 JSON。使用 JSON Schema 去校验 JSON，可以让你的代码安全地访问 DOM，而无须检查类型或键值是否存在等。这也能确保输出的 JSON 是符合指定的 schema。
-
-RapidJSON 实现了一个 [JSON Schema Draft v4](http://json-schema.org/documentation.html) 的校验器。若你不熟悉 JSON Schema，可以参考 [Understanding JSON Schema](http://spacetelescope.github.io/understanding-json-schema/)。
-
-[TOC]
-
-# 基本用法 {#BasicUsage}
-
-首先，你要把 JSON Schema 解析成 `Document`，再把它编译成一个 `SchemaDocument`。
-
-然后，利用该 `SchemaDocument` 创建一个 `SchemaValidator`。它与 `Writer` 相似，都是能够处理 SAX 事件的。因此，你可以用 `document.Accept(validator)` 去校验一个 JSON，然后再获取校验结果。
-
-~~~cpp
-#include "rapidjson/schema.h"
-
-// ...
-
-Document sd;
-if (sd.Parse(schemaJson).HasParseError()) {
-    // 此 schema 不是合法的 JSON
-    // ...       
-}
-SchemaDocument schema(sd); // 把一个 Document 编译至 SchemaDocument
-// 之后不再需要 sd
-
-Document d;
-if (d.Parse(inputJson).HasParseError()) {
-    // 输入不是一个合法的 JSON
-    // ...       
-}
-
-SchemaValidator validator(schema);
-if (!d.Accept(validator)) {
-    // 输入的 JSON 不合乎 schema
-    // 打印诊断信息
-    StringBuffer sb;
-    validator.GetInvalidSchemaPointer().StringifyUriFragment(sb);
-    printf("Invalid schema: %s\n", sb.GetString());
-    printf("Invalid keyword: %s\n", validator.GetInvalidSchemaKeyword());
-    sb.Clear();
-    validator.GetInvalidDocumentPointer().StringifyUriFragment(sb);
-    printf("Invalid document: %s\n", sb.GetString());
-}
-~~~
-
-一些注意点：
-
-* 一个 `SchemaDocment` 能被多个 `SchemaValidator` 引用。它不会被 `SchemaValidator` 修改。
-* 可以重复使用一个 `SchemaValidator` 来校验多个文件。在校验其他文件前，须先调用 `validator.Reset()`。
-
-# 在解析／生成时进行校验 {#ParsingSerialization}
-
-与大部分 JSON Schema 校验器有所不同，RapidJSON 提供了一个基于 SAX 的 schema 校验器实现。因此，你可以在输入流解析 JSON 的同时进行校验。若校验器遇到一个与 schema 不符的值，就会立即终止解析。这设计对于解析大型 JSON 文件时特别有用。
-
-## DOM 解析 {#DomParsing}
-
-在使用 DOM 进行解析时，`Document` 除了接收 SAX 事件外，还需做一些准备及结束工作，因此，为了连接 `Reader`、`SchemaValidator` 和 `Document` 要做多一点事情。`SchemaValidatingReader` 是一个辅助类去做那些工作。
-
-~~~cpp
-#include "rapidjson/filereadstream.h"
-
-// ...
-SchemaDocument schema(sd); // 把一个 Document 编译至 SchemaDocument
-
-// 使用 reader 解析 JSON
-FILE* fp = fopen("big.json", "r");
-FileReadStream is(fp, buffer, sizeof(buffer));
-
-// 用 reader 解析 JSON，校验它的 SAX 事件，并存储至 d
-Document d;
-SchemaValidatingReader<kParseDefaultFlags, FileReadStream, UTF8<> > reader(is, schema);
-d.Populate(reader);
-
-if (!reader.GetParseResult()) {
-    // 不是一个合法的 JSON
-    // 当 reader.GetParseResult().Code() == kParseErrorTermination,
-    // 它可能是被以下原因中止：
-    // (1) 校验器发现 JSON 不合乎 schema；或
-    // (2) 输入流有 I/O 错误。
-
-    // 检查校验结果
-    if (!reader.IsValid()) {
-        // 输入的 JSON 不合乎 schema
-        // 打印诊断信息
-        StringBuffer sb;
-        reader.GetInvalidSchemaPointer().StringifyUriFragment(sb);
-        printf("Invalid schema: %s\n", sb.GetString());
-        printf("Invalid keyword: %s\n", reader.GetInvalidSchemaKeyword());
-        sb.Clear();
-        reader.GetInvalidDocumentPointer().StringifyUriFragment(sb);
-        printf("Invalid document: %s\n", sb.GetString());
-    }
-}
-~~~
-
-## SAX 解析 {#SaxParsing}
-
-使用 SAX 解析时，情况就简单得多。若只需要校验 JSON 而无需进一步处理，那么仅需要：
-
-~~~
-SchemaValidator validator(schema);
-Reader reader;
-if (!reader.Parse(stream, validator)) {
-    if (!validator.IsValid()) {
-        // ...    
-    }
-}
-~~~
-
-这种方式和 [schemavalidator](example/schemavalidator/schemavalidator.cpp) 例子完全相同。这带来的独特优势是，无论 JSON 多巨大，永远维持低内存用量（内存用量只与 Schema 的复杂度相关）。
-
-若你需要进一步处理 SAX 事件，便可使用模板类 `GenericSchemaValidator` 去设置校验器的输出 `Handler`：
-
-~~~
-MyHandler handler;
-GenericSchemaValidator<SchemaDocument, MyHandler> validator(schema, handler);
-Reader reader;
-if (!reader.Parse(ss, validator)) {
-    if (!validator.IsValid()) {
-        // ...    
-    }
-}
-~~~
-
-## 生成 {#Serialization}
-
-我们也可以在生成（serialization）的时候进行校验。这能确保输出的 JSON 符合一个 JSON Schema。
-
-~~~
-StringBuffer sb;
-Writer<StringBuffer> writer(sb);
-GenericSchemaValidator<SchemaDocument, Writer<StringBuffer> > validator(s, writer);
-if (!d.Accept(validator)) {
-    // Some problem during Accept(), it may be validation or encoding issues.
-    if (!validator.IsValid()) {
-        // ...
-    }
-}
-~~~
-
-当然，如果你的应用仅需要 SAX 风格的生成，那么只需要把 SAX 事件由原来发送到 `Writer`，改为发送到 `SchemaValidator`。
-
-# 远程 Schema {#RemoteSchema}
-
-JSON Schema 支持 [`$ref` 关键字](http://spacetelescope.github.io/understanding-json-schema/structuring.html)，它是一个 [JSON pointer](doc/pointer.zh-cn.md) 引用至一个本地（local）或远程（remote） schema。本地指针的首字符是 `#`，而远程指针是一个相对或绝对 URI。例如：
-
-~~~js
-{ "$ref": "definitions.json#/address" }
-~~~
-
-由于 `SchemaDocument` 并不知道如何处理那些 URI，它需要使用者提供一个 `IRemoteSchemaDocumentProvider` 的实例去处理。
-
-~~~
-class MyRemoteSchemaDocumentProvider : public IRemoteSchemaDocumentProvider {
-public:
-    virtual const SchemaDocument* GetRemoteDocument(const char* uri, SizeType length) {
-        // Resolve the uri and returns a pointer to that schema.
-    }
-};
-
-// ...
-
-MyRemoteSchemaDocumentProvider provider;
-SchemaDocument schema(sd, &provider);
-~~~
-
-# 标准的符合程度 {#Conformance}
-
-RapidJSON 通过了 [JSON Schema Test Suite](https://github.com/json-schema/JSON-Schema-Test-Suite) (Json Schema draft 4) 中 263 个测试的 262 个。
-
-没通过的测试是 `refRemote.json` 中的 "change resolution scope" - "changed scope ref invalid"。这是由于未实现 `id` schema 关键字及 URI 合并功能。
-
-除此以外，关于字符串类型的 `format` schema 关键字也会被忽略，因为标准中并没需求必须实现。
-
-## 正则表达式 {#RegEx}
-
-`pattern` 及 `patternProperties` 这两个 schema 关键字使用了正则表达式去匹配所需的模式。
-
-RapidJSON 实现了一个简单的 NFA 正则表达式引擎，并预设使用。它支持以下语法。
-
-|语法|描述|
-|------|-----------|
-|`ab`    | 串联 |
-|<code>a&#124;b</code>   | 交替 |
-|`a?`    | 零或一次 |
-|`a*`    | 零或多次 |
-|`a+`    | 一或多次 |
-|`a{3}`  | 刚好 3 次 |
-|`a{3,}` | 至少 3 次 |
-|`a{3,5}`| 3 至 5 次 |
-|`(ab)`  | 分组 |
-|`^a`    | 在开始处 |
-|`a$`    | 在结束处 |
-|`.`     | 任何字符 |
-|`[abc]` | 字符组 |
-|`[a-c]` | 字符组范围 |
-|`[a-z0-9_]` | 字符组组合 |
-|`[^abc]` | 字符组取反 |
-|`[^a-c]` | 字符组范围取反 |
-|`[\b]`   | 退格符 (U+0008) |
-|<code>\\&#124;</code>, `\\`, ...  | 转义字符 |
-|`\f` | 馈页 (U+000C) |
-|`\n` | 馈行 (U+000A) |
-|`\r` | 回车 (U+000D) |
-|`\t` | 制表 (U+0009) |
-|`\v` | 垂直制表 (U+000B) |
-
-对于使用 C++11 编译器的使用者，也可使用 `std::regex`，只需定义 `RAPIDJSON_SCHEMA_USE_INTERNALREGEX=0` 及 `RAPIDJSON_SCHEMA_USE_STDREGEX=1`。若你的 schema 无需使用 `pattern` 或 `patternProperties`，可以把两个宏都设为零，以禁用此功能，这样做可节省一些代码体积。
-
-# 性能 {#Performance}
-
-大部分 C++ JSON 库都未支持 JSON Schema。因此我们尝试按照 [json-schema-benchmark](https://github.com/ebdrup/json-schema-benchmark) 去评估 RapidJSON 的 JSON Schema 校验器。该评测测试了 11 个运行在 node.js 上的 JavaScript 库。
-
-该评测校验 [JSON Schema Test Suite](https://github.com/json-schema/JSON-Schema-Test-Suite) 中的测试，当中排除了一些测试套件及个别测试。我们在 [`schematest.cpp`](test/perftest/schematest.cpp) 实现了相同的评测。
-
-在 MacBook Pro (2.8 GHz Intel Core i7) 上收集到以下结果。
-
-|校验器|相对速度|每秒执行的测试数目|
-|---------|:------------:|:----------------------------:|
-|RapidJSON|155%|30682|
-|[`ajv`](https://github.com/epoberezkin/ajv)|100%|19770 (± 1.31%)|
-|[`is-my-json-valid`](https://github.com/mafintosh/is-my-json-valid)|70%|13835 (± 2.84%)|
-|[`jsen`](https://github.com/bugventure/jsen)|57.7%|11411 (± 1.27%)|
-|[`schemasaurus`](https://github.com/AlexeyGrishin/schemasaurus)|26%|5145 (± 1.62%)|
-|[`themis`](https://github.com/playlyfe/themis)|19.9%|3935 (± 2.69%)|
-|[`z-schema`](https://github.com/zaggino/z-schema)|7%|1388 (± 0.84%)|
-|[`jsck`](https://github.com/pandastrike/jsck#readme)|3.1%|606 (± 2.84%)|
-|[`jsonschema`](https://github.com/tdegrunt/jsonschema#readme)|0.9%|185 (± 1.01%)|
-|[`skeemas`](https://github.com/Prestaul/skeemas#readme)|0.8%|154 (± 0.79%)|
-|tv4|0.5%|93 (± 0.94%)|
-|[`jayschema`](https://github.com/natesilva/jayschema)|0.1%|21 (± 1.14%)|
-
-换言之，RapidJSON 比最快的 JavaScript 库（ajv）快约 1.5x。比最慢的快 1400x。
diff --git a/src/sioclient/lib/rapidjson/doc/stream.md b/src/sioclient/lib/rapidjson/doc/stream.md
deleted file mode 100644
index d95de142..00000000
--- a/src/sioclient/lib/rapidjson/doc/stream.md
+++ /dev/null
@@ -1,429 +0,0 @@
-# Stream
-
-In RapidJSON, `rapidjson::Stream` is a concept for reading/writing JSON. Here we first show how to use streams provided. And then see how to create a custom stream.
-
-[TOC]
-
-# Memory Streams {#MemoryStreams}
-
-Memory streams store JSON in memory.
-
-## StringStream (Input) {#StringStream}
-
-`StringStream` is the most basic input stream. It represents a complete, read-only JSON stored in memory. It is defined in `rapidjson/rapidjson.h`.
-
-~~~~~~~~~~cpp
-#include "rapidjson/document.h" // will include "rapidjson/rapidjson.h"
-
-using namespace rapidjson;
-
-// ...
-const char json[] = "[1, 2, 3, 4]";
-StringStream s(json);
-
-Document d;
-d.ParseStream(s);
-~~~~~~~~~~
-
-Since this is very common usage, `Document::Parse(const char*)` is provided to do exactly the same as above:
-
-~~~~~~~~~~cpp
-// ...
-const char json[] = "[1, 2, 3, 4]";
-Document d;
-d.Parse(json);
-~~~~~~~~~~
-
-Note that, `StringStream` is a typedef of `GenericStringStream<UTF8<> >`, user may use another encodings to represent the character set of the stream.
-
-## StringBuffer (Output) {#StringBuffer}
-
-`StringBuffer` is a simple output stream. It allocates a memory buffer for writing the whole JSON. Use `GetString()` to obtain the buffer.
-
-~~~~~~~~~~cpp
-#include "rapidjson/stringbuffer.h"
-#include <rapidjson/writer.h>
-
-StringBuffer buffer;
-Writer<StringBuffer> writer(buffer);
-d.Accept(writer);
-
-const char* output = buffer.GetString();
-~~~~~~~~~~
-
-When the buffer is full, it will increases the capacity automatically. The default capacity is 256 characters (256 bytes for UTF8, 512 bytes for UTF16, etc.). User can provide an allocator and a initial capacity.
-
-~~~~~~~~~~cpp
-StringBuffer buffer1(0, 1024); // Use its allocator, initial size = 1024
-StringBuffer buffer2(allocator, 1024);
-~~~~~~~~~~
-
-By default, `StringBuffer` will instantiate an internal allocator.
-
-Similarly, `StringBuffer` is a typedef of `GenericStringBuffer<UTF8<> >`.
-
-# File Streams {#FileStreams}
-
-When parsing a JSON from file, you may read the whole JSON into memory and use ``StringStream`` above.
-
-However, if the JSON is big, or memory is limited, you can use `FileReadStream`. It only read a part of JSON from file into buffer, and then let the part be parsed. If it runs out of characters in the buffer, it will read the next part from file.
-
-## FileReadStream (Input) {#FileReadStream}
-
-`FileReadStream` reads the file via a `FILE` pointer. And user need to provide a buffer.
-
-~~~~~~~~~~cpp
-#include "rapidjson/filereadstream.h"
-#include <cstdio>
-
-using namespace rapidjson;
-
-FILE* fp = fopen("big.json", "rb"); // non-Windows use "r"
-
-char readBuffer[65536];
-FileReadStream is(fp, readBuffer, sizeof(readBuffer));
-
-Document d;
-d.ParseStream(is);
-
-fclose(fp);
-~~~~~~~~~~
-
-Different from string streams, `FileReadStream` is byte stream. It does not handle encodings. If the file is not UTF-8, the byte stream can be wrapped in a `EncodedInputStream`. It will be discussed very soon.
-
-Apart from reading file, user can also use `FileReadStream` to read `stdin`.
-
-## FileWriteStream (Output) {#FileWriteStream}
-
-`FileWriteStream` is buffered output stream. Its usage is very similar to `FileReadStream`.
-
-~~~~~~~~~~cpp
-#include "rapidjson/filewritestream.h"
-#include <rapidjson/writer.h>
-#include <cstdio>
-
-using namespace rapidjson;
-
-Document d;
-d.Parse(json);
-// ...
-
-FILE* fp = fopen("output.json", "wb"); // non-Windows use "w"
-
-char writeBuffer[65536];
-FileWriteStream os(fp, writeBuffer, sizeof(writeBuffer));
-
-Writer<FileWriteStream> writer(os);
-d.Accept(writer);
-
-fclose(fp);
-~~~~~~~~~~
-
-It can also directs the output to `stdout`.
-
-# iostream Wrapper {#iostreamWrapper}
-
-Due to users' requests, RapidJSON provided official wrappers for `std::basic_istream` and `std::basic_ostream`. However, please note that the performance will be much lower than the other streams above.
-
-## IStreamWrapper {#IStreamWrapper}
-
-`IStreamWrapper` wraps any class drived from `std::istream`, such as `std::istringstream`, `std::stringstream`, `std::ifstream`, `std::fstream`, into RapidJSON's input stream.
-
-~~~cpp
-#include <rapidjson/document.h>
-#include <rapidjson/istreamwrapper.h>
-#include <fstream>
-
-using namespace rapidjson;
-using namespace std;
-
-ifstream ifs("test.json");
-IStreamWrapper isw(ifs);
-
-Document d;
-d.ParseStream(isw);
-~~~
-
-For classes derived from `std::wistream`, use `WIStreamWrapper`.
-
-## OStreamWrapper {#OStreamWrapper}
-
-Similarly, `OStreamWrapper` wraps any class derived from `std::ostream`, such as `std::ostringstream`, `std::stringstream`, `std::ofstream`, `std::fstream`, into RapidJSON's input stream.
-
-~~~cpp
-#include <rapidjson/document.h>
-#include <rapidjson/ostreamwrapper.h>
-#include <rapidjson/writer.h>
-#include <fstream>
-
-using namespace rapidjson;
-using namespace std;
-
-Document d;
-d.Parse(json);
-
-// ...
-
-ofstream ofs("output.json");
-OStreamWrapper osw(ofs);
-
-Writer<OStreamWrapper> writer(osw);
-d.Accept(writer);
-~~~
-
-For classes derived from `std::wostream`, use `WOStreamWrapper`.
-
-# Encoded Streams {#EncodedStreams}
-
-Encoded streams do not contain JSON itself, but they wrap byte streams to provide basic encoding/decoding function.
-
-As mentioned above, UTF-8 byte streams can be read directly. However, UTF-16 and UTF-32 have endian issue. To handle endian correctly, it needs to convert bytes into characters (e.g. `wchar_t` for UTF-16) while reading, and characters into bytes while writing.
-
-Besides, it also need to handle [byte order mark (BOM)](http://en.wikipedia.org/wiki/Byte_order_mark). When reading from a byte stream, it is needed to detect or just consume the BOM if exists. When writing to a byte stream, it can optionally write BOM.
-
-If the encoding of stream is known in compile-time, you may use `EncodedInputStream` and `EncodedOutputStream`. If the stream can be UTF-8, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE JSON, and it is only known in runtime, you may use `AutoUTFInputStream` and `AutoUTFOutputStream`. These streams are defined in `rapidjson/encodedstream.h`.
-
-Note that, these encoded streams can be applied to streams other than file. For example, you may have a file in memory, or a custom byte stream, be wrapped in encoded streams.
-
-## EncodedInputStream {#EncodedInputStream}
-
-`EncodedInputStream` has two template parameters. The first one is a `Encoding` class, such as `UTF8`, `UTF16LE`, defined in `rapidjson/encodings.h`. The second one is the class of stream to be wrapped.
-
-~~~~~~~~~~cpp
-#include "rapidjson/document.h"
-#include "rapidjson/filereadstream.h"   // FileReadStream
-#include "rapidjson/encodedstream.h"    // EncodedInputStream
-#include <cstdio>
-
-using namespace rapidjson;
-
-FILE* fp = fopen("utf16le.json", "rb"); // non-Windows use "r"
-
-char readBuffer[256];
-FileReadStream bis(fp, readBuffer, sizeof(readBuffer));
-
-EncodedInputStream<UTF16LE<>, FileReadStream> eis(bis);  // wraps bis into eis
-
-Document d; // Document is GenericDocument<UTF8<> > 
-d.ParseStream<0, UTF16LE<> >(eis);  // Parses UTF-16LE file into UTF-8 in memory
-
-fclose(fp);
-~~~~~~~~~~
-
-## EncodedOutputStream {#EncodedOutputStream}
-
-`EncodedOutputStream` is similar but it has a `bool putBOM` parameter in the constructor, controlling whether to write BOM into output byte stream.
-
-~~~~~~~~~~cpp
-#include "rapidjson/filewritestream.h"  // FileWriteStream
-#include "rapidjson/encodedstream.h"    // EncodedOutputStream
-#include <rapidjson/writer.h>
-#include <cstdio>
-
-Document d;         // Document is GenericDocument<UTF8<> > 
-// ...
-
-FILE* fp = fopen("output_utf32le.json", "wb"); // non-Windows use "w"
-
-char writeBuffer[256];
-FileWriteStream bos(fp, writeBuffer, sizeof(writeBuffer));
-
-typedef EncodedOutputStream<UTF32LE<>, FileWriteStream> OutputStream;
-OutputStream eos(bos, true);   // Write BOM
-
-Writer<OutputStream, UTF32LE<>, UTF8<>> writer(eos);
-d.Accept(writer);   // This generates UTF32-LE file from UTF-8 in memory
-
-fclose(fp);
-~~~~~~~~~~
-
-## AutoUTFInputStream {#AutoUTFInputStream}
-
-Sometimes an application may want to handle all supported JSON encoding. `AutoUTFInputStream` will detection encoding by BOM first. If BOM is unavailable, it will use  characteristics of valid JSON to make detection. If neither method success, it falls back to the UTF type provided in constructor.
-
-Since the characters (code units) may be 8-bit, 16-bit or 32-bit. `AutoUTFInputStream` requires a character type which can hold at least 32-bit. We may use `unsigned`, as in the template parameter:
-
-~~~~~~~~~~cpp
-#include "rapidjson/document.h"
-#include "rapidjson/filereadstream.h"   // FileReadStream
-#include "rapidjson/encodedstream.h"    // AutoUTFInputStream
-#include <cstdio>
-
-using namespace rapidjson;
-
-FILE* fp = fopen("any.json", "rb"); // non-Windows use "r"
-
-char readBuffer[256];
-FileReadStream bis(fp, readBuffer, sizeof(readBuffer));
-
-AutoUTFInputStream<unsigned, FileReadStream> eis(bis);  // wraps bis into eis
-
-Document d;         // Document is GenericDocument<UTF8<> > 
-d.ParseStream<0, AutoUTF<unsigned> >(eis); // This parses any UTF file into UTF-8 in memory
-
-fclose(fp);
-~~~~~~~~~~
-
-When specifying the encoding of stream, uses `AutoUTF<CharType>` as in `ParseStream()` above.
-
-You can obtain the type of UTF via `UTFType GetType()`. And check whether a BOM is found by `HasBOM()`
-
-## AutoUTFOutputStream {#AutoUTFOutputStream}
-
-Similarly, to choose encoding for output during runtime, we can use `AutoUTFOutputStream`. This class is not automatic *per se*. You need to specify the UTF type and whether to write BOM in runtime.
-
-~~~~~~~~~~cpp
-using namespace rapidjson;
-
-void WriteJSONFile(FILE* fp, UTFType type, bool putBOM, const Document& d) {
-    char writeBuffer[256];
-    FileWriteStream bos(fp, writeBuffer, sizeof(writeBuffer));
-
-    typedef AutoUTFOutputStream<unsigned, FileWriteStream> OutputStream;
-    OutputStream eos(bos, type, putBOM);
-    
-    Writer<OutputStream, UTF8<>, AutoUTF<> > writer;
-    d.Accept(writer);
-}
-~~~~~~~~~~
-
-`AutoUTFInputStream` and `AutoUTFOutputStream` is more convenient than `EncodedInputStream` and `EncodedOutputStream`. They just incur a little bit runtime overheads.
-
-# Custom Stream {#CustomStream}
-
-In addition to memory/file streams, user can create their own stream classes which fits RapidJSON's API. For example, you may create network stream, stream from compressed file, etc.
-
-RapidJSON combines different types using templates. A class containing all required interface can be a stream. The Stream interface is defined in comments of `rapidjson/rapidjson.h`:
-
-~~~~~~~~~~cpp
-concept Stream {
-    typename Ch;    //!< Character type of the stream.
-
-    //! Read the current character from stream without moving the read cursor.
-    Ch Peek() const;
-
-    //! Read the current character from stream and moving the read cursor to next character.
-    Ch Take();
-
-    //! Get the current read cursor.
-    //! \return Number of characters read from start.
-    size_t Tell();
-
-    //! Begin writing operation at the current read pointer.
-    //! \return The begin writer pointer.
-    Ch* PutBegin();
-
-    //! Write a character.
-    void Put(Ch c);
-
-    //! Flush the buffer.
-    void Flush();
-
-    //! End the writing operation.
-    //! \param begin The begin write pointer returned by PutBegin().
-    //! \return Number of characters written.
-    size_t PutEnd(Ch* begin);
-}
-~~~~~~~~~~
-
-For input stream, they must implement `Peek()`, `Take()` and `Tell()`.
-For output stream, they must implement `Put()` and `Flush()`. 
-There are two special interface, `PutBegin()` and `PutEnd()`, which are only for *in situ* parsing. Normal streams do not implement them. However, if the interface is not needed for a particular stream, it is still need to a dummy implementation, otherwise will generate compilation error.
-
-## Example: istream wrapper {#ExampleIStreamWrapper}
-
-The following example is a simple wrapper of `std::istream`, which only implements 3 functions.
-
-~~~~~~~~~~cpp
-class MyIStreamWrapper {
-public:
-    typedef char Ch;
-
-    MyIStreamWrapper(std::istream& is) : is_(is) {
-    }
-
-    Ch Peek() const { // 1
-        int c = is_.peek();
-        return c == std::char_traits<char>::eof() ? '\0' : (Ch)c;
-    }
-
-    Ch Take() { // 2
-        int c = is_.get();
-        return c == std::char_traits<char>::eof() ? '\0' : (Ch)c;
-    }
-
-    size_t Tell() const { return (size_t)is_.tellg(); } // 3
-
-    Ch* PutBegin() { assert(false); return 0; }
-    void Put(Ch) { assert(false); }
-    void Flush() { assert(false); }
-    size_t PutEnd(Ch*) { assert(false); return 0; }
-
-private:
-    MyIStreamWrapper(const MyIStreamWrapper&);
-    MyIStreamWrapper& operator=(const MyIStreamWrapper&);
-
-    std::istream& is_;
-};
-~~~~~~~~~~
-
-User can use it to wrap instances of `std::stringstream`, `std::ifstream`.
-
-~~~~~~~~~~cpp
-const char* json = "[1,2,3,4]";
-std::stringstream ss(json);
-MyIStreamWrapper is(ss);
-
-Document d;
-d.ParseStream(is);
-~~~~~~~~~~
-
-Note that, this implementation may not be as efficient as RapidJSON's memory or file streams, due to internal overheads of the standard library.
-
-## Example: ostream wrapper {#ExampleOStreamWrapper}
-
-The following example is a simple wrapper of `std::istream`, which only implements 2 functions.
-
-~~~~~~~~~~cpp
-class MyOStreamWrapper {
-public:
-    typedef char Ch;
-
-    MyOStreamWrapper(std::ostream& os) : os_(os) {
-    }
-
-    Ch Peek() const { assert(false); return '\0'; }
-    Ch Take() { assert(false); return '\0'; }
-    size_t Tell() const {  }
-
-    Ch* PutBegin() { assert(false); return 0; }
-    void Put(Ch c) { os_.put(c); }                  // 1
-    void Flush() { os_.flush(); }                   // 2
-    size_t PutEnd(Ch*) { assert(false); return 0; }
-
-private:
-    MyOStreamWrapper(const MyOStreamWrapper&);
-    MyOStreamWrapper& operator=(const MyOStreamWrapper&);
-
-    std::ostream& os_;
-};
-~~~~~~~~~~
-
-User can use it to wrap instances of `std::stringstream`, `std::ofstream`.
-
-~~~~~~~~~~cpp
-Document d;
-// ...
-
-std::stringstream ss;
-MyOStreamWrapper os(ss);
-
-Writer<MyOStreamWrapper> writer(os);
-d.Accept(writer);
-~~~~~~~~~~
-
-Note that, this implementation may not be as efficient as RapidJSON's memory or file streams, due to internal overheads of the standard library.
-
-# Summary {#Summary}
-
-This section describes stream classes available in RapidJSON. Memory streams are simple. File stream can reduce the memory required during JSON parsing and generation, if the JSON is stored in file system. Encoded streams converts between byte streams and character streams. Finally, user may create custom streams using a simple interface.
diff --git a/src/sioclient/lib/rapidjson/doc/stream.zh-cn.md b/src/sioclient/lib/rapidjson/doc/stream.zh-cn.md
deleted file mode 100644
index 7f2f356f..00000000
--- a/src/sioclient/lib/rapidjson/doc/stream.zh-cn.md
+++ /dev/null
@@ -1,429 +0,0 @@
-# 流
-
-在 RapidJSON 中，`rapidjson::Stream` 是用於读写 JSON 的概念（概念是指 C++ 的 concept）。在这里我们先介绍如何使用 RapidJSON 提供的各种流。然后再看看如何自行定义流。
-
-[TOC]
-
-# 内存流 {#MemoryStreams}
-
-内存流把 JSON 存储在内存之中。
-
-## StringStream（输入）{#StringStream}
-
-`StringStream` 是最基本的输入流，它表示一个完整的、只读的、存储于内存的 JSON。它在 `rapidjson/rapidjson.h` 中定义。
-
-~~~~~~~~~~cpp
-#include "rapidjson/document.h" // 会包含 "rapidjson/rapidjson.h"
-
-using namespace rapidjson;
-
-// ...
-const char json[] = "[1, 2, 3, 4]";
-StringStream s(json);
-
-Document d;
-d.ParseStream(s);
-~~~~~~~~~~
-
-由于这是非常常用的用法，RapidJSON 提供 `Document::Parse(const char*)` 去做完全相同的事情：
-
-~~~~~~~~~~cpp
-// ...
-const char json[] = "[1, 2, 3, 4]";
-Document d;
-d.Parse(json);
-~~~~~~~~~~
-
-需要注意，`StringStream` 是 `GenericStringStream<UTF8<> >` 的 typedef，使用者可用其他编码类去代表流所使用的字符集。
-
-## StringBuffer（输出）{#StringBuffer}
-
-`StringBuffer` 是一个简单的输出流。它分配一个内存缓冲区，供写入整个 JSON。可使用 `GetString()` 来获取该缓冲区。
-
-~~~~~~~~~~cpp
-#include "rapidjson/stringbuffer.h"
-#include <rapidjson/writer.h>
-
-StringBuffer buffer;
-Writer<StringBuffer> writer(buffer);
-d.Accept(writer);
-
-const char* output = buffer.GetString();
-~~~~~~~~~~
-
-当缓冲区满溢，它将自动增加容量。缺省容量是 256 个字符（UTF8 是 256 字节，UTF16 是 512 字节等）。使用者能自行提供分配器及初始容量。
-
-~~~~~~~~~~cpp
-StringBuffer buffer1(0, 1024); // 使用它的分配器，初始大小 = 1024
-StringBuffer buffer2(allocator, 1024);
-~~~~~~~~~~
-
-如无设置分配器，`StringBuffer` 会自行实例化一个内部分配器。
-
-相似地，`StringBuffer` 是 `GenericStringBuffer<UTF8<> >` 的 typedef。
-
-# 文件流 {#FileStreams}
-
-当要从文件解析一个 JSON，你可以把整个 JSON 读入内存并使用上述的 `StringStream`。
-
-然而，若 JSON 很大，或是内存有限，你可以改用 `FileReadStream`。它只会从文件读取一部分至缓冲区，然后让那部分被解析。若缓冲区的字符都被读完，它会再从文件读取下一部分。
-
-## FileReadStream（输入） {#FileReadStream}
-
-`FileReadStream` 通过 `FILE` 指针读取文件。使用者需要提供一个缓冲区。
-
-~~~~~~~~~~cpp
-#include "rapidjson/filereadstream.h"
-#include <cstdio>
-
-using namespace rapidjson;
-
-FILE* fp = fopen("big.json", "rb"); // 非 Windows 平台使用 "r"
-
-char readBuffer[65536];
-FileReadStream is(fp, readBuffer, sizeof(readBuffer));
-
-Document d;
-d.ParseStream(is);
-
-fclose(fp);
-~~~~~~~~~~
-
-与 `StringStreams` 不一样，`FileReadStream` 是一个字节流。它不处理编码。若文件并非 UTF-8 编码，可以把字节流用 `EncodedInputStream` 包装。我们很快会讨论这个问题。
-
-除了读取文件，使用者也可以使用 `FileReadStream` 来读取 `stdin`。
-
-## FileWriteStream（输出）{#FileWriteStream}
-
-`FileWriteStream` 是一个含缓冲功能的输出流。它的用法与 `FileReadStream` 非常相似。
-
-~~~~~~~~~~cpp
-#include "rapidjson/filewritestream.h"
-#include <rapidjson/writer.h>
-#include <cstdio>
-
-using namespace rapidjson;
-
-Document d;
-d.Parse(json);
-// ...
-
-FILE* fp = fopen("output.json", "wb"); // 非 Windows 平台使用 "w"
-
-char writeBuffer[65536];
-FileWriteStream os(fp, writeBuffer, sizeof(writeBuffer));
-
-Writer<FileWriteStream> writer(os);
-d.Accept(writer);
-
-fclose(fp);
-~~~~~~~~~~
-
-它也可以把输出导向 `stdout`。
-
-# iostream 包装类 {#iostreamWrapper}
-
-基于用户的要求，RapidJSON 提供了正式的 `std::basic_istream` 和 `std::basic_ostream` 包装类。然而，请注意其性能会大大低于以上的其他流。
-
-## IStreamWrapper {#IStreamWrapper}
-
-`IStreamWrapper` 把任何继承自 `std::istream` 的类（如 `std::istringstream`、`std::stringstream`、`std::ifstream`、`std::fstream`）包装成 RapidJSON 的输入流。
-
-~~~cpp
-#include <rapidjson/document.h>
-#include <rapidjson/istreamwrapper.h>
-#include <fstream>
-
-using namespace rapidjson;
-using namespace std;
-
-ifstream ifs("test.json");
-IStreamWrapper isw(ifs);
-
-Document d;
-d.ParseStream(isw);
-~~~
-
-对于继承自 `std::wistream` 的类，则使用 `WIStreamWrapper`。
-
-## OStreamWrapper {#OStreamWrapper}
-
-相似地，`OStreamWrapper` 把任何继承自 `std::ostream` 的类（如 `std::ostringstream`、`std::stringstream`、`std::ofstream`、`std::fstream`）包装成 RapidJSON 的输出流。
-
-~~~cpp
-#include <rapidjson/document.h>
-#include <rapidjson/ostreamwrapper.h>
-#include <rapidjson/writer.h>
-#include <fstream>
-
-using namespace rapidjson;
-using namespace std;
-
-Document d;
-d.Parse(json);
-
-// ...
-
-ofstream ofs("output.json");
-OStreamWrapper osw(ofs);
-
-Writer<OStreamWrapper> writer(osw);
-d.Accept(writer);
-~~~
-
-对于继承自 `std::wistream` 的类，则使用 `WIStreamWrapper`。
-
-# 编码流 {#EncodedStreams}
-
-编码流（encoded streams）本身不存储 JSON，它们是通过包装字节流来提供基本的编码／解码功能。
-
-如上所述，我们可以直接读入 UTF-8 字节流。然而，UTF-16 及 UTF-32 有字节序（endian）问题。要正确地处理字节序，需要在读取时把字节转换成字符（如对 UTF-16 使用 `wchar_t`），以及在写入时把字符转换为字节。
-
-除此以外，我们也需要处理 [字节顺序标记（byte order mark, BOM）](http://en.wikipedia.org/wiki/Byte_order_mark)。当从一个字节流读取时，需要检测 BOM，或者仅仅是把存在的 BOM 消去。当把 JSON 写入字节流时，也可选择写入 BOM。
-
-若一个流的编码在编译期已知，你可使用 `EncodedInputStream` 及 `EncodedOutputStream`。若一个流可能存储 UTF-8、UTF-16LE、UTF-16BE、UTF-32LE、UTF-32BE 的 JSON，并且编码只能在运行时得知，你便可以使用 `AutoUTFInputStream` 及 `AutoUTFOutputStream`。这些流定义在 `rapidjson/encodedstream.h`。
-
-注意到，这些编码流可以施于文件以外的流。例如，你可以用编码流包装内存中的文件或自定义的字节流。
-
-## EncodedInputStream {#EncodedInputStream}
-
-`EncodedInputStream` 含两个模板参数。第一个是 `Encoding` 类型，例如定义于 `rapidjson/encodings.h` 的 `UTF8`、`UTF16LE`。第二个参数是被包装的流的类型。
-
-~~~~~~~~~~cpp
-#include "rapidjson/document.h"
-#include "rapidjson/filereadstream.h"   // FileReadStream
-#include "rapidjson/encodedstream.h"    // EncodedInputStream
-#include <cstdio>
-
-using namespace rapidjson;
-
-FILE* fp = fopen("utf16le.json", "rb"); // 非 Windows 平台使用 "r"
-
-char readBuffer[256];
-FileReadStream bis(fp, readBuffer, sizeof(readBuffer));
-
-EncodedInputStream<UTF16LE<>, FileReadStream> eis(bis);  // 用 eis 包装 bis
-
-Document d; // Document 为 GenericDocument<UTF8<> > 
-d.ParseStream<0, UTF16LE<> >(eis);  // 把 UTF-16LE 文件解析至内存中的 UTF-8
-
-fclose(fp);
-~~~~~~~~~~
-
-## EncodedOutputStream {#EncodedOutputStream}
-
-`EncodedOutputStream` 也是相似的，但它的构造函数有一个 `bool putBOM` 参数，用于控制是否在输出字节流写入 BOM。
-
-~~~~~~~~~~cpp
-#include "rapidjson/filewritestream.h"  // FileWriteStream
-#include "rapidjson/encodedstream.h"    // EncodedOutputStream
-#include <rapidjson/writer.h>
-#include <cstdio>
-
-Document d;         // Document 为 GenericDocument<UTF8<> > 
-// ...
-
-FILE* fp = fopen("output_utf32le.json", "wb"); // 非 Windows 平台使用 "w"
-
-char writeBuffer[256];
-FileWriteStream bos(fp, writeBuffer, sizeof(writeBuffer));
-
-typedef EncodedOutputStream<UTF32LE<>, FileWriteStream> OutputStream;
-OutputStream eos(bos, true);   // 写入 BOM
-
-Writer<OutputStream, UTF32LE<>, UTF8<>> writer(eos);
-d.Accept(writer);   // 这里从内存的 UTF-8 生成 UTF32-LE 文件
-
-fclose(fp);
-~~~~~~~~~~
-
-## AutoUTFInputStream {#AutoUTFInputStream}
-
-有时候，应用软件可能需要㲃理所有可支持的 JSON 编码。`AutoUTFInputStream` 会先使用 BOM 来检测编码。若 BOM 不存在，它便会使用合法 JSON 的特性来检测。若两种方法都失败，它就会倒退至构造函数提供的 UTF 类型。
-
-由于字符（编码单元／code unit）可能是 8 位、16 位或 32 位，`AutoUTFInputStream` 需要一个能至少储存 32 位的字符类型。我们可以使用 `unsigned` 作为模板参数：
-
-~~~~~~~~~~cpp
-#include "rapidjson/document.h"
-#include "rapidjson/filereadstream.h"   // FileReadStream
-#include "rapidjson/encodedstream.h"    // AutoUTFInputStream
-#include <cstdio>
-
-using namespace rapidjson;
-
-FILE* fp = fopen("any.json", "rb"); // 非 Windows 平台使用 "r"
-
-char readBuffer[256];
-FileReadStream bis(fp, readBuffer, sizeof(readBuffer));
-
-AutoUTFInputStream<unsigned, FileReadStream> eis(bis);  // 用 eis 包装 bis
-
-Document d;         // Document 为 GenericDocument<UTF8<> > 
-d.ParseStream<0, AutoUTF<unsigned> >(eis); // 把任何 UTF 编码的文件解析至内存中的 UTF-8
-
-fclose(fp);
-~~~~~~~~~~
-
-当要指定流的编码，可使用上面例子中 `ParseStream()` 的参数 `AutoUTF<CharType>`。
-
-你可以使用 `UTFType GetType()` 去获取 UTF 类型，并且用 `HasBOM()` 检测输入流是否含有 BOM。
-
-## AutoUTFOutputStream {#AutoUTFOutputStream}
-
-相似地，要在运行时选择输出的编码，我们可使用 `AutoUTFOutputStream`。这个类本身并非「自动」。你需要在运行时指定 UTF 类型，以及是否写入 BOM。
-
-~~~~~~~~~~cpp
-using namespace rapidjson;
-
-void WriteJSONFile(FILE* fp, UTFType type, bool putBOM, const Document& d) {
-    char writeBuffer[256];
-    FileWriteStream bos(fp, writeBuffer, sizeof(writeBuffer));
-
-    typedef AutoUTFOutputStream<unsigned, FileWriteStream> OutputStream;
-    OutputStream eos(bos, type, putBOM);
-    
-    Writer<OutputStream, UTF8<>, AutoUTF<> > writer;
-    d.Accept(writer);
-}
-~~~~~~~~~~
-
-`AutoUTFInputStream`／`AutoUTFOutputStream` 是比 `EncodedInputStream`／`EncodedOutputStream` 方便。但前者会产生一点运行期额外开销。
-
-# 自定义流 {#CustomStream}
-
-除了内存／文件流，使用者可创建自行定义适配 RapidJSON API 的流类。例如，你可以创建网络流、从压缩文件读取的流等等。
-
-RapidJSON 利用模板结合不同的类型。只要一个类包含所有所需的接口，就可以作为一个流。流的接合定义在 `rapidjson/rapidjson.h` 的注释里：
-
-~~~~~~~~~~cpp
-concept Stream {
-    typename Ch;    //!< 流的字符类型
-
-    //! 从流读取当前字符，不移动读取指针（read cursor）
-    Ch Peek() const;
-
-    //! 从流读取当前字符，移动读取指针至下一字符。
-    Ch Take();
-
-    //! 获取读取指针。
-    //! \return 从开始以来所读过的字符数量。
-    size_t Tell();
-
-    //! 从当前读取指针开始写入操作。
-    //! \return 返回开始写入的指针。
-    Ch* PutBegin();
-
-    //! 写入一个字符。
-    void Put(Ch c);
-
-    //! 清空缓冲区。
-    void Flush();
-
-    //! 完成写作操作。
-    //! \param begin PutBegin() 返回的开始写入指针。
-    //! \return 已写入的字符数量。
-    size_t PutEnd(Ch* begin);
-}
-~~~~~~~~~~
-
-输入流必须实现 `Peek()`、`Take()` 及 `Tell()`。
-输出流必须实现 `Put()` 及 `Flush()`。
-`PutBegin()` 及 `PutEnd()` 是特殊的接口，仅用于原位（*in situ*）解析。一般的流不需实现它们。然而，即使接口不需用于某些流，仍然需要提供空实现，否则会产生编译错误。
-
-## 例子：istream 的包装类 {#ExampleIStreamWrapper}
-
-以下的简单例子是 `std::istream` 的包装类，它只需现 3 个函数。
-
-~~~~~~~~~~cpp
-class MyIStreamWrapper {
-public:
-    typedef char Ch;
-
-    MyIStreamWrapper(std::istream& is) : is_(is) {
-    }
-
-    Ch Peek() const { // 1
-        int c = is_.peek();
-        return c == std::char_traits<char>::eof() ? '\0' : (Ch)c;
-    }
-
-    Ch Take() { // 2
-        int c = is_.get();
-        return c == std::char_traits<char>::eof() ? '\0' : (Ch)c;
-    }
-
-    size_t Tell() const { return (size_t)is_.tellg(); } // 3
-
-    Ch* PutBegin() { assert(false); return 0; }
-    void Put(Ch) { assert(false); }
-    void Flush() { assert(false); }
-    size_t PutEnd(Ch*) { assert(false); return 0; }
-
-private:
-    MyIStreamWrapper(const MyIStreamWrapper&);
-    MyIStreamWrapper& operator=(const MyIStreamWrapper&);
-
-    std::istream& is_;
-};
-~~~~~~~~~~
-
-使用者能用它来包装 `std::stringstream`、`std::ifstream` 的实例。
-
-~~~~~~~~~~cpp
-const char* json = "[1,2,3,4]";
-std::stringstream ss(json);
-MyIStreamWrapper is(ss);
-
-Document d;
-d.ParseStream(is);
-~~~~~~~~~~
-
-但要注意，由于标准库的内部开销问，此实现的性能可能不如 RapidJSON 的内存／文件流。
-
-## 例子：ostream 的包装类 {#ExampleOStreamWrapper}
-
-以下的例子是 `std::istream` 的包装类，它只需实现 2 个函数。
-
-~~~~~~~~~~cpp
-class MyOStreamWrapper {
-public:
-    typedef char Ch;
-
-    OStreamWrapper(std::ostream& os) : os_(os) {
-    }
-
-    Ch Peek() const { assert(false); return '\0'; }
-    Ch Take() { assert(false); return '\0'; }
-    size_t Tell() const {  }
-
-    Ch* PutBegin() { assert(false); return 0; }
-    void Put(Ch c) { os_.put(c); }                  // 1
-    void Flush() { os_.flush(); }                   // 2
-    size_t PutEnd(Ch*) { assert(false); return 0; }
-
-private:
-    MyOStreamWrapper(const MyOStreamWrapper&);
-    MyOStreamWrapper& operator=(const MyOStreamWrapper&);
-
-    std::ostream& os_;
-};
-~~~~~~~~~~
-
-使用者能用它来包装 `std::stringstream`、`std::ofstream` 的实例。
-
-~~~~~~~~~~cpp
-Document d;
-// ...
-
-std::stringstream ss;
-MyOStreamWrapper os(ss);
-
-Writer<MyOStreamWrapper> writer(os);
-d.Accept(writer);
-~~~~~~~~~~
-
-但要注意，由于标准库的内部开销问，此实现的性能可能不如 RapidJSON 的内存／文件流。
-
-# 总结 {#Summary}
-
-本节描述了 RapidJSON 提供的各种流的类。内存流很简单。若 JSON 存储在文件中，文件流可减少 JSON 解析及生成所需的内存量。编码流在字节流和字符流之间作转换。最后，使用者可使用一个简单接口创建自定义的流。
diff --git a/src/sioclient/lib/rapidjson/doc/tutorial.md b/src/sioclient/lib/rapidjson/doc/tutorial.md
deleted file mode 100644
index 3fa63c93..00000000
--- a/src/sioclient/lib/rapidjson/doc/tutorial.md
+++ /dev/null
@@ -1,536 +0,0 @@
-# Tutorial
-
-This tutorial introduces the basics of the Document Object Model(DOM) API.
-
-As shown in [Usage at a glance](@ref index), JSON can be parsed into a DOM, and then the DOM can be queried and modified easily, and finally be converted back to JSON.
-
-[TOC]
-
-# Value & Document {#ValueDocument}
-
-Each JSON value is stored in a type called `Value`. A `Document`, representing the DOM, contains the root `Value` of the DOM tree. All public types and functions of RapidJSON are defined in the `rapidjson` namespace.
-
-# Query Value {#QueryValue}
-
-In this section, we will use excerpt of `example/tutorial/tutorial.cpp`.
-
-Assume we have the following JSON stored in a C string (`const char* json`):
-~~~~~~~~~~js
-{
-    "hello": "world",
-    "t": true ,
-    "f": false,
-    "n": null,
-    "i": 123,
-    "pi": 3.1416,
-    "a": [1, 2, 3, 4]
-}
-~~~~~~~~~~
-
-Parse it into a `Document`:
-~~~~~~~~~~cpp
-#include "rapidjson/document.h"
-
-using namespace rapidjson;
-
-// ...
-Document document;
-document.Parse(json);
-~~~~~~~~~~
-
-The JSON is now parsed into `document` as a *DOM tree*:
-
-![DOM in the tutorial](diagram/tutorial.png)
-
-Since the update to RFC 7159, the root of a conforming JSON document can be any JSON value.  In earlier RFC 4627, only objects or arrays were allowed as root values. In this case, the root is an object.
-~~~~~~~~~~cpp
-assert(document.IsObject());
-~~~~~~~~~~
-
-Let's query whether a `"hello"` member exists in the root object. Since a `Value` can contain different types of value, we may need to verify its type and use suitable API to obtain the value. In this example, `"hello"` member associates with a JSON string.
-~~~~~~~~~~cpp
-assert(document.HasMember("hello"));
-assert(document["hello"].IsString());
-printf("hello = %s\n", document["hello"].GetString());
-~~~~~~~~~~
-
-~~~~~~~~~~
-hello = world
-~~~~~~~~~~
-
-JSON true/false values are represented as `bool`.
-~~~~~~~~~~cpp
-assert(document["t"].IsBool());
-printf("t = %s\n", document["t"].GetBool() ? "true" : "false");
-~~~~~~~~~~
-
-~~~~~~~~~~
-t = true
-~~~~~~~~~~
-
-JSON null can be queried with `IsNull()`.
-~~~~~~~~~~cpp
-printf("n = %s\n", document["n"].IsNull() ? "null" : "?");
-~~~~~~~~~~
-
-~~~~~~~~~~
-n = null
-~~~~~~~~~~
-
-JSON number type represents all numeric values. However, C++ needs more specific type for manipulation.
-
-~~~~~~~~~~cpp
-assert(document["i"].IsNumber());
-
-// In this case, IsUint()/IsInt64()/IsUInt64() also return true.
-assert(document["i"].IsInt());          
-printf("i = %d\n", document["i"].GetInt());
-// Alternative (int)document["i"]
-
-assert(document["pi"].IsNumber());
-assert(document["pi"].IsDouble());
-printf("pi = %g\n", document["pi"].GetDouble());
-~~~~~~~~~~
-
-~~~~~~~~~~
-i = 123
-pi = 3.1416
-~~~~~~~~~~
-
-JSON array contains a number of elements.
-~~~~~~~~~~cpp
-// Using a reference for consecutive access is handy and faster.
-const Value& a = document["a"];
-assert(a.IsArray());
-for (SizeType i = 0; i < a.Size(); i++) // Uses SizeType instead of size_t
-        printf("a[%d] = %d\n", i, a[i].GetInt());
-~~~~~~~~~~
-
-~~~~~~~~~~
-a[0] = 1
-a[1] = 2
-a[2] = 3
-a[3] = 4
-~~~~~~~~~~
-
-Note that, RapidJSON does not automatically convert values between JSON types. If a value is a string, it is invalid to call `GetInt()`, for example. In debug mode it will fail an assertion. In release mode, the behavior is undefined.
-
-In the following sections we discuss details about querying individual types.
-
-## Query Array {#QueryArray}
-
-By default, `SizeType` is typedef of `unsigned`. In most systems, an array is limited to store up to 2^32-1 elements.
-
-You may access the elements in an array by integer literal, for example, `a[0]`, `a[1]`, `a[2]`.
-
-Array is similar to `std::vector`: instead of using indices, you may also use iterator to access all the elements.
-~~~~~~~~~~cpp
-for (Value::ConstValueIterator itr = a.Begin(); itr != a.End(); ++itr)
-    printf("%d ", itr->GetInt());
-~~~~~~~~~~
-
-And other familiar query functions:
-* `SizeType Capacity() const`
-* `bool Empty() const`
-
-### Range-based For Loop (New in v1.1.0)
-
-When C++11 is enabled, you can use range-based for loop to access all elements in an array.
-
-~~~~~~~~~~cpp
-for (auto& v : a.GetArray())
-    printf("%d ", v.GetInt());
-~~~~~~~~~~
-
-## Query Object {#QueryObject}
-
-Similar to Array, we can access all object members by iterator:
-
-~~~~~~~~~~cpp
-static const char* kTypeNames[] = 
-    { "Null", "False", "True", "Object", "Array", "String", "Number" };
-
-for (Value::ConstMemberIterator itr = document.MemberBegin();
-    itr != document.MemberEnd(); ++itr)
-{
-    printf("Type of member %s is %s\n",
-        itr->name.GetString(), kTypeNames[itr->value.GetType()]);
-}
-~~~~~~~~~~
-
-~~~~~~~~~~
-Type of member hello is String
-Type of member t is True
-Type of member f is False
-Type of member n is Null
-Type of member i is Number
-Type of member pi is Number
-Type of member a is Array
-~~~~~~~~~~
-
-Note that, when `operator[](const char*)` cannot find the member, it will fail an assertion.
-
-If we are unsure whether a member exists, we need to call `HasMember()` before calling `operator[](const char*)`. However, this incurs two lookup. A better way is to call `FindMember()`, which can check the existence of member and obtain its value at once:
-
-~~~~~~~~~~cpp
-Value::ConstMemberIterator itr = document.FindMember("hello");
-if (itr != document.MemberEnd())
-    printf("%s\n", itr->value.GetString());
-~~~~~~~~~~
-
-### Range-based For Loop (New in v1.1.0)
-
-When C++11 is enabled, you can use range-based for loop to access all members in an object.
-
-~~~~~~~~~~cpp
-for (auto& m : document.GetObject())
-    printf("Type of member %s is %s\n",
-        m.name.GetString(), kTypeNames[m.value.GetType()]);
-~~~~~~~~~~
-
-## Querying Number {#QueryNumber}
-
-JSON provides a single numerical type called Number. Number can be an integer or a real number. RFC 4627 says the range of Number is specified by the parser implementation.
-
-As C++ provides several integer and floating point number types, the DOM tries to handle these with the widest possible range and good performance.
-
-When a Number is parsed, it is stored in the DOM as one of the following types:
-
-Type       | Description
------------|---------------------------------------
-`unsigned` | 32-bit unsigned integer
-`int`      | 32-bit signed integer
-`uint64_t` | 64-bit unsigned integer
-`int64_t`  | 64-bit signed integer
-`double`   | 64-bit double precision floating point
-
-When querying a number, you can check whether the number can be obtained as the target type:
-
-Checking          | Obtaining
-------------------|---------------------
-`bool IsNumber()` | N/A
-`bool IsUint()`   | `unsigned GetUint()`
-`bool IsInt()`    | `int GetInt()`
-`bool IsUint64()` | `uint64_t GetUint64()`
-`bool IsInt64()`  | `int64_t GetInt64()`
-`bool IsDouble()` | `double GetDouble()`
-
-Note that, an integer value may be obtained in various ways without conversion. For example, A value `x` containing 123 will make `x.IsInt() == x.IsUint() == x.IsInt64() == x.IsUint64() == true`. But a value `y` containing -3000000000 will only make `x.IsInt64() == true`.
-
-When obtaining the numeric values, `GetDouble()` will convert internal integer representation to a `double`. Note that, `int` and `unsigned` can be safely converted to `double`, but `int64_t` and `uint64_t` may lose precision (since mantissa of `double` is only 52-bits).
-
-## Query String {#QueryString}
-
-In addition to `GetString()`, the `Value` class also contains `GetStringLength()`. Here explains why.
-
-According to RFC 4627, JSON strings can contain Unicode character `U+0000`, which must be escaped as `"\u0000"`. The problem is that, C/C++ often uses null-terminated string, which treats ``\0'` as the terminator symbol.
-
-To conform RFC 4627, RapidJSON supports string containing `U+0000`. If you need to handle this, you can use `GetStringLength()` to obtain the correct string length.
-
-For example, after parsing a the following JSON to `Document d`:
-
-~~~~~~~~~~js
-{ "s" :  "a\u0000b" }
-~~~~~~~~~~
-The correct length of the value `"a\u0000b"` is 3. But `strlen()` returns 1.
-
-`GetStringLength()` can also improve performance, as user may often need to call `strlen()` for allocating buffer.
-
-Besides, `std::string` also support a constructor:
-
-~~~~~~~~~~cpp
-string(const char* s, size_t count);
-~~~~~~~~~~
-
-which accepts the length of string as parameter. This constructor supports storing null character within the string, and should also provide better performance.
-
-## Comparing values
-
-You can use `==` and `!=` to compare values. Two values are equal if and only if they are have same type and contents. You can also compare values with primitive types. Here is an example.
-
-~~~~~~~~~~cpp
-if (document["hello"] == document["n"]) /*...*/;    // Compare values
-if (document["hello"] == "world") /*...*/;          // Compare value with literal string
-if (document["i"] != 123) /*...*/;                  // Compare with integers
-if (document["pi"] != 3.14) /*...*/;                // Compare with double.
-~~~~~~~~~~
-
-Array/object compares their elements/members in order. They are equal if and only if their whole subtrees are equal.
-
-Note that, currently if an object contains duplicated named member, comparing equality with any object is always `false`.
-
-# Create/Modify Values {#CreateModifyValues}
-
-There are several ways to create values. After a DOM tree is created and/or modified, it can be saved as JSON again using `Writer`.
-
-## Change Value Type {#ChangeValueType}
-When creating a Value or Document by default constructor, its type is Null. To change its type, call `SetXXX()` or assignment operator, for example:
-
-~~~~~~~~~~cpp
-Document d; // Null
-d.SetObject();
-
-Value v;    // Null
-v.SetInt(10);
-v = 10;     // Shortcut, same as above
-~~~~~~~~~~
-
-### Overloaded Constructors
-There are also overloaded constructors for several types:
-
-~~~~~~~~~~cpp
-Value b(true);    // calls Value(bool)
-Value i(-123);    // calls Value(int)
-Value u(123u);    // calls Value(unsigned)
-Value d(1.5);     // calls Value(double)
-~~~~~~~~~~
-
-To create empty object or array, you may use `SetObject()`/`SetArray()` after default constructor, or using the `Value(Type)` in one shot:
-
-~~~~~~~~~~cpp
-Value o(kObjectType);
-Value a(kArrayType);
-~~~~~~~~~~
-
-## Move Semantics {#MoveSemantics}
-
-A very special decision during design of RapidJSON is that, assignment of value does not copy the source value to destination value. Instead, the value from source is moved to the destination. For example,
-
-~~~~~~~~~~cpp
-Value a(123);
-Value b(456);
-b = a;         // a becomes a Null value, b becomes number 123.
-~~~~~~~~~~
-
-![Assignment with move semantics.](diagram/move1.png)
-
-Why? What is the advantage of this semantics?
-
-The simple answer is performance. For fixed size JSON types (Number, True, False, Null), copying them is fast and easy. However, For variable size JSON types (String, Array, Object), copying them will incur a lot of overheads. And these overheads are often unnoticed. Especially when we need to create temporary object, copy it to another variable, and then destruct it.
-
-For example, if normal *copy* semantics was used:
-
-~~~~~~~~~~cpp
-Document d;
-Value o(kObjectType);
-{
-    Value contacts(kArrayType);
-    // adding elements to contacts array.
-    // ...
-    o.AddMember("contacts", contacts, d.GetAllocator());  // deep clone contacts (may be with lots of allocations)
-    // destruct contacts.
-}
-~~~~~~~~~~
-
-![Copy semantics makes a lots of copy operations.](diagram/move2.png)
-
-The object `o` needs to allocate a buffer of same size as contacts, makes a deep clone of it, and then finally contacts is destructed. This will incur a lot of unnecessary allocations/deallocations and memory copying.
-
-There are solutions to prevent actual copying these data, such as reference counting and garbage collection(GC).
-
-To make RapidJSON simple and fast, we chose to use *move* semantics for assignment. It is similar to `std::auto_ptr` which transfer ownership during assignment. Move is much faster and simpler, it just destructs the original value, `memcpy()` the source to destination, and finally sets the source as Null type.
-
-So, with move semantics, the above example becomes:
-
-~~~~~~~~~~cpp
-Document d;
-Value o(kObjectType);
-{
-    Value contacts(kArrayType);
-    // adding elements to contacts array.
-    o.AddMember("contacts", contacts, d.GetAllocator());  // just memcpy() of contacts itself to the value of new member (16 bytes)
-    // contacts became Null here. Its destruction is trivial.
-}
-~~~~~~~~~~
-
-![Move semantics makes no copying.](diagram/move3.png)
-
-This is called move assignment operator in C++11. As RapidJSON supports C++03, it adopts move semantics using assignment operator, and all other modifying function like `AddMember()`, `PushBack()`.
-
-### Move semantics and temporary values {#TemporaryValues}
-
-Sometimes, it is convenient to construct a Value in place, before passing it to one of the "moving" functions, like `PushBack()` or `AddMember()`.  As temporary objects can't be converted to proper Value references, the convenience function `Move()` is available:
-
-~~~~~~~~~~cpp
-Value a(kArrayType);
-Document::AllocatorType& allocator = document.GetAllocator();
-// a.PushBack(Value(42), allocator);       // will not compile
-a.PushBack(Value().SetInt(42), allocator); // fluent API
-a.PushBack(Value(42).Move(), allocator);   // same as above
-~~~~~~~~~~
-
-## Create String {#CreateString}
-RapidJSON provides two strategies for storing string.
-
-1. copy-string: allocates a buffer, and then copy the source data into it.
-2. const-string: simply store a pointer of string.
-
-Copy-string is always safe because it owns a copy of the data. Const-string can be used for storing a string literal, and for in-situ parsing which will be mentioned in the DOM section.
-
-To make memory allocation customizable, RapidJSON requires users to pass an instance of allocator, whenever an operation may require allocation. This design is needed to prevent storing a allocator (or Document) pointer per Value.
-
-Therefore, when we assign a copy-string, we call this overloaded `SetString()` with allocator:
-
-~~~~~~~~~~cpp
-Document document;
-Value author;
-char buffer[10];
-int len = sprintf(buffer, "%s %s", "Milo", "Yip"); // dynamically created string.
-author.SetString(buffer, len, document.GetAllocator());
-memset(buffer, 0, sizeof(buffer));
-// author.GetString() still contains "Milo Yip" after buffer is destroyed
-~~~~~~~~~~
-
-In this example, we get the allocator from a `Document` instance. This is a common idiom when using RapidJSON. But you may use other instances of allocator.
-
-Besides, the above `SetString()` requires length. This can handle null characters within a string. There is another `SetString()` overloaded function without the length parameter. And it assumes the input is null-terminated and calls a `strlen()`-like function to obtain the length.
-
-Finally, for a string literal or string with a safe life-cycle one can use the const-string version of `SetString()`, which lacks an allocator parameter.  For string literals (or constant character arrays), simply passing the literal as parameter is safe and efficient:
-
-~~~~~~~~~~cpp
-Value s;
-s.SetString("rapidjson");    // can contain null character, length derived at compile time
-s = "rapidjson";             // shortcut, same as above
-~~~~~~~~~~
-
-For a character pointer, RapidJSON requires it to be marked as safe before using it without copying. This can be achieved by using the `StringRef` function:
-
-~~~~~~~~~cpp
-const char * cstr = getenv("USER");
-size_t cstr_len = ...;                 // in case length is available
-Value s;
-// s.SetString(cstr);                  // will not compile
-s.SetString(StringRef(cstr));          // ok, assume safe lifetime, null-terminated
-s = StringRef(cstr);                   // shortcut, same as above
-s.SetString(StringRef(cstr,cstr_len)); // faster, can contain null character
-s = StringRef(cstr,cstr_len);          // shortcut, same as above
-
-~~~~~~~~~
-
-## Modify Array {#ModifyArray}
-Value with array type provides an API similar to `std::vector`.
-
-* `Clear()`
-* `Reserve(SizeType, Allocator&)`
-* `Value& PushBack(Value&, Allocator&)`
-* `template <typename T> GenericValue& PushBack(T, Allocator&)`
-* `Value& PopBack()`
-* `ValueIterator Erase(ConstValueIterator pos)`
-* `ValueIterator Erase(ConstValueIterator first, ConstValueIterator last)`
-
-Note that, `Reserve(...)` and `PushBack(...)` may allocate memory for the array elements, therefore requiring an allocator.
-
-Here is an example of `PushBack()`:
-
-~~~~~~~~~~cpp
-Value a(kArrayType);
-Document::AllocatorType& allocator = document.GetAllocator();
-
-for (int i = 5; i <= 10; i++)
-    a.PushBack(i, allocator);   // allocator is needed for potential realloc().
-
-// Fluent interface
-a.PushBack("Lua", allocator).PushBack("Mio", allocator);
-~~~~~~~~~~
-
-This API differs from STL in that `PushBack()`/`PopBack()` return the array reference itself. This is called _fluent interface_.
-
-If you want to add a non-constant string or a string without sufficient lifetime (see [Create String](#CreateString)) to the array, you need to create a string Value by using the copy-string API.  To avoid the need for an intermediate variable, you can use a [temporary value](#TemporaryValues) in place:
-
-~~~~~~~~~~cpp
-// in-place Value parameter
-contact.PushBack(Value("copy", document.GetAllocator()).Move(), // copy string
-                 document.GetAllocator());
-
-// explicit parameters
-Value val("key", document.GetAllocator()); // copy string
-contact.PushBack(val, document.GetAllocator());
-~~~~~~~~~~
-
-## Modify Object {#ModifyObject}
-The Object class is a collection of key-value pairs (members). Each key must be a string value. To modify an object, either add or remove members. The following API is for adding members:
-
-* `Value& AddMember(Value&, Value&, Allocator& allocator)`
-* `Value& AddMember(StringRefType, Value&, Allocator&)`
-* `template <typename T> Value& AddMember(StringRefType, T value, Allocator&)`
-
-Here is an example.
-
-~~~~~~~~~~cpp
-Value contact(kObject);
-contact.AddMember("name", "Milo", document.GetAllocator());
-contact.AddMember("married", true, document.GetAllocator());
-~~~~~~~~~~
-
-The name parameter with `StringRefType` is similar to the interface of the `SetString` function for string values. These overloads are used to avoid the need for copying the `name` string, since constant key names are very common in JSON objects.
-
-If you need to create a name from a non-constant string or a string without sufficient lifetime (see [Create String](#CreateString)), you need to create a string Value by using the copy-string API.  To avoid the need for an intermediate variable, you can use a [temporary value](#TemporaryValues) in place:
-
-~~~~~~~~~~cpp
-// in-place Value parameter
-contact.AddMember(Value("copy", document.GetAllocator()).Move(), // copy string
-                  Value().Move(),                                // null value
-                  document.GetAllocator());
-
-// explicit parameters
-Value key("key", document.GetAllocator()); // copy string name
-Value val(42);                             // some value
-contact.AddMember(key, val, document.GetAllocator());
-~~~~~~~~~~
-
-For removing members, there are several choices: 
-
-* `bool RemoveMember(const Ch* name)`: Remove a member by search its name (linear time complexity).
-* `bool RemoveMember(const Value& name)`: same as above but `name` is a Value.
-* `MemberIterator RemoveMember(MemberIterator)`: Remove a member by iterator (_constant_ time complexity).
-* `MemberIterator EraseMember(MemberIterator)`: similar to the above but it preserves order of members (linear time complexity).
-* `MemberIterator EraseMember(MemberIterator first, MemberIterator last)`: remove a range of members, preserves order (linear time complexity).
-
-`MemberIterator RemoveMember(MemberIterator)` uses a "move-last" trick to achieve constant time complexity. Basically the member at iterator is destructed, and then the last element is moved to that position. So the order of the remaining members are changed.
-
-## Deep Copy Value {#DeepCopyValue}
-If we really need to copy a DOM tree, we can use two APIs for deep copy: constructor with allocator, and `CopyFrom()`.
-
-~~~~~~~~~~cpp
-Document d;
-Document::AllocatorType& a = d.GetAllocator();
-Value v1("foo");
-// Value v2(v1); // not allowed
-
-Value v2(v1, a);                      // make a copy
-assert(v1.IsString());                // v1 untouched
-d.SetArray().PushBack(v1, a).PushBack(v2, a);
-assert(v1.IsNull() && v2.IsNull());   // both moved to d
-
-v2.CopyFrom(d, a);                    // copy whole document to v2
-assert(d.IsArray() && d.Size() == 2); // d untouched
-v1.SetObject().AddMember("array", v2, a);
-d.PushBack(v1, a);
-~~~~~~~~~~
-
-## Swap Values {#SwapValues}
-
-`Swap()` is also provided.
-
-~~~~~~~~~~cpp
-Value a(123);
-Value b("Hello");
-a.Swap(b);
-assert(a.IsString());
-assert(b.IsInt());
-~~~~~~~~~~
-
-Swapping two DOM trees is fast (constant time), despite the complexity of the trees.
-
-# What's next {#WhatsNext}
-
-This tutorial shows the basics of DOM tree query and manipulation. There are several important concepts in RapidJSON:
-
-1. [Streams](doc/stream.md) are channels for reading/writing JSON, which can be a in-memory string, or file stream, etc. User can also create their streams.
-2. [Encoding](doc/encoding.md) defines which character encoding is used in streams and memory. RapidJSON also provide Unicode conversion/validation internally.
-3. [DOM](doc/dom.md)'s basics are already covered in this tutorial. Uncover more advanced features such as *in situ* parsing, other parsing options and advanced usages.
-4. [SAX](doc/sax.md) is the foundation of parsing/generating facility in RapidJSON. Learn how to use `Reader`/`Writer` to implement even faster applications. Also try `PrettyWriter` to format the JSON.
-5. [Performance](doc/performance.md) shows some in-house and third-party benchmarks.
-6. [Internals](doc/internals.md) describes some internal designs and techniques of RapidJSON.
-
-You may also refer to the [FAQ](doc/faq.md), API documentation, examples and unit tests.
diff --git a/src/sioclient/lib/rapidjson/doc/tutorial.zh-cn.md b/src/sioclient/lib/rapidjson/doc/tutorial.zh-cn.md
deleted file mode 100644
index 6b2588f7..00000000
--- a/src/sioclient/lib/rapidjson/doc/tutorial.zh-cn.md
+++ /dev/null
@@ -1,534 +0,0 @@
-# 教程
-
-本教程简介文件对象模型（Document Object Model, DOM）API。
-
-如 [用法一览](../readme.zh-cn.md#用法一览) 中所示，可以解析一个 JSON 至 DOM，然后就可以轻松查询及修改 DOM，并最终转换回 JSON。
-
-[TOC]
-
-# Value 及 Document {#ValueDocument}
-
-每个 JSON 值都储存为 `Value` 类，而 `Document` 类则表示整个 DOM，它存储了一个 DOM 树的根 `Value`。RapidJSON 的所有公开类型及函数都在 `rapidjson` 命名空间中。
-
-# 查询 Value {#QueryValue}
-
-在本节中，我们会使用到 `example/tutorial/tutorial.cpp` 中的代码片段。
-
-假设我们用 C 语言的字符串储存一个 JSON（`const char* json`）：
-~~~~~~~~~~js
-{
-    "hello": "world",
-    "t": true ,
-    "f": false,
-    "n": null,
-    "i": 123,
-    "pi": 3.1416,
-    "a": [1, 2, 3, 4]
-}
-~~~~~~~~~~
-
-把它解析至一个 `Document`：
-~~~~~~~~~~cpp
-#include "rapidjson/document.h"
-
-using namespace rapidjson;
-
-// ...
-Document document;
-document.Parse(json);
-~~~~~~~~~~
-
-那么现在该 JSON 就会被解析至 `document` 中，成为一棵 *DOM 树 *:
-
-![教程中的 DOM](diagram/tutorial.png)
-
-自从 RFC 7159 作出更新，合法 JSON 文件的根可以是任何类型的 JSON 值。而在较早的 RFC 4627 中，根值只允许是 Object 或 Array。而在上述例子中，根是一个 Object。
-~~~~~~~~~~cpp
-assert(document.IsObject());
-~~~~~~~~~~
-
-让我们查询一下根 Object 中有没有 `"hello"` 成员。由于一个 `Value` 可包含不同类型的值，我们可能需要验证它的类型，并使用合适的 API 去获取其值。在此例中，`"hello"` 成员关联到一个 JSON String。
-~~~~~~~~~~cpp
-assert(document.HasMember("hello"));
-assert(document["hello"].IsString());
-printf("hello = %s\n", document["hello"].GetString());
-~~~~~~~~~~
-
-~~~~~~~~~~
-world
-~~~~~~~~~~
-
-JSON True/False 值是以 `bool` 表示的。
-~~~~~~~~~~cpp
-assert(document["t"].IsBool());
-printf("t = %s\n", document["t"].GetBool() ? "true" : "false");
-~~~~~~~~~~
-
-~~~~~~~~~~
-true
-~~~~~~~~~~
-
-JSON Null 值可用 `IsNull()` 查询。
-~~~~~~~~~~cpp
-printf("n = %s\n", document["n"].IsNull() ? "null" : "?");
-~~~~~~~~~~
-
-~~~~~~~~~~
-null
-~~~~~~~~~~
-
-JSON Number 类型表示所有数值。然而，C++ 需要使用更专门的类型。
-
-~~~~~~~~~~cpp
-assert(document["i"].IsNumber());
-
-// 在此情况下，IsUint()/IsInt64()/IsUInt64() 也会返回 true
-assert(document["i"].IsInt());          
-printf("i = %d\n", document["i"].GetInt());
-// 另一种用法： (int)document["i"]
-
-assert(document["pi"].IsNumber());
-assert(document["pi"].IsDouble());
-printf("pi = %g\n", document["pi"].GetDouble());
-~~~~~~~~~~
-
-~~~~~~~~~~
-i = 123
-pi = 3.1416
-~~~~~~~~~~
-
-JSON Array 包含一些元素。
-~~~~~~~~~~cpp
-// 使用引用来连续访问，方便之余还更高效。
-const Value& a = document["a"];
-assert(a.IsArray());
-for (SizeType i = 0; i < a.Size(); i++) // 使用 SizeType 而不是 size_t
-        printf("a[%d] = %d\n", i, a[i].GetInt());
-~~~~~~~~~~
-
-~~~~~~~~~~
-a[0] = 1
-a[1] = 2
-a[2] = 3
-a[3] = 4
-~~~~~~~~~~
-
-注意，RapidJSON 并不自动转换各种 JSON 类型。例如，对一个 String 的 Value 调用 `GetInt()` 是非法的。在调试模式下，它会被断言失败。在发布模式下，其行为是未定义的。
-
-以下将会讨论有关查询各类型的细节。
-
-## 查询 Array {#QueryArray}
-
-缺省情况下，`SizeType` 是 `unsigned` 的 typedef。在多数系统中，Array 最多能存储 2^32-1 个元素。
-
-你可以用整数字面量访问元素，如 `a[0]`、`a[1]`、`a[2]`。
-
-Array 与 `std::vector` 相似，除了使用索引，也可使用迭代器来访问所有元素。
-~~~~~~~~~~cpp
-for (Value::ConstValueIterator itr = a.Begin(); itr != a.End(); ++itr)
-    printf("%d ", itr->GetInt());
-~~~~~~~~~~
-
-还有一些熟悉的查询函数：
-* `SizeType Capacity() const`
-* `bool Empty() const`
-
-### 范围 for 循环 (v1.1.0 中的新功能)
-
-当使用 C++11 功能时，你可使用范围 for 循环去访问 Array 内的所有元素。
-
-~~~~~~~~~~cpp
-for (auto& v : a.GetArray())
-    printf("%d ", v.GetInt());
-~~~~~~~~~~
-
-## 查询 Object {#QueryObject}
-
-和 Array 相似，我们可以用迭代器去访问所有 Object 成员：
-
-~~~~~~~~~~cpp
-static const char* kTypeNames[] = 
-    { "Null", "False", "True", "Object", "Array", "String", "Number" };
-
-for (Value::ConstMemberIterator itr = document.MemberBegin();
-    itr != document.MemberEnd(); ++itr)
-{
-    printf("Type of member %s is %s\n",
-        itr->name.GetString(), kTypeNames[itr->value.GetType()]);
-}
-~~~~~~~~~~
-
-~~~~~~~~~~
-Type of member hello is String
-Type of member t is True
-Type of member f is False
-Type of member n is Null
-Type of member i is Number
-Type of member pi is Number
-Type of member a is Array
-~~~~~~~~~~
-
-注意，当 `operator[](const char*)` 找不到成员，它会断言失败。
-
-若我们不确定一个成员是否存在，便需要在调用 `operator[](const char*)` 前先调用 `HasMember()`。然而，这会导致两次查找。更好的做法是调用 `FindMember()`，它能同时检查成员是否存在并返回它的 Value：
-
-~~~~~~~~~~cpp
-Value::ConstMemberIterator itr = document.FindMember("hello");
-if (itr != document.MemberEnd())
-    printf("%s\n", itr->value.GetString());
-~~~~~~~~~~
-
-### 范围 for 循环 (v1.1.0 中的新功能)
-
-当使用 C++11 功能时，你可使用范围 for 循环去访问 Object 内的所有成员。
-
-~~~~~~~~~~cpp
-for (auto& m : document.GetObject())
-    printf("Type of member %s is %s\n",
-        m.name.GetString(), kTypeNames[m.value.GetType()]);
-~~~~~~~~~~
-
-## 查询 Number {#QueryNumber}
-
-JSON 只提供一种数值类型──Number。数字可以是整数或实数。RFC 4627 规定数字的范围由解析器指定。
-
-由于 C++ 提供多种整数及浮点数类型，DOM 尝试尽量提供最广的范围及良好性能。
-
-当解析一个 Number 时, 它会被存储在 DOM 之中，成为下列其中一个类型：
-
-类型       | 描述
------------|---------------------------------------
-`unsigned` | 32 位无号整数
-`int`      | 32 位有号整数
-`uint64_t` | 64 位无号整数
-`int64_t`  | 64 位有号整数
-`double`   | 64 位双精度浮点数
-
-当查询一个 Number 时, 你可以检查该数字是否能以目标类型来提取：
-
-查检              | 提取
-------------------|---------------------
-`bool IsNumber()` | 不适用
-`bool IsUint()`   | `unsigned GetUint()`
-`bool IsInt()`    | `int GetInt()`
-`bool IsUint64()` | `uint64_t GetUint64()`
-`bool IsInt64()`  | `int64_t GetInt64()`
-`bool IsDouble()` | `double GetDouble()`
-
-注意，一个整数可能用几种类型来提取，而无需转换。例如，一个名为 `x` 的 Value 包含 123，那么 `x.IsInt() == x.IsUint() == x.IsInt64() == x.IsUint64() == true`。但如果一个名为 `y` 的 Value 包含 -3000000000，那么仅会令 `x.IsInt64() == true`。
-
-当要提取 Number 类型，`GetDouble()` 是会把内部整数的表示转换成 `double`。注意 `int` 和 `unsigned` 可以安全地转换至 `double`，但 `int64_t` 及 `uint64_t` 可能会丧失精度（因为 `double` 的尾数只有 52 位）。
-
-## 查询 String {#QueryString}
-
-除了 `GetString()`，`Value` 类也有一个 `GetStringLength()`。这里会解释个中原因。
-
-根据 RFC 4627，JSON String 可包含 Unicode 字符 `U+0000`，在 JSON 中会表示为 `"\u0000"`。问题是，C/C++ 通常使用空字符结尾字符串（null-terminated string），这种字符串把 ``\0'` 作为结束符号。
-
-为了符合 RFC 4627，RapidJSON 支持包含 `U+0000` 的 String。若你需要处理这些 String，便可使用 `GetStringLength()` 去获得正确的字符串长度。
-
-例如，当解析以下的 JSON 至 `Document d` 之后：
-
-~~~~~~~~~~js
-{ "s" :  "a\u0000b" }
-~~~~~~~~~~
-`"a\u0000b"` 值的正确长度应该是 3。但 `strlen()` 会返回 1。
-
-`GetStringLength()` 也可以提高性能，因为用户可能需要调用 `strlen()` 去分配缓冲。
-
-此外，`std::string` 也支持这个构造函数：
-
-~~~~~~~~~~cpp
-string(const char* s, size_t count);
-~~~~~~~~~~
-
-此构造函数接受字符串长度作为参数。它支持在字符串中存储空字符，也应该会有更好的性能。
-
-## 比较两个 Value
-
-你可使用 `==` 及 `!=` 去比较两个 Value。当且仅当两个 Value 的类型及内容相同，它们才当作相等。你也可以比较 Value 和它的原生类型值。以下是一个例子。
-
-~~~~~~~~~~cpp
-if (document["hello"] == document["n"]) /*...*/;    // 比较两个值
-if (document["hello"] == "world") /*...*/;          // 与字符串家面量作比较
-if (document["i"] != 123) /*...*/;                  // 与整数作比较
-if (document["pi"] != 3.14) /*...*/;                // 与 double 作比较
-~~~~~~~~~~
-
-Array／Object 顺序以它们的元素／成员作比较。当且仅当它们的整个子树相等，它们才当作相等。
-
-注意，现时若一个 Object 含有重复命名的成员，它与任何 Object 作比较都总会返回 `false`。
-
-# 创建／修改值 {#CreateModifyValues}
-
-有多种方法去创建值。 当一个 DOM 树被创建或修改后，可使用 `Writer` 再次存储为 JSON。
-
-## 改变 Value 类型 {#ChangeValueType}
-当使用默认构造函数创建一个 Value 或 Document，它的类型便会是 Null。要改变其类型，需调用 `SetXXX()` 或赋值操作，例如：
-
-~~~~~~~~~~cpp
-Document d; // Null
-d.SetObject();
-
-Value v;    // Null
-v.SetInt(10);
-v = 10;     // 简写，和上面的相同
-~~~~~~~~~~
-
-### 构造函数的各个重载
-几个类型也有重载构造函数：
-
-~~~~~~~~~~cpp
-Value b(true);    // 调用 Value(bool)
-Value i(-123);    // 调用 Value(int)
-Value u(123u);    // 调用 Value(unsigned)
-Value d(1.5);     // 调用 Value(double)
-~~~~~~~~~~
-
-要重建空 Object 或 Array，可在默认构造函数后使用 `SetObject()`/`SetArray()`，或一次性使用 `Value(Type)`：
-
-~~~~~~~~~~cpp
-Value o(kObjectType);
-Value a(kArrayType);
-~~~~~~~~~~
-
-## 转移语义（Move Semantics） {#MoveSemantics}
-
-在设计 RapidJSON 时有一个非常特别的决定，就是 Value 赋值并不是把来源 Value 复制至目的 Value，而是把把来源 Value 转移（move）至目的 Value。例如：
-
-~~~~~~~~~~cpp
-Value a(123);
-Value b(456);
-b = a;         // a 变成 Null，b 变成数字 123。
-~~~~~~~~~~
-
-![使用移动语义赋值。](diagram/move1.png)
-
-为什么？此语义有何优点？
-
-最简单的答案就是性能。对于固定大小的 JSON 类型（Number、True、False、Null），复制它们是简单快捷。然而，对于可变大小的 JSON 类型（String、Array、Object），复制它们会产生大量开销，而且这些开销常常不被察觉。尤其是当我们需要创建临时 Object，把它复制至另一变量，然后再析构它。
-
-例如，若使用正常 * 复制 * 语义：
-
-~~~~~~~~~~cpp
-Value o(kObjectType);
-{
-    Value contacts(kArrayType);
-    // 把元素加进 contacts 数组。
-    // ...
-    o.AddMember("contacts", contacts, d.GetAllocator());  // 深度复制 contacts （可能有大量内存分配）
-    // 析构 contacts。
-}
-~~~~~~~~~~
-
-![复制语义产生大量的复制操作。](diagram/move2.png)
-
-那个 `o` Object 需要分配一个和 contacts 相同大小的缓冲区，对 conacts 做深度复制，并最终要析构 contacts。这样会产生大量无必要的内存分配／释放，以及内存复制。
-
-有一些方案可避免实质地复制这些数据，例如引用计数（reference counting）、垃圾回收（garbage collection, GC）。
-
-为了使 RapidJSON 简单及快速，我们选择了对赋值采用 * 转移 * 语义。这方法与 `std::auto_ptr` 相似，都是在赋值时转移拥有权。转移快得多简单得多，只需要析构原来的 Value，把来源 `memcpy()` 至目标，最后把来源设置为 Null 类型。
-
-因此，使用转移语义后，上面的例子变成：
-
-~~~~~~~~~~cpp
-Value o(kObjectType);
-{
-    Value contacts(kArrayType);
-    // adding elements to contacts array.
-    o.AddMember("contacts", contacts, d.GetAllocator());  // 只需 memcpy() contacts 本身至新成员的 Value（16 字节）
-    // contacts 在这里变成 Null。它的析构是平凡的。
-}
-~~~~~~~~~~
-
-![转移语义不需复制。](diagram/move3.png)
-
-在 C++11 中这称为转移赋值操作（move assignment operator）。由于 RapidJSON 支持 C++03，它在赋值操作采用转移语义，其它修改型函数如 `AddMember()`, `PushBack()` 也采用转移语义。
-
-### 转移语义及临时值 {#TemporaryValues}
-
-有时候，我们想直接构造一个 Value 并传递给一个“转移”函数（如 `PushBack()`、`AddMember()`）。由于临时对象是不能转换为正常的 Value 引用，我们加入了一个方便的 `Move()` 函数：
-
-~~~~~~~~~~cpp
-Value a(kArrayType);
-Document::AllocatorType& allocator = document.GetAllocator();
-// a.PushBack(Value(42), allocator);       // 不能通过编译
-a.PushBack(Value().SetInt(42), allocator); // fluent API
-a.PushBack(Value(42).Move(), allocator);   // 和上一行相同
-~~~~~~~~~~
-
-## 创建 String {#CreateString}
-RapidJSON 提供两个 String 的存储策略。
-
-1. copy-string: 分配缓冲区，然后把来源数据复制至它。
-2. const-string: 简单地储存字符串的指针。
-
-Copy-string 总是安全的，因为它拥有数据的克隆。Const-string 可用于存储字符串字面量，以及用于在 DOM 一节中将会提到的 in-situ 解析中。
-
-为了让用户自定义内存分配方式，当一个操作可能需要内存分配时，RapidJSON 要求用户传递一个 allocator 实例作为 API 参数。此设计避免了在每个 Value 存储 allocator（或 document）的指针。
-
-因此，当我们把一个 copy-string 赋值时, 调用含有 allocator 的 `SetString()` 重载函数：
-
-~~~~~~~~~~cpp
-Document document;
-Value author;
-char buffer[10];
-int len = sprintf(buffer, "%s %s", "Milo", "Yip"); // 动态创建的字符串。
-author.SetString(buffer, len, document.GetAllocator());
-memset(buffer, 0, sizeof(buffer));
-// 清空 buffer 后 author.GetString() 仍然包含 "Milo Yip"
-~~~~~~~~~~
-
-在此例子中，我们使用 `Document` 实例的 allocator。这是使用 RapidJSON 时常用的惯用法。但你也可以用其他 allocator 实例。
-
-另外，上面的 `SetString()` 需要长度参数。这个 API 能处理含有空字符的字符串。另一个 `SetString()` 重载函数没有长度参数，它假设输入是空字符结尾的，并会调用类似 `strlen()` 的函数去获取长度。
-
-最后，对于字符串字面量或有安全生命周期的字符串，可以使用 const-string 版本的 `SetString()`，它没有 allocator 参数。对于字符串家面量（或字符数组常量），只需简单地传递字面量，又安全又高效：
-
-~~~~~~~~~~cpp
-Value s;
-s.SetString("rapidjson");    // 可包含空字符，长度在编译萁推导
-s = "rapidjson";             // 上行的缩写
-~~~~~~~~~~
-
-对于字符指针，RapidJSON 需要作一个标记，代表它不复制也是安全的。可以使用 `StringRef` 函数：
-
-~~~~~~~~~cpp
-const char * cstr = getenv("USER");
-size_t cstr_len = ...;                 // 如果有长度
-Value s;
-// s.SetString(cstr);                  // 这不能通过编译
-s.SetString(StringRef(cstr));          // 可以，假设它的生命周期安全，并且是以空字符结尾的
-s = StringRef(cstr);                   // 上行的缩写
-s.SetString(StringRef(cstr, cstr_len));// 更快，可处理空字符
-s = StringRef(cstr, cstr_len);         // 上行的缩写
-
-~~~~~~~~~
-
-## 修改 Array {#ModifyArray}
-Array 类型的 Value 提供与 `std::vector` 相似的 API。
-
-* `Clear()`
-* `Reserve(SizeType, Allocator&)`
-* `Value& PushBack(Value&, Allocator&)`
-* `template <typename T> GenericValue& PushBack(T, Allocator&)`
-* `Value& PopBack()`
-* `ValueIterator Erase(ConstValueIterator pos)`
-* `ValueIterator Erase(ConstValueIterator first, ConstValueIterator last)`
-
-注意，`Reserve(...)` 及 `PushBack(...)` 可能会为数组元素分配内存，所以需要一个 allocator。
-
-以下是 `PushBack()` 的例子：
-
-~~~~~~~~~~cpp
-Value a(kArrayType);
-Document::AllocatorType& allocator = document.GetAllocator();
-
-for (int i = 5; i <= 10; i++)
-    a.PushBack(i, allocator);   // 可能需要调用 realloc() 所以需要 allocator
-
-// 流畅接口（Fluent interface）
-a.PushBack("Lua", allocator).PushBack("Mio", allocator);
-~~~~~~~~~~
-
-与 STL 不一样的是，`PushBack()`/`PopBack()` 返回 Array 本身的引用。这称为流畅接口（_fluent interface_）。
-
-如果你想在 Array 中加入一个非常量字符串，或是一个没有足够生命周期的字符串（见 [Create String](#CreateString)），你需要使用 copy-string API 去创建一个 String。为了避免加入中间变量，可以就地使用一个 [临时值](#TemporaryValues)：
-
-~~~~~~~~~~cpp
-// 就地 Value 参数
-contact.PushBack(Value("copy", document.GetAllocator()).Move(), // copy string
-                 document.GetAllocator());
-
-// 显式 Value 参数
-Value val("key", document.GetAllocator()); // copy string
-contact.PushBack(val, document.GetAllocator());
-~~~~~~~~~~
-
-## 修改 Object {#ModifyObject}
-Object 是键值对的集合。每个键必须为 String。要修改 Object，方法是增加或移除成员。以下的 API 用来增加城员：
-
-* `Value& AddMember(Value&, Value&, Allocator& allocator)`
-* `Value& AddMember(StringRefType, Value&, Allocator&)`
-* `template <typename T> Value& AddMember(StringRefType, T value, Allocator&)`
-
-以下是一个例子。
-
-~~~~~~~~~~cpp
-Value contact(kObject);
-contact.AddMember("name", "Milo", document.GetAllocator());
-contact.AddMember("married", true, document.GetAllocator());
-~~~~~~~~~~
-
-使用 `StringRefType` 作为 name 参数的重载版本与字符串的 `SetString` 的接口相似。 这些重载是为了避免复制 `name` 字符串，因为 JSON object 中经常会使用常数键名。
-
-如果你需要从非常数字符串或生命周期不足的字符串创建键名（见 [创建 String](#CreateString)），你需要使用 copy-string API。为了避免中间变量，可以就地使用 [临时值](#TemporaryValues)：
-
-~~~~~~~~~~cpp
-// 就地 Value 参数
-contact.AddMember(Value("copy", document.GetAllocator()).Move(), // copy string
-                  Value().Move(),                                // null value
-                  document.GetAllocator());
-
-// 显式参数
-Value key("key", document.GetAllocator()); // copy string name
-Value val(42);                             // 某 Value
-contact.AddMember(key, val, document.GetAllocator());
-~~~~~~~~~~
-
-移除成员有几个选择：
-
-* `bool RemoveMember(const Ch* name)`：使用键名来移除成员（线性时间复杂度）。
-* `bool RemoveMember(const Value& name)`：除了 `name` 是一个 Value，和上一行相同。
-* `MemberIterator RemoveMember(MemberIterator)`：使用迭代器移除成员（_ 常数 _ 时间复杂度）。
-* `MemberIterator EraseMember(MemberIterator)`：和上行相似但维持成员次序（线性时间复杂度）。
-* `MemberIterator EraseMember(MemberIterator first, MemberIterator last)`：移除一个范围内的成员，维持次序（线性时间复杂度）。
-
-`MemberIterator RemoveMember(MemberIterator)` 使用了“转移最后”手法来达成常数时间复杂度。基本上就是析构迭代器位置的成员，然后把最后的成员转移至迭代器位置。因此，成员的次序会被改变。
-
-## 深复制 Value {#DeepCopyValue}
-若我们真的要复制一个 DOM 树，我们可使用两个 APIs 作深复制：含 allocator 的构造函数及 `CopyFrom()`。
-
-~~~~~~~~~~cpp
-Document d;
-Document::AllocatorType& a = d.GetAllocator();
-Value v1("foo");
-// Value v2(v1); // 不容许
-
-Value v2(v1, a);                      // 制造一个克隆
-assert(v1.IsString());                // v1 不变
-d.SetArray().PushBack(v1, a).PushBack(v2, a);
-assert(v1.IsNull() && v2.IsNull());   // 两个都转移动 d
-
-v2.CopyFrom(d, a);                    // 把整个 document 复制至 v2
-assert(d.IsArray() && d.Size() == 2); // d 不变
-v1.SetObject().AddMember("array", v2, a);
-d.PushBack(v1, a);
-~~~~~~~~~~
-
-## 交换 Value {#SwapValues}
-
-RapidJSON 也提供 `Swap()`。
-
-~~~~~~~~~~cpp
-Value a(123);
-Value b("Hello");
-a.Swap(b);
-assert(a.IsString());
-assert(b.IsInt());
-~~~~~~~~~~
-
-无论两棵 DOM 树有多复杂，交换是很快的（常数时间）。
-
-# 下一部分 {#WhatsNext}
-
-本教程展示了如何询查及修改 DOM 树。RapidJSON 还有一个重要概念：
-
-1. [流](doc/stream.zh-cn.md) 是读写 JSON 的通道。流可以是内存字符串、文件流等。用户也可以自定义流。
-2. [编码](doc/encoding.zh-cn.md) 定义在流或内存中使用的字符编码。RapidJSON 也在内部提供 Unicode 转换及校验功能。
-3. [DOM](doc/dom.zh-cn.md) 的基本功能已在本教程里介绍。还有更高级的功能，如原位（*in situ*）解析、其他解析选项及高级用法。
-4. [SAX](doc/sax.zh-cn.md) 是 RapidJSON 解析／生成功能的基础。学习使用 `Reader`/`Writer` 去实现更高性能的应用程序。也可以使用 `PrettyWriter` 去格式化 JSON。
-5. [性能](doc/performance.zh-cn.md) 展示一些我们做的及第三方的性能测试。
-6. [技术内幕](doc/internals.md) 讲述一些 RapidJSON 内部的设计及技术。
-
-你也可以参考 [常见问题](doc/faq.zh-cn.md)、API 文档、例子及单元测试。
diff --git a/src/sioclient/lib/rapidjson/docker/debian/Dockerfile b/src/sioclient/lib/rapidjson/docker/debian/Dockerfile
deleted file mode 100644
index 76f0235e..00000000
--- a/src/sioclient/lib/rapidjson/docker/debian/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# BUILD:  docker build -t rapidjson-debian .
-# RUN:    docker run -it -v "$PWD"/../..:/rapidjson rapidjson-debian
-
-FROM debian:jessie
-
-RUN apt-get update && apt-get install -y g++ cmake doxygen valgrind
-
-ENTRYPOINT ["/bin/bash"]
diff --git a/src/sioclient/lib/rapidjson/example/CMakeLists.txt b/src/sioclient/lib/rapidjson/example/CMakeLists.txt
deleted file mode 100644
index ff541993..00000000
--- a/src/sioclient/lib/rapidjson/example/CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-if(POLICY CMP0054)
-  cmake_policy(SET CMP0054 NEW)
-endif()
-
-set(EXAMPLES
-    capitalize
-    condense
-    filterkey
-    filterkeydom
-    jsonx
-    lookaheadparser
-    messagereader
-    parsebyparts
-    pretty
-    prettyauto
-    schemavalidator
-    serialize
-    simpledom
-    simplereader
-    simplepullreader
-    simplewriter
-    tutorial)
-    
-include_directories("../include/")
-
-add_definitions(-D__STDC_FORMAT_MACROS)
-set_property(DIRECTORY PROPERTY COMPILE_OPTIONS ${EXTRA_CXX_FLAGS})
-
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
-endif()
-
-add_executable(archivertest archiver/archiver.cpp archiver/archivertest.cpp)
-
-foreach (example ${EXAMPLES})
-    add_executable(${example} ${example}/${example}.cpp)
-endforeach()
-
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    target_link_libraries(parsebyparts pthread)
-endif()
-
-add_custom_target(examples ALL DEPENDS ${EXAMPLES})
diff --git a/src/sioclient/lib/rapidjson/example/archiver/archiver.cpp b/src/sioclient/lib/rapidjson/example/archiver/archiver.cpp
deleted file mode 100644
index 59ae4c41..00000000
--- a/src/sioclient/lib/rapidjson/example/archiver/archiver.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-#include "archiver.h"
-#include <cassert>
-#include <stack>
-#include "rapidjson/document.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/stringbuffer.h"
-
-using namespace rapidjson;
-
-struct JsonReaderStackItem {
-    enum State {
-        BeforeStart,    //!< An object/array is in the stack but it is not yet called by StartObject()/StartArray().
-        Started,        //!< An object/array is called by StartObject()/StartArray().
-        Closed          //!< An array is closed after read all element, but before EndArray().
-    };
-
-    JsonReaderStackItem(const Value* value, State state) : value(value), state(state), index() {}
-
-    const Value* value;
-    State state;
-    SizeType index;   // For array iteration
-};
-
-typedef std::stack<JsonReaderStackItem> JsonReaderStack;
-
-#define DOCUMENT reinterpret_cast<Document*>(mDocument)
-#define STACK (reinterpret_cast<JsonReaderStack*>(mStack))
-#define TOP (STACK->top())
-#define CURRENT (*TOP.value)
-
-JsonReader::JsonReader(const char* json) : mDocument(), mStack(), mError(false) {
-    mDocument = new Document;
-    DOCUMENT->Parse(json);
-    if (DOCUMENT->HasParseError())
-        mError = true;
-    else {
-        mStack = new JsonReaderStack;
-        STACK->push(JsonReaderStackItem(DOCUMENT, JsonReaderStackItem::BeforeStart));
-    }
-}
-
-JsonReader::~JsonReader() {
-    delete DOCUMENT;
-    delete STACK;
-}
-
-// Archive concept
-JsonReader& JsonReader::StartObject() {
-    if (!mError) {
-        if (CURRENT.IsObject() && TOP.state == JsonReaderStackItem::BeforeStart)
-            TOP.state = JsonReaderStackItem::Started;
-        else
-            mError = true;
-    }
-    return *this;
-}
-
-JsonReader& JsonReader::EndObject() {
-    if (!mError) {
-        if (CURRENT.IsObject() && TOP.state == JsonReaderStackItem::Started)
-            Next();
-        else
-            mError = true;
-    }
-    return *this;
-}
-
-JsonReader& JsonReader::Member(const char* name) {
-    if (!mError) {
-        if (CURRENT.IsObject() && TOP.state == JsonReaderStackItem::Started) {
-            Value::ConstMemberIterator memberItr = CURRENT.FindMember(name);
-            if (memberItr != CURRENT.MemberEnd()) 
-                STACK->push(JsonReaderStackItem(&memberItr->value, JsonReaderStackItem::BeforeStart));
-            else
-                mError = true;
-        }
-        else
-            mError = true;
-    }
-    return *this;
-}
-
-bool JsonReader::HasMember(const char* name) const {
-    if (!mError && CURRENT.IsObject() && TOP.state == JsonReaderStackItem::Started)
-        return CURRENT.HasMember(name);
-    return false;
-}
-
-JsonReader& JsonReader::StartArray(size_t* size) {
-    if (!mError) {
-        if (CURRENT.IsArray() && TOP.state == JsonReaderStackItem::BeforeStart) {
-            TOP.state = JsonReaderStackItem::Started;
-            if (size)
-                *size = CURRENT.Size();
-
-            if (!CURRENT.Empty()) {
-                const Value* value = &CURRENT[TOP.index];
-                STACK->push(JsonReaderStackItem(value, JsonReaderStackItem::BeforeStart));
-            }
-            else
-                TOP.state = JsonReaderStackItem::Closed;
-        }
-        else
-            mError = true;
-    }
-    return *this;
-}
-
-JsonReader& JsonReader::EndArray() {
-    if (!mError) {
-        if (CURRENT.IsArray() && TOP.state == JsonReaderStackItem::Closed)
-            Next();
-        else
-            mError = true;
-    }
-    return *this;
-}
-
-JsonReader& JsonReader::operator&(bool& b) {
-    if (!mError) {
-        if (CURRENT.IsBool()) {
-            b = CURRENT.GetBool();
-            Next();
-        }
-        else
-            mError = true;
-    }
-    return *this;
-}
-
-JsonReader& JsonReader::operator&(unsigned& u) {
-    if (!mError) {
-        if (CURRENT.IsUint()) {
-            u = CURRENT.GetUint();
-            Next();
-        }
-        else
-            mError = true;
-    }
-    return *this;
-}
-
-JsonReader& JsonReader::operator&(int& i) {
-    if (!mError) {
-        if (CURRENT.IsInt()) {
-            i = CURRENT.GetInt();
-            Next();
-        }
-        else
-            mError = true;
-    }
-    return *this;
-}
-
-JsonReader& JsonReader::operator&(double& d) {
-    if (!mError) {
-        if (CURRENT.IsNumber()) {
-            d = CURRENT.GetDouble();
-            Next();
-        }
-        else
-            mError = true;
-    }
-    return *this;
-}
-
-JsonReader& JsonReader::operator&(std::string& s) {
-    if (!mError) {
-        if (CURRENT.IsString()) {
-            s = CURRENT.GetString();
-            Next();
-        }
-        else
-            mError = true;
-    }
-    return *this;
-}
-
-JsonReader& JsonReader::SetNull() {
-    // This function is for JsonWriter only.
-    mError = true;
-    return *this;
-}
-
-void JsonReader::Next() {
-    if (!mError) {
-        assert(!STACK->empty());
-        STACK->pop();
-
-        if (!STACK->empty() && CURRENT.IsArray()) {
-            if (TOP.state == JsonReaderStackItem::Started) { // Otherwise means reading array item pass end
-                if (TOP.index < CURRENT.Size() - 1) {
-                    const Value* value = &CURRENT[++TOP.index];
-                    STACK->push(JsonReaderStackItem(value, JsonReaderStackItem::BeforeStart));
-                }
-                else
-                    TOP.state = JsonReaderStackItem::Closed;
-            }
-            else
-                mError = true;
-        }
-    }
-}
-
-#undef DOCUMENT
-#undef STACK
-#undef TOP
-#undef CURRENT
-
-////////////////////////////////////////////////////////////////////////////////
-// JsonWriter
-
-#define WRITER reinterpret_cast<PrettyWriter<StringBuffer>*>(mWriter)
-#define STREAM reinterpret_cast<StringBuffer*>(mStream)
-
-JsonWriter::JsonWriter() : mWriter(), mStream() {
-    mStream = new StringBuffer;
-    mWriter = new PrettyWriter<StringBuffer>(*STREAM);
-}
-
-JsonWriter::~JsonWriter() { 
-    delete WRITER;
-    delete STREAM;
-}
-
-const char* JsonWriter::GetString() const {
-    return STREAM->GetString();
-}
-
-JsonWriter& JsonWriter::StartObject() {
-    WRITER->StartObject();
-    return *this;
-}
-
-JsonWriter& JsonWriter::EndObject() {
-    WRITER->EndObject();
-    return *this;
-}
-
-JsonWriter& JsonWriter::Member(const char* name) {
-    WRITER->String(name, static_cast<SizeType>(strlen(name)));
-    return *this;
-}
-
-bool JsonWriter::HasMember(const char*) const {
-    // This function is for JsonReader only.
-    assert(false);
-    return false;
-}
-
-JsonWriter& JsonWriter::StartArray(size_t*) {
-    WRITER->StartArray();   
-    return *this;
-}
-
-JsonWriter& JsonWriter::EndArray() {
-    WRITER->EndArray();
-    return *this;
-}
-
-JsonWriter& JsonWriter::operator&(bool& b) {
-    WRITER->Bool(b);
-    return *this;
-}
-
-JsonWriter& JsonWriter::operator&(unsigned& u) {
-    WRITER->Uint(u);
-    return *this;
-}
-
-JsonWriter& JsonWriter::operator&(int& i) {
-    WRITER->Int(i);
-    return *this;
-}
-
-JsonWriter& JsonWriter::operator&(double& d) {
-    WRITER->Double(d);
-    return *this;
-}
-
-JsonWriter& JsonWriter::operator&(std::string& s) {
-    WRITER->String(s.c_str(), static_cast<SizeType>(s.size()));
-    return *this;
-}
-
-JsonWriter& JsonWriter::SetNull() {
-    WRITER->Null();
-    return *this;
-}
-
-#undef STREAM
-#undef WRITER
diff --git a/src/sioclient/lib/rapidjson/example/archiver/archiver.h b/src/sioclient/lib/rapidjson/example/archiver/archiver.h
deleted file mode 100644
index 285ca73d..00000000
--- a/src/sioclient/lib/rapidjson/example/archiver/archiver.h
+++ /dev/null
@@ -1,145 +0,0 @@
-#ifndef ARCHIVER_H_
-#define ARCHIVER_H_
-
-#include <cstddef>
-#include <string>
-
-/**
-\class Archiver
-\brief Archiver concept
-
-Archiver can be a reader or writer for serialization or deserialization respectively.
-
-class Archiver {
-public:
-    /// \returns true if the archiver is in normal state. false if it has errors.
-    operator bool() const;
-
-    /// Starts an object
-    Archiver& StartObject();
-    
-    /// After calling StartObject(), assign a member with a name
-    Archiver& Member(const char* name);
-
-    /// After calling StartObject(), check if a member presents
-    bool HasMember(const char* name) const;
-
-    /// Ends an object
-    Archiver& EndObject();
-
-    /// Starts an array
-    /// \param size If Archiver::IsReader is true, the size of array is written.
-    Archiver& StartArray(size_t* size = 0);
-
-    /// Ends an array
-    Archiver& EndArray();
-
-    /// Read/Write primitive types.
-    Archiver& operator&(bool& b);
-    Archiver& operator&(unsigned& u);
-    Archiver& operator&(int& i);
-    Archiver& operator&(double& d);
-    Archiver& operator&(std::string& s);
-
-    /// Write primitive types.
-    Archiver& SetNull();
-
-    //! Whether it is a reader.
-    static const bool IsReader;
-
-    //! Whether it is a writer.
-    static const bool IsWriter;
-};
-*/
-
-/// Represents a JSON reader which implements Archiver concept.
-class JsonReader {
-public:
-    /// Constructor.
-    /**
-        \param json A non-const source json string for in-situ parsing.
-        \note in-situ means the source JSON string will be modified after parsing.
-    */
-    JsonReader(const char* json);
-
-    /// Destructor.
-    ~JsonReader();
-
-    // Archive concept
-
-    operator bool() const { return !mError; }
-
-    JsonReader& StartObject();
-    JsonReader& Member(const char* name);
-    bool HasMember(const char* name) const;
-    JsonReader& EndObject();
-
-    JsonReader& StartArray(size_t* size = 0);
-    JsonReader& EndArray();
-
-    JsonReader& operator&(bool& b);
-    JsonReader& operator&(unsigned& u);
-    JsonReader& operator&(int& i);
-    JsonReader& operator&(double& d);
-    JsonReader& operator&(std::string& s);
-
-    JsonReader& SetNull();
-
-    static const bool IsReader = true;
-    static const bool IsWriter = !IsReader;
-
-private:
-    JsonReader(const JsonReader&);
-    JsonReader& operator=(const JsonReader&);
-
-    void Next();
-
-    // PIMPL
-    void* mDocument;              ///< DOM result of parsing.
-    void* mStack;                 ///< Stack for iterating the DOM
-    bool mError;                  ///< Whether an error has occurred.
-};
-
-class JsonWriter {
-public:
-    /// Constructor.
-    JsonWriter();
-
-    /// Destructor.
-    ~JsonWriter();
-
-    /// Obtains the serialized JSON string.
-    const char* GetString() const;
-
-    // Archive concept
-
-    operator bool() const { return true; }
-
-    JsonWriter& StartObject();
-    JsonWriter& Member(const char* name);
-    bool HasMember(const char* name) const;
-    JsonWriter& EndObject();
-
-    JsonWriter& StartArray(size_t* size = 0);
-    JsonWriter& EndArray();
-
-    JsonWriter& operator&(bool& b);
-    JsonWriter& operator&(unsigned& u);
-    JsonWriter& operator&(int& i);
-    JsonWriter& operator&(double& d);
-    JsonWriter& operator&(std::string& s);
-    JsonWriter& SetNull();
-
-    static const bool IsReader = false;
-    static const bool IsWriter = !IsReader;
-
-private:
-    JsonWriter(const JsonWriter&);
-    JsonWriter& operator=(const JsonWriter&);
-
-    // PIMPL idiom
-    void* mWriter;      ///< JSON writer.
-    void* mStream;      ///< Stream buffer.
-};
-
-#endif // ARCHIVER_H__
diff --git a/src/sioclient/lib/rapidjson/example/archiver/archivertest.cpp b/src/sioclient/lib/rapidjson/example/archiver/archivertest.cpp
deleted file mode 100644
index 417a421a..00000000
--- a/src/sioclient/lib/rapidjson/example/archiver/archivertest.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-#include "archiver.h"
-#include <iostream>
-#include <vector>
-
-//////////////////////////////////////////////////////////////////////////////
-// Test1: simple object
-
-struct Student {
-    Student() : name(), age(), height(), canSwim() {}
-    Student(const std::string name, unsigned age, double height, bool canSwim) :
-        name(name), age(age), height(height), canSwim(canSwim)
-    {}
-
-    std::string name;
-    unsigned age;
-    double height;
-    bool canSwim;
-};
-
-template <typename Archiver>
-Archiver& operator&(Archiver& ar, Student& s) {
-    ar.StartObject();
-    ar.Member("name") & s.name;
-    ar.Member("age") & s.age;
-    ar.Member("height") & s.height;
-    ar.Member("canSwim") & s.canSwim;
-    return ar.EndObject();
-}
-
-std::ostream& operator<<(std::ostream& os, const Student& s) {
-    return os << s.name << " " << s.age << " " << s.height << " " << s.canSwim;
-}
-
-void test1() {
-    std::string json;
-
-    // Serialize
-    {
-        Student s("Lua", 9, 150.5, true);
-
-        JsonWriter writer;
-        writer & s;
-        json = writer.GetString();
-        std::cout << json << std::endl;
-    }
-
-    // Deserialize
-    {
-        Student s;
-        JsonReader reader(json.c_str());
-        reader & s;
-        std::cout << s << std::endl;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Test2: std::vector <=> JSON array
-// 
-// You can map a JSON array to other data structures as well
-
-struct Group {
-    Group() : groupName(), students() {}
-    std::string groupName;
-    std::vector<Student> students;
-};
-
-template <typename Archiver>
-Archiver& operator&(Archiver& ar, Group& g) {
-    ar.StartObject();
-    
-    ar.Member("groupName");
-    ar & g.groupName;
-
-    ar.Member("students");
-    size_t studentCount = g.students.size();
-    ar.StartArray(&studentCount);
-    if (ar.IsReader)
-        g.students.resize(studentCount);
-    for (size_t i = 0; i < studentCount; i++)
-        ar & g.students[i];
-    ar.EndArray();
-
-    return ar.EndObject();
-}
-
-std::ostream& operator<<(std::ostream& os, const Group& g) {
-    os << g.groupName << std::endl;
-    for (std::vector<Student>::const_iterator itr = g.students.begin(); itr != g.students.end(); ++itr)
-        os << *itr << std::endl;
-    return os;
-}
-
-void test2() {
-    std::string json;
-
-    // Serialize
-    {
-        Group g;
-        g.groupName = "Rainbow";
-
-        Student s1("Lua", 9, 150.5, true);
-        Student s2("Mio", 7, 120.0, false);
-        g.students.push_back(s1);
-        g.students.push_back(s2);
-
-        JsonWriter writer;
-        writer & g;
-        json = writer.GetString();
-        std::cout << json << std::endl;
-    }
-
-    // Deserialize
-    {
-        Group g;
-        JsonReader reader(json.c_str());
-        reader & g;
-        std::cout << g << std::endl;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Test3: polymorphism & friend
-//
-// Note that friendship is not necessary but make things simpler.
-
-class Shape {
-public:
-    virtual ~Shape() {}
-    virtual const char* GetType() const = 0;
-    virtual void Print(std::ostream& os) const = 0;
-
-protected:
-    Shape() : x_(), y_() {}
-    Shape(double x, double y) : x_(x), y_(y) {}
-
-    template <typename Archiver>
-    friend Archiver& operator&(Archiver& ar, Shape& s);
-
-    double x_, y_;
-};
-
-template <typename Archiver>
-Archiver& operator&(Archiver& ar, Shape& s) {
-    ar.Member("x") & s.x_;
-    ar.Member("y") & s.y_;
-    return ar;
-}
-
-class Circle : public Shape {
-public:
-    Circle() : radius_() {}
-    Circle(double x, double y, double radius) : Shape(x, y), radius_(radius) {}
-    ~Circle() {}
-
-    const char* GetType() const { return "Circle"; }
-
-    void Print(std::ostream& os) const {
-        os << "Circle (" << x_ << ", " << y_ << ")" << " radius = " << radius_;
-    }
-
-private:
-    template <typename Archiver>
-    friend Archiver& operator&(Archiver& ar, Circle& c);
-
-    double radius_;
-};
-
-template <typename Archiver>
-Archiver& operator&(Archiver& ar, Circle& c) {
-    ar & static_cast<Shape&>(c);
-    ar.Member("radius") & c.radius_;
-    return ar;
-}
-
-class Box : public Shape {
-public:
-    Box() : width_(), height_() {}
-    Box(double x, double y, double width, double height) : Shape(x, y), width_(width), height_(height) {}
-    ~Box() {}
-
-    const char* GetType() const { return "Box"; }
-
-    void Print(std::ostream& os) const {
-        os << "Box (" << x_ << ", " << y_ << ")" << " width = " << width_ << " height = " << height_;
-    }
-
-private:
-    template <typename Archiver>
-    friend Archiver& operator&(Archiver& ar, Box& b);
-
-    double width_, height_;
-};
-
-template <typename Archiver>
-Archiver& operator&(Archiver& ar, Box& b) {
-    ar & static_cast<Shape&>(b);
-    ar.Member("width") & b.width_;
-    ar.Member("height") & b.height_;
-    return ar;
-}
-
-class Canvas {
-public:
-    Canvas() : shapes_() {}
-    ~Canvas() { Clear(); }
-    
-    void Clear() {
-        for (std::vector<Shape*>::iterator itr = shapes_.begin(); itr != shapes_.end(); ++itr)
-            delete *itr;
-    }
-
-    void AddShape(Shape* shape) { shapes_.push_back(shape); }
-    
-    void Print(std::ostream& os) {
-        for (std::vector<Shape*>::iterator itr = shapes_.begin(); itr != shapes_.end(); ++itr) {
-            (*itr)->Print(os);
-            std::cout << std::endl;
-        }
-    }
-
-private:
-    template <typename Archiver>
-    friend Archiver& operator&(Archiver& ar, Canvas& c);
-
-    std::vector<Shape*> shapes_;
-};
-
-template <typename Archiver>
-Archiver& operator&(Archiver& ar, Shape*& shape) {
-    std::string type = ar.IsReader ? "" : shape->GetType();
-    ar.StartObject();
-    ar.Member("type") & type;
-    if (type == "Circle") {
-        if (ar.IsReader) shape = new Circle;
-        ar & static_cast<Circle&>(*shape);
-    }
-    else if (type == "Box") {
-        if (ar.IsReader) shape = new Box;
-        ar & static_cast<Box&>(*shape);
-    }
-    return ar.EndObject();
-}
-
-template <typename Archiver>
-Archiver& operator&(Archiver& ar, Canvas& c) {
-    size_t shapeCount = c.shapes_.size();
-    ar.StartArray(&shapeCount);
-    if (ar.IsReader) {
-        c.Clear();
-        c.shapes_.resize(shapeCount);
-    }
-    for (size_t i = 0; i < shapeCount; i++)
-        ar & c.shapes_[i];
-    return ar.EndArray();
-}
-
-void test3() {
-    std::string json;
-
-    // Serialize
-    {
-        Canvas c;
-        c.AddShape(new Circle(1.0, 2.0, 3.0));
-        c.AddShape(new Box(4.0, 5.0, 6.0, 7.0));
-
-        JsonWriter writer;
-        writer & c;
-        json = writer.GetString();
-        std::cout << json << std::endl;
-    }
-
-    // Deserialize
-    {
-        Canvas c;
-        JsonReader reader(json.c_str());
-        reader & c;
-        c.Print(std::cout);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-int main() {
-    test1();
-    test2();
-    test3();
-}
diff --git a/src/sioclient/lib/rapidjson/example/capitalize/capitalize.cpp b/src/sioclient/lib/rapidjson/example/capitalize/capitalize.cpp
deleted file mode 100644
index 7da37e9c..00000000
--- a/src/sioclient/lib/rapidjson/example/capitalize/capitalize.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// JSON condenser example
-
-// This example parses JSON from stdin with validation, 
-// and re-output the JSON content to stdout with all string capitalized, and without whitespace.
-
-#include "rapidjson/reader.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/error/en.h"
-#include <vector>
-#include <cctype>
-
-using namespace rapidjson;
-
-template<typename OutputHandler>
-struct CapitalizeFilter {
-    CapitalizeFilter(OutputHandler& out) : out_(out), buffer_() {}
-
-    bool Null() { return out_.Null(); }
-    bool Bool(bool b) { return out_.Bool(b); }
-    bool Int(int i) { return out_.Int(i); }
-    bool Uint(unsigned u) { return out_.Uint(u); }
-    bool Int64(int64_t i) { return out_.Int64(i); }
-    bool Uint64(uint64_t u) { return out_.Uint64(u); }
-    bool Double(double d) { return out_.Double(d); }
-    bool RawNumber(const char* str, SizeType length, bool copy) { return out_.RawNumber(str, length, copy); }
-    bool String(const char* str, SizeType length, bool) {
-        buffer_.clear();
-        for (SizeType i = 0; i < length; i++)
-            buffer_.push_back(static_cast<char>(std::toupper(str[i])));
-        return out_.String(&buffer_.front(), length, true); // true = output handler need to copy the string
-    }
-    bool StartObject() { return out_.StartObject(); }
-    bool Key(const char* str, SizeType length, bool copy) { return String(str, length, copy); }
-    bool EndObject(SizeType memberCount) { return out_.EndObject(memberCount); }
-    bool StartArray() { return out_.StartArray(); }
-    bool EndArray(SizeType elementCount) { return out_.EndArray(elementCount); }
-
-    OutputHandler& out_;
-    std::vector<char> buffer_;
-
-private:
-    CapitalizeFilter(const CapitalizeFilter&);
-    CapitalizeFilter& operator=(const CapitalizeFilter&);
-};
-
-int main(int, char*[]) {
-    // Prepare JSON reader and input stream.
-    Reader reader;
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-
-    // Prepare JSON writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-    Writer<FileWriteStream> writer(os);
-
-    // JSON reader parse from the input stream and let writer generate the output.
-    CapitalizeFilter<Writer<FileWriteStream> > filter(writer);
-    if (!reader.Parse(is, filter)) {
-        fprintf(stderr, "\nError(%u): %s\n", static_cast<unsigned>(reader.GetErrorOffset()), GetParseError_En(reader.GetParseErrorCode()));
-        return 1;
-    }
-
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/example/condense/condense.cpp b/src/sioclient/lib/rapidjson/example/condense/condense.cpp
deleted file mode 100644
index 46dc3504..00000000
--- a/src/sioclient/lib/rapidjson/example/condense/condense.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// JSON condenser example
-
-// This example parses JSON text from stdin with validation, 
-// and re-output the JSON content to stdout without whitespace.
-
-#include "rapidjson/reader.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/error/en.h"
-
-using namespace rapidjson;
-
-int main(int, char*[]) {
-    // Prepare JSON reader and input stream.
-    Reader reader;
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-
-    // Prepare JSON writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-    Writer<FileWriteStream> writer(os);
-
-    // JSON reader parse from the input stream and let writer generate the output.
-    if (!reader.Parse(is, writer)) {
-        fprintf(stderr, "\nError(%u): %s\n", static_cast<unsigned>(reader.GetErrorOffset()), GetParseError_En(reader.GetParseErrorCode()));
-        return 1;
-    }
-
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/example/filterkey/filterkey.cpp b/src/sioclient/lib/rapidjson/example/filterkey/filterkey.cpp
deleted file mode 100644
index c34a050d..00000000
--- a/src/sioclient/lib/rapidjson/example/filterkey/filterkey.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-// JSON filterkey example with SAX-style API.
-
-// This example parses JSON text from stdin with validation.
-// During parsing, specified key will be filtered using a SAX handler.
-// It re-output the JSON content to stdout without whitespace.
-
-#include "rapidjson/reader.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/error/en.h"
-#include <stack>
-
-using namespace rapidjson;
-
-// This handler forwards event into an output handler, with filtering the descendent events of specified key.
-template <typename OutputHandler>
-class FilterKeyHandler {
-public:
-    typedef char Ch;
-
-    FilterKeyHandler(OutputHandler& outputHandler, const Ch* keyString, SizeType keyLength) : 
-        outputHandler_(outputHandler), keyString_(keyString), keyLength_(keyLength), filterValueDepth_(), filteredKeyCount_()
-    {}
-
-    bool Null()             { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Null()    && EndValue(); }
-    bool Bool(bool b)       { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Bool(b)   && EndValue(); }
-    bool Int(int i)         { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Int(i)    && EndValue(); }
-    bool Uint(unsigned u)   { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Uint(u)   && EndValue(); }
-    bool Int64(int64_t i)   { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Int64(i)  && EndValue(); }
-    bool Uint64(uint64_t u) { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Uint64(u) && EndValue(); }
-    bool Double(double d)   { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Double(d) && EndValue(); }
-    bool RawNumber(const Ch* str, SizeType len, bool copy) { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.RawNumber(str, len, copy) && EndValue(); }
-    bool String   (const Ch* str, SizeType len, bool copy) { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.String   (str, len, copy) && EndValue(); }
-    
-    bool StartObject() { 
-        if (filterValueDepth_ > 0) {
-            filterValueDepth_++;
-            return true;
-        }
-        else {
-            filteredKeyCount_.push(0);
-            return outputHandler_.StartObject();
-        }
-    }
-    
-    bool Key(const Ch* str, SizeType len, bool copy) { 
-        if (filterValueDepth_ > 0) 
-            return true;
-        else if (len == keyLength_ && std::memcmp(str, keyString_, len) == 0) {
-            filterValueDepth_ = 1;
-            return true;
-        }
-        else {
-            ++filteredKeyCount_.top();
-            return outputHandler_.Key(str, len, copy);
-        }
-    }
-
-    bool EndObject(SizeType) {
-        if (filterValueDepth_ > 0) {
-            filterValueDepth_--;
-            return EndValue();
-        }
-        else {
-            // Use our own filtered memberCount
-            SizeType memberCount = filteredKeyCount_.top();
-            filteredKeyCount_.pop();
-            return outputHandler_.EndObject(memberCount) && EndValue();
-        }
-    }
-
-    bool StartArray() {
-        if (filterValueDepth_ > 0) {
-            filterValueDepth_++;
-            return true;
-        }
-        else
-            return outputHandler_.StartArray();
-    }
-
-    bool EndArray(SizeType elementCount) {
-        if (filterValueDepth_ > 0) {
-            filterValueDepth_--;
-            return EndValue();
-        }
-        else
-            return outputHandler_.EndArray(elementCount) && EndValue();
-    }
-
-private:
-    FilterKeyHandler(const FilterKeyHandler&);
-    FilterKeyHandler& operator=(const FilterKeyHandler&);
-
-    bool EndValue() {
-        if (filterValueDepth_ == 1) // Just at the end of value after filtered key
-            filterValueDepth_ = 0;
-        return true;
-    }
-    
-    OutputHandler& outputHandler_;
-    const char* keyString_;
-    const SizeType keyLength_;
-    unsigned filterValueDepth_;
-    std::stack<SizeType> filteredKeyCount_;
-};
-
-int main(int argc, char* argv[]) {
-    if (argc != 2) {
-        fprintf(stderr, "filterkey key < input.json > output.json\n");
-        return 1;
-    }
-
-    // Prepare JSON reader and input stream.
-    Reader reader;
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-
-    // Prepare JSON writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-    Writer<FileWriteStream> writer(os);
-
-    // Prepare Filter
-    FilterKeyHandler<Writer<FileWriteStream> > filter(writer, argv[1], static_cast<SizeType>(strlen(argv[1])));
-
-    // JSON reader parse from the input stream, filter handler filters the events, and forward to writer.
-    // i.e. the events flow is: reader -> filter -> writer
-    if (!reader.Parse(is, filter)) {
-        fprintf(stderr, "\nError(%u): %s\n", static_cast<unsigned>(reader.GetErrorOffset()), GetParseError_En(reader.GetParseErrorCode()));
-        return 1;
-    }
-
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/example/filterkeydom/filterkeydom.cpp b/src/sioclient/lib/rapidjson/example/filterkeydom/filterkeydom.cpp
deleted file mode 100644
index 732cc81f..00000000
--- a/src/sioclient/lib/rapidjson/example/filterkeydom/filterkeydom.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-// JSON filterkey example which populates filtered SAX events into a Document.
-
-// This example parses JSON text from stdin with validation.
-// During parsing, specified key will be filtered using a SAX handler.
-// And finally the filtered events are used to populate a Document.
-// As an example, the document is written to standard output.
-
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/error/en.h"
-#include <stack>
-
-using namespace rapidjson;
-
-// This handler forwards event into an output handler, with filtering the descendent events of specified key.
-template <typename OutputHandler>
-class FilterKeyHandler {
-public:
-    typedef char Ch;
-
-    FilterKeyHandler(OutputHandler& outputHandler, const Ch* keyString, SizeType keyLength) : 
-        outputHandler_(outputHandler), keyString_(keyString), keyLength_(keyLength), filterValueDepth_(), filteredKeyCount_()
-    {}
-
-    bool Null()             { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Null()    && EndValue(); }
-    bool Bool(bool b)       { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Bool(b)   && EndValue(); }
-    bool Int(int i)         { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Int(i)    && EndValue(); }
-    bool Uint(unsigned u)   { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Uint(u)   && EndValue(); }
-    bool Int64(int64_t i)   { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Int64(i)  && EndValue(); }
-    bool Uint64(uint64_t u) { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Uint64(u) && EndValue(); }
-    bool Double(double d)   { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.Double(d) && EndValue(); }
-    bool RawNumber(const Ch* str, SizeType len, bool copy) { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.RawNumber(str, len, copy) && EndValue(); }
-    bool String   (const Ch* str, SizeType len, bool copy) { return filterValueDepth_ > 0 ? EndValue() : outputHandler_.String   (str, len, copy) && EndValue(); }
-    
-    bool StartObject() { 
-        if (filterValueDepth_ > 0) {
-            filterValueDepth_++;
-            return true;
-        }
-        else {
-            filteredKeyCount_.push(0);
-            return outputHandler_.StartObject();
-        }
-    }
-    
-    bool Key(const Ch* str, SizeType len, bool copy) { 
-        if (filterValueDepth_ > 0) 
-            return true;
-        else if (len == keyLength_ && std::memcmp(str, keyString_, len) == 0) {
-            filterValueDepth_ = 1;
-            return true;
-        }
-        else {
-            ++filteredKeyCount_.top();
-            return outputHandler_.Key(str, len, copy);
-        }
-    }
-
-    bool EndObject(SizeType) {
-        if (filterValueDepth_ > 0) {
-            filterValueDepth_--;
-            return EndValue();
-        }
-        else {
-            // Use our own filtered memberCount
-            SizeType memberCount = filteredKeyCount_.top();
-            filteredKeyCount_.pop();
-            return outputHandler_.EndObject(memberCount) && EndValue();
-        }
-    }
-
-    bool StartArray() {
-        if (filterValueDepth_ > 0) {
-            filterValueDepth_++;
-            return true;
-        }
-        else
-            return outputHandler_.StartArray();
-    }
-
-    bool EndArray(SizeType elementCount) {
-        if (filterValueDepth_ > 0) {
-            filterValueDepth_--;
-            return EndValue();
-        }
-        else
-            return outputHandler_.EndArray(elementCount) && EndValue();
-    }
-
-private:
-    FilterKeyHandler(const FilterKeyHandler&);
-    FilterKeyHandler& operator=(const FilterKeyHandler&);
-
-    bool EndValue() {
-        if (filterValueDepth_ == 1) // Just at the end of value after filtered key
-            filterValueDepth_ = 0;
-        return true;
-    }
-
-    OutputHandler& outputHandler_;
-    const char* keyString_;
-    const SizeType keyLength_;
-    unsigned filterValueDepth_;
-    std::stack<SizeType> filteredKeyCount_;
-};
-
-// Implements a generator for Document::Populate()
-template <typename InputStream>
-class FilterKeyReader {
-public:
-    typedef char Ch;
-
-    FilterKeyReader(InputStream& is, const Ch* keyString, SizeType keyLength) : 
-        is_(is), keyString_(keyString), keyLength_(keyLength), parseResult_()
-    {}
-
-    // SAX event flow: reader -> filter -> handler
-    template <typename Handler>
-    bool operator()(Handler& handler) {
-        FilterKeyHandler<Handler> filter(handler, keyString_, keyLength_);
-        Reader reader;
-        parseResult_ = reader.Parse(is_, filter);
-        return parseResult_;
-    }
-
-    const ParseResult& GetParseResult() const { return parseResult_; }
-
-private:
-    FilterKeyReader(const FilterKeyReader&);
-    FilterKeyReader& operator=(const FilterKeyReader&);
-
-    InputStream& is_;
-    const char* keyString_;
-    const SizeType keyLength_;
-    ParseResult parseResult_;
-};
-
-int main(int argc, char* argv[]) {
-    if (argc != 2) {
-        fprintf(stderr, "filterkeydom key < input.json > output.json\n");
-        return 1;
-    }
-
-    // Prepare input stream.
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-
-    // Prepare Filter
-    FilterKeyReader<FileReadStream> reader(is, argv[1], static_cast<SizeType>(strlen(argv[1])));
-
-    // Populates the filtered events from reader
-    Document document;
-    document.Populate(reader);
-    ParseResult pr = reader.GetParseResult();
-    if (!pr) {
-        fprintf(stderr, "\nError(%u): %s\n", static_cast<unsigned>(pr.Offset()), GetParseError_En(pr.Code()));
-        return 1;
-    }
-
-    // Prepare JSON writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-    Writer<FileWriteStream> writer(os);
-
-    // Write the document to standard output
-    document.Accept(writer);
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/example/jsonx/jsonx.cpp b/src/sioclient/lib/rapidjson/example/jsonx/jsonx.cpp
deleted file mode 100644
index 954aa2b9..00000000
--- a/src/sioclient/lib/rapidjson/example/jsonx/jsonx.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-// JSON to JSONx conversion example, using SAX API.
-// JSONx is an IBM standard format to represent JSON as XML.
-// https://www-01.ibm.com/support/knowledgecenter/SS9H2Y_7.1.0/com.ibm.dp.doc/json_jsonx.html
-// This example parses JSON text from stdin with validation, 
-// and convert to JSONx format to stdout.
-// Need compile with -D__STDC_FORMAT_MACROS for defining PRId64 and PRIu64 macros.
-
-#include "rapidjson/reader.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/error/en.h"
-#include <cstdio>
-
-using namespace rapidjson;
-
-// For simplicity, this example only read/write in UTF-8 encoding
-template <typename OutputStream>
-class JsonxWriter {
-public:
-    JsonxWriter(OutputStream& os) : os_(os), name_(), level_(0), hasName_(false) {
-    }
-
-    bool Null() {
-        return WriteStartElement("null", true);
-    }
-    
-    bool Bool(bool b) {
-        return 
-            WriteStartElement("boolean") &&
-            WriteString(b ? "true" : "false") &&
-            WriteEndElement("boolean");
-    }
-    
-    bool Int(int i) {
-        char buffer[12];
-        return WriteNumberElement(buffer, sprintf(buffer, "%d", i));
-    }
-    
-    bool Uint(unsigned i) {
-        char buffer[11];
-        return WriteNumberElement(buffer, sprintf(buffer, "%u", i));
-    }
-    
-    bool Int64(int64_t i) {
-        char buffer[21];
-        return WriteNumberElement(buffer, sprintf(buffer, "%" PRId64, i));
-    }
-    
-    bool Uint64(uint64_t i) {
-        char buffer[21];
-        return WriteNumberElement(buffer, sprintf(buffer, "%" PRIu64, i));
-    }
-    
-    bool Double(double d) {
-        char buffer[30];
-        return WriteNumberElement(buffer, sprintf(buffer, "%.17g", d));
-    }
-
-    bool RawNumber(const char* str, SizeType length, bool) {
-        return
-            WriteStartElement("number") &&
-            WriteEscapedText(str, length) &&
-            WriteEndElement("number");
-    }
-
-    bool String(const char* str, SizeType length, bool) {
-        return
-            WriteStartElement("string") &&
-            WriteEscapedText(str, length) &&
-            WriteEndElement("string");
-    }
-
-    bool StartObject() {
-        return WriteStartElement("object");
-    }
-
-    bool Key(const char* str, SizeType length, bool) {
-        // backup key to name_
-        name_.Clear();
-        for (SizeType i = 0; i < length; i++)
-            name_.Put(str[i]);
-        hasName_ = true;
-        return true;
-    }
-
-    bool EndObject(SizeType) {
-        return WriteEndElement("object");
-    }
-
-    bool StartArray() {
-        return WriteStartElement("array");
-    }
-
-    bool EndArray(SizeType) {
-        return WriteEndElement("array");
-    }
-
-private:
-    bool WriteString(const char* s) {
-        while (*s)
-            os_.Put(*s++);
-        return true;
-    }
-
-    bool WriteEscapedAttributeValue(const char* s, size_t length) {
-        for (size_t i = 0; i < length; i++) {
-            switch (s[i]) {
-                case '&': WriteString("&amp;"); break;
-                case '<': WriteString("&lt;"); break;
-                case '"': WriteString("&quot;"); break;
-                default: os_.Put(s[i]); break;
-            }
-        }
-        return true;
-    }
-
-    bool WriteEscapedText(const char* s, size_t length) {
-        for (size_t i = 0; i < length; i++) {
-            switch (s[i]) {
-                case '&': WriteString("&amp;"); break;
-                case '<': WriteString("&lt;"); break;
-                default: os_.Put(s[i]); break;
-            }
-        }
-        return true;
-    }
-
-    bool WriteStartElement(const char* type, bool emptyElement = false) {
-        if (level_ == 0)
-            if (!WriteString("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"))
-                return false;
-
-        if (!WriteString("<json:") || !WriteString(type))
-            return false;
-
-        // For root element, need to add declarations
-        if (level_ == 0) {
-            if (!WriteString(
-                " xsi:schemaLocation=\"http://www.datapower.com/schemas/json jsonx.xsd\""
-                " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-                " xmlns:json=\"http://www.ibm.com/xmlns/prod/2009/jsonx\""))
-                return false;
-        }
-
-        if (hasName_) {
-            hasName_ = false;
-            if (!WriteString(" name=\"") ||
-                !WriteEscapedAttributeValue(name_.GetString(), name_.GetSize()) ||
-                !WriteString("\""))
-                return false;
-        }
-
-        if (emptyElement)
-            return WriteString("/>");
-        else {
-            level_++;
-            return WriteString(">");
-        }
-    }
-
-    bool WriteEndElement(const char* type) {
-        if (!WriteString("</json:") ||
-            !WriteString(type) ||
-            !WriteString(">"))
-            return false;
-
-        // For the last end tag, flush the output stream.
-        if (--level_ == 0)
-            os_.Flush();
-
-        return true;
-    }
-
-    bool WriteNumberElement(const char* buffer, int length) {
-        if (!WriteStartElement("number"))
-            return false;
-        for (int j = 0; j < length; j++)
-            os_.Put(buffer[j]);
-        return WriteEndElement("number");
-    }
-
-    OutputStream& os_;
-    StringBuffer name_;
-    unsigned level_;
-    bool hasName_;
-};
-
-int main(int, char*[]) {
-    // Prepare JSON reader and input stream.
-    Reader reader;
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-
-    // Prepare JSON writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-    JsonxWriter<FileWriteStream> writer(os);
-
-    // JSON reader parse from the input stream and let writer generate the output.
-    if (!reader.Parse(is, writer)) {
-        fprintf(stderr, "\nError(%u): %s\n", static_cast<unsigned>(reader.GetErrorOffset()), GetParseError_En(reader.GetParseErrorCode()));
-        return 1;
-    }
-
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/example/lookaheadparser/lookaheadparser.cpp b/src/sioclient/lib/rapidjson/example/lookaheadparser/lookaheadparser.cpp
deleted file mode 100644
index f627f4d8..00000000
--- a/src/sioclient/lib/rapidjson/example/lookaheadparser/lookaheadparser.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-#include "rapidjson/reader.h"
-#include "rapidjson/document.h"
-#include <iostream>
-
-RAPIDJSON_DIAG_PUSH
-#ifdef __GNUC__
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-// This example demonstrates JSON token-by-token parsing with an API that is
-// more direct; you don't need to design your logic around a handler object and
-// callbacks. Instead, you retrieve values from the JSON stream by calling
-// GetInt(), GetDouble(), GetString() and GetBool(), traverse into structures
-// by calling EnterObject() and EnterArray(), and skip over unwanted data by
-// calling SkipValue(). When you know your JSON's structure, this can be quite
-// convenient.
-//
-// If you aren't sure of what's next in the JSON data, you can use PeekType() and
-// PeekValue() to look ahead to the next object before reading it.
-//
-// If you call the wrong retrieval method--e.g. GetInt when the next JSON token is
-// not an int, EnterObject or EnterArray when there isn't actually an object or array
-// to read--the stream parsing will end immediately and no more data will be delivered.
-//
-// After calling EnterObject, you retrieve keys via NextObjectKey() and values via
-// the normal getters. When NextObjectKey() returns null, you have exited the
-// object, or you can call SkipObject() to skip to the end of the object
-// immediately. If you fetch the entire object (i.e. NextObjectKey() returned  null),
-// you should not call SkipObject().
-//
-// After calling EnterArray(), you must alternate between calling NextArrayValue()
-// to see if the array has more data, and then retrieving values via the normal
-// getters. You can call SkipArray() to skip to the end of the array immediately.
-// If you fetch the entire array (i.e. NextArrayValue() returned null),
-// you should not call SkipArray().
-//
-// This parser uses in-situ strings, so the JSON buffer will be altered during the
-// parse.
-
-using namespace rapidjson;
-
-
-class LookaheadParserHandler {
-public:
-    bool Null() { st_ = kHasNull; v_.SetNull(); return true; }
-    bool Bool(bool b) { st_ = kHasBool; v_.SetBool(b); return true; }
-    bool Int(int i) { st_ = kHasNumber; v_.SetInt(i); return true; }
-    bool Uint(unsigned u) { st_ = kHasNumber; v_.SetUint(u); return true; }
-    bool Int64(int64_t i) { st_ = kHasNumber; v_.SetInt64(i); return true; }
-    bool Uint64(uint64_t u) { st_ = kHasNumber; v_.SetUint64(u); return true; }
-    bool Double(double d) { st_ = kHasNumber; v_.SetDouble(d); return true; }
-    bool RawNumber(const char*, SizeType, bool) { return false; }
-    bool String(const char* str, SizeType length, bool) { st_ = kHasString; v_.SetString(str, length); return true; }
-    bool StartObject() { st_ = kEnteringObject; return true; }
-    bool Key(const char* str, SizeType length, bool) { st_ = kHasKey; v_.SetString(str, length); return true; }
-    bool EndObject(SizeType) { st_ = kExitingObject; return true; }
-    bool StartArray() { st_ = kEnteringArray; return true; }
-    bool EndArray(SizeType) { st_ = kExitingArray; return true; }
-
-protected:
-    LookaheadParserHandler(char* str);
-    void ParseNext();
-
-protected:
-    enum LookaheadParsingState {
-        kInit,
-        kError,
-        kHasNull,
-        kHasBool,
-        kHasNumber,
-        kHasString,
-        kHasKey,
-        kEnteringObject,
-        kExitingObject,
-        kEnteringArray,
-        kExitingArray
-    };
-    
-    Value v_;
-    LookaheadParsingState st_;
-    Reader r_;
-    InsituStringStream ss_;
-    
-    static const int parseFlags = kParseDefaultFlags | kParseInsituFlag;
-};
-
-LookaheadParserHandler::LookaheadParserHandler(char* str) : v_(), st_(kInit), r_(), ss_(str) {
-    r_.IterativeParseInit();
-    ParseNext();
-}
-
-void LookaheadParserHandler::ParseNext() {
-    if (r_.HasParseError()) {
-        st_ = kError;
-        return;
-    }
-    
-    r_.IterativeParseNext<parseFlags>(ss_, *this);
-}
-
-class LookaheadParser : protected LookaheadParserHandler {
-public:
-    LookaheadParser(char* str) : LookaheadParserHandler(str) {}
-    
-    bool EnterObject();
-    bool EnterArray();
-    const char* NextObjectKey();
-    bool NextArrayValue();
-    int GetInt();
-    double GetDouble();
-    const char* GetString();
-    bool GetBool();
-    void GetNull();
-
-    void SkipObject();
-    void SkipArray();
-    void SkipValue();
-    Value* PeekValue();
-    int PeekType(); // returns a rapidjson::Type, or -1 for no value (at end of object/array)
-    
-    bool IsValid() { return st_ != kError; }
-    
-protected:
-    void SkipOut(int depth);
-};
-
-bool LookaheadParser::EnterObject() {
-    if (st_ != kEnteringObject) {
-        st_  = kError;
-        return false;
-    }
-    
-    ParseNext();
-    return true;
-}
-
-bool LookaheadParser::EnterArray() {
-    if (st_ != kEnteringArray) {
-        st_  = kError;
-        return false;
-    }
-    
-    ParseNext();
-    return true;
-}
-
-const char* LookaheadParser::NextObjectKey() {
-    if (st_ == kHasKey) {
-        const char* result = v_.GetString();
-        ParseNext();
-        return result;
-    }
-    
-    if (st_ != kExitingObject) {
-        st_ = kError;
-        return 0;
-    }
-    
-    ParseNext();
-    return 0;
-}
-
-bool LookaheadParser::NextArrayValue() {
-    if (st_ == kExitingArray) {
-        ParseNext();
-        return false;
-    }
-    
-    if (st_ == kError || st_ == kExitingObject || st_ == kHasKey) {
-        st_ = kError;
-        return false;
-    }
-
-    return true;
-}
-
-int LookaheadParser::GetInt() {
-    if (st_ != kHasNumber || !v_.IsInt()) {
-        st_ = kError;
-        return 0;
-    }
-
-    int result = v_.GetInt();
-    ParseNext();
-    return result;
-}
-
-double LookaheadParser::GetDouble() {
-    if (st_ != kHasNumber) {
-        st_  = kError;
-        return 0.;
-    }
-    
-    double result = v_.GetDouble();
-    ParseNext();
-    return result;
-}
-
-bool LookaheadParser::GetBool() {
-    if (st_ != kHasBool) {
-        st_  = kError;
-        return false;
-    }
-    
-    bool result = v_.GetBool();
-    ParseNext();
-    return result;
-}
-
-void LookaheadParser::GetNull() {
-    if (st_ != kHasNull) {
-        st_  = kError;
-        return;
-    }
-
-    ParseNext();
-}
-
-const char* LookaheadParser::GetString() {
-    if (st_ != kHasString) {
-        st_  = kError;
-        return 0;
-    }
-    
-    const char* result = v_.GetString();
-    ParseNext();
-    return result;
-}
-
-void LookaheadParser::SkipOut(int depth) {
-    do {
-        if (st_ == kEnteringArray || st_ == kEnteringObject) {
-            ++depth;
-        }
-        else if (st_ == kExitingArray || st_ == kExitingObject) {
-            --depth;
-        }
-        else if (st_ == kError) {
-            return;
-        }
-
-        ParseNext();
-    }
-    while (depth > 0);
-}
-
-void LookaheadParser::SkipValue() {
-    SkipOut(0);
-}
-
-void LookaheadParser::SkipArray() {
-    SkipOut(1);
-}
-
-void LookaheadParser::SkipObject() {
-    SkipOut(1);
-}
-
-Value* LookaheadParser::PeekValue() {
-    if (st_ >= kHasNull && st_ <= kHasKey) {
-        return &v_;
-    }
-    
-    return 0;
-}
-
-int LookaheadParser::PeekType() {
-    if (st_ >= kHasNull && st_ <= kHasKey) {
-        return v_.GetType();
-    }
-    
-    if (st_ == kEnteringArray) {
-        return kArrayType;
-    }
-    
-    if (st_ == kEnteringObject) {
-        return kObjectType;
-    }
-
-    return -1;
-}
-
-//-------------------------------------------------------------------------
-
-int main() {
-    using namespace std;
-
-    char json[] = " { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null,"
-        "\"i\":123, \"pi\": 3.1416, \"a\":[-1, 2, 3, 4, \"array\", []], \"skipArrays\":[1, 2, [[[3]]]], "
-        "\"skipObject\":{ \"i\":0, \"t\":true, \"n\":null, \"d\":123.45 }, "
-        "\"skipNested\":[[[[{\"\":0}, {\"\":[-9.87]}]]], [], []], "
-        "\"skipString\":\"zzz\", \"reachedEnd\":null, \"t\":true }";
-
-    LookaheadParser r(json);
-    
-    RAPIDJSON_ASSERT(r.PeekType() == kObjectType);
-
-    r.EnterObject();
-    while (const char* key = r.NextObjectKey()) {
-        if (0 == strcmp(key, "hello")) {
-            RAPIDJSON_ASSERT(r.PeekType() == kStringType);
-            cout << key << ":" << r.GetString() << endl;
-        }
-        else if (0 == strcmp(key, "t") || 0 == strcmp(key, "f")) {
-            RAPIDJSON_ASSERT(r.PeekType() == kTrueType || r.PeekType() == kFalseType);
-            cout << key << ":" << r.GetBool() << endl;
-            continue;
-        }
-        else if (0 == strcmp(key, "n")) {
-            RAPIDJSON_ASSERT(r.PeekType() == kNullType);
-            r.GetNull();
-            cout << key << endl;
-            continue;
-        }
-        else if (0 == strcmp(key, "pi")) {
-            RAPIDJSON_ASSERT(r.PeekType() == kNumberType);
-            cout << key << ":" << r.GetDouble() << endl;
-            continue;
-        }
-        else if (0 == strcmp(key, "a")) {
-            RAPIDJSON_ASSERT(r.PeekType() == kArrayType);
-            
-            r.EnterArray();
-            
-            cout << key << ":[ ";
-            while (r.NextArrayValue()) {
-                if (r.PeekType() == kNumberType) {
-                    cout << r.GetDouble() << " ";
-                }
-                else if (r.PeekType() == kStringType) {
-                    cout << r.GetString() << " ";
-                }
-                else {
-                    r.SkipArray();
-                    break;
-                }
-            }
-            
-            cout << "]" << endl;
-        }
-        else {
-            cout << key << ":skipped" << endl;
-            r.SkipValue();
-        }
-    }
-    
-    return 0;
-}
-
-RAPIDJSON_DIAG_POP
diff --git a/src/sioclient/lib/rapidjson/example/messagereader/messagereader.cpp b/src/sioclient/lib/rapidjson/example/messagereader/messagereader.cpp
deleted file mode 100644
index 3399bc94..00000000
--- a/src/sioclient/lib/rapidjson/example/messagereader/messagereader.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// Reading a message JSON with Reader (SAX-style API).
-// The JSON should be an object with key-string pairs.
-
-#include "rapidjson/reader.h"
-#include "rapidjson/error/en.h"
-#include <iostream>
-#include <string>
-#include <map>
-
-using namespace std;
-using namespace rapidjson;
-
-typedef map<string, string> MessageMap;
-
-#if defined(__GNUC__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(switch-enum)
-#endif
-
-struct MessageHandler
-    : public BaseReaderHandler<UTF8<>, MessageHandler> {
-    MessageHandler() : messages_(), state_(kExpectObjectStart), name_() {}
-
-    bool StartObject() {
-        switch (state_) {
-        case kExpectObjectStart:
-            state_ = kExpectNameOrObjectEnd;
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    bool String(const char* str, SizeType length, bool) {
-        switch (state_) {
-        case kExpectNameOrObjectEnd:
-            name_ = string(str, length);
-            state_ = kExpectValue;
-            return true;
-        case kExpectValue:
-            messages_.insert(MessageMap::value_type(name_, string(str, length)));
-            state_ = kExpectNameOrObjectEnd;
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    bool EndObject(SizeType) { return state_ == kExpectNameOrObjectEnd; }
-
-    bool Default() { return false; } // All other events are invalid.
-
-    MessageMap messages_;
-    enum State {
-        kExpectObjectStart,
-        kExpectNameOrObjectEnd,
-        kExpectValue
-    }state_;
-    std::string name_;
-};
-
-#if defined(__GNUC__)
-RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-static void ParseMessages(const char* json, MessageMap& messages) {
-    Reader reader;
-    MessageHandler handler;
-    StringStream ss(json);
-    if (reader.Parse(ss, handler))
-        messages.swap(handler.messages_);   // Only change it if success.
-    else {
-        ParseErrorCode e = reader.GetParseErrorCode();
-        size_t o = reader.GetErrorOffset();
-        cout << "Error: " << GetParseError_En(e) << endl;;
-        cout << " at offset " << o << " near '" << string(json).substr(o, 10) << "...'" << endl;
-    }
-}
-
-int main() {
-    MessageMap messages;
-
-    const char* json1 = "{ \"greeting\" : \"Hello!\", \"farewell\" : \"bye-bye!\" }";
-    cout << json1 << endl;
-    ParseMessages(json1, messages);
-
-    for (MessageMap::const_iterator itr = messages.begin(); itr != messages.end(); ++itr)
-        cout << itr->first << ": " << itr->second << endl;
-
-    cout << endl << "Parse a JSON with invalid schema." << endl;
-    const char* json2 = "{ \"greeting\" : \"Hello!\", \"farewell\" : \"bye-bye!\", \"foo\" : {} }";
-    cout << json2 << endl;
-    ParseMessages(json2, messages);
-
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/example/parsebyparts/parsebyparts.cpp b/src/sioclient/lib/rapidjson/example/parsebyparts/parsebyparts.cpp
deleted file mode 100644
index ff735394..00000000
--- a/src/sioclient/lib/rapidjson/example/parsebyparts/parsebyparts.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// Example of parsing JSON to document by parts.
-
-// Using C++11 threads
-// Temporarily disable for clang (older version) due to incompatibility with libstdc++
-#if (__cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1700)) && !defined(__clang__)
-
-#include "rapidjson/document.h"
-#include "rapidjson/error/en.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/ostreamwrapper.h"
-#include <condition_variable>
-#include <iostream>
-#include <mutex>
-#include <thread>
-
-using namespace rapidjson;
-
-template<unsigned parseFlags = kParseDefaultFlags>
-class AsyncDocumentParser {
-public:
-    AsyncDocumentParser(Document& d)
-        : stream_(*this)
-        , d_(d)
-        , parseThread_()
-        , mutex_()
-        , notEmpty_()
-        , finish_()
-        , completed_()
-    {
-        // Create and execute thread after all member variables are initialized.
-        parseThread_ = std::thread(&AsyncDocumentParser::Parse, this);
-    }
-
-    ~AsyncDocumentParser() {
-        if (!parseThread_.joinable())
-            return;
-
-        {        
-            std::unique_lock<std::mutex> lock(mutex_);
-
-            // Wait until the buffer is read up (or parsing is completed)
-            while (!stream_.Empty() && !completed_)
-                finish_.wait(lock);
-
-            // Automatically append '\0' as the terminator in the stream.
-            static const char terminator[] = "";
-            stream_.src_ = terminator;
-            stream_.end_ = terminator + 1;
-            notEmpty_.notify_one(); // unblock the AsyncStringStream
-        }
-
-        parseThread_.join();
-    }
-
-    void ParsePart(const char* buffer, size_t length) {
-        std::unique_lock<std::mutex> lock(mutex_);
-        
-        // Wait until the buffer is read up (or parsing is completed)
-        while (!stream_.Empty() && !completed_)
-            finish_.wait(lock);
-
-        // Stop further parsing if the parsing process is completed.
-        if (completed_)
-            return;
-
-        // Set the buffer to stream and unblock the AsyncStringStream
-        stream_.src_ = buffer;
-        stream_.end_ = buffer + length;
-        notEmpty_.notify_one();
-    }
-
-private:
-    void Parse() {
-        d_.ParseStream<parseFlags>(stream_);
-
-        // The stream may not be fully read, notify finish anyway to unblock ParsePart()
-        std::unique_lock<std::mutex> lock(mutex_);
-        completed_ = true;      // Parsing process is completed
-        finish_.notify_one();   // Unblock ParsePart() or destructor if they are waiting.
-    }
-
-    struct AsyncStringStream {
-        typedef char Ch;
-
-        AsyncStringStream(AsyncDocumentParser& parser) : parser_(parser), src_(), end_(), count_() {}
-
-        char Peek() const {
-            std::unique_lock<std::mutex> lock(parser_.mutex_);
-
-            // If nothing in stream, block to wait.
-            while (Empty())
-                parser_.notEmpty_.wait(lock);
-
-            return *src_;
-        }
-
-        char Take() {
-            std::unique_lock<std::mutex> lock(parser_.mutex_);
-
-            // If nothing in stream, block to wait.
-            while (Empty())
-                parser_.notEmpty_.wait(lock);
-
-            count_++;
-            char c = *src_++;
-
-            // If all stream is read up, notify that the stream is finish.
-            if (Empty())
-                parser_.finish_.notify_one();
-
-            return c;
-        }
-
-        size_t Tell() const { return count_; }
-
-        // Not implemented
-        char* PutBegin() { return 0; }
-        void Put(char) {}
-        void Flush() {}
-        size_t PutEnd(char*) { return 0; }
-
-        bool Empty() const { return src_ == end_; }
-
-        AsyncDocumentParser& parser_;
-        const char* src_;     //!< Current read position.
-        const char* end_;     //!< End of buffer
-        size_t count_;        //!< Number of characters taken so far.
-    };
-
-    AsyncStringStream stream_;
-    Document& d_;
-    std::thread parseThread_;
-    std::mutex mutex_;
-    std::condition_variable notEmpty_;
-    std::condition_variable finish_;
-    bool completed_;
-};
-
-int main() {
-    Document d;
-
-    {
-        AsyncDocumentParser<> parser(d);
-
-        const char json1[] = " { \"hello\" : \"world\", \"t\" : tr";
-        //const char json1[] = " { \"hello\" : \"world\", \"t\" : trX"; // For test parsing error
-        const char json2[] = "ue, \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.14";
-        const char json3[] = "16, \"a\":[1, 2, 3, 4] } ";
-
-        parser.ParsePart(json1, sizeof(json1) - 1);
-        parser.ParsePart(json2, sizeof(json2) - 1);
-        parser.ParsePart(json3, sizeof(json3) - 1);
-    }
-
-    if (d.HasParseError()) {
-        std::cout << "Error at offset " << d.GetErrorOffset() << ": " << GetParseError_En(d.GetParseError()) << std::endl;
-        return EXIT_FAILURE;
-    }
-    
-    // Stringify the JSON to cout
-    OStreamWrapper os(std::cout);
-    Writer<OStreamWrapper> writer(os);
-    d.Accept(writer);
-    std::cout << std::endl;
-
-    return EXIT_SUCCESS;
-}
-
-#else // Not supporting C++11 
-
-#include <iostream>
-int main() {
-    std::cout << "This example requires C++11 compiler" << std::endl;
-}
-
-#endif
diff --git a/src/sioclient/lib/rapidjson/example/pretty/pretty.cpp b/src/sioclient/lib/rapidjson/example/pretty/pretty.cpp
deleted file mode 100644
index 2feff5d0..00000000
--- a/src/sioclient/lib/rapidjson/example/pretty/pretty.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// JSON pretty formatting example
-// This example can only handle UTF-8. For handling other encodings, see prettyauto example.
-
-#include "rapidjson/reader.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/error/en.h"
-
-using namespace rapidjson;
-
-int main(int, char*[]) {
-    // Prepare reader and input stream.
-    Reader reader;
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-
-    // Prepare writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-    PrettyWriter<FileWriteStream> writer(os);
-
-    // JSON reader parse from the input stream and let writer generate the output.
-    if (!reader.Parse<kParseValidateEncodingFlag>(is, writer)) {
-        fprintf(stderr, "\nError(%u): %s\n", static_cast<unsigned>(reader.GetErrorOffset()), GetParseError_En(reader.GetParseErrorCode()));
-        return 1;
-    }
-
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/example/prettyauto/prettyauto.cpp b/src/sioclient/lib/rapidjson/example/prettyauto/prettyauto.cpp
deleted file mode 100644
index 1687bae5..00000000
--- a/src/sioclient/lib/rapidjson/example/prettyauto/prettyauto.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// JSON pretty formatting example
-// This example can handle UTF-8/UTF-16LE/UTF-16BE/UTF-32LE/UTF-32BE.
-// The input firstly convert to UTF8, and then write to the original encoding with pretty formatting.
-
-#include "rapidjson/reader.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/encodedstream.h"    // NEW
-#include "rapidjson/error/en.h"
-#ifdef _WIN32
-#include <fcntl.h>
-#include <io.h>
-#endif
-
-using namespace rapidjson;
-
-int main(int, char*[]) {
-#ifdef _WIN32
-    // Prevent Windows converting between CR+LF and LF
-    _setmode(_fileno(stdin), _O_BINARY);    // NEW
-    _setmode(_fileno(stdout), _O_BINARY);   // NEW
-#endif
-
-    // Prepare reader and input stream.
-    //Reader reader;
-    GenericReader<AutoUTF<unsigned>, UTF8<> > reader;       // CHANGED
-    char readBuffer[65536];
-    FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
-    AutoUTFInputStream<unsigned, FileReadStream> eis(is);   // NEW
-
-    // Prepare writer and output stream.
-    char writeBuffer[65536];
-    FileWriteStream os(stdout, writeBuffer, sizeof(writeBuffer));
-
-#if 1
-    // Use the same Encoding of the input. Also use BOM according to input.
-    typedef AutoUTFOutputStream<unsigned, FileWriteStream> OutputStream;    // NEW
-    OutputStream eos(os, eis.GetType(), eis.HasBOM());                      // NEW
-    PrettyWriter<OutputStream, UTF8<>, AutoUTF<unsigned> > writer(eos);     // CHANGED
-#else
-    // You may also use static bound encoding type, such as output to UTF-16LE with BOM
-    typedef EncodedOutputStream<UTF16LE<>,FileWriteStream> OutputStream;    // NEW
-    OutputStream eos(os, true);                                             // NEW
-    PrettyWriter<OutputStream, UTF8<>, UTF16LE<> > writer(eos);             // CHANGED
-#endif
-
-    // JSON reader parse from the input stream and let writer generate the output.
-    //if (!reader.Parse<kParseValidateEncodingFlag>(is, writer)) {
-    if (!reader.Parse<kParseValidateEncodingFlag>(eis, writer)) {   // CHANGED
-        fprintf(stderr, "\nError(%u): %s\n", static_cast<unsigned>(reader.GetErrorOffset()), GetParseError_En(reader.GetParseErrorCode()));
-        return 1;
-    }
-
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/example/schemavalidator/schemavalidator.cpp b/src/sioclient/lib/rapidjson/example/schemavalidator/schemavalidator.cpp
deleted file mode 100644
index 06bbe4dd..00000000
--- a/src/sioclient/lib/rapidjson/example/schemavalidator/schemavalidator.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// Schema Validator example
-
-// The example validates JSON text from stdin with a JSON schema specified in the argument.
-
-#include "rapidjson/error/en.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/schema.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/prettywriter.h"
-
-using namespace rapidjson;
-
-int main(int argc, char *argv[]) {
-    if (argc != 2) {
-        fprintf(stderr, "Usage: schemavalidator schema.json < input.json\n");
-        return EXIT_FAILURE;
-    }
-
-    // Read a JSON schema from file into Document
-    Document d;
-    char buffer[4096];
-
-    {
-        FILE *fp = fopen(argv[1], "r");
-        if (!fp) {
-            printf("Schema file '%s' not found\n", argv[1]);
-            return -1;
-        }
-        FileReadStream fs(fp, buffer, sizeof(buffer));
-        d.ParseStream(fs);
-        if (d.HasParseError()) {
-            fprintf(stderr, "Schema file '%s' is not a valid JSON\n", argv[1]);
-            fprintf(stderr, "Error(offset %u): %s\n",
-                static_cast<unsigned>(d.GetErrorOffset()),
-                GetParseError_En(d.GetParseError()));
-            fclose(fp);
-            return EXIT_FAILURE;
-        }
-        fclose(fp);
-    }
-    
-    // Then convert the Document into SchemaDocument
-    SchemaDocument sd(d);
-
-    // Use reader to parse the JSON in stdin, and forward SAX events to validator
-    SchemaValidator validator(sd);
-    Reader reader;
-    FileReadStream is(stdin, buffer, sizeof(buffer));
-    if (!reader.Parse(is, validator) && reader.GetParseErrorCode() != kParseErrorTermination) {
-        // Schema validator error would cause kParseErrorTermination, which will handle it in next step.
-        fprintf(stderr, "Input is not a valid JSON\n");
-        fprintf(stderr, "Error(offset %u): %s\n",
-            static_cast<unsigned>(reader.GetErrorOffset()),
-            GetParseError_En(reader.GetParseErrorCode()));
-    }
-
-    // Check the validation result
-    if (validator.IsValid()) {
-        printf("Input JSON is valid.\n");
-        return EXIT_SUCCESS;
-    }
-    else {
-        printf("Input JSON is invalid.\n");
-        StringBuffer sb;
-        validator.GetInvalidSchemaPointer().StringifyUriFragment(sb);
-        fprintf(stderr, "Invalid schema: %s\n", sb.GetString());
-        fprintf(stderr, "Invalid keyword: %s\n", validator.GetInvalidSchemaKeyword());
-        sb.Clear();
-        validator.GetInvalidDocumentPointer().StringifyUriFragment(sb);
-        fprintf(stderr, "Invalid document: %s\n", sb.GetString());
-        // Detailed violation report is available as a JSON value
-        sb.Clear();
-        PrettyWriter<StringBuffer> w(sb);
-        validator.GetError().Accept(w);
-        fprintf(stderr, "Error report:\n%s\n", sb.GetString());
-        return EXIT_FAILURE;
-    }
-}
diff --git a/src/sioclient/lib/rapidjson/example/serialize/serialize.cpp b/src/sioclient/lib/rapidjson/example/serialize/serialize.cpp
deleted file mode 100644
index 12d87151..00000000
--- a/src/sioclient/lib/rapidjson/example/serialize/serialize.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// Serialize example
-// This example shows writing JSON string with writer directly.
-
-#include "rapidjson/prettywriter.h" // for stringify JSON
-#include <cstdio>
-#include <string>
-#include <vector>
-
-using namespace rapidjson;
-
-class Person {
-public:
-    Person(const std::string& name, unsigned age) : name_(name), age_(age) {}
-    Person(const Person& rhs) : name_(rhs.name_), age_(rhs.age_) {}
-    virtual ~Person();
-
-    Person& operator=(const Person& rhs) {
-        name_ = rhs.name_;
-        age_ = rhs.age_;
-        return *this;
-    }
-
-protected:
-    template <typename Writer>
-    void Serialize(Writer& writer) const {
-        // This base class just write out name-value pairs, without wrapping within an object.
-        writer.String("name");
-#if RAPIDJSON_HAS_STDSTRING
-        writer.String(name_);
-#else
-        writer.String(name_.c_str(), static_cast<SizeType>(name_.length())); // Supplying length of string is faster.
-#endif
-        writer.String("age");
-        writer.Uint(age_);
-    }
-
-private:
-    std::string name_;
-    unsigned age_;
-};
-
-Person::~Person() {
-}
-
-class Education {
-public:
-    Education(const std::string& school, double GPA) : school_(school), GPA_(GPA) {}
-    Education(const Education& rhs) : school_(rhs.school_), GPA_(rhs.GPA_) {}
-
-    template <typename Writer>
-    void Serialize(Writer& writer) const {
-        writer.StartObject();
-        
-        writer.String("school");
-#if RAPIDJSON_HAS_STDSTRING
-        writer.String(school_);
-#else
-        writer.String(school_.c_str(), static_cast<SizeType>(school_.length()));
-#endif
-
-        writer.String("GPA");
-        writer.Double(GPA_);
-
-        writer.EndObject();
-    }
-
-private:
-    std::string school_;
-    double GPA_;
-};
-
-class Dependent : public Person {
-public:
-    Dependent(const std::string& name, unsigned age, Education* education = 0) : Person(name, age), education_(education) {}
-    Dependent(const Dependent& rhs) : Person(rhs), education_(0) { education_ = (rhs.education_ == 0) ? 0 : new Education(*rhs.education_); }
-    virtual ~Dependent();
-
-    Dependent& operator=(const Dependent& rhs) {
-        if (this == &rhs)
-            return *this;
-        delete education_;
-        education_ = (rhs.education_ == 0) ? 0 : new Education(*rhs.education_);
-        return *this;
-    }
-
-    template <typename Writer>
-    void Serialize(Writer& writer) const {
-        writer.StartObject();
-
-        Person::Serialize(writer);
-
-        writer.String("education");
-        if (education_)
-            education_->Serialize(writer);
-        else
-            writer.Null();
-
-        writer.EndObject();
-    }
-
-private:
-
-    Education *education_;
-};
-
-Dependent::~Dependent() {
-    delete education_; 
-}
-
-class Employee : public Person {
-public:
-    Employee(const std::string& name, unsigned age, bool married) : Person(name, age), dependents_(), married_(married) {}
-    Employee(const Employee& rhs) : Person(rhs), dependents_(rhs.dependents_), married_(rhs.married_) {}
-    virtual ~Employee();
-
-    Employee& operator=(const Employee& rhs) {
-        static_cast<Person&>(*this) = rhs;
-        dependents_ = rhs.dependents_;
-        married_ = rhs.married_;
-        return *this;
-    }
-
-    void AddDependent(const Dependent& dependent) {
-        dependents_.push_back(dependent);
-    }
-
-    template <typename Writer>
-    void Serialize(Writer& writer) const {
-        writer.StartObject();
-
-        Person::Serialize(writer);
-
-        writer.String("married");
-        writer.Bool(married_);
-
-        writer.String(("dependents"));
-        writer.StartArray();
-        for (std::vector<Dependent>::const_iterator dependentItr = dependents_.begin(); dependentItr != dependents_.end(); ++dependentItr)
-            dependentItr->Serialize(writer);
-        writer.EndArray();
-
-        writer.EndObject();
-    }
-
-private:
-    std::vector<Dependent> dependents_;
-    bool married_;
-};
-
-Employee::~Employee() {
-}
-
-int main(int, char*[]) {
-    std::vector<Employee> employees;
-
-    employees.push_back(Employee("Milo YIP", 34, true));
-    employees.back().AddDependent(Dependent("Lua YIP", 3, new Education("Happy Kindergarten", 3.5)));
-    employees.back().AddDependent(Dependent("Mio YIP", 1));
-
-    employees.push_back(Employee("Percy TSE", 30, false));
-
-    StringBuffer sb;
-    PrettyWriter<StringBuffer> writer(sb);
-
-    writer.StartArray();
-    for (std::vector<Employee>::const_iterator employeeItr = employees.begin(); employeeItr != employees.end(); ++employeeItr)
-        employeeItr->Serialize(writer);
-    writer.EndArray();
-
-    puts(sb.GetString());
-
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/example/simpledom/simpledom.cpp b/src/sioclient/lib/rapidjson/example/simpledom/simpledom.cpp
deleted file mode 100644
index 80384199..00000000
--- a/src/sioclient/lib/rapidjson/example/simpledom/simpledom.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// JSON simple example
-// This example does not handle errors.
-
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include <iostream>
-
-using namespace rapidjson;
-
-int main() {
-    // 1. Parse a JSON string into DOM.
-    const char* json = "{\"project\":\"rapidjson\",\"stars\":10}";
-    Document d;
-    d.Parse(json);
-
-    // 2. Modify it by DOM.
-    Value& s = d["stars"];
-    s.SetInt(s.GetInt() + 1);
-
-    // 3. Stringify the DOM
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    d.Accept(writer);
-
-    // Output {"project":"rapidjson","stars":11}
-    std::cout << buffer.GetString() << std::endl;
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/example/simplepullreader/simplepullreader.cpp b/src/sioclient/lib/rapidjson/example/simplepullreader/simplepullreader.cpp
deleted file mode 100644
index a4fb1161..00000000
--- a/src/sioclient/lib/rapidjson/example/simplepullreader/simplepullreader.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "rapidjson/reader.h"
-#include <iostream>
-#include <sstream>
-
-using namespace rapidjson;
-using namespace std;
-
-// If you can require C++11, you could use std::to_string here
-template <typename T> std::string stringify(T x) {
-    std::stringstream ss;
-    ss << x;
-    return ss.str();
-}
-
-struct MyHandler {
-    const char* type;
-    std::string data;
-    
-    MyHandler() : type(), data() {}
-
-    bool Null() { type = "Null"; data.clear(); return true; }
-    bool Bool(bool b) { type = "Bool:"; data = b? "true": "false"; return true; }
-    bool Int(int i) { type = "Int:"; data = stringify(i); return true; }
-    bool Uint(unsigned u) { type = "Uint:"; data = stringify(u); return true; }
-    bool Int64(int64_t i) { type = "Int64:"; data = stringify(i); return true; }
-    bool Uint64(uint64_t u) { type = "Uint64:"; data = stringify(u); return true; }
-    bool Double(double d) { type = "Double:"; data = stringify(d); return true; }
-    bool RawNumber(const char* str, SizeType length, bool) { type = "Number:"; data = std::string(str, length); return true; }
-    bool String(const char* str, SizeType length, bool) { type = "String:"; data = std::string(str, length); return true; }
-    bool StartObject() { type = "StartObject"; data.clear(); return true; }
-    bool Key(const char* str, SizeType length, bool) { type = "Key:"; data = std::string(str, length); return true; }
-    bool EndObject(SizeType memberCount) { type = "EndObject:"; data = stringify(memberCount); return true; }
-    bool StartArray() { type = "StartArray"; data.clear(); return true; }
-    bool EndArray(SizeType elementCount) { type = "EndArray:"; data = stringify(elementCount); return true; }
-private:
-    MyHandler(const MyHandler& noCopyConstruction);
-    MyHandler& operator=(const MyHandler& noAssignment);
-};
-
-int main() {
-    const char json[] = " { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ";
-
-    MyHandler handler;
-    Reader reader;
-    StringStream ss(json);
-    reader.IterativeParseInit();
-    while (!reader.IterativeParseComplete()) {
-        reader.IterativeParseNext<kParseDefaultFlags>(ss, handler);
-        cout << handler.type << handler.data << endl;
-    }
-
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/example/simplereader/simplereader.cpp b/src/sioclient/lib/rapidjson/example/simplereader/simplereader.cpp
deleted file mode 100644
index 5aae8a1c..00000000
--- a/src/sioclient/lib/rapidjson/example/simplereader/simplereader.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "rapidjson/reader.h"
-#include <iostream>
-
-using namespace rapidjson;
-using namespace std;
-
-struct MyHandler {
-    bool Null() { cout << "Null()" << endl; return true; }
-    bool Bool(bool b) { cout << "Bool(" << boolalpha << b << ")" << endl; return true; }
-    bool Int(int i) { cout << "Int(" << i << ")" << endl; return true; }
-    bool Uint(unsigned u) { cout << "Uint(" << u << ")" << endl; return true; }
-    bool Int64(int64_t i) { cout << "Int64(" << i << ")" << endl; return true; }
-    bool Uint64(uint64_t u) { cout << "Uint64(" << u << ")" << endl; return true; }
-    bool Double(double d) { cout << "Double(" << d << ")" << endl; return true; }
-    bool RawNumber(const char* str, SizeType length, bool copy) { 
-        cout << "Number(" << str << ", " << length << ", " << boolalpha << copy << ")" << endl;
-        return true;
-    }
-    bool String(const char* str, SizeType length, bool copy) { 
-        cout << "String(" << str << ", " << length << ", " << boolalpha << copy << ")" << endl;
-        return true;
-    }
-    bool StartObject() { cout << "StartObject()" << endl; return true; }
-    bool Key(const char* str, SizeType length, bool copy) {
-        cout << "Key(" << str << ", " << length << ", " << boolalpha << copy << ")" << endl;
-        return true;
-    }
-    bool EndObject(SizeType memberCount) { cout << "EndObject(" << memberCount << ")" << endl; return true; }
-    bool StartArray() { cout << "StartArray()" << endl; return true; }
-    bool EndArray(SizeType elementCount) { cout << "EndArray(" << elementCount << ")" << endl; return true; }
-};
-
-int main() {
-    const char json[] = " { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ";
-
-    MyHandler handler;
-    Reader reader;
-    StringStream ss(json);
-    reader.Parse(ss, handler);
-
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/example/simplewriter/simplewriter.cpp b/src/sioclient/lib/rapidjson/example/simplewriter/simplewriter.cpp
deleted file mode 100644
index 8d1275c2..00000000
--- a/src/sioclient/lib/rapidjson/example/simplewriter/simplewriter.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include <iostream>
-
-using namespace rapidjson;
-using namespace std;
-
-int main() {
-    StringBuffer s;
-    Writer<StringBuffer> writer(s);
-    
-    writer.StartObject();               // Between StartObject()/EndObject(), 
-    writer.Key("hello");                // output a key,
-    writer.String("world");             // follow by a value.
-    writer.Key("t");
-    writer.Bool(true);
-    writer.Key("f");
-    writer.Bool(false);
-    writer.Key("n");
-    writer.Null();
-    writer.Key("i");
-    writer.Uint(123);
-    writer.Key("pi");
-    writer.Double(3.1416);
-    writer.Key("a");
-    writer.StartArray();                // Between StartArray()/EndArray(),
-    for (unsigned i = 0; i < 4; i++)
-        writer.Uint(i);                 // all values are elements of the array.
-    writer.EndArray();
-    writer.EndObject();
-
-    // {"hello":"world","t":true,"f":false,"n":null,"i":123,"pi":3.1416,"a":[0,1,2,3]}
-    cout << s.GetString() << endl;
-
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/example/tutorial/tutorial.cpp b/src/sioclient/lib/rapidjson/example/tutorial/tutorial.cpp
deleted file mode 100644
index c8bfcc14..00000000
--- a/src/sioclient/lib/rapidjson/example/tutorial/tutorial.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// Hello World example
-// This example shows basic usage of DOM-style API.
-
-#include "rapidjson/document.h"     // rapidjson's DOM-style API
-#include "rapidjson/prettywriter.h" // for stringify JSON
-#include <cstdio>
-
-using namespace rapidjson;
-using namespace std;
-
-int main(int, char*[]) {
-    ////////////////////////////////////////////////////////////////////////////
-    // 1. Parse a JSON text string to a document.
-
-    const char json[] = " { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ";
-    printf("Original JSON:\n %s\n", json);
-
-    Document document;  // Default template parameter uses UTF8 and MemoryPoolAllocator.
-
-#if 0
-    // "normal" parsing, decode strings to new buffers. Can use other input stream via ParseStream().
-    if (document.Parse(json).HasParseError())
-        return 1;
-#else
-    // In-situ parsing, decode strings directly in the source string. Source must be string.
-    char buffer[sizeof(json)];
-    memcpy(buffer, json, sizeof(json));
-    if (document.ParseInsitu(buffer).HasParseError())
-        return 1;
-#endif
-
-    printf("\nParsing to document succeeded.\n");
-
-    ////////////////////////////////////////////////////////////////////////////
-    // 2. Access values in document. 
-
-    printf("\nAccess values in document:\n");
-    assert(document.IsObject());    // Document is a JSON value represents the root of DOM. Root can be either an object or array.
-
-    assert(document.HasMember("hello"));
-    assert(document["hello"].IsString());
-    printf("hello = %s\n", document["hello"].GetString());
-
-    // Since version 0.2, you can use single lookup to check the existing of member and its value:
-    Value::MemberIterator hello = document.FindMember("hello");
-    assert(hello != document.MemberEnd());
-    assert(hello->value.IsString());
-    assert(strcmp("world", hello->value.GetString()) == 0);
-    (void)hello;
-
-    assert(document["t"].IsBool());     // JSON true/false are bool. Can also uses more specific function IsTrue().
-    printf("t = %s\n", document["t"].GetBool() ? "true" : "false");
-
-    assert(document["f"].IsBool());
-    printf("f = %s\n", document["f"].GetBool() ? "true" : "false");
-
-    printf("n = %s\n", document["n"].IsNull() ? "null" : "?");
-
-    assert(document["i"].IsNumber());   // Number is a JSON type, but C++ needs more specific type.
-    assert(document["i"].IsInt());      // In this case, IsUint()/IsInt64()/IsUInt64() also return true.
-    printf("i = %d\n", document["i"].GetInt()); // Alternative (int)document["i"]
-
-    assert(document["pi"].IsNumber());
-    assert(document["pi"].IsDouble());
-    printf("pi = %g\n", document["pi"].GetDouble());
-
-    {
-        const Value& a = document["a"]; // Using a reference for consecutive access is handy and faster.
-        assert(a.IsArray());
-        for (SizeType i = 0; i < a.Size(); i++) // rapidjson uses SizeType instead of size_t.
-            printf("a[%d] = %d\n", i, a[i].GetInt());
-        
-        int y = a[0].GetInt();
-        (void)y;
-
-        // Iterating array with iterators
-        printf("a = ");
-        for (Value::ConstValueIterator itr = a.Begin(); itr != a.End(); ++itr)
-            printf("%d ", itr->GetInt());
-        printf("\n");
-    }
-
-    // Iterating object members
-    static const char* kTypeNames[] = { "Null", "False", "True", "Object", "Array", "String", "Number" };
-    for (Value::ConstMemberIterator itr = document.MemberBegin(); itr != document.MemberEnd(); ++itr)
-        printf("Type of member %s is %s\n", itr->name.GetString(), kTypeNames[itr->value.GetType()]);
-
-    ////////////////////////////////////////////////////////////////////////////
-    // 3. Modify values in document.
-
-    // Change i to a bigger number
-    {
-        uint64_t f20 = 1;   // compute factorial of 20
-        for (uint64_t j = 1; j <= 20; j++)
-            f20 *= j;
-        document["i"] = f20;    // Alternate form: document["i"].SetUint64(f20)
-        assert(!document["i"].IsInt()); // No longer can be cast as int or uint.
-    }
-
-    // Adding values to array.
-    {
-        Value& a = document["a"];   // This time we uses non-const reference.
-        Document::AllocatorType& allocator = document.GetAllocator();
-        for (int i = 5; i <= 10; i++)
-            a.PushBack(i, allocator);   // May look a bit strange, allocator is needed for potentially realloc. We normally uses the document's.
-
-        // Fluent API
-        a.PushBack("Lua", allocator).PushBack("Mio", allocator);
-    }
-
-    // Making string values.
-
-    // This version of SetString() just store the pointer to the string.
-    // So it is for literal and string that exists within value's life-cycle.
-    {
-        document["hello"] = "rapidjson";    // This will invoke strlen()
-        // Faster version:
-        // document["hello"].SetString("rapidjson", 9);
-    }
-
-    // This version of SetString() needs an allocator, which means it will allocate a new buffer and copy the the string into the buffer.
-    Value author;
-    {
-        char buffer2[10];
-        int len = sprintf(buffer2, "%s %s", "Milo", "Yip");  // synthetic example of dynamically created string.
-
-        author.SetString(buffer2, static_cast<SizeType>(len), document.GetAllocator());
-        // Shorter but slower version:
-        // document["hello"].SetString(buffer, document.GetAllocator());
-
-        // Constructor version: 
-        // Value author(buffer, len, document.GetAllocator());
-        // Value author(buffer, document.GetAllocator());
-        memset(buffer2, 0, sizeof(buffer2)); // For demonstration purpose.
-    }
-    // Variable 'buffer' is unusable now but 'author' has already made a copy.
-    document.AddMember("author", author, document.GetAllocator());
-
-    assert(author.IsNull());        // Move semantic for assignment. After this variable is assigned as a member, the variable becomes null.
-
-    ////////////////////////////////////////////////////////////////////////////
-    // 4. Stringify JSON
-
-    printf("\nModified JSON with reformatting:\n");
-    StringBuffer sb;
-    PrettyWriter<StringBuffer> writer(sb);
-    document.Accept(writer);    // Accept() traverses the DOM and generates Handler events.
-    puts(sb.GetString());
-
-    return 0;
-}
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/allocators.h b/src/sioclient/lib/rapidjson/include/rapidjson/allocators.h
deleted file mode 100644
index 06b34204..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/allocators.h
+++ /dev/null
@@ -1,284 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ALLOCATORS_H_
-#define RAPIDJSON_ALLOCATORS_H_
-
-#include "rapidjson.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// Allocator
-
-/*! \class rapidjson::Allocator
-    \brief Concept for allocating, resizing and freeing memory block.
-    
-    Note that Malloc() and Realloc() are non-static but Free() is static.
-    
-    So if an allocator need to support Free(), it needs to put its pointer in 
-    the header of memory block.
-
-\code
-concept Allocator {
-    static const bool kNeedFree;    //!< Whether this allocator needs to call Free().
-
-    // Allocate a memory block.
-    // \param size of the memory block in bytes.
-    // \returns pointer to the memory block.
-    void* Malloc(size_t size);
-
-    // Resize a memory block.
-    // \param originalPtr The pointer to current memory block. Null pointer is permitted.
-    // \param originalSize The current size in bytes. (Design issue: since some allocator may not book-keep this, explicitly pass to it can save memory.)
-    // \param newSize the new size in bytes.
-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize);
-
-    // Free a memory block.
-    // \param pointer to the memory block. Null pointer is permitted.
-    static void Free(void *ptr);
-};
-\endcode
-*/
-
-
-/*! \def RAPIDJSON_ALLOCATOR_DEFUALT_CHUNK_CAPACITY
-    \ingroup RAPIDJSON_CONFIG
-    \brief User-defined kDefaultChunkCapacity definition.
-
-    User can define this as any \c size that is a power of 2.
-*/
-
-#ifndef RAPIDJSON_ALLOCATOR_DEFAULT_CHUNK_CAPACITY
-#define RAPIDJSON_ALLOCATOR_DEFAULT_CHUNK_CAPACITY (64 * 1024)
-#endif
-
-
-///////////////////////////////////////////////////////////////////////////////
-// CrtAllocator
-
-//! C-runtime library allocator.
-/*! This class is just wrapper for standard C library memory routines.
-    \note implements Allocator concept
-*/
-class CrtAllocator {
-public:
-    static const bool kNeedFree = true;
-    void* Malloc(size_t size) { 
-        if (size) //  behavior of malloc(0) is implementation defined.
-            return std::malloc(size);
-        else
-            return NULL; // standardize to returning NULL.
-    }
-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
-        (void)originalSize;
-        if (newSize == 0) {
-            std::free(originalPtr);
-            return NULL;
-        }
-        return std::realloc(originalPtr, newSize);
-    }
-    static void Free(void *ptr) { std::free(ptr); }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// MemoryPoolAllocator
-
-//! Default memory allocator used by the parser and DOM.
-/*! This allocator allocate memory blocks from pre-allocated memory chunks. 
-
-    It does not free memory blocks. And Realloc() only allocate new memory.
-
-    The memory chunks are allocated by BaseAllocator, which is CrtAllocator by default.
-
-    User may also supply a buffer as the first chunk.
-
-    If the user-buffer is full then additional chunks are allocated by BaseAllocator.
-
-    The user-buffer is not deallocated by this allocator.
-
-    \tparam BaseAllocator the allocator type for allocating memory chunks. Default is CrtAllocator.
-    \note implements Allocator concept
-*/
-template <typename BaseAllocator = CrtAllocator>
-class MemoryPoolAllocator {
-public:
-    static const bool kNeedFree = false;    //!< Tell users that no need to call Free() with this allocator. (concept Allocator)
-
-    //! Constructor with chunkSize.
-    /*! \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
-        \param baseAllocator The allocator for allocating memory chunks.
-    */
-    MemoryPoolAllocator(size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) : 
-        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(0), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
-    {
-    }
-
-    //! Constructor with user-supplied buffer.
-    /*! The user buffer will be used firstly. When it is full, memory pool allocates new chunk with chunk size.
-
-        The user buffer will not be deallocated when this allocator is destructed.
-
-        \param buffer User supplied buffer.
-        \param size Size of the buffer in bytes. It must at least larger than sizeof(ChunkHeader).
-        \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
-        \param baseAllocator The allocator for allocating memory chunks.
-    */
-    MemoryPoolAllocator(void *buffer, size_t size, size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) :
-        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(buffer), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
-    {
-        RAPIDJSON_ASSERT(buffer != 0);
-        RAPIDJSON_ASSERT(size > sizeof(ChunkHeader));
-        chunkHead_ = reinterpret_cast<ChunkHeader*>(buffer);
-        chunkHead_->capacity = size - sizeof(ChunkHeader);
-        chunkHead_->size = 0;
-        chunkHead_->next = 0;
-    }
-
-    //! Destructor.
-    /*! This deallocates all memory chunks, excluding the user-supplied buffer.
-    */
-    ~MemoryPoolAllocator() {
-        Clear();
-        RAPIDJSON_DELETE(ownBaseAllocator_);
-    }
-
-    //! Deallocates all memory chunks, excluding the user-supplied buffer.
-    void Clear() {
-        while (chunkHead_ && chunkHead_ != userBuffer_) {
-            ChunkHeader* next = chunkHead_->next;
-            baseAllocator_->Free(chunkHead_);
-            chunkHead_ = next;
-        }
-        if (chunkHead_ && chunkHead_ == userBuffer_)
-            chunkHead_->size = 0; // Clear user buffer
-    }
-
-    //! Computes the total capacity of allocated memory chunks.
-    /*! \return total capacity in bytes.
-    */
-    size_t Capacity() const {
-        size_t capacity = 0;
-        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
-            capacity += c->capacity;
-        return capacity;
-    }
-
-    //! Computes the memory blocks allocated.
-    /*! \return total used bytes.
-    */
-    size_t Size() const {
-        size_t size = 0;
-        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
-            size += c->size;
-        return size;
-    }
-
-    //! Allocates a memory block. (concept Allocator)
-    void* Malloc(size_t size) {
-        if (!size)
-            return NULL;
-
-        size = RAPIDJSON_ALIGN(size);
-        if (chunkHead_ == 0 || chunkHead_->size + size > chunkHead_->capacity)
-            if (!AddChunk(chunk_capacity_ > size ? chunk_capacity_ : size))
-                return NULL;
-
-        void *buffer = reinterpret_cast<char *>(chunkHead_) + RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size;
-        chunkHead_->size += size;
-        return buffer;
-    }
-
-    //! Resizes a memory block (concept Allocator)
-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
-        if (originalPtr == 0)
-            return Malloc(newSize);
-
-        if (newSize == 0)
-            return NULL;
-
-        originalSize = RAPIDJSON_ALIGN(originalSize);
-        newSize = RAPIDJSON_ALIGN(newSize);
-
-        // Do not shrink if new size is smaller than original
-        if (originalSize >= newSize)
-            return originalPtr;
-
-        // Simply expand it if it is the last allocation and there is sufficient space
-        if (originalPtr == reinterpret_cast<char *>(chunkHead_) + RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size - originalSize) {
-            size_t increment = static_cast<size_t>(newSize - originalSize);
-            if (chunkHead_->size + increment <= chunkHead_->capacity) {
-                chunkHead_->size += increment;
-                return originalPtr;
-            }
-        }
-
-        // Realloc process: allocate and copy memory, do not free original buffer.
-        if (void* newBuffer = Malloc(newSize)) {
-            if (originalSize)
-                std::memcpy(newBuffer, originalPtr, originalSize);
-            return newBuffer;
-        }
-        else
-            return NULL;
-    }
-
-    //! Frees a memory block (concept Allocator)
-    static void Free(void *ptr) { (void)ptr; } // Do nothing
-
-private:
-    //! Copy constructor is not permitted.
-    MemoryPoolAllocator(const MemoryPoolAllocator& rhs) /* = delete */;
-    //! Copy assignment operator is not permitted.
-    MemoryPoolAllocator& operator=(const MemoryPoolAllocator& rhs) /* = delete */;
-
-    //! Creates a new chunk.
-    /*! \param capacity Capacity of the chunk in bytes.
-        \return true if success.
-    */
-    bool AddChunk(size_t capacity) {
-        if (!baseAllocator_)
-            ownBaseAllocator_ = baseAllocator_ = RAPIDJSON_NEW(BaseAllocator)();
-        if (ChunkHeader* chunk = reinterpret_cast<ChunkHeader*>(baseAllocator_->Malloc(RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + capacity))) {
-            chunk->capacity = capacity;
-            chunk->size = 0;
-            chunk->next = chunkHead_;
-            chunkHead_ =  chunk;
-            return true;
-        }
-        else
-            return false;
-    }
-
-    static const int kDefaultChunkCapacity = RAPIDJSON_ALLOCATOR_DEFAULT_CHUNK_CAPACITY; //!< Default chunk capacity.
-
-    //! Chunk header for perpending to each chunk.
-    /*! Chunks are stored as a singly linked list.
-    */
-    struct ChunkHeader {
-        size_t capacity;    //!< Capacity of the chunk in bytes (excluding the header itself).
-        size_t size;        //!< Current size of allocated memory in bytes.
-        ChunkHeader *next;  //!< Next chunk in the linked list.
-    };
-
-    ChunkHeader *chunkHead_;    //!< Head of the chunk linked-list. Only the head chunk serves allocation.
-    size_t chunk_capacity_;     //!< The minimum capacity of chunk when they are allocated.
-    void *userBuffer_;          //!< User supplied buffer.
-    BaseAllocator* baseAllocator_;  //!< base allocator for allocating memory chunks.
-    BaseAllocator* ownBaseAllocator_;   //!< base allocator created by this object.
-};
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_ENCODINGS_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/cursorstreamwrapper.h b/src/sioclient/lib/rapidjson/include/rapidjson/cursorstreamwrapper.h
deleted file mode 100644
index 52c11a7c..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/cursorstreamwrapper.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_CURSORSTREAMWRAPPER_H_
-#define RAPIDJSON_CURSORSTREAMWRAPPER_H_
-
-#include "stream.h"
-
-#if defined(__GNUC__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER <= 1800
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4702)  // unreachable code
-RAPIDJSON_DIAG_OFF(4512)  // assignment operator could not be generated
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-
-//! Cursor stream wrapper for counting line and column number if error exists.
-/*!
-    \tparam InputStream     Any stream that implements Stream Concept
-*/
-template <typename InputStream, typename Encoding = UTF8<> >
-class CursorStreamWrapper : public GenericStreamWrapper<InputStream, Encoding> {
-public:
-    typedef typename Encoding::Ch Ch;
-
-    CursorStreamWrapper(InputStream& is):
-        GenericStreamWrapper<InputStream, Encoding>(is), line_(1), col_(0) {}
-
-    // counting line and column number
-    Ch Take() {
-        Ch ch = this->is_.Take();
-        if(ch == '\n') {
-            line_ ++;
-            col_ = 0;
-        } else {
-            col_ ++;
-        }
-        return ch;
-    }
-
-    //! Get the error line number, if error exists.
-    size_t GetLine() const { return line_; }
-    //! Get the error column number, if error exists.
-    size_t GetColumn() const { return col_; }
-
-private:
-    size_t line_;   //!< Current Line
-    size_t col_;    //!< Current Column
-};
-
-#if defined(_MSC_VER) && _MSC_VER <= 1800
-RAPIDJSON_DIAG_POP
-#endif
-
-#if defined(__GNUC__)
-RAPIDJSON_DIAG_POP
-#endif
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_CURSORSTREAMWRAPPER_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/document.h b/src/sioclient/lib/rapidjson/include/rapidjson/document.h
deleted file mode 100644
index d25c5c0a..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/document.h
+++ /dev/null
@@ -1,2658 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_DOCUMENT_H_
-#define RAPIDJSON_DOCUMENT_H_
-
-/*! \file document.h */
-
-#include "reader.h"
-#include "internal/meta.h"
-#include "internal/strfunc.h"
-#include "memorystream.h"
-#include "encodedstream.h"
-#include <new>      // placement new
-#include <limits>
-
-RAPIDJSON_DIAG_PUSH
-#ifdef __clang__
-RAPIDJSON_DIAG_OFF(padded)
-RAPIDJSON_DIAG_OFF(switch-enum)
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#elif defined(_MSC_VER)
-RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
-RAPIDJSON_DIAG_OFF(4244) // conversion from kXxxFlags to 'uint16_t', possible loss of data
-#endif
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_OFF(effc++)
-#if __GNUC__ >= 6
-RAPIDJSON_DIAG_OFF(terminate) // ignore throwing RAPIDJSON_ASSERT in RAPIDJSON_NOEXCEPT functions
-#endif
-#endif // __GNUC__
-
-#ifndef RAPIDJSON_NOMEMBERITERATORCLASS
-#include <iterator> // std::random_access_iterator_tag
-#endif
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-#include <utility> // std::move
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-// Forward declaration.
-template <typename Encoding, typename Allocator>
-class GenericValue;
-
-template <typename Encoding, typename Allocator, typename StackAllocator>
-class GenericDocument;
-
-//! Name-value pair in a JSON object value.
-/*!
-    This class was internal to GenericValue. It used to be a inner struct.
-    But a compiler (IBM XL C/C++ for AIX) have reported to have problem with that so it moved as a namespace scope struct.
-    https://code.google.com/p/rapidjson/issues/detail?id=64
-*/
-template <typename Encoding, typename Allocator> 
-struct GenericMember { 
-    GenericValue<Encoding, Allocator> name;     //!< name of member (must be a string)
-    GenericValue<Encoding, Allocator> value;    //!< value of member.
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericMemberIterator
-
-#ifndef RAPIDJSON_NOMEMBERITERATORCLASS
-
-//! (Constant) member iterator for a JSON object value
-/*!
-    \tparam Const Is this a constant iterator?
-    \tparam Encoding    Encoding of the value. (Even non-string values need to have the same encoding in a document)
-    \tparam Allocator   Allocator type for allocating memory of object, array and string.
-
-    This class implements a Random Access Iterator for GenericMember elements
-    of a GenericValue, see ISO/IEC 14882:2003(E) C++ standard, 24.1 [lib.iterator.requirements].
-
-    \note This iterator implementation is mainly intended to avoid implicit
-        conversions from iterator values to \c NULL,
-        e.g. from GenericValue::FindMember.
-
-    \note Define \c RAPIDJSON_NOMEMBERITERATORCLASS to fall back to a
-        pointer-based implementation, if your platform doesn't provide
-        the C++ <iterator> header.
-
-    \see GenericMember, GenericValue::MemberIterator, GenericValue::ConstMemberIterator
- */
-template <bool Const, typename Encoding, typename Allocator>
-class GenericMemberIterator {
-
-    friend class GenericValue<Encoding,Allocator>;
-    template <bool, typename, typename> friend class GenericMemberIterator;
-
-    typedef GenericMember<Encoding,Allocator> PlainType;
-    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
-
-public:
-    //! Iterator type itself
-    typedef GenericMemberIterator Iterator;
-    //! Constant iterator type
-    typedef GenericMemberIterator<true,Encoding,Allocator>  ConstIterator;
-    //! Non-constant iterator type
-    typedef GenericMemberIterator<false,Encoding,Allocator> NonConstIterator;
-
-    /** \name std::iterator_traits support */
-    //@{
-    typedef ValueType      value_type;
-    typedef ValueType *    pointer;
-    typedef ValueType &    reference;
-    typedef std::ptrdiff_t difference_type;
-    typedef std::random_access_iterator_tag iterator_category;
-    //@}
-
-    //! Pointer to (const) GenericMember
-    typedef pointer         Pointer;
-    //! Reference to (const) GenericMember
-    typedef reference       Reference;
-    //! Signed integer type (e.g. \c ptrdiff_t)
-    typedef difference_type DifferenceType;
-
-    //! Default constructor (singular value)
-    /*! Creates an iterator pointing to no element.
-        \note All operations, except for comparisons, are undefined on such values.
-     */
-    GenericMemberIterator() : ptr_() {}
-
-    //! Iterator conversions to more const
-    /*!
-        \param it (Non-const) iterator to copy from
-
-        Allows the creation of an iterator from another GenericMemberIterator
-        that is "less const".  Especially, creating a non-constant iterator
-        from a constant iterator are disabled:
-        \li const -> non-const (not ok)
-        \li const -> const (ok)
-        \li non-const -> const (ok)
-        \li non-const -> non-const (ok)
-
-        \note If the \c Const template parameter is already \c false, this
-            constructor effectively defines a regular copy-constructor.
-            Otherwise, the copy constructor is implicitly defined.
-    */
-    GenericMemberIterator(const NonConstIterator & it) : ptr_(it.ptr_) {}
-    Iterator& operator=(const NonConstIterator & it) { ptr_ = it.ptr_; return *this; }
-
-    //! @name stepping
-    //@{
-    Iterator& operator++(){ ++ptr_; return *this; }
-    Iterator& operator--(){ --ptr_; return *this; }
-    Iterator  operator++(int){ Iterator old(*this); ++ptr_; return old; }
-    Iterator  operator--(int){ Iterator old(*this); --ptr_; return old; }
-    //@}
-
-    //! @name increment/decrement
-    //@{
-    Iterator operator+(DifferenceType n) const { return Iterator(ptr_+n); }
-    Iterator operator-(DifferenceType n) const { return Iterator(ptr_-n); }
-
-    Iterator& operator+=(DifferenceType n) { ptr_+=n; return *this; }
-    Iterator& operator-=(DifferenceType n) { ptr_-=n; return *this; }
-    //@}
-
-    //! @name relations
-    //@{
-    bool operator==(ConstIterator that) const { return ptr_ == that.ptr_; }
-    bool operator!=(ConstIterator that) const { return ptr_ != that.ptr_; }
-    bool operator<=(ConstIterator that) const { return ptr_ <= that.ptr_; }
-    bool operator>=(ConstIterator that) const { return ptr_ >= that.ptr_; }
-    bool operator< (ConstIterator that) const { return ptr_ < that.ptr_; }
-    bool operator> (ConstIterator that) const { return ptr_ > that.ptr_; }
-    //@}
-
-    //! @name dereference
-    //@{
-    Reference operator*() const { return *ptr_; }
-    Pointer   operator->() const { return ptr_; }
-    Reference operator[](DifferenceType n) const { return ptr_[n]; }
-    //@}
-
-    //! Distance
-    DifferenceType operator-(ConstIterator that) const { return ptr_-that.ptr_; }
-
-private:
-    //! Internal constructor from plain pointer
-    explicit GenericMemberIterator(Pointer p) : ptr_(p) {}
-
-    Pointer ptr_; //!< raw pointer
-};
-
-#else // RAPIDJSON_NOMEMBERITERATORCLASS
-
-// class-based member iterator implementation disabled, use plain pointers
-
-template <bool Const, typename Encoding, typename Allocator>
-struct GenericMemberIterator;
-
-//! non-const GenericMemberIterator
-template <typename Encoding, typename Allocator>
-struct GenericMemberIterator<false,Encoding,Allocator> {
-    //! use plain pointer as iterator type
-    typedef GenericMember<Encoding,Allocator>* Iterator;
-};
-//! const GenericMemberIterator
-template <typename Encoding, typename Allocator>
-struct GenericMemberIterator<true,Encoding,Allocator> {
-    //! use plain const pointer as iterator type
-    typedef const GenericMember<Encoding,Allocator>* Iterator;
-};
-
-#endif // RAPIDJSON_NOMEMBERITERATORCLASS
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericStringRef
-
-//! Reference to a constant string (not taking a copy)
-/*!
-    \tparam CharType character type of the string
-
-    This helper class is used to automatically infer constant string
-    references for string literals, especially from \c const \b (!)
-    character arrays.
-
-    The main use is for creating JSON string values without copying the
-    source string via an \ref Allocator.  This requires that the referenced
-    string pointers have a sufficient lifetime, which exceeds the lifetime
-    of the associated GenericValue.
-
-    \b Example
-    \code
-    Value v("foo");   // ok, no need to copy & calculate length
-    const char foo[] = "foo";
-    v.SetString(foo); // ok
-
-    const char* bar = foo;
-    // Value x(bar); // not ok, can't rely on bar's lifetime
-    Value x(StringRef(bar)); // lifetime explicitly guaranteed by user
-    Value y(StringRef(bar, 3));  // ok, explicitly pass length
-    \endcode
-
-    \see StringRef, GenericValue::SetString
-*/
-template<typename CharType>
-struct GenericStringRef {
-    typedef CharType Ch; //!< character type of the string
-
-    //! Create string reference from \c const character array
-#ifndef __clang__ // -Wdocumentation
-    /*!
-        This constructor implicitly creates a constant string reference from
-        a \c const character array.  It has better performance than
-        \ref StringRef(const CharType*) by inferring the string \ref length
-        from the array length, and also supports strings containing null
-        characters.
-
-        \tparam N length of the string, automatically inferred
-
-        \param str Constant character array, lifetime assumed to be longer
-            than the use of the string in e.g. a GenericValue
-
-        \post \ref s == str
-
-        \note Constant complexity.
-        \note There is a hidden, private overload to disallow references to
-            non-const character arrays to be created via this constructor.
-            By this, e.g. function-scope arrays used to be filled via
-            \c snprintf are excluded from consideration.
-            In such cases, the referenced string should be \b copied to the
-            GenericValue instead.
-     */
-#endif
-    template<SizeType N>
-    GenericStringRef(const CharType (&str)[N]) RAPIDJSON_NOEXCEPT
-        : s(str), length(N-1) {}
-
-    //! Explicitly create string reference from \c const character pointer
-#ifndef __clang__ // -Wdocumentation
-    /*!
-        This constructor can be used to \b explicitly  create a reference to
-        a constant string pointer.
-
-        \see StringRef(const CharType*)
-
-        \param str Constant character pointer, lifetime assumed to be longer
-            than the use of the string in e.g. a GenericValue
-
-        \post \ref s == str
-
-        \note There is a hidden, private overload to disallow references to
-            non-const character arrays to be created via this constructor.
-            By this, e.g. function-scope arrays used to be filled via
-            \c snprintf are excluded from consideration.
-            In such cases, the referenced string should be \b copied to the
-            GenericValue instead.
-     */
-#endif
-    explicit GenericStringRef(const CharType* str)
-        : s(str), length(NotNullStrLen(str)) {}
-
-    //! Create constant string reference from pointer and length
-#ifndef __clang__ // -Wdocumentation
-    /*! \param str constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
-        \param len length of the string, excluding the trailing NULL terminator
-
-        \post \ref s == str && \ref length == len
-        \note Constant complexity.
-     */
-#endif
-    GenericStringRef(const CharType* str, SizeType len)
-        : s(RAPIDJSON_LIKELY(str) ? str : emptyString), length(len) { RAPIDJSON_ASSERT(str != 0 || len == 0u); }
-
-    GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
-
-    //! implicit conversion to plain CharType pointer
-    operator const Ch *() const { return s; }
-
-    const Ch* const s; //!< plain CharType pointer
-    const SizeType length; //!< length of the string (excluding the trailing NULL terminator)
-
-private:
-    SizeType NotNullStrLen(const CharType* str) {
-        RAPIDJSON_ASSERT(str != 0);
-        return internal::StrLen(str);
-    }
-
-    /// Empty string - used when passing in a NULL pointer
-    static const Ch emptyString[];
-
-    //! Disallow construction from non-const array
-    template<SizeType N>
-    GenericStringRef(CharType (&str)[N]) /* = delete */;
-    //! Copy assignment operator not permitted - immutable type
-    GenericStringRef& operator=(const GenericStringRef& rhs) /* = delete */;
-};
-
-template<typename CharType>
-const CharType GenericStringRef<CharType>::emptyString[] = { CharType() };
-
-//! Mark a character pointer as constant string
-/*! Mark a plain character pointer as a "string literal".  This function
-    can be used to avoid copying a character string to be referenced as a
-    value in a JSON GenericValue object, if the string's lifetime is known
-    to be valid long enough.
-    \tparam CharType Character type of the string
-    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
-    \return GenericStringRef string reference object
-    \relatesalso GenericStringRef
-
-    \see GenericValue::GenericValue(StringRefType), GenericValue::operator=(StringRefType), GenericValue::SetString(StringRefType), GenericValue::PushBack(StringRefType, Allocator&), GenericValue::AddMember
-*/
-template<typename CharType>
-inline GenericStringRef<CharType> StringRef(const CharType* str) {
-    return GenericStringRef<CharType>(str);
-}
-
-//! Mark a character pointer as constant string
-/*! Mark a plain character pointer as a "string literal".  This function
-    can be used to avoid copying a character string to be referenced as a
-    value in a JSON GenericValue object, if the string's lifetime is known
-    to be valid long enough.
-
-    This version has better performance with supplied length, and also
-    supports string containing null characters.
-
-    \tparam CharType character type of the string
-    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
-    \param length The length of source string.
-    \return GenericStringRef string reference object
-    \relatesalso GenericStringRef
-*/
-template<typename CharType>
-inline GenericStringRef<CharType> StringRef(const CharType* str, size_t length) {
-    return GenericStringRef<CharType>(str, SizeType(length));
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-//! Mark a string object as constant string
-/*! Mark a string object (e.g. \c std::string) as a "string literal".
-    This function can be used to avoid copying a string to be referenced as a
-    value in a JSON GenericValue object, if the string's lifetime is known
-    to be valid long enough.
-
-    \tparam CharType character type of the string
-    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
-    \return GenericStringRef string reference object
-    \relatesalso GenericStringRef
-    \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
-*/
-template<typename CharType>
-inline GenericStringRef<CharType> StringRef(const std::basic_string<CharType>& str) {
-    return GenericStringRef<CharType>(str.data(), SizeType(str.size()));
-}
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericValue type traits
-namespace internal {
-
-template <typename T, typename Encoding = void, typename Allocator = void>
-struct IsGenericValueImpl : FalseType {};
-
-// select candidates according to nested encoding and allocator types
-template <typename T> struct IsGenericValueImpl<T, typename Void<typename T::EncodingType>::Type, typename Void<typename T::AllocatorType>::Type>
-    : IsBaseOf<GenericValue<typename T::EncodingType, typename T::AllocatorType>, T>::Type {};
-
-// helper to match arbitrary GenericValue instantiations, including derived classes
-template <typename T> struct IsGenericValue : IsGenericValueImpl<T>::Type {};
-
-} // namespace internal
-
-///////////////////////////////////////////////////////////////////////////////
-// TypeHelper
-
-namespace internal {
-
-template <typename ValueType, typename T>
-struct TypeHelper {};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, bool> {
-    static bool Is(const ValueType& v) { return v.IsBool(); }
-    static bool Get(const ValueType& v) { return v.GetBool(); }
-    static ValueType& Set(ValueType& v, bool data) { return v.SetBool(data); }
-    static ValueType& Set(ValueType& v, bool data, typename ValueType::AllocatorType&) { return v.SetBool(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, int> {
-    static bool Is(const ValueType& v) { return v.IsInt(); }
-    static int Get(const ValueType& v) { return v.GetInt(); }
-    static ValueType& Set(ValueType& v, int data) { return v.SetInt(data); }
-    static ValueType& Set(ValueType& v, int data, typename ValueType::AllocatorType&) { return v.SetInt(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, unsigned> {
-    static bool Is(const ValueType& v) { return v.IsUint(); }
-    static unsigned Get(const ValueType& v) { return v.GetUint(); }
-    static ValueType& Set(ValueType& v, unsigned data) { return v.SetUint(data); }
-    static ValueType& Set(ValueType& v, unsigned data, typename ValueType::AllocatorType&) { return v.SetUint(data); }
-};
-
-#ifdef _MSC_VER
-RAPIDJSON_STATIC_ASSERT(sizeof(long) == sizeof(int));
-template<typename ValueType>
-struct TypeHelper<ValueType, long> {
-    static bool Is(const ValueType& v) { return v.IsInt(); }
-    static long Get(const ValueType& v) { return v.GetInt(); }
-    static ValueType& Set(ValueType& v, long data) { return v.SetInt(data); }
-    static ValueType& Set(ValueType& v, long data, typename ValueType::AllocatorType&) { return v.SetInt(data); }
-};
-
-RAPIDJSON_STATIC_ASSERT(sizeof(unsigned long) == sizeof(unsigned));
-template<typename ValueType>
-struct TypeHelper<ValueType, unsigned long> {
-    static bool Is(const ValueType& v) { return v.IsUint(); }
-    static unsigned long Get(const ValueType& v) { return v.GetUint(); }
-    static ValueType& Set(ValueType& v, unsigned long data) { return v.SetUint(data); }
-    static ValueType& Set(ValueType& v, unsigned long data, typename ValueType::AllocatorType&) { return v.SetUint(data); }
-};
-#endif
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, int64_t> {
-    static bool Is(const ValueType& v) { return v.IsInt64(); }
-    static int64_t Get(const ValueType& v) { return v.GetInt64(); }
-    static ValueType& Set(ValueType& v, int64_t data) { return v.SetInt64(data); }
-    static ValueType& Set(ValueType& v, int64_t data, typename ValueType::AllocatorType&) { return v.SetInt64(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, uint64_t> {
-    static bool Is(const ValueType& v) { return v.IsUint64(); }
-    static uint64_t Get(const ValueType& v) { return v.GetUint64(); }
-    static ValueType& Set(ValueType& v, uint64_t data) { return v.SetUint64(data); }
-    static ValueType& Set(ValueType& v, uint64_t data, typename ValueType::AllocatorType&) { return v.SetUint64(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, double> {
-    static bool Is(const ValueType& v) { return v.IsDouble(); }
-    static double Get(const ValueType& v) { return v.GetDouble(); }
-    static ValueType& Set(ValueType& v, double data) { return v.SetDouble(data); }
-    static ValueType& Set(ValueType& v, double data, typename ValueType::AllocatorType&) { return v.SetDouble(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, float> {
-    static bool Is(const ValueType& v) { return v.IsFloat(); }
-    static float Get(const ValueType& v) { return v.GetFloat(); }
-    static ValueType& Set(ValueType& v, float data) { return v.SetFloat(data); }
-    static ValueType& Set(ValueType& v, float data, typename ValueType::AllocatorType&) { return v.SetFloat(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, const typename ValueType::Ch*> {
-    typedef const typename ValueType::Ch* StringType;
-    static bool Is(const ValueType& v) { return v.IsString(); }
-    static StringType Get(const ValueType& v) { return v.GetString(); }
-    static ValueType& Set(ValueType& v, const StringType data) { return v.SetString(typename ValueType::StringRefType(data)); }
-    static ValueType& Set(ValueType& v, const StringType data, typename ValueType::AllocatorType& a) { return v.SetString(data, a); }
-};
-
-#if RAPIDJSON_HAS_STDSTRING
-template<typename ValueType> 
-struct TypeHelper<ValueType, std::basic_string<typename ValueType::Ch> > {
-    typedef std::basic_string<typename ValueType::Ch> StringType;
-    static bool Is(const ValueType& v) { return v.IsString(); }
-    static StringType Get(const ValueType& v) { return StringType(v.GetString(), v.GetStringLength()); }
-    static ValueType& Set(ValueType& v, const StringType& data, typename ValueType::AllocatorType& a) { return v.SetString(data, a); }
-};
-#endif
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, typename ValueType::Array> {
-    typedef typename ValueType::Array ArrayType;
-    static bool Is(const ValueType& v) { return v.IsArray(); }
-    static ArrayType Get(ValueType& v) { return v.GetArray(); }
-    static ValueType& Set(ValueType& v, ArrayType data) { return v = data; }
-    static ValueType& Set(ValueType& v, ArrayType data, typename ValueType::AllocatorType&) { return v = data; }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, typename ValueType::ConstArray> {
-    typedef typename ValueType::ConstArray ArrayType;
-    static bool Is(const ValueType& v) { return v.IsArray(); }
-    static ArrayType Get(const ValueType& v) { return v.GetArray(); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, typename ValueType::Object> {
-    typedef typename ValueType::Object ObjectType;
-    static bool Is(const ValueType& v) { return v.IsObject(); }
-    static ObjectType Get(ValueType& v) { return v.GetObject(); }
-    static ValueType& Set(ValueType& v, ObjectType data) { return v = data; }
-    static ValueType& Set(ValueType& v, ObjectType data, typename ValueType::AllocatorType&) { return v = data; }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, typename ValueType::ConstObject> {
-    typedef typename ValueType::ConstObject ObjectType;
-    static bool Is(const ValueType& v) { return v.IsObject(); }
-    static ObjectType Get(const ValueType& v) { return v.GetObject(); }
-};
-
-} // namespace internal
-
-// Forward declarations
-template <bool, typename> class GenericArray;
-template <bool, typename> class GenericObject;
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericValue
-
-//! Represents a JSON value. Use Value for UTF8 encoding and default allocator.
-/*!
-    A JSON value can be one of 7 types. This class is a variant type supporting
-    these types.
-
-    Use the Value if UTF8 and default allocator
-
-    \tparam Encoding    Encoding of the value. (Even non-string values need to have the same encoding in a document)
-    \tparam Allocator   Allocator type for allocating memory of object, array and string.
-*/
-template <typename Encoding, typename Allocator = MemoryPoolAllocator<> > 
-class GenericValue {
-public:
-    //! Name-value pair in an object.
-    typedef GenericMember<Encoding, Allocator> Member;
-    typedef Encoding EncodingType;                  //!< Encoding type from template parameter.
-    typedef Allocator AllocatorType;                //!< Allocator type from template parameter.
-    typedef typename Encoding::Ch Ch;               //!< Character type derived from Encoding.
-    typedef GenericStringRef<Ch> StringRefType;     //!< Reference to a constant string
-    typedef typename GenericMemberIterator<false,Encoding,Allocator>::Iterator MemberIterator;  //!< Member iterator for iterating in object.
-    typedef typename GenericMemberIterator<true,Encoding,Allocator>::Iterator ConstMemberIterator;  //!< Constant member iterator for iterating in object.
-    typedef GenericValue* ValueIterator;            //!< Value iterator for iterating in array.
-    typedef const GenericValue* ConstValueIterator; //!< Constant value iterator for iterating in array.
-    typedef GenericValue<Encoding, Allocator> ValueType;    //!< Value type of itself.
-    typedef GenericArray<false, ValueType> Array;
-    typedef GenericArray<true, ValueType> ConstArray;
-    typedef GenericObject<false, ValueType> Object;
-    typedef GenericObject<true, ValueType> ConstObject;
-
-    //!@name Constructors and destructor.
-    //@{
-
-    //! Default constructor creates a null value.
-    GenericValue() RAPIDJSON_NOEXCEPT : data_() { data_.f.flags = kNullFlag; }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move constructor in C++11
-    GenericValue(GenericValue&& rhs) RAPIDJSON_NOEXCEPT : data_(rhs.data_) {
-        rhs.data_.f.flags = kNullFlag; // give up contents
-    }
-#endif
-
-private:
-    //! Copy constructor is not permitted.
-    GenericValue(const GenericValue& rhs);
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Moving from a GenericDocument is not permitted.
-    template <typename StackAllocator>
-    GenericValue(GenericDocument<Encoding,Allocator,StackAllocator>&& rhs);
-
-    //! Move assignment from a GenericDocument is not permitted.
-    template <typename StackAllocator>
-    GenericValue& operator=(GenericDocument<Encoding,Allocator,StackAllocator>&& rhs);
-#endif
-
-public:
-
-    //! Constructor with JSON value type.
-    /*! This creates a Value of specified type with default content.
-        \param type Type of the value.
-        \note Default content for number is zero.
-    */
-    explicit GenericValue(Type type) RAPIDJSON_NOEXCEPT : data_() {
-        static const uint16_t defaultFlags[7] = {
-            kNullFlag, kFalseFlag, kTrueFlag, kObjectFlag, kArrayFlag, kShortStringFlag,
-            kNumberAnyFlag
-        };
-        RAPIDJSON_ASSERT(type >= kNullType && type <= kNumberType);
-        data_.f.flags = defaultFlags[type];
-
-        // Use ShortString to store empty string.
-        if (type == kStringType)
-            data_.ss.SetLength(0);
-    }
-
-    //! Explicit copy constructor (with allocator)
-    /*! Creates a copy of a Value by using the given Allocator
-        \tparam SourceAllocator allocator of \c rhs
-        \param rhs Value to copy from (read-only)
-        \param allocator Allocator for allocating copied elements and buffers. Commonly use GenericDocument::GetAllocator().
-        \param copyConstStrings Force copying of constant strings (e.g. referencing an in-situ buffer)
-        \see CopyFrom()
-    */
-    template <typename SourceAllocator>
-    GenericValue(const GenericValue<Encoding,SourceAllocator>& rhs, Allocator& allocator, bool copyConstStrings = false) {
-        switch (rhs.GetType()) {
-        case kObjectType: {
-                SizeType count = rhs.data_.o.size;
-                Member* lm = reinterpret_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
-                const typename GenericValue<Encoding,SourceAllocator>::Member* rm = rhs.GetMembersPointer();
-                for (SizeType i = 0; i < count; i++) {
-                    new (&lm[i].name) GenericValue(rm[i].name, allocator, copyConstStrings);
-                    new (&lm[i].value) GenericValue(rm[i].value, allocator, copyConstStrings);
-                }
-                data_.f.flags = kObjectFlag;
-                data_.o.size = data_.o.capacity = count;
-                SetMembersPointer(lm);
-            }
-            break;
-        case kArrayType: {
-                SizeType count = rhs.data_.a.size;
-                GenericValue* le = reinterpret_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
-                const GenericValue<Encoding,SourceAllocator>* re = rhs.GetElementsPointer();
-                for (SizeType i = 0; i < count; i++)
-                    new (&le[i]) GenericValue(re[i], allocator, copyConstStrings);
-                data_.f.flags = kArrayFlag;
-                data_.a.size = data_.a.capacity = count;
-                SetElementsPointer(le);
-            }
-            break;
-        case kStringType:
-            if (rhs.data_.f.flags == kConstStringFlag && !copyConstStrings) {
-                data_.f.flags = rhs.data_.f.flags;
-                data_  = *reinterpret_cast<const Data*>(&rhs.data_);
-            }
-            else
-                SetStringRaw(StringRef(rhs.GetString(), rhs.GetStringLength()), allocator);
-            break;
-        default:
-            data_.f.flags = rhs.data_.f.flags;
-            data_  = *reinterpret_cast<const Data*>(&rhs.data_);
-            break;
-        }
-    }
-
-    //! Constructor for boolean value.
-    /*! \param b Boolean value
-        \note This constructor is limited to \em real boolean values and rejects
-            implicitly converted types like arbitrary pointers.  Use an explicit cast
-            to \c bool, if you want to construct a boolean JSON value in such cases.
-     */
-#ifndef RAPIDJSON_DOXYGEN_RUNNING // hide SFINAE from Doxygen
-    template <typename T>
-    explicit GenericValue(T b, RAPIDJSON_ENABLEIF((internal::IsSame<bool, T>))) RAPIDJSON_NOEXCEPT  // See #472
-#else
-    explicit GenericValue(bool b) RAPIDJSON_NOEXCEPT
-#endif
-        : data_() {
-            // safe-guard against failing SFINAE
-            RAPIDJSON_STATIC_ASSERT((internal::IsSame<bool,T>::Value));
-            data_.f.flags = b ? kTrueFlag : kFalseFlag;
-    }
-
-    //! Constructor for int value.
-    explicit GenericValue(int i) RAPIDJSON_NOEXCEPT : data_() {
-        data_.n.i64 = i;
-        data_.f.flags = (i >= 0) ? (kNumberIntFlag | kUintFlag | kUint64Flag) : kNumberIntFlag;
-    }
-
-    //! Constructor for unsigned value.
-    explicit GenericValue(unsigned u) RAPIDJSON_NOEXCEPT : data_() {
-        data_.n.u64 = u; 
-        data_.f.flags = (u & 0x80000000) ? kNumberUintFlag : (kNumberUintFlag | kIntFlag | kInt64Flag);
-    }
-
-    //! Constructor for int64_t value.
-    explicit GenericValue(int64_t i64) RAPIDJSON_NOEXCEPT : data_() {
-        data_.n.i64 = i64;
-        data_.f.flags = kNumberInt64Flag;
-        if (i64 >= 0) {
-            data_.f.flags |= kNumberUint64Flag;
-            if (!(static_cast<uint64_t>(i64) & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
-                data_.f.flags |= kUintFlag;
-            if (!(static_cast<uint64_t>(i64) & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-                data_.f.flags |= kIntFlag;
-        }
-        else if (i64 >= static_cast<int64_t>(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-            data_.f.flags |= kIntFlag;
-    }
-
-    //! Constructor for uint64_t value.
-    explicit GenericValue(uint64_t u64) RAPIDJSON_NOEXCEPT : data_() {
-        data_.n.u64 = u64;
-        data_.f.flags = kNumberUint64Flag;
-        if (!(u64 & RAPIDJSON_UINT64_C2(0x80000000, 0x00000000)))
-            data_.f.flags |= kInt64Flag;
-        if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
-            data_.f.flags |= kUintFlag;
-        if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-            data_.f.flags |= kIntFlag;
-    }
-
-    //! Constructor for double value.
-    explicit GenericValue(double d) RAPIDJSON_NOEXCEPT : data_() { data_.n.d = d; data_.f.flags = kNumberDoubleFlag; }
-
-    //! Constructor for float value.
-    explicit GenericValue(float f) RAPIDJSON_NOEXCEPT : data_() { data_.n.d = static_cast<double>(f); data_.f.flags = kNumberDoubleFlag; }
-
-    //! Constructor for constant string (i.e. do not make a copy of string)
-    GenericValue(const Ch* s, SizeType length) RAPIDJSON_NOEXCEPT : data_() { SetStringRaw(StringRef(s, length)); }
-
-    //! Constructor for constant string (i.e. do not make a copy of string)
-    explicit GenericValue(StringRefType s) RAPIDJSON_NOEXCEPT : data_() { SetStringRaw(s); }
-
-    //! Constructor for copy-string (i.e. do make a copy of string)
-    GenericValue(const Ch* s, SizeType length, Allocator& allocator) : data_() { SetStringRaw(StringRef(s, length), allocator); }
-
-    //! Constructor for copy-string (i.e. do make a copy of string)
-    GenericValue(const Ch*s, Allocator& allocator) : data_() { SetStringRaw(StringRef(s), allocator); }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Constructor for copy-string from a string object (i.e. do make a copy of string)
-    /*! \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
-     */
-    GenericValue(const std::basic_string<Ch>& s, Allocator& allocator) : data_() { SetStringRaw(StringRef(s), allocator); }
-#endif
-
-    //! Constructor for Array.
-    /*!
-        \param a An array obtained by \c GetArray().
-        \note \c Array is always pass-by-value.
-        \note the source array is moved into this value and the sourec array becomes empty.
-    */
-    GenericValue(Array a) RAPIDJSON_NOEXCEPT : data_(a.value_.data_) {
-        a.value_.data_ = Data();
-        a.value_.data_.f.flags = kArrayFlag;
-    }
-
-    //! Constructor for Object.
-    /*!
-        \param o An object obtained by \c GetObject().
-        \note \c Object is always pass-by-value.
-        \note the source object is moved into this value and the sourec object becomes empty.
-    */
-    GenericValue(Object o) RAPIDJSON_NOEXCEPT : data_(o.value_.data_) {
-        o.value_.data_ = Data();
-        o.value_.data_.f.flags = kObjectFlag;
-    }
-
-    //! Destructor.
-    /*! Need to destruct elements of array, members of object, or copy-string.
-    */
-    ~GenericValue() {
-        if (Allocator::kNeedFree) { // Shortcut by Allocator's trait
-            switch(data_.f.flags) {
-            case kArrayFlag:
-                {
-                    GenericValue* e = GetElementsPointer();
-                    for (GenericValue* v = e; v != e + data_.a.size; ++v)
-                        v->~GenericValue();
-                    Allocator::Free(e);
-                }
-                break;
-
-            case kObjectFlag:
-                for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
-                    m->~Member();
-                Allocator::Free(GetMembersPointer());
-                break;
-
-            case kCopyStringFlag:
-                Allocator::Free(const_cast<Ch*>(GetStringPointer()));
-                break;
-
-            default:
-                break;  // Do nothing for other types.
-            }
-        }
-    }
-
-    //@}
-
-    //!@name Assignment operators
-    //@{
-
-    //! Assignment with move semantics.
-    /*! \param rhs Source of the assignment. It will become a null value after assignment.
-    */
-    GenericValue& operator=(GenericValue& rhs) RAPIDJSON_NOEXCEPT {
-        RAPIDJSON_ASSERT(this != &rhs);
-        this->~GenericValue();
-        RawAssign(rhs);
-        return *this;
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move assignment in C++11
-    GenericValue& operator=(GenericValue&& rhs) RAPIDJSON_NOEXCEPT {
-        return *this = rhs.Move();
-    }
-#endif
-
-    //! Assignment of constant string reference (no copy)
-    /*! \param str Constant string reference to be assigned
-        \note This overload is needed to avoid clashes with the generic primitive type assignment overload below.
-        \see GenericStringRef, operator=(T)
-    */
-    GenericValue& operator=(StringRefType str) RAPIDJSON_NOEXCEPT {
-        GenericValue s(str);
-        return *this = s;
-    }
-
-    //! Assignment with primitive types.
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
-        \param value The value to be assigned.
-
-        \note The source type \c T explicitly disallows all pointer types,
-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
-            referencing character strings with insufficient lifetime, use
-            \ref SetString(const Ch*, Allocator&) (for copying) or
-            \ref StringRef() (to explicitly mark the pointer as constant) instead.
-            All other pointer types would implicitly convert to \c bool,
-            use \ref SetBool() instead.
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::IsPointer<T>), (GenericValue&))
-    operator=(T value) {
-        GenericValue v(value);
-        return *this = v;
-    }
-
-    //! Deep-copy assignment from Value
-    /*! Assigns a \b copy of the Value to the current Value object
-        \tparam SourceAllocator Allocator type of \c rhs
-        \param rhs Value to copy from (read-only)
-        \param allocator Allocator to use for copying
-        \param copyConstStrings Force copying of constant strings (e.g. referencing an in-situ buffer)
-     */
-    template <typename SourceAllocator>
-    GenericValue& CopyFrom(const GenericValue<Encoding, SourceAllocator>& rhs, Allocator& allocator, bool copyConstStrings = false) {
-        RAPIDJSON_ASSERT(static_cast<void*>(this) != static_cast<void const*>(&rhs));
-        this->~GenericValue();
-        new (this) GenericValue(rhs, allocator, copyConstStrings);
-        return *this;
-    }
-
-    //! Exchange the contents of this value with those of other.
-    /*!
-        \param other Another value.
-        \note Constant complexity.
-    */
-    GenericValue& Swap(GenericValue& other) RAPIDJSON_NOEXCEPT {
-        GenericValue temp;
-        temp.RawAssign(*this);
-        RawAssign(other);
-        other.RawAssign(temp);
-        return *this;
-    }
-
-    //! free-standing swap function helper
-    /*!
-        Helper function to enable support for common swap implementation pattern based on \c std::swap:
-        \code
-        void swap(MyClass& a, MyClass& b) {
-            using std::swap;
-            swap(a.value, b.value);
-            // ...
-        }
-        \endcode
-        \see Swap()
-     */
-    friend inline void swap(GenericValue& a, GenericValue& b) RAPIDJSON_NOEXCEPT { a.Swap(b); }
-
-    //! Prepare Value for move semantics
-    /*! \return *this */
-    GenericValue& Move() RAPIDJSON_NOEXCEPT { return *this; }
-    //@}
-
-    //!@name Equal-to and not-equal-to operators
-    //@{
-    //! Equal-to operator
-    /*!
-        \note If an object contains duplicated named member, comparing equality with any object is always \c false.
-        \note Linear time complexity (number of all values in the subtree and total lengths of all strings).
-    */
-    template <typename SourceAllocator>
-    bool operator==(const GenericValue<Encoding, SourceAllocator>& rhs) const {
-        typedef GenericValue<Encoding, SourceAllocator> RhsType;
-        if (GetType() != rhs.GetType())
-            return false;
-
-        switch (GetType()) {
-        case kObjectType: // Warning: O(n^2) inner-loop
-            if (data_.o.size != rhs.data_.o.size)
-                return false;           
-            for (ConstMemberIterator lhsMemberItr = MemberBegin(); lhsMemberItr != MemberEnd(); ++lhsMemberItr) {
-                typename RhsType::ConstMemberIterator rhsMemberItr = rhs.FindMember(lhsMemberItr->name);
-                if (rhsMemberItr == rhs.MemberEnd() || lhsMemberItr->value != rhsMemberItr->value)
-                    return false;
-            }
-            return true;
-            
-        case kArrayType:
-            if (data_.a.size != rhs.data_.a.size)
-                return false;
-            for (SizeType i = 0; i < data_.a.size; i++)
-                if ((*this)[i] != rhs[i])
-                    return false;
-            return true;
-
-        case kStringType:
-            return StringEqual(rhs);
-
-        case kNumberType:
-            if (IsDouble() || rhs.IsDouble()) {
-                double a = GetDouble();     // May convert from integer to double.
-                double b = rhs.GetDouble(); // Ditto
-                return a >= b && a <= b;    // Prevent -Wfloat-equal
-            }
-            else
-                return data_.n.u64 == rhs.data_.n.u64;
-
-        default:
-            return true;
-        }
-    }
-
-    //! Equal-to operator with const C-string pointer
-    bool operator==(const Ch* rhs) const { return *this == GenericValue(StringRef(rhs)); }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Equal-to operator with string object
-    /*! \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
-     */
-    bool operator==(const std::basic_string<Ch>& rhs) const { return *this == GenericValue(StringRef(rhs)); }
-#endif
-
-    //! Equal-to operator with primitive types
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c double, \c true, \c false
-    */
-    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>,internal::IsGenericValue<T> >), (bool)) operator==(const T& rhs) const { return *this == GenericValue(rhs); }
-
-    //! Not-equal-to operator
-    /*! \return !(*this == rhs)
-     */
-    template <typename SourceAllocator>
-    bool operator!=(const GenericValue<Encoding, SourceAllocator>& rhs) const { return !(*this == rhs); }
-
-    //! Not-equal-to operator with const C-string pointer
-    bool operator!=(const Ch* rhs) const { return !(*this == rhs); }
-
-    //! Not-equal-to operator with arbitrary types
-    /*! \return !(*this == rhs)
-     */
-    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator!=(const T& rhs) const { return !(*this == rhs); }
-
-    //! Equal-to operator with arbitrary types (symmetric version)
-    /*! \return (rhs == lhs)
-     */
-    template <typename T> friend RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator==(const T& lhs, const GenericValue& rhs) { return rhs == lhs; }
-
-    //! Not-Equal-to operator with arbitrary types (symmetric version)
-    /*! \return !(rhs == lhs)
-     */
-    template <typename T> friend RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator!=(const T& lhs, const GenericValue& rhs) { return !(rhs == lhs); }
-    //@}
-
-    //!@name Type
-    //@{
-
-    Type GetType()  const { return static_cast<Type>(data_.f.flags & kTypeMask); }
-    bool IsNull()   const { return data_.f.flags == kNullFlag; }
-    bool IsFalse()  const { return data_.f.flags == kFalseFlag; }
-    bool IsTrue()   const { return data_.f.flags == kTrueFlag; }
-    bool IsBool()   const { return (data_.f.flags & kBoolFlag) != 0; }
-    bool IsObject() const { return data_.f.flags == kObjectFlag; }
-    bool IsArray()  const { return data_.f.flags == kArrayFlag; }
-    bool IsNumber() const { return (data_.f.flags & kNumberFlag) != 0; }
-    bool IsInt()    const { return (data_.f.flags & kIntFlag) != 0; }
-    bool IsUint()   const { return (data_.f.flags & kUintFlag) != 0; }
-    bool IsInt64()  const { return (data_.f.flags & kInt64Flag) != 0; }
-    bool IsUint64() const { return (data_.f.flags & kUint64Flag) != 0; }
-    bool IsDouble() const { return (data_.f.flags & kDoubleFlag) != 0; }
-    bool IsString() const { return (data_.f.flags & kStringFlag) != 0; }
-
-    // Checks whether a number can be losslessly converted to a double.
-    bool IsLosslessDouble() const {
-        if (!IsNumber()) return false;
-        if (IsUint64()) {
-            uint64_t u = GetUint64();
-            volatile double d = static_cast<double>(u);
-            return (d >= 0.0)
-                && (d < static_cast<double>((std::numeric_limits<uint64_t>::max)()))
-                && (u == static_cast<uint64_t>(d));
-        }
-        if (IsInt64()) {
-            int64_t i = GetInt64();
-            volatile double d = static_cast<double>(i);
-            return (d >= static_cast<double>((std::numeric_limits<int64_t>::min)()))
-                && (d < static_cast<double>((std::numeric_limits<int64_t>::max)()))
-                && (i == static_cast<int64_t>(d));
-        }
-        return true; // double, int, uint are always lossless
-    }
-
-    // Checks whether a number is a float (possible lossy).
-    bool IsFloat() const  {
-        if ((data_.f.flags & kDoubleFlag) == 0)
-            return false;
-        double d = GetDouble();
-        return d >= -3.4028234e38 && d <= 3.4028234e38;
-    }
-    // Checks whether a number can be losslessly converted to a float.
-    bool IsLosslessFloat() const {
-        if (!IsNumber()) return false;
-        double a = GetDouble();
-        if (a < static_cast<double>(-(std::numeric_limits<float>::max)())
-                || a > static_cast<double>((std::numeric_limits<float>::max)()))
-            return false;
-        double b = static_cast<double>(static_cast<float>(a));
-        return a >= b && a <= b;    // Prevent -Wfloat-equal
-    }
-
-    //@}
-
-    //!@name Null
-    //@{
-
-    GenericValue& SetNull() { this->~GenericValue(); new (this) GenericValue(); return *this; }
-
-    //@}
-
-    //!@name Bool
-    //@{
-
-    bool GetBool() const { RAPIDJSON_ASSERT(IsBool()); return data_.f.flags == kTrueFlag; }
-    //!< Set boolean value
-    /*! \post IsBool() == true */
-    GenericValue& SetBool(bool b) { this->~GenericValue(); new (this) GenericValue(b); return *this; }
-
-    //@}
-
-    //!@name Object
-    //@{
-
-    //! Set this value as an empty object.
-    /*! \post IsObject() == true */
-    GenericValue& SetObject() { this->~GenericValue(); new (this) GenericValue(kObjectType); return *this; }
-
-    //! Get the number of members in the object.
-    SizeType MemberCount() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.size; }
-
-    //! Get the capacity of object.
-    SizeType MemberCapacity() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.capacity; }
-
-    //! Check whether the object is empty.
-    bool ObjectEmpty() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.size == 0; }
-
-    //! Get a value from an object associated with the name.
-    /*! \pre IsObject() == true
-        \tparam T Either \c Ch or \c const \c Ch (template used for disambiguation with \ref operator[](SizeType))
-        \note In version 0.1x, if the member is not found, this function returns a null value. This makes issue 7.
-        Since 0.2, if the name is not correct, it will assert.
-        If user is unsure whether a member exists, user should use HasMember() first.
-        A better approach is to use FindMember().
-        \note Linear time complexity.
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >),(GenericValue&)) operator[](T* name) {
-        GenericValue n(StringRef(name));
-        return (*this)[n];
-    }
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >),(const GenericValue&)) operator[](T* name) const { return const_cast<GenericValue&>(*this)[name]; }
-
-    //! Get a value from an object associated with the name.
-    /*! \pre IsObject() == true
-        \tparam SourceAllocator Allocator of the \c name value
-
-        \note Compared to \ref operator[](T*), this version is faster because it does not need a StrLen().
-        And it can also handle strings with embedded null characters.
-
-        \note Linear time complexity.
-    */
-    template <typename SourceAllocator>
-    GenericValue& operator[](const GenericValue<Encoding, SourceAllocator>& name) {
-        MemberIterator member = FindMember(name);
-        if (member != MemberEnd())
-            return member->value;
-        else {
-            RAPIDJSON_ASSERT(false);    // see above note
-
-            // This will generate -Wexit-time-destructors in clang
-            // static GenericValue NullValue;
-            // return NullValue;
-
-            // Use static buffer and placement-new to prevent destruction
-            static char buffer[sizeof(GenericValue)];
-            return *new (buffer) GenericValue();
-        }
-    }
-    template <typename SourceAllocator>
-    const GenericValue& operator[](const GenericValue<Encoding, SourceAllocator>& name) const { return const_cast<GenericValue&>(*this)[name]; }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Get a value from an object associated with name (string object).
-    GenericValue& operator[](const std::basic_string<Ch>& name) { return (*this)[GenericValue(StringRef(name))]; }
-    const GenericValue& operator[](const std::basic_string<Ch>& name) const { return (*this)[GenericValue(StringRef(name))]; }
-#endif
-
-    //! Const member iterator
-    /*! \pre IsObject() == true */
-    ConstMemberIterator MemberBegin() const { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(GetMembersPointer()); }
-    //! Const \em past-the-end member iterator
-    /*! \pre IsObject() == true */
-    ConstMemberIterator MemberEnd() const   { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(GetMembersPointer() + data_.o.size); }
-    //! Member iterator
-    /*! \pre IsObject() == true */
-    MemberIterator MemberBegin()            { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(GetMembersPointer()); }
-    //! \em Past-the-end member iterator
-    /*! \pre IsObject() == true */
-    MemberIterator MemberEnd()              { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(GetMembersPointer() + data_.o.size); }
-
-    //! Request the object to have enough capacity to store members.
-    /*! \param newCapacity  The capacity that the object at least need to have.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \note Linear time complexity.
-    */
-    GenericValue& MemberReserve(SizeType newCapacity, Allocator &allocator) {
-        RAPIDJSON_ASSERT(IsObject());
-        if (newCapacity > data_.o.capacity) {
-            SetMembersPointer(reinterpret_cast<Member*>(allocator.Realloc(GetMembersPointer(), data_.o.capacity * sizeof(Member), newCapacity * sizeof(Member))));
-            data_.o.capacity = newCapacity;
-        }
-        return *this;
-    }
-
-    //! Check whether a member exists in the object.
-    /*!
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Whether a member with that name exists.
-        \note It is better to use FindMember() directly if you need the obtain the value as well.
-        \note Linear time complexity.
-    */
-    bool HasMember(const Ch* name) const { return FindMember(name) != MemberEnd(); }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Check whether a member exists in the object with string object.
-    /*!
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Whether a member with that name exists.
-        \note It is better to use FindMember() directly if you need the obtain the value as well.
-        \note Linear time complexity.
-    */
-    bool HasMember(const std::basic_string<Ch>& name) const { return FindMember(name) != MemberEnd(); }
-#endif
-
-    //! Check whether a member exists in the object with GenericValue name.
-    /*!
-        This version is faster because it does not need a StrLen(). It can also handle string with null character.
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Whether a member with that name exists.
-        \note It is better to use FindMember() directly if you need the obtain the value as well.
-        \note Linear time complexity.
-    */
-    template <typename SourceAllocator>
-    bool HasMember(const GenericValue<Encoding, SourceAllocator>& name) const { return FindMember(name) != MemberEnd(); }
-
-    //! Find member by name.
-    /*!
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Iterator to member, if it exists.
-            Otherwise returns \ref MemberEnd().
-
-        \note Earlier versions of Rapidjson returned a \c NULL pointer, in case
-            the requested member doesn't exist. For consistency with e.g.
-            \c std::map, this has been changed to MemberEnd() now.
-        \note Linear time complexity.
-    */
-    MemberIterator FindMember(const Ch* name) {
-        GenericValue n(StringRef(name));
-        return FindMember(n);
-    }
-
-    ConstMemberIterator FindMember(const Ch* name) const { return const_cast<GenericValue&>(*this).FindMember(name); }
-
-    //! Find member by name.
-    /*!
-        This version is faster because it does not need a StrLen(). It can also handle string with null character.
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Iterator to member, if it exists.
-            Otherwise returns \ref MemberEnd().
-
-        \note Earlier versions of Rapidjson returned a \c NULL pointer, in case
-            the requested member doesn't exist. For consistency with e.g.
-            \c std::map, this has been changed to MemberEnd() now.
-        \note Linear time complexity.
-    */
-    template <typename SourceAllocator>
-    MemberIterator FindMember(const GenericValue<Encoding, SourceAllocator>& name) {
-        RAPIDJSON_ASSERT(IsObject());
-        RAPIDJSON_ASSERT(name.IsString());
-        MemberIterator member = MemberBegin();
-        for ( ; member != MemberEnd(); ++member)
-            if (name.StringEqual(member->name))
-                break;
-        return member;
-    }
-    template <typename SourceAllocator> ConstMemberIterator FindMember(const GenericValue<Encoding, SourceAllocator>& name) const { return const_cast<GenericValue&>(*this).FindMember(name); }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Find member by string object name.
-    /*!
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Iterator to member, if it exists.
-            Otherwise returns \ref MemberEnd().
-    */
-    MemberIterator FindMember(const std::basic_string<Ch>& name) { return FindMember(GenericValue(StringRef(name))); }
-    ConstMemberIterator FindMember(const std::basic_string<Ch>& name) const { return FindMember(GenericValue(StringRef(name))); }
-#endif
-
-    //! Add a member (name-value pair) to the object.
-    /*! \param name A string value as name of member.
-        \param value Value of any type.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \note The ownership of \c name and \c value will be transferred to this object on success.
-        \pre  IsObject() && name.IsString()
-        \post name.IsNull() && value.IsNull()
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(GenericValue& name, GenericValue& value, Allocator& allocator) {
-        RAPIDJSON_ASSERT(IsObject());
-        RAPIDJSON_ASSERT(name.IsString());
-
-        ObjectData& o = data_.o;
-        if (o.size >= o.capacity)
-            MemberReserve(o.capacity == 0 ? kDefaultObjectCapacity : (o.capacity + (o.capacity + 1) / 2), allocator);
-        Member* members = GetMembersPointer();
-        members[o.size].name.RawAssign(name);
-        members[o.size].value.RawAssign(value);
-        o.size++;
-        return *this;
-    }
-
-    //! Add a constant string value as member (name-value pair) to the object.
-    /*! \param name A string value as name of member.
-        \param value constant string reference as value of member.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-        \note This overload is needed to avoid clashes with the generic primitive type AddMember(GenericValue&,T,Allocator&) overload below.
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(GenericValue& name, StringRefType value, Allocator& allocator) {
-        GenericValue v(value);
-        return AddMember(name, v, allocator);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Add a string object as member (name-value pair) to the object.
-    /*! \param name A string value as name of member.
-        \param value constant string reference as value of member.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-        \note This overload is needed to avoid clashes with the generic primitive type AddMember(GenericValue&,T,Allocator&) overload below.
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(GenericValue& name, std::basic_string<Ch>& value, Allocator& allocator) {
-        GenericValue v(value, allocator);
-        return AddMember(name, v, allocator);
-    }
-#endif
-
-    //! Add any primitive value as member (name-value pair) to the object.
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
-        \param name A string value as name of member.
-        \param value Value of primitive type \c T as value of member
-        \param allocator Allocator for reallocating memory. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-
-        \note The source type \c T explicitly disallows all pointer types,
-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
-            referencing character strings with insufficient lifetime, use
-            \ref AddMember(StringRefType, GenericValue&, Allocator&) or \ref
-            AddMember(StringRefType, StringRefType, Allocator&).
-            All other pointer types would implicitly convert to \c bool,
-            use an explicit cast instead, if needed.
-        \note Amortized Constant time complexity.
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
-    AddMember(GenericValue& name, T value, Allocator& allocator) {
-        GenericValue v(value);
-        return AddMember(name, v, allocator);
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericValue& AddMember(GenericValue&& name, GenericValue&& value, Allocator& allocator) {
-        return AddMember(name, value, allocator);
-    }
-    GenericValue& AddMember(GenericValue&& name, GenericValue& value, Allocator& allocator) {
-        return AddMember(name, value, allocator);
-    }
-    GenericValue& AddMember(GenericValue& name, GenericValue&& value, Allocator& allocator) {
-        return AddMember(name, value, allocator);
-    }
-    GenericValue& AddMember(StringRefType name, GenericValue&& value, Allocator& allocator) {
-        GenericValue n(name);
-        return AddMember(n, value, allocator);
-    }
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-
-    //! Add a member (name-value pair) to the object.
-    /*! \param name A constant string reference as name of member.
-        \param value Value of any type.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \note The ownership of \c value will be transferred to this object on success.
-        \pre  IsObject()
-        \post value.IsNull()
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(StringRefType name, GenericValue& value, Allocator& allocator) {
-        GenericValue n(name);
-        return AddMember(n, value, allocator);
-    }
-
-    //! Add a constant string value as member (name-value pair) to the object.
-    /*! \param name A constant string reference as name of member.
-        \param value constant string reference as value of member.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-        \note This overload is needed to avoid clashes with the generic primitive type AddMember(StringRefType,T,Allocator&) overload below.
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(StringRefType name, StringRefType value, Allocator& allocator) {
-        GenericValue v(value);
-        return AddMember(name, v, allocator);
-    }
-
-    //! Add any primitive value as member (name-value pair) to the object.
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
-        \param name A constant string reference as name of member.
-        \param value Value of primitive type \c T as value of member
-        \param allocator Allocator for reallocating memory. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-
-        \note The source type \c T explicitly disallows all pointer types,
-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
-            referencing character strings with insufficient lifetime, use
-            \ref AddMember(StringRefType, GenericValue&, Allocator&) or \ref
-            AddMember(StringRefType, StringRefType, Allocator&).
-            All other pointer types would implicitly convert to \c bool,
-            use an explicit cast instead, if needed.
-        \note Amortized Constant time complexity.
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
-    AddMember(StringRefType name, T value, Allocator& allocator) {
-        GenericValue n(name);
-        return AddMember(n, value, allocator);
-    }
-
-    //! Remove all members in the object.
-    /*! This function do not deallocate memory in the object, i.e. the capacity is unchanged.
-        \note Linear time complexity.
-    */
-    void RemoveAllMembers() {
-        RAPIDJSON_ASSERT(IsObject()); 
-        for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
-            m->~Member();
-        data_.o.size = 0;
-    }
-
-    //! Remove a member in object by its name.
-    /*! \param name Name of member to be removed.
-        \return Whether the member existed.
-        \note This function may reorder the object members. Use \ref
-            EraseMember(ConstMemberIterator) if you need to preserve the
-            relative order of the remaining members.
-        \note Linear time complexity.
-    */
-    bool RemoveMember(const Ch* name) {
-        GenericValue n(StringRef(name));
-        return RemoveMember(n);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    bool RemoveMember(const std::basic_string<Ch>& name) { return RemoveMember(GenericValue(StringRef(name))); }
-#endif
-
-    template <typename SourceAllocator>
-    bool RemoveMember(const GenericValue<Encoding, SourceAllocator>& name) {
-        MemberIterator m = FindMember(name);
-        if (m != MemberEnd()) {
-            RemoveMember(m);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    //! Remove a member in object by iterator.
-    /*! \param m member iterator (obtained by FindMember() or MemberBegin()).
-        \return the new iterator after removal.
-        \note This function may reorder the object members. Use \ref
-            EraseMember(ConstMemberIterator) if you need to preserve the
-            relative order of the remaining members.
-        \note Constant time complexity.
-    */
-    MemberIterator RemoveMember(MemberIterator m) {
-        RAPIDJSON_ASSERT(IsObject());
-        RAPIDJSON_ASSERT(data_.o.size > 0);
-        RAPIDJSON_ASSERT(GetMembersPointer() != 0);
-        RAPIDJSON_ASSERT(m >= MemberBegin() && m < MemberEnd());
-
-        MemberIterator last(GetMembersPointer() + (data_.o.size - 1));
-        if (data_.o.size > 1 && m != last)
-            *m = *last; // Move the last one to this place
-        else
-            m->~Member(); // Only one left, just destroy
-        --data_.o.size;
-        return m;
-    }
-
-    //! Remove a member from an object by iterator.
-    /*! \param pos iterator to the member to remove
-        \pre IsObject() == true && \ref MemberBegin() <= \c pos < \ref MemberEnd()
-        \return Iterator following the removed element.
-            If the iterator \c pos refers to the last element, the \ref MemberEnd() iterator is returned.
-        \note This function preserves the relative order of the remaining object
-            members. If you do not need this, use the more efficient \ref RemoveMember(MemberIterator).
-        \note Linear time complexity.
-    */
-    MemberIterator EraseMember(ConstMemberIterator pos) {
-        return EraseMember(pos, pos +1);
-    }
-
-    //! Remove members in the range [first, last) from an object.
-    /*! \param first iterator to the first member to remove
-        \param last  iterator following the last member to remove
-        \pre IsObject() == true && \ref MemberBegin() <= \c first <= \c last <= \ref MemberEnd()
-        \return Iterator following the last removed element.
-        \note This function preserves the relative order of the remaining object
-            members.
-        \note Linear time complexity.
-    */
-    MemberIterator EraseMember(ConstMemberIterator first, ConstMemberIterator last) {
-        RAPIDJSON_ASSERT(IsObject());
-        RAPIDJSON_ASSERT(data_.o.size > 0);
-        RAPIDJSON_ASSERT(GetMembersPointer() != 0);
-        RAPIDJSON_ASSERT(first >= MemberBegin());
-        RAPIDJSON_ASSERT(first <= last);
-        RAPIDJSON_ASSERT(last <= MemberEnd());
-
-        MemberIterator pos = MemberBegin() + (first - MemberBegin());
-        for (MemberIterator itr = pos; itr != last; ++itr)
-            itr->~Member();
-        std::memmove(&*pos, &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member));
-        data_.o.size -= static_cast<SizeType>(last - first);
-        return pos;
-    }
-
-    //! Erase a member in object by its name.
-    /*! \param name Name of member to be removed.
-        \return Whether the member existed.
-        \note Linear time complexity.
-    */
-    bool EraseMember(const Ch* name) {
-        GenericValue n(StringRef(name));
-        return EraseMember(n);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    bool EraseMember(const std::basic_string<Ch>& name) { return EraseMember(GenericValue(StringRef(name))); }
-#endif
-
-    template <typename SourceAllocator>
-    bool EraseMember(const GenericValue<Encoding, SourceAllocator>& name) {
-        MemberIterator m = FindMember(name);
-        if (m != MemberEnd()) {
-            EraseMember(m);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    Object GetObject() { RAPIDJSON_ASSERT(IsObject()); return Object(*this); }
-    ConstObject GetObject() const { RAPIDJSON_ASSERT(IsObject()); return ConstObject(*this); }
-
-    //@}
-
-    //!@name Array
-    //@{
-
-    //! Set this value as an empty array.
-    /*! \post IsArray == true */
-    GenericValue& SetArray() { this->~GenericValue(); new (this) GenericValue(kArrayType); return *this; }
-
-    //! Get the number of elements in array.
-    SizeType Size() const { RAPIDJSON_ASSERT(IsArray()); return data_.a.size; }
-
-    //! Get the capacity of array.
-    SizeType Capacity() const { RAPIDJSON_ASSERT(IsArray()); return data_.a.capacity; }
-
-    //! Check whether the array is empty.
-    bool Empty() const { RAPIDJSON_ASSERT(IsArray()); return data_.a.size == 0; }
-
-    //! Remove all elements in the array.
-    /*! This function do not deallocate memory in the array, i.e. the capacity is unchanged.
-        \note Linear time complexity.
-    */
-    void Clear() {
-        RAPIDJSON_ASSERT(IsArray()); 
-        GenericValue* e = GetElementsPointer();
-        for (GenericValue* v = e; v != e + data_.a.size; ++v)
-            v->~GenericValue();
-        data_.a.size = 0;
-    }
-
-    //! Get an element from array by index.
-    /*! \pre IsArray() == true
-        \param index Zero-based index of element.
-        \see operator[](T*)
-    */
-    GenericValue& operator[](SizeType index) {
-        RAPIDJSON_ASSERT(IsArray());
-        RAPIDJSON_ASSERT(index < data_.a.size);
-        return GetElementsPointer()[index];
-    }
-    const GenericValue& operator[](SizeType index) const { return const_cast<GenericValue&>(*this)[index]; }
-
-    //! Element iterator
-    /*! \pre IsArray() == true */
-    ValueIterator Begin() { RAPIDJSON_ASSERT(IsArray()); return GetElementsPointer(); }
-    //! \em Past-the-end element iterator
-    /*! \pre IsArray() == true */
-    ValueIterator End() { RAPIDJSON_ASSERT(IsArray()); return GetElementsPointer() + data_.a.size; }
-    //! Constant element iterator
-    /*! \pre IsArray() == true */
-    ConstValueIterator Begin() const { return const_cast<GenericValue&>(*this).Begin(); }
-    //! Constant \em past-the-end element iterator
-    /*! \pre IsArray() == true */
-    ConstValueIterator End() const { return const_cast<GenericValue&>(*this).End(); }
-
-    //! Request the array to have enough capacity to store elements.
-    /*! \param newCapacity  The capacity that the array at least need to have.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \note Linear time complexity.
-    */
-    GenericValue& Reserve(SizeType newCapacity, Allocator &allocator) {
-        RAPIDJSON_ASSERT(IsArray());
-        if (newCapacity > data_.a.capacity) {
-            SetElementsPointer(reinterpret_cast<GenericValue*>(allocator.Realloc(GetElementsPointer(), data_.a.capacity * sizeof(GenericValue), newCapacity * sizeof(GenericValue))));
-            data_.a.capacity = newCapacity;
-        }
-        return *this;
-    }
-
-    //! Append a GenericValue at the end of the array.
-    /*! \param value        Value to be appended.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \pre IsArray() == true
-        \post value.IsNull() == true
-        \return The value itself for fluent API.
-        \note The ownership of \c value will be transferred to this array on success.
-        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
-        \note Amortized constant time complexity.
-    */
-    GenericValue& PushBack(GenericValue& value, Allocator& allocator) {
-        RAPIDJSON_ASSERT(IsArray());
-        if (data_.a.size >= data_.a.capacity)
-            Reserve(data_.a.capacity == 0 ? kDefaultArrayCapacity : (data_.a.capacity + (data_.a.capacity + 1) / 2), allocator);
-        GetElementsPointer()[data_.a.size++].RawAssign(value);
-        return *this;
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericValue& PushBack(GenericValue&& value, Allocator& allocator) {
-        return PushBack(value, allocator);
-    }
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-    //! Append a constant string reference at the end of the array.
-    /*! \param value        Constant string reference to be appended.
-        \param allocator    Allocator for reallocating memory. It must be the same one used previously. Commonly use GenericDocument::GetAllocator().
-        \pre IsArray() == true
-        \return The value itself for fluent API.
-        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
-        \note Amortized constant time complexity.
-        \see GenericStringRef
-    */
-    GenericValue& PushBack(StringRefType value, Allocator& allocator) {
-        return (*this).template PushBack<StringRefType>(value, allocator);
-    }
-
-    //! Append a primitive value at the end of the array.
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
-        \param value Value of primitive type T to be appended.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \pre IsArray() == true
-        \return The value itself for fluent API.
-        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
-
-        \note The source type \c T explicitly disallows all pointer types,
-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
-            referencing character strings with insufficient lifetime, use
-            \ref PushBack(GenericValue&, Allocator&) or \ref
-            PushBack(StringRefType, Allocator&).
-            All other pointer types would implicitly convert to \c bool,
-            use an explicit cast instead, if needed.
-        \note Amortized constant time complexity.
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
-    PushBack(T value, Allocator& allocator) {
-        GenericValue v(value);
-        return PushBack(v, allocator);
-    }
-
-    //! Remove the last element in the array.
-    /*!
-        \note Constant time complexity.
-    */
-    GenericValue& PopBack() {
-        RAPIDJSON_ASSERT(IsArray());
-        RAPIDJSON_ASSERT(!Empty());
-        GetElementsPointer()[--data_.a.size].~GenericValue();
-        return *this;
-    }
-
-    //! Remove an element of array by iterator.
-    /*!
-        \param pos iterator to the element to remove
-        \pre IsArray() == true && \ref Begin() <= \c pos < \ref End()
-        \return Iterator following the removed element. If the iterator pos refers to the last element, the End() iterator is returned.
-        \note Linear time complexity.
-    */
-    ValueIterator Erase(ConstValueIterator pos) {
-        return Erase(pos, pos + 1);
-    }
-
-    //! Remove elements in the range [first, last) of the array.
-    /*!
-        \param first iterator to the first element to remove
-        \param last  iterator following the last element to remove
-        \pre IsArray() == true && \ref Begin() <= \c first <= \c last <= \ref End()
-        \return Iterator following the last removed element.
-        \note Linear time complexity.
-    */
-    ValueIterator Erase(ConstValueIterator first, ConstValueIterator last) {
-        RAPIDJSON_ASSERT(IsArray());
-        RAPIDJSON_ASSERT(data_.a.size > 0);
-        RAPIDJSON_ASSERT(GetElementsPointer() != 0);
-        RAPIDJSON_ASSERT(first >= Begin());
-        RAPIDJSON_ASSERT(first <= last);
-        RAPIDJSON_ASSERT(last <= End());
-        ValueIterator pos = Begin() + (first - Begin());
-        for (ValueIterator itr = pos; itr != last; ++itr)
-            itr->~GenericValue();       
-        std::memmove(pos, last, static_cast<size_t>(End() - last) * sizeof(GenericValue));
-        data_.a.size -= static_cast<SizeType>(last - first);
-        return pos;
-    }
-
-    Array GetArray() { RAPIDJSON_ASSERT(IsArray()); return Array(*this); }
-    ConstArray GetArray() const { RAPIDJSON_ASSERT(IsArray()); return ConstArray(*this); }
-
-    //@}
-
-    //!@name Number
-    //@{
-
-    int GetInt() const          { RAPIDJSON_ASSERT(data_.f.flags & kIntFlag);   return data_.n.i.i;   }
-    unsigned GetUint() const    { RAPIDJSON_ASSERT(data_.f.flags & kUintFlag);  return data_.n.u.u;   }
-    int64_t GetInt64() const    { RAPIDJSON_ASSERT(data_.f.flags & kInt64Flag); return data_.n.i64; }
-    uint64_t GetUint64() const  { RAPIDJSON_ASSERT(data_.f.flags & kUint64Flag); return data_.n.u64; }
-
-    //! Get the value as double type.
-    /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessDouble() to check whether the converison is lossless.
-    */
-    double GetDouble() const {
-        RAPIDJSON_ASSERT(IsNumber());
-        if ((data_.f.flags & kDoubleFlag) != 0)                return data_.n.d;   // exact type, no conversion.
-        if ((data_.f.flags & kIntFlag) != 0)                   return data_.n.i.i; // int -> double
-        if ((data_.f.flags & kUintFlag) != 0)                  return data_.n.u.u; // unsigned -> double
-        if ((data_.f.flags & kInt64Flag) != 0)                 return static_cast<double>(data_.n.i64); // int64_t -> double (may lose precision)
-        RAPIDJSON_ASSERT((data_.f.flags & kUint64Flag) != 0);  return static_cast<double>(data_.n.u64); // uint64_t -> double (may lose precision)
-    }
-
-    //! Get the value as float type.
-    /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessFloat() to check whether the converison is lossless.
-    */
-    float GetFloat() const {
-        return static_cast<float>(GetDouble());
-    }
-
-    GenericValue& SetInt(int i)             { this->~GenericValue(); new (this) GenericValue(i);    return *this; }
-    GenericValue& SetUint(unsigned u)       { this->~GenericValue(); new (this) GenericValue(u);    return *this; }
-    GenericValue& SetInt64(int64_t i64)     { this->~GenericValue(); new (this) GenericValue(i64);  return *this; }
-    GenericValue& SetUint64(uint64_t u64)   { this->~GenericValue(); new (this) GenericValue(u64);  return *this; }
-    GenericValue& SetDouble(double d)       { this->~GenericValue(); new (this) GenericValue(d);    return *this; }
-    GenericValue& SetFloat(float f)         { this->~GenericValue(); new (this) GenericValue(static_cast<double>(f)); return *this; }
-
-    //@}
-
-    //!@name String
-    //@{
-
-    const Ch* GetString() const { RAPIDJSON_ASSERT(IsString()); return (data_.f.flags & kInlineStrFlag) ? data_.ss.str : GetStringPointer(); }
-
-    //! Get the length of string.
-    /*! Since rapidjson permits "\\u0000" in the json string, strlen(v.GetString()) may not equal to v.GetStringLength().
-    */
-    SizeType GetStringLength() const { RAPIDJSON_ASSERT(IsString()); return ((data_.f.flags & kInlineStrFlag) ? (data_.ss.GetLength()) : data_.s.length); }
-
-    //! Set this value as a string without copying source string.
-    /*! This version has better performance with supplied length, and also support string containing null character.
-        \param s source string pointer. 
-        \param length The length of source string, excluding the trailing null terminator.
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() == s && GetStringLength() == length
-        \see SetString(StringRefType)
-    */
-    GenericValue& SetString(const Ch* s, SizeType length) { return SetString(StringRef(s, length)); }
-
-    //! Set this value as a string without copying source string.
-    /*! \param s source string reference
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() == s && GetStringLength() == s.length
-    */
-    GenericValue& SetString(StringRefType s) { this->~GenericValue(); SetStringRaw(s); return *this; }
-
-    //! Set this value as a string by copying from source string.
-    /*! This version has better performance with supplied length, and also support string containing null character.
-        \param s source string. 
-        \param length The length of source string, excluding the trailing null terminator.
-        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() != s && strcmp(GetString(),s) == 0 && GetStringLength() == length
-    */
-    GenericValue& SetString(const Ch* s, SizeType length, Allocator& allocator) { return SetString(StringRef(s, length), allocator); }
-
-    //! Set this value as a string by copying from source string.
-    /*! \param s source string. 
-        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() != s && strcmp(GetString(),s) == 0 && GetStringLength() == length
-    */
-    GenericValue& SetString(const Ch* s, Allocator& allocator) { return SetString(StringRef(s), allocator); }
-
-    //! Set this value as a string by copying from source string.
-    /*! \param s source string reference
-        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() != s.s && strcmp(GetString(),s) == 0 && GetStringLength() == length
-    */
-    GenericValue& SetString(StringRefType s, Allocator& allocator) { this->~GenericValue(); SetStringRaw(s, allocator); return *this; }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Set this value as a string by copying from source string.
-    /*! \param s source string.
-        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() != s.data() && strcmp(GetString(),s.data() == 0 && GetStringLength() == s.size()
-        \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
-    */
-    GenericValue& SetString(const std::basic_string<Ch>& s, Allocator& allocator) { return SetString(StringRef(s), allocator); }
-#endif
-
-    //@}
-
-    //!@name Array
-    //@{
-
-    //! Templated version for checking whether this value is type T.
-    /*!
-        \tparam T Either \c bool, \c int, \c unsigned, \c int64_t, \c uint64_t, \c double, \c float, \c const \c char*, \c std::basic_string<Ch>
-    */
-    template <typename T>
-    bool Is() const { return internal::TypeHelper<ValueType, T>::Is(*this); }
-
-    template <typename T>
-    T Get() const { return internal::TypeHelper<ValueType, T>::Get(*this); }
-
-    template <typename T>
-    T Get() { return internal::TypeHelper<ValueType, T>::Get(*this); }
-
-    template<typename T>
-    ValueType& Set(const T& data) { return internal::TypeHelper<ValueType, T>::Set(*this, data); }
-
-    template<typename T>
-    ValueType& Set(const T& data, AllocatorType& allocator) { return internal::TypeHelper<ValueType, T>::Set(*this, data, allocator); }
-
-    //@}
-
-    //! Generate events of this value to a Handler.
-    /*! This function adopts the GoF visitor pattern.
-        Typical usage is to output this JSON value as JSON text via Writer, which is a Handler.
-        It can also be used to deep clone this value via GenericDocument, which is also a Handler.
-        \tparam Handler type of handler.
-        \param handler An object implementing concept Handler.
-    */
-    template <typename Handler>
-    bool Accept(Handler& handler) const {
-        switch(GetType()) {
-        case kNullType:     return handler.Null();
-        case kFalseType:    return handler.Bool(false);
-        case kTrueType:     return handler.Bool(true);
-
-        case kObjectType:
-            if (RAPIDJSON_UNLIKELY(!handler.StartObject()))
-                return false;
-            for (ConstMemberIterator m = MemberBegin(); m != MemberEnd(); ++m) {
-                RAPIDJSON_ASSERT(m->name.IsString()); // User may change the type of name by MemberIterator.
-                if (RAPIDJSON_UNLIKELY(!handler.Key(m->name.GetString(), m->name.GetStringLength(), (m->name.data_.f.flags & kCopyFlag) != 0)))
-                    return false;
-                if (RAPIDJSON_UNLIKELY(!m->value.Accept(handler)))
-                    return false;
-            }
-            return handler.EndObject(data_.o.size);
-
-        case kArrayType:
-            if (RAPIDJSON_UNLIKELY(!handler.StartArray()))
-                return false;
-            for (const GenericValue* v = Begin(); v != End(); ++v)
-                if (RAPIDJSON_UNLIKELY(!v->Accept(handler)))
-                    return false;
-            return handler.EndArray(data_.a.size);
-    
-        case kStringType:
-            return handler.String(GetString(), GetStringLength(), (data_.f.flags & kCopyFlag) != 0);
-    
-        default:
-            RAPIDJSON_ASSERT(GetType() == kNumberType);
-            if (IsDouble())         return handler.Double(data_.n.d);
-            else if (IsInt())       return handler.Int(data_.n.i.i);
-            else if (IsUint())      return handler.Uint(data_.n.u.u);
-            else if (IsInt64())     return handler.Int64(data_.n.i64);
-            else                    return handler.Uint64(data_.n.u64);
-        }
-    }
-
-private:
-    template <typename, typename> friend class GenericValue;
-    template <typename, typename, typename> friend class GenericDocument;
-
-    enum {
-        kBoolFlag       = 0x0008,
-        kNumberFlag     = 0x0010,
-        kIntFlag        = 0x0020,
-        kUintFlag       = 0x0040,
-        kInt64Flag      = 0x0080,
-        kUint64Flag     = 0x0100,
-        kDoubleFlag     = 0x0200,
-        kStringFlag     = 0x0400,
-        kCopyFlag       = 0x0800,
-        kInlineStrFlag  = 0x1000,
-
-        // Initial flags of different types.
-        kNullFlag = kNullType,
-        kTrueFlag = kTrueType | kBoolFlag,
-        kFalseFlag = kFalseType | kBoolFlag,
-        kNumberIntFlag = kNumberType | kNumberFlag | kIntFlag | kInt64Flag,
-        kNumberUintFlag = kNumberType | kNumberFlag | kUintFlag | kUint64Flag | kInt64Flag,
-        kNumberInt64Flag = kNumberType | kNumberFlag | kInt64Flag,
-        kNumberUint64Flag = kNumberType | kNumberFlag | kUint64Flag,
-        kNumberDoubleFlag = kNumberType | kNumberFlag | kDoubleFlag,
-        kNumberAnyFlag = kNumberType | kNumberFlag | kIntFlag | kInt64Flag | kUintFlag | kUint64Flag | kDoubleFlag,
-        kConstStringFlag = kStringType | kStringFlag,
-        kCopyStringFlag = kStringType | kStringFlag | kCopyFlag,
-        kShortStringFlag = kStringType | kStringFlag | kCopyFlag | kInlineStrFlag,
-        kObjectFlag = kObjectType,
-        kArrayFlag = kArrayType,
-
-        kTypeMask = 0x07
-    };
-
-    static const SizeType kDefaultArrayCapacity = 16;
-    static const SizeType kDefaultObjectCapacity = 16;
-
-    struct Flag {
-#if RAPIDJSON_48BITPOINTER_OPTIMIZATION
-        char payload[sizeof(SizeType) * 2 + 6];     // 2 x SizeType + lower 48-bit pointer
-#elif RAPIDJSON_64BIT
-        char payload[sizeof(SizeType) * 2 + sizeof(void*) + 6]; // 6 padding bytes
-#else
-        char payload[sizeof(SizeType) * 2 + sizeof(void*) + 2]; // 2 padding bytes
-#endif
-        uint16_t flags;
-    };
-
-    struct String {
-        SizeType length;
-        SizeType hashcode;  //!< reserved
-        const Ch* str;
-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
-
-    // implementation detail: ShortString can represent zero-terminated strings up to MaxSize chars
-    // (excluding the terminating zero) and store a value to determine the length of the contained
-    // string in the last character str[LenPos] by storing "MaxSize - length" there. If the string
-    // to store has the maximal length of MaxSize then str[LenPos] will be 0 and therefore act as
-    // the string terminator as well. For getting the string length back from that value just use
-    // "MaxSize - str[LenPos]".
-    // This allows to store 13-chars strings in 32-bit mode, 21-chars strings in 64-bit mode,
-    // 13-chars strings for RAPIDJSON_48BITPOINTER_OPTIMIZATION=1 inline (for `UTF8`-encoded strings).
-    struct ShortString {
-        enum { MaxChars = sizeof(static_cast<Flag*>(0)->payload) / sizeof(Ch), MaxSize = MaxChars - 1, LenPos = MaxSize };
-        Ch str[MaxChars];
-
-        inline static bool Usable(SizeType len) { return                       (MaxSize >= len); }
-        inline void     SetLength(SizeType len) { str[LenPos] = static_cast<Ch>(MaxSize -  len); }
-        inline SizeType GetLength() const       { return  static_cast<SizeType>(MaxSize -  str[LenPos]); }
-    };  // at most as many bytes as "String" above => 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
-
-    // By using proper binary layout, retrieval of different integer types do not need conversions.
-    union Number {
-#if RAPIDJSON_ENDIAN == RAPIDJSON_LITTLEENDIAN
-        struct I {
-            int i;
-            char padding[4];
-        }i;
-        struct U {
-            unsigned u;
-            char padding2[4];
-        }u;
-#else
-        struct I {
-            char padding[4];
-            int i;
-        }i;
-        struct U {
-            char padding2[4];
-            unsigned u;
-        }u;
-#endif
-        int64_t i64;
-        uint64_t u64;
-        double d;
-    };  // 8 bytes
-
-    struct ObjectData {
-        SizeType size;
-        SizeType capacity;
-        Member* members;
-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
-
-    struct ArrayData {
-        SizeType size;
-        SizeType capacity;
-        GenericValue* elements;
-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
-
-    union Data {
-        String s;
-        ShortString ss;
-        Number n;
-        ObjectData o;
-        ArrayData a;
-        Flag f;
-    };  // 16 bytes in 32-bit mode, 24 bytes in 64-bit mode, 16 bytes in 64-bit with RAPIDJSON_48BITPOINTER_OPTIMIZATION
-
-    RAPIDJSON_FORCEINLINE const Ch* GetStringPointer() const { return RAPIDJSON_GETPOINTER(Ch, data_.s.str); }
-    RAPIDJSON_FORCEINLINE const Ch* SetStringPointer(const Ch* str) { return RAPIDJSON_SETPOINTER(Ch, data_.s.str, str); }
-    RAPIDJSON_FORCEINLINE GenericValue* GetElementsPointer() const { return RAPIDJSON_GETPOINTER(GenericValue, data_.a.elements); }
-    RAPIDJSON_FORCEINLINE GenericValue* SetElementsPointer(GenericValue* elements) { return RAPIDJSON_SETPOINTER(GenericValue, data_.a.elements, elements); }
-    RAPIDJSON_FORCEINLINE Member* GetMembersPointer() const { return RAPIDJSON_GETPOINTER(Member, data_.o.members); }
-    RAPIDJSON_FORCEINLINE Member* SetMembersPointer(Member* members) { return RAPIDJSON_SETPOINTER(Member, data_.o.members, members); }
-
-    // Initialize this value as array with initial data, without calling destructor.
-    void SetArrayRaw(GenericValue* values, SizeType count, Allocator& allocator) {
-        data_.f.flags = kArrayFlag;
-        if (count) {
-            GenericValue* e = static_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
-            SetElementsPointer(e);
-RAPIDJSON_DIAG_PUSH
-#if defined(__GNUC__) && __GNUC__ >= 8
-RAPIDJSON_DIAG_OFF(class-memaccess) // ignore complains from gcc that no trivial copy constructor exists.
-#endif
-            std::memcpy(e, values, count * sizeof(GenericValue));
-RAPIDJSON_DIAG_POP
-        }
-        else
-            SetElementsPointer(0);
-        data_.a.size = data_.a.capacity = count;
-    }
-
-    //! Initialize this value as object with initial data, without calling destructor.
-    void SetObjectRaw(Member* members, SizeType count, Allocator& allocator) {
-        data_.f.flags = kObjectFlag;
-        if (count) {
-            Member* m = static_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
-            SetMembersPointer(m);
-RAPIDJSON_DIAG_PUSH
-#if defined(__GNUC__) && __GNUC__ >= 8
-RAPIDJSON_DIAG_OFF(class-memaccess) // ignore complains from gcc that no trivial copy constructor exists.
-#endif
-            std::memcpy(m, members, count * sizeof(Member));
-RAPIDJSON_DIAG_POP
-        }
-        else
-            SetMembersPointer(0);
-        data_.o.size = data_.o.capacity = count;
-    }
-
-    //! Initialize this value as constant string, without calling destructor.
-    void SetStringRaw(StringRefType s) RAPIDJSON_NOEXCEPT {
-        data_.f.flags = kConstStringFlag;
-        SetStringPointer(s);
-        data_.s.length = s.length;
-    }
-
-    //! Initialize this value as copy string with initial data, without calling destructor.
-    void SetStringRaw(StringRefType s, Allocator& allocator) {
-        Ch* str = 0;
-        if (ShortString::Usable(s.length)) {
-            data_.f.flags = kShortStringFlag;
-            data_.ss.SetLength(s.length);
-            str = data_.ss.str;
-        } else {
-            data_.f.flags = kCopyStringFlag;
-            data_.s.length = s.length;
-            str = static_cast<Ch *>(allocator.Malloc((s.length + 1) * sizeof(Ch)));
-            SetStringPointer(str);
-        }
-        std::memcpy(str, s, s.length * sizeof(Ch));
-        str[s.length] = '\0';
-    }
-
-    //! Assignment without calling destructor
-    void RawAssign(GenericValue& rhs) RAPIDJSON_NOEXCEPT {
-        data_ = rhs.data_;
-        // data_.f.flags = rhs.data_.f.flags;
-        rhs.data_.f.flags = kNullFlag;
-    }
-
-    template <typename SourceAllocator>
-    bool StringEqual(const GenericValue<Encoding, SourceAllocator>& rhs) const {
-        RAPIDJSON_ASSERT(IsString());
-        RAPIDJSON_ASSERT(rhs.IsString());
-
-        const SizeType len1 = GetStringLength();
-        const SizeType len2 = rhs.GetStringLength();
-        if(len1 != len2) { return false; }
-
-        const Ch* const str1 = GetString();
-        const Ch* const str2 = rhs.GetString();
-        if(str1 == str2) { return true; } // fast path for constant string
-
-        return (std::memcmp(str1, str2, sizeof(Ch) * len1) == 0);
-    }
-
-    Data data_;
-};
-
-//! GenericValue with UTF8 encoding
-typedef GenericValue<UTF8<> > Value;
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericDocument 
-
-//! A document for parsing JSON text as DOM.
-/*!
-    \note implements Handler concept
-    \tparam Encoding Encoding for both parsing and string storage.
-    \tparam Allocator Allocator for allocating memory for the DOM
-    \tparam StackAllocator Allocator for allocating memory for stack during parsing.
-    \warning Although GenericDocument inherits from GenericValue, the API does \b not provide any virtual functions, especially no virtual destructor.  To avoid memory leaks, do not \c delete a GenericDocument object via a pointer to a GenericValue.
-*/
-template <typename Encoding, typename Allocator = MemoryPoolAllocator<>, typename StackAllocator = CrtAllocator>
-class GenericDocument : public GenericValue<Encoding, Allocator> {
-public:
-    typedef typename Encoding::Ch Ch;                       //!< Character type derived from Encoding.
-    typedef GenericValue<Encoding, Allocator> ValueType;    //!< Value type of the document.
-    typedef Allocator AllocatorType;                        //!< Allocator type from template parameter.
-
-    //! Constructor
-    /*! Creates an empty document of specified type.
-        \param type             Mandatory type of object to create.
-        \param allocator        Optional allocator for allocating memory.
-        \param stackCapacity    Optional initial capacity of stack in bytes.
-        \param stackAllocator   Optional allocator for allocating memory for stack.
-    */
-    explicit GenericDocument(Type type, Allocator* allocator = 0, size_t stackCapacity = kDefaultStackCapacity, StackAllocator* stackAllocator = 0) :
-        GenericValue<Encoding, Allocator>(type),  allocator_(allocator), ownAllocator_(0), stack_(stackAllocator, stackCapacity), parseResult_()
-    {
-        if (!allocator_)
-            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
-    }
-
-    //! Constructor
-    /*! Creates an empty document which type is Null. 
-        \param allocator        Optional allocator for allocating memory.
-        \param stackCapacity    Optional initial capacity of stack in bytes.
-        \param stackAllocator   Optional allocator for allocating memory for stack.
-    */
-    GenericDocument(Allocator* allocator = 0, size_t stackCapacity = kDefaultStackCapacity, StackAllocator* stackAllocator = 0) : 
-        allocator_(allocator), ownAllocator_(0), stack_(stackAllocator, stackCapacity), parseResult_()
-    {
-        if (!allocator_)
-            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move constructor in C++11
-    GenericDocument(GenericDocument&& rhs) RAPIDJSON_NOEXCEPT
-        : ValueType(std::forward<ValueType>(rhs)), // explicit cast to avoid prohibited move from Document
-          allocator_(rhs.allocator_),
-          ownAllocator_(rhs.ownAllocator_),
-          stack_(std::move(rhs.stack_)),
-          parseResult_(rhs.parseResult_)
-    {
-        rhs.allocator_ = 0;
-        rhs.ownAllocator_ = 0;
-        rhs.parseResult_ = ParseResult();
-    }
-#endif
-
-    ~GenericDocument() {
-        Destroy();
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move assignment in C++11
-    GenericDocument& operator=(GenericDocument&& rhs) RAPIDJSON_NOEXCEPT
-    {
-        // The cast to ValueType is necessary here, because otherwise it would
-        // attempt to call GenericValue's templated assignment operator.
-        ValueType::operator=(std::forward<ValueType>(rhs));
-
-        // Calling the destructor here would prematurely call stack_'s destructor
-        Destroy();
-
-        allocator_ = rhs.allocator_;
-        ownAllocator_ = rhs.ownAllocator_;
-        stack_ = std::move(rhs.stack_);
-        parseResult_ = rhs.parseResult_;
-
-        rhs.allocator_ = 0;
-        rhs.ownAllocator_ = 0;
-        rhs.parseResult_ = ParseResult();
-
-        return *this;
-    }
-#endif
-
-    //! Exchange the contents of this document with those of another.
-    /*!
-        \param rhs Another document.
-        \note Constant complexity.
-        \see GenericValue::Swap
-    */
-    GenericDocument& Swap(GenericDocument& rhs) RAPIDJSON_NOEXCEPT {
-        ValueType::Swap(rhs);
-        stack_.Swap(rhs.stack_);
-        internal::Swap(allocator_, rhs.allocator_);
-        internal::Swap(ownAllocator_, rhs.ownAllocator_);
-        internal::Swap(parseResult_, rhs.parseResult_);
-        return *this;
-    }
-
-    // Allow Swap with ValueType.
-    // Refer to Effective C++ 3rd Edition/Item 33: Avoid hiding inherited names.
-    using ValueType::Swap;
-
-    //! free-standing swap function helper
-    /*!
-        Helper function to enable support for common swap implementation pattern based on \c std::swap:
-        \code
-        void swap(MyClass& a, MyClass& b) {
-            using std::swap;
-            swap(a.doc, b.doc);
-            // ...
-        }
-        \endcode
-        \see Swap()
-     */
-    friend inline void swap(GenericDocument& a, GenericDocument& b) RAPIDJSON_NOEXCEPT { a.Swap(b); }
-
-    //! Populate this document by a generator which produces SAX events.
-    /*! \tparam Generator A functor with <tt>bool f(Handler)</tt> prototype.
-        \param g Generator functor which sends SAX events to the parameter.
-        \return The document itself for fluent API.
-    */
-    template <typename Generator>
-    GenericDocument& Populate(Generator& g) {
-        ClearStackOnExit scope(*this);
-        if (g(*this)) {
-            RAPIDJSON_ASSERT(stack_.GetSize() == sizeof(ValueType)); // Got one and only one root object
-            ValueType::operator=(*stack_.template Pop<ValueType>(1));// Move value from stack to document
-        }
-        return *this;
-    }
-
-    //!@name Parse from stream
-    //!@{
-
-    //! Parse JSON text from an input stream (with Encoding conversion)
-    /*! \tparam parseFlags Combination of \ref ParseFlag.
-        \tparam SourceEncoding Encoding of input stream
-        \tparam InputStream Type of input stream, implementing Stream concept
-        \param is Input stream to be parsed.
-        \return The document itself for fluent API.
-    */
-    template <unsigned parseFlags, typename SourceEncoding, typename InputStream>
-    GenericDocument& ParseStream(InputStream& is) {
-        GenericReader<SourceEncoding, Encoding, StackAllocator> reader(
-            stack_.HasAllocator() ? &stack_.GetAllocator() : 0);
-        ClearStackOnExit scope(*this);
-        parseResult_ = reader.template Parse<parseFlags>(is, *this);
-        if (parseResult_) {
-            RAPIDJSON_ASSERT(stack_.GetSize() == sizeof(ValueType)); // Got one and only one root object
-            ValueType::operator=(*stack_.template Pop<ValueType>(1));// Move value from stack to document
-        }
-        return *this;
-    }
-
-    //! Parse JSON text from an input stream
-    /*! \tparam parseFlags Combination of \ref ParseFlag.
-        \tparam InputStream Type of input stream, implementing Stream concept
-        \param is Input stream to be parsed.
-        \return The document itself for fluent API.
-    */
-    template <unsigned parseFlags, typename InputStream>
-    GenericDocument& ParseStream(InputStream& is) {
-        return ParseStream<parseFlags, Encoding, InputStream>(is);
-    }
-
-    //! Parse JSON text from an input stream (with \ref kParseDefaultFlags)
-    /*! \tparam InputStream Type of input stream, implementing Stream concept
-        \param is Input stream to be parsed.
-        \return The document itself for fluent API.
-    */
-    template <typename InputStream>
-    GenericDocument& ParseStream(InputStream& is) {
-        return ParseStream<kParseDefaultFlags, Encoding, InputStream>(is);
-    }
-    //!@}
-
-    //!@name Parse in-place from mutable string
-    //!@{
-
-    //! Parse JSON text from a mutable string
-    /*! \tparam parseFlags Combination of \ref ParseFlag.
-        \param str Mutable zero-terminated string to be parsed.
-        \return The document itself for fluent API.
-    */
-    template <unsigned parseFlags>
-    GenericDocument& ParseInsitu(Ch* str) {
-        GenericInsituStringStream<Encoding> s(str);
-        return ParseStream<parseFlags | kParseInsituFlag>(s);
-    }
-
-    //! Parse JSON text from a mutable string (with \ref kParseDefaultFlags)
-    /*! \param str Mutable zero-terminated string to be parsed.
-        \return The document itself for fluent API.
-    */
-    GenericDocument& ParseInsitu(Ch* str) {
-        return ParseInsitu<kParseDefaultFlags>(str);
-    }
-    //!@}
-
-    //!@name Parse from read-only string
-    //!@{
-
-    //! Parse JSON text from a read-only string (with Encoding conversion)
-    /*! \tparam parseFlags Combination of \ref ParseFlag (must not contain \ref kParseInsituFlag).
-        \tparam SourceEncoding Transcoding from input Encoding
-        \param str Read-only zero-terminated string to be parsed.
-    */
-    template <unsigned parseFlags, typename SourceEncoding>
-    GenericDocument& Parse(const typename SourceEncoding::Ch* str) {
-        RAPIDJSON_ASSERT(!(parseFlags & kParseInsituFlag));
-        GenericStringStream<SourceEncoding> s(str);
-        return ParseStream<parseFlags, SourceEncoding>(s);
-    }
-
-    //! Parse JSON text from a read-only string
-    /*! \tparam parseFlags Combination of \ref ParseFlag (must not contain \ref kParseInsituFlag).
-        \param str Read-only zero-terminated string to be parsed.
-    */
-    template <unsigned parseFlags>
-    GenericDocument& Parse(const Ch* str) {
-        return Parse<parseFlags, Encoding>(str);
-    }
-
-    //! Parse JSON text from a read-only string (with \ref kParseDefaultFlags)
-    /*! \param str Read-only zero-terminated string to be parsed.
-    */
-    GenericDocument& Parse(const Ch* str) {
-        return Parse<kParseDefaultFlags>(str);
-    }
-
-    template <unsigned parseFlags, typename SourceEncoding>
-    GenericDocument& Parse(const typename SourceEncoding::Ch* str, size_t length) {
-        RAPIDJSON_ASSERT(!(parseFlags & kParseInsituFlag));
-        MemoryStream ms(reinterpret_cast<const char*>(str), length * sizeof(typename SourceEncoding::Ch));
-        EncodedInputStream<SourceEncoding, MemoryStream> is(ms);
-        ParseStream<parseFlags, SourceEncoding>(is);
-        return *this;
-    }
-
-    template <unsigned parseFlags>
-    GenericDocument& Parse(const Ch* str, size_t length) {
-        return Parse<parseFlags, Encoding>(str, length);
-    }
-    
-    GenericDocument& Parse(const Ch* str, size_t length) {
-        return Parse<kParseDefaultFlags>(str, length);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    template <unsigned parseFlags, typename SourceEncoding>
-    GenericDocument& Parse(const std::basic_string<typename SourceEncoding::Ch>& str) {
-        // c_str() is constant complexity according to standard. Should be faster than Parse(const char*, size_t)
-        return Parse<parseFlags, SourceEncoding>(str.c_str());
-    }
-
-    template <unsigned parseFlags>
-    GenericDocument& Parse(const std::basic_string<Ch>& str) {
-        return Parse<parseFlags, Encoding>(str.c_str());
-    }
-
-    GenericDocument& Parse(const std::basic_string<Ch>& str) {
-        return Parse<kParseDefaultFlags>(str);
-    }
-#endif // RAPIDJSON_HAS_STDSTRING    
-
-    //!@}
-
-    //!@name Handling parse errors
-    //!@{
-
-    //! Whether a parse error has occurred in the last parsing.
-    bool HasParseError() const { return parseResult_.IsError(); }
-
-    //! Get the \ref ParseErrorCode of last parsing.
-    ParseErrorCode GetParseError() const { return parseResult_.Code(); }
-
-    //! Get the position of last parsing error in input, 0 otherwise.
-    size_t GetErrorOffset() const { return parseResult_.Offset(); }
-
-    //! Implicit conversion to get the last parse result
-#ifndef __clang // -Wdocumentation
-    /*! \return \ref ParseResult of the last parse operation
-
-        \code
-          Document doc;
-          ParseResult ok = doc.Parse(json);
-          if (!ok)
-            printf( "JSON parse error: %s (%u)\n", GetParseError_En(ok.Code()), ok.Offset());
-        \endcode
-     */
-#endif
-    operator ParseResult() const { return parseResult_; }
-    //!@}
-
-    //! Get the allocator of this document.
-    Allocator& GetAllocator() {
-        RAPIDJSON_ASSERT(allocator_);
-        return *allocator_;
-    }
-
-    //! Get the capacity of stack in bytes.
-    size_t GetStackCapacity() const { return stack_.GetCapacity(); }
-
-private:
-    // clear stack on any exit from ParseStream, e.g. due to exception
-    struct ClearStackOnExit {
-        explicit ClearStackOnExit(GenericDocument& d) : d_(d) {}
-        ~ClearStackOnExit() { d_.ClearStack(); }
-    private:
-        ClearStackOnExit(const ClearStackOnExit&);
-        ClearStackOnExit& operator=(const ClearStackOnExit&);
-        GenericDocument& d_;
-    };
-
-    // callers of the following private Handler functions
-    // template <typename,typename,typename> friend class GenericReader; // for parsing
-    template <typename, typename> friend class GenericValue; // for deep copying
-
-public:
-    // Implementation of Handler
-    bool Null() { new (stack_.template Push<ValueType>()) ValueType(); return true; }
-    bool Bool(bool b) { new (stack_.template Push<ValueType>()) ValueType(b); return true; }
-    bool Int(int i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
-    bool Uint(unsigned i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
-    bool Int64(int64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
-    bool Uint64(uint64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
-    bool Double(double d) { new (stack_.template Push<ValueType>()) ValueType(d); return true; }
-
-    bool RawNumber(const Ch* str, SizeType length, bool copy) { 
-        if (copy) 
-            new (stack_.template Push<ValueType>()) ValueType(str, length, GetAllocator());
-        else
-            new (stack_.template Push<ValueType>()) ValueType(str, length);
-        return true;
-    }
-
-    bool String(const Ch* str, SizeType length, bool copy) { 
-        if (copy) 
-            new (stack_.template Push<ValueType>()) ValueType(str, length, GetAllocator());
-        else
-            new (stack_.template Push<ValueType>()) ValueType(str, length);
-        return true;
-    }
-
-    bool StartObject() { new (stack_.template Push<ValueType>()) ValueType(kObjectType); return true; }
-    
-    bool Key(const Ch* str, SizeType length, bool copy) { return String(str, length, copy); }
-
-    bool EndObject(SizeType memberCount) {
-        typename ValueType::Member* members = stack_.template Pop<typename ValueType::Member>(memberCount);
-        stack_.template Top<ValueType>()->SetObjectRaw(members, memberCount, GetAllocator());
-        return true;
-    }
-
-    bool StartArray() { new (stack_.template Push<ValueType>()) ValueType(kArrayType); return true; }
-    
-    bool EndArray(SizeType elementCount) {
-        ValueType* elements = stack_.template Pop<ValueType>(elementCount);
-        stack_.template Top<ValueType>()->SetArrayRaw(elements, elementCount, GetAllocator());
-        return true;
-    }
-
-private:
-    //! Prohibit copying
-    GenericDocument(const GenericDocument&);
-    //! Prohibit assignment
-    GenericDocument& operator=(const GenericDocument&);
-
-    void ClearStack() {
-        if (Allocator::kNeedFree)
-            while (stack_.GetSize() > 0)    // Here assumes all elements in stack array are GenericValue (Member is actually 2 GenericValue objects)
-                (stack_.template Pop<ValueType>(1))->~ValueType();
-        else
-            stack_.Clear();
-        stack_.ShrinkToFit();
-    }
-
-    void Destroy() {
-        RAPIDJSON_DELETE(ownAllocator_);
-    }
-
-    static const size_t kDefaultStackCapacity = 1024;
-    Allocator* allocator_;
-    Allocator* ownAllocator_;
-    internal::Stack<StackAllocator> stack_;
-    ParseResult parseResult_;
-};
-
-//! GenericDocument with UTF8 encoding
-typedef GenericDocument<UTF8<> > Document;
-
-//! Helper class for accessing Value of array type.
-/*!
-    Instance of this helper class is obtained by \c GenericValue::GetArray().
-    In addition to all APIs for array type, it provides range-based for loop if \c RAPIDJSON_HAS_CXX11_RANGE_FOR=1.
-*/
-template <bool Const, typename ValueT>
-class GenericArray {
-public:
-    typedef GenericArray<true, ValueT> ConstArray;
-    typedef GenericArray<false, ValueT> Array;
-    typedef ValueT PlainType;
-    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
-    typedef ValueType* ValueIterator;  // This may be const or non-const iterator
-    typedef const ValueT* ConstValueIterator;
-    typedef typename ValueType::AllocatorType AllocatorType;
-    typedef typename ValueType::StringRefType StringRefType;
-
-    template <typename, typename>
-    friend class GenericValue;
-
-    GenericArray(const GenericArray& rhs) : value_(rhs.value_) {}
-    GenericArray& operator=(const GenericArray& rhs) { value_ = rhs.value_; return *this; }
-    ~GenericArray() {}
-
-    SizeType Size() const { return value_.Size(); }
-    SizeType Capacity() const { return value_.Capacity(); }
-    bool Empty() const { return value_.Empty(); }
-    void Clear() const { value_.Clear(); }
-    ValueType& operator[](SizeType index) const {  return value_[index]; }
-    ValueIterator Begin() const { return value_.Begin(); }
-    ValueIterator End() const { return value_.End(); }
-    GenericArray Reserve(SizeType newCapacity, AllocatorType &allocator) const { value_.Reserve(newCapacity, allocator); return *this; }
-    GenericArray PushBack(ValueType& value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericArray PushBack(ValueType&& value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericArray PushBack(StringRefType value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
-    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (const GenericArray&)) PushBack(T value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
-    GenericArray PopBack() const { value_.PopBack(); return *this; }
-    ValueIterator Erase(ConstValueIterator pos) const { return value_.Erase(pos); }
-    ValueIterator Erase(ConstValueIterator first, ConstValueIterator last) const { return value_.Erase(first, last); }
-
-#if RAPIDJSON_HAS_CXX11_RANGE_FOR
-    ValueIterator begin() const { return value_.Begin(); }
-    ValueIterator end() const { return value_.End(); }
-#endif
-
-private:
-    GenericArray();
-    GenericArray(ValueType& value) : value_(value) {}
-    ValueType& value_;
-};
-
-//! Helper class for accessing Value of object type.
-/*!
-    Instance of this helper class is obtained by \c GenericValue::GetObject().
-    In addition to all APIs for array type, it provides range-based for loop if \c RAPIDJSON_HAS_CXX11_RANGE_FOR=1.
-*/
-template <bool Const, typename ValueT>
-class GenericObject {
-public:
-    typedef GenericObject<true, ValueT> ConstObject;
-    typedef GenericObject<false, ValueT> Object;
-    typedef ValueT PlainType;
-    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
-    typedef GenericMemberIterator<Const, typename ValueT::EncodingType, typename ValueT::AllocatorType> MemberIterator;  // This may be const or non-const iterator
-    typedef GenericMemberIterator<true, typename ValueT::EncodingType, typename ValueT::AllocatorType> ConstMemberIterator;
-    typedef typename ValueType::AllocatorType AllocatorType;
-    typedef typename ValueType::StringRefType StringRefType;
-    typedef typename ValueType::EncodingType EncodingType;
-    typedef typename ValueType::Ch Ch;
-
-    template <typename, typename>
-    friend class GenericValue;
-
-    GenericObject(const GenericObject& rhs) : value_(rhs.value_) {}
-    GenericObject& operator=(const GenericObject& rhs) { value_ = rhs.value_; return *this; }
-    ~GenericObject() {}
-
-    SizeType MemberCount() const { return value_.MemberCount(); }
-    SizeType MemberCapacity() const { return value_.MemberCapacity(); }
-    bool ObjectEmpty() const { return value_.ObjectEmpty(); }
-    template <typename T> ValueType& operator[](T* name) const { return value_[name]; }
-    template <typename SourceAllocator> ValueType& operator[](const GenericValue<EncodingType, SourceAllocator>& name) const { return value_[name]; }
-#if RAPIDJSON_HAS_STDSTRING
-    ValueType& operator[](const std::basic_string<Ch>& name) const { return value_[name]; }
-#endif
-    MemberIterator MemberBegin() const { return value_.MemberBegin(); }
-    MemberIterator MemberEnd() const { return value_.MemberEnd(); }
-    GenericObject MemberReserve(SizeType newCapacity, AllocatorType &allocator) const { value_.MemberReserve(newCapacity, allocator); return *this; }
-    bool HasMember(const Ch* name) const { return value_.HasMember(name); }
-#if RAPIDJSON_HAS_STDSTRING
-    bool HasMember(const std::basic_string<Ch>& name) const { return value_.HasMember(name); }
-#endif
-    template <typename SourceAllocator> bool HasMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.HasMember(name); }
-    MemberIterator FindMember(const Ch* name) const { return value_.FindMember(name); }
-    template <typename SourceAllocator> MemberIterator FindMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.FindMember(name); }
-#if RAPIDJSON_HAS_STDSTRING
-    MemberIterator FindMember(const std::basic_string<Ch>& name) const { return value_.FindMember(name); }
-#endif
-    GenericObject AddMember(ValueType& name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(ValueType& name, StringRefType value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-#if RAPIDJSON_HAS_STDSTRING
-    GenericObject AddMember(ValueType& name, std::basic_string<Ch>& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-#endif
-    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&)) AddMember(ValueType& name, T value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericObject AddMember(ValueType&& name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(ValueType&& name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(ValueType& name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(StringRefType name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericObject AddMember(StringRefType name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(StringRefType name, StringRefType value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericObject)) AddMember(StringRefType name, T value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    void RemoveAllMembers() { value_.RemoveAllMembers(); }
-    bool RemoveMember(const Ch* name) const { return value_.RemoveMember(name); }
-#if RAPIDJSON_HAS_STDSTRING
-    bool RemoveMember(const std::basic_string<Ch>& name) const { return value_.RemoveMember(name); }
-#endif
-    template <typename SourceAllocator> bool RemoveMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.RemoveMember(name); }
-    MemberIterator RemoveMember(MemberIterator m) const { return value_.RemoveMember(m); }
-    MemberIterator EraseMember(ConstMemberIterator pos) const { return value_.EraseMember(pos); }
-    MemberIterator EraseMember(ConstMemberIterator first, ConstMemberIterator last) const { return value_.EraseMember(first, last); }
-    bool EraseMember(const Ch* name) const { return value_.EraseMember(name); }
-#if RAPIDJSON_HAS_STDSTRING
-    bool EraseMember(const std::basic_string<Ch>& name) const { return EraseMember(ValueType(StringRef(name))); }
-#endif
-    template <typename SourceAllocator> bool EraseMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.EraseMember(name); }
-
-#if RAPIDJSON_HAS_CXX11_RANGE_FOR
-    MemberIterator begin() const { return value_.MemberBegin(); }
-    MemberIterator end() const { return value_.MemberEnd(); }
-#endif
-
-private:
-    GenericObject();
-    GenericObject(ValueType& value) : value_(value) {}
-    ValueType& value_;
-};
-
-RAPIDJSON_NAMESPACE_END
-RAPIDJSON_DIAG_POP
-
-#endif // RAPIDJSON_DOCUMENT_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/encodedstream.h b/src/sioclient/lib/rapidjson/include/rapidjson/encodedstream.h
deleted file mode 100644
index 223601c0..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/encodedstream.h
+++ /dev/null
@@ -1,299 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ENCODEDSTREAM_H_
-#define RAPIDJSON_ENCODEDSTREAM_H_
-
-#include "stream.h"
-#include "memorystream.h"
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Input byte stream wrapper with a statically bound encoding.
-/*!
-    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
-    \tparam InputByteStream Type of input byte stream. For example, FileReadStream.
-*/
-template <typename Encoding, typename InputByteStream>
-class EncodedInputStream {
-    RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-public:
-    typedef typename Encoding::Ch Ch;
-
-    EncodedInputStream(InputByteStream& is) : is_(is) { 
-        current_ = Encoding::TakeBOM(is_);
-    }
-
-    Ch Peek() const { return current_; }
-    Ch Take() { Ch c = current_; current_ = Encoding::Take(is_); return c; }
-    size_t Tell() const { return is_.Tell(); }
-
-    // Not implemented
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); } 
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    EncodedInputStream(const EncodedInputStream&);
-    EncodedInputStream& operator=(const EncodedInputStream&);
-
-    InputByteStream& is_;
-    Ch current_;
-};
-
-//! Specialized for UTF8 MemoryStream.
-template <>
-class EncodedInputStream<UTF8<>, MemoryStream> {
-public:
-    typedef UTF8<>::Ch Ch;
-
-    EncodedInputStream(MemoryStream& is) : is_(is) {
-        if (static_cast<unsigned char>(is_.Peek()) == 0xEFu) is_.Take();
-        if (static_cast<unsigned char>(is_.Peek()) == 0xBBu) is_.Take();
-        if (static_cast<unsigned char>(is_.Peek()) == 0xBFu) is_.Take();
-    }
-    Ch Peek() const { return is_.Peek(); }
-    Ch Take() { return is_.Take(); }
-    size_t Tell() const { return is_.Tell(); }
-
-    // Not implemented
-    void Put(Ch) {}
-    void Flush() {} 
-    Ch* PutBegin() { return 0; }
-    size_t PutEnd(Ch*) { return 0; }
-
-    MemoryStream& is_;
-
-private:
-    EncodedInputStream(const EncodedInputStream&);
-    EncodedInputStream& operator=(const EncodedInputStream&);
-};
-
-//! Output byte stream wrapper with statically bound encoding.
-/*!
-    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
-    \tparam OutputByteStream Type of input byte stream. For example, FileWriteStream.
-*/
-template <typename Encoding, typename OutputByteStream>
-class EncodedOutputStream {
-    RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-public:
-    typedef typename Encoding::Ch Ch;
-
-    EncodedOutputStream(OutputByteStream& os, bool putBOM = true) : os_(os) { 
-        if (putBOM)
-            Encoding::PutBOM(os_);
-    }
-
-    void Put(Ch c) { Encoding::Put(os_, c);  }
-    void Flush() { os_.Flush(); }
-
-    // Not implemented
-    Ch Peek() const { RAPIDJSON_ASSERT(false); return 0;}
-    Ch Take() { RAPIDJSON_ASSERT(false); return 0;}
-    size_t Tell() const { RAPIDJSON_ASSERT(false);  return 0; }
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    EncodedOutputStream(const EncodedOutputStream&);
-    EncodedOutputStream& operator=(const EncodedOutputStream&);
-
-    OutputByteStream& os_;
-};
-
-#define RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
-
-//! Input stream wrapper with dynamically bound encoding and automatic encoding detection.
-/*!
-    \tparam CharType Type of character for reading.
-    \tparam InputByteStream type of input byte stream to be wrapped.
-*/
-template <typename CharType, typename InputByteStream>
-class AutoUTFInputStream {
-    RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-public:
-    typedef CharType Ch;
-
-    //! Constructor.
-    /*!
-        \param is input stream to be wrapped.
-        \param type UTF encoding type if it is not detected from the stream.
-    */
-    AutoUTFInputStream(InputByteStream& is, UTFType type = kUTF8) : is_(&is), type_(type), hasBOM_(false) {
-        RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);        
-        DetectType();
-        static const TakeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Take) };
-        takeFunc_ = f[type_];
-        current_ = takeFunc_(*is_);
-    }
-
-    UTFType GetType() const { return type_; }
-    bool HasBOM() const { return hasBOM_; }
-
-    Ch Peek() const { return current_; }
-    Ch Take() { Ch c = current_; current_ = takeFunc_(*is_); return c; }
-    size_t Tell() const { return is_->Tell(); }
-
-    // Not implemented
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); } 
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    AutoUTFInputStream(const AutoUTFInputStream&);
-    AutoUTFInputStream& operator=(const AutoUTFInputStream&);
-
-    // Detect encoding type with BOM or RFC 4627
-    void DetectType() {
-        // BOM (Byte Order Mark):
-        // 00 00 FE FF  UTF-32BE
-        // FF FE 00 00  UTF-32LE
-        // FE FF        UTF-16BE
-        // FF FE        UTF-16LE
-        // EF BB BF     UTF-8
-
-        const unsigned char* c = reinterpret_cast<const unsigned char *>(is_->Peek4());
-        if (!c)
-            return;
-
-        unsigned bom = static_cast<unsigned>(c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24));
-        hasBOM_ = false;
-        if (bom == 0xFFFE0000)                  { type_ = kUTF32BE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
-        else if (bom == 0x0000FEFF)             { type_ = kUTF32LE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
-        else if ((bom & 0xFFFF) == 0xFFFE)      { type_ = kUTF16BE; hasBOM_ = true; is_->Take(); is_->Take();                           }
-        else if ((bom & 0xFFFF) == 0xFEFF)      { type_ = kUTF16LE; hasBOM_ = true; is_->Take(); is_->Take();                           }
-        else if ((bom & 0xFFFFFF) == 0xBFBBEF)  { type_ = kUTF8;    hasBOM_ = true; is_->Take(); is_->Take(); is_->Take();              }
-
-        // RFC 4627: Section 3
-        // "Since the first two characters of a JSON text will always be ASCII
-        // characters [RFC0020], it is possible to determine whether an octet
-        // stream is UTF-8, UTF-16 (BE or LE), or UTF-32 (BE or LE) by looking
-        // at the pattern of nulls in the first four octets."
-        // 00 00 00 xx  UTF-32BE
-        // 00 xx 00 xx  UTF-16BE
-        // xx 00 00 00  UTF-32LE
-        // xx 00 xx 00  UTF-16LE
-        // xx xx xx xx  UTF-8
-
-        if (!hasBOM_) {
-            int pattern = (c[0] ? 1 : 0) | (c[1] ? 2 : 0) | (c[2] ? 4 : 0) | (c[3] ? 8 : 0);
-            switch (pattern) {
-            case 0x08: type_ = kUTF32BE; break;
-            case 0x0A: type_ = kUTF16BE; break;
-            case 0x01: type_ = kUTF32LE; break;
-            case 0x05: type_ = kUTF16LE; break;
-            case 0x0F: type_ = kUTF8;    break;
-            default: break; // Use type defined by user.
-            }
-        }
-
-        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
-        if (type_ == kUTF16LE || type_ == kUTF16BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
-        if (type_ == kUTF32LE || type_ == kUTF32BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
-    }
-
-    typedef Ch (*TakeFunc)(InputByteStream& is);
-    InputByteStream* is_;
-    UTFType type_;
-    Ch current_;
-    TakeFunc takeFunc_;
-    bool hasBOM_;
-};
-
-//! Output stream wrapper with dynamically bound encoding and automatic encoding detection.
-/*!
-    \tparam CharType Type of character for writing.
-    \tparam OutputByteStream type of output byte stream to be wrapped.
-*/
-template <typename CharType, typename OutputByteStream>
-class AutoUTFOutputStream {
-    RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-public:
-    typedef CharType Ch;
-
-    //! Constructor.
-    /*!
-        \param os output stream to be wrapped.
-        \param type UTF encoding type.
-        \param putBOM Whether to write BOM at the beginning of the stream.
-    */
-    AutoUTFOutputStream(OutputByteStream& os, UTFType type, bool putBOM) : os_(&os), type_(type) {
-        RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);
-
-        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
-        if (type_ == kUTF16LE || type_ == kUTF16BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
-        if (type_ == kUTF32LE || type_ == kUTF32BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
-
-        static const PutFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Put) };
-        putFunc_ = f[type_];
-
-        if (putBOM)
-            PutBOM();
-    }
-
-    UTFType GetType() const { return type_; }
-
-    void Put(Ch c) { putFunc_(*os_, c); }
-    void Flush() { os_->Flush(); } 
-
-    // Not implemented
-    Ch Peek() const { RAPIDJSON_ASSERT(false); return 0;}
-    Ch Take() { RAPIDJSON_ASSERT(false); return 0;}
-    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    AutoUTFOutputStream(const AutoUTFOutputStream&);
-    AutoUTFOutputStream& operator=(const AutoUTFOutputStream&);
-
-    void PutBOM() { 
-        typedef void (*PutBOMFunc)(OutputByteStream&);
-        static const PutBOMFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(PutBOM) };
-        f[type_](*os_);
-    }
-
-    typedef void (*PutFunc)(OutputByteStream&, Ch);
-
-    OutputByteStream* os_;
-    UTFType type_;
-    PutFunc putFunc_;
-};
-
-#undef RAPIDJSON_ENCODINGS_FUNC
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_FILESTREAM_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/encodings.h b/src/sioclient/lib/rapidjson/include/rapidjson/encodings.h
deleted file mode 100644
index 12b562ac..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/encodings.h
+++ /dev/null
@@ -1,716 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ENCODINGS_H_
-#define RAPIDJSON_ENCODINGS_H_
-
-#include "rapidjson.h"
-
-#if defined(_MSC_VER) && !defined(__clang__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4244) // conversion from 'type1' to 'type2', possible loss of data
-RAPIDJSON_DIAG_OFF(4702)  // unreachable code
-#elif defined(__GNUC__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-RAPIDJSON_DIAG_OFF(overflow)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// Encoding
-
-/*! \class rapidjson::Encoding
-    \brief Concept for encoding of Unicode characters.
-
-\code
-concept Encoding {
-    typename Ch;    //! Type of character. A "character" is actually a code unit in unicode's definition.
-
-    enum { supportUnicode = 1 }; // or 0 if not supporting unicode
-
-    //! \brief Encode a Unicode codepoint to an output stream.
-    //! \param os Output stream.
-    //! \param codepoint An unicode codepoint, ranging from 0x0 to 0x10FFFF inclusively.
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint);
-
-    //! \brief Decode a Unicode codepoint from an input stream.
-    //! \param is Input stream.
-    //! \param codepoint Output of the unicode codepoint.
-    //! \return true if a valid codepoint can be decoded from the stream.
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint);
-
-    //! \brief Validate one Unicode codepoint from an encoded stream.
-    //! \param is Input stream to obtain codepoint.
-    //! \param os Output for copying one codepoint.
-    //! \return true if it is valid.
-    //! \note This function just validating and copying the codepoint without actually decode it.
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os);
-
-    // The following functions are deal with byte streams.
-
-    //! Take a character from input byte stream, skip BOM if exist.
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is);
-
-    //! Take a character from input byte stream.
-    template <typename InputByteStream>
-    static Ch Take(InputByteStream& is);
-
-    //! Put BOM to output byte stream.
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os);
-
-    //! Put a character to output byte stream.
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, Ch c);
-};
-\endcode
-*/
-
-///////////////////////////////////////////////////////////////////////////////
-// UTF8
-
-//! UTF-8 encoding.
-/*! http://en.wikipedia.org/wiki/UTF-8
-    http://tools.ietf.org/html/rfc3629
-    \tparam CharType Code unit for storing 8-bit UTF-8 data. Default is char.
-    \note implements Encoding concept
-*/
-template<typename CharType = char>
-struct UTF8 {
-    typedef CharType Ch;
-
-    enum { supportUnicode = 1 };
-
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint) {
-        if (codepoint <= 0x7F) 
-            os.Put(static_cast<Ch>(codepoint & 0xFF));
-        else if (codepoint <= 0x7FF) {
-            os.Put(static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
-            os.Put(static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
-        }
-        else if (codepoint <= 0xFFFF) {
-            os.Put(static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
-            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-        }
-        else {
-            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-            os.Put(static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
-            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
-            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-        }
-    }
-
-    template<typename OutputStream>
-    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        if (codepoint <= 0x7F) 
-            PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
-        else if (codepoint <= 0x7FF) {
-            PutUnsafe(os, static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
-        }
-        else if (codepoint <= 0xFFFF) {
-            PutUnsafe(os, static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-        }
-        else {
-            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-            PutUnsafe(os, static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-        }
-    }
-
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint) {
-#define COPY() c = is.Take(); *codepoint = (*codepoint << 6) | (static_cast<unsigned char>(c) & 0x3Fu)
-#define TRANS(mask) result &= ((GetRange(static_cast<unsigned char>(c)) & mask) != 0)
-#define TAIL() COPY(); TRANS(0x70)
-        typename InputStream::Ch c = is.Take();
-        if (!(c & 0x80)) {
-            *codepoint = static_cast<unsigned char>(c);
-            return true;
-        }
-
-        unsigned char type = GetRange(static_cast<unsigned char>(c));
-        if (type >= 32) {
-            *codepoint = 0;
-        } else {
-            *codepoint = (0xFFu >> type) & static_cast<unsigned char>(c);
-        }
-        bool result = true;
-        switch (type) {
-        case 2: TAIL(); return result;
-        case 3: TAIL(); TAIL(); return result;
-        case 4: COPY(); TRANS(0x50); TAIL(); return result;
-        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
-        case 6: TAIL(); TAIL(); TAIL(); return result;
-        case 10: COPY(); TRANS(0x20); TAIL(); return result;
-        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
-        default: return false;
-        }
-#undef COPY
-#undef TRANS
-#undef TAIL
-    }
-
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os) {
-#define COPY() os.Put(c = is.Take())
-#define TRANS(mask) result &= ((GetRange(static_cast<unsigned char>(c)) & mask) != 0)
-#define TAIL() COPY(); TRANS(0x70)
-        Ch c;
-        COPY();
-        if (!(c & 0x80))
-            return true;
-
-        bool result = true;
-        switch (GetRange(static_cast<unsigned char>(c))) {
-        case 2: TAIL(); return result;
-        case 3: TAIL(); TAIL(); return result;
-        case 4: COPY(); TRANS(0x50); TAIL(); return result;
-        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
-        case 6: TAIL(); TAIL(); TAIL(); return result;
-        case 10: COPY(); TRANS(0x20); TAIL(); return result;
-        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
-        default: return false;
-        }
-#undef COPY
-#undef TRANS
-#undef TAIL
-    }
-
-    static unsigned char GetRange(unsigned char c) {
-        // Referring to DFA of http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
-        // With new mapping 1 -> 0x10, 7 -> 0x20, 9 -> 0x40, such that AND operation can test multiple types.
-        static const unsigned char type[] = {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
-            0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
-            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-            8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-            10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
-        };
-        return type[c];
-    }
-
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        typename InputByteStream::Ch c = Take(is);
-        if (static_cast<unsigned char>(c) != 0xEFu) return c;
-        c = is.Take();
-        if (static_cast<unsigned char>(c) != 0xBBu) return c;
-        c = is.Take();
-        if (static_cast<unsigned char>(c) != 0xBFu) return c;
-        c = is.Take();
-        return c;
-    }
-
-    template <typename InputByteStream>
-    static Ch Take(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        return static_cast<Ch>(is.Take());
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xEFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xBBu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xBFu));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, Ch c) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(c));
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// UTF16
-
-//! UTF-16 encoding.
-/*! http://en.wikipedia.org/wiki/UTF-16
-    http://tools.ietf.org/html/rfc2781
-    \tparam CharType Type for storing 16-bit UTF-16 data. Default is wchar_t. C++11 may use char16_t instead.
-    \note implements Encoding concept
-
-    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
-    For streaming, use UTF16LE and UTF16BE, which handle endianness.
-*/
-template<typename CharType = wchar_t>
-struct UTF16 {
-    typedef CharType Ch;
-    RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 2);
-
-    enum { supportUnicode = 1 };
-
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
-        if (codepoint <= 0xFFFF) {
-            RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
-            os.Put(static_cast<typename OutputStream::Ch>(codepoint));
-        }
-        else {
-            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-            unsigned v = codepoint - 0x10000;
-            os.Put(static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
-            os.Put(static_cast<typename OutputStream::Ch>((v & 0x3FF) | 0xDC00));
-        }
-    }
-
-
-    template<typename OutputStream>
-    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
-        if (codepoint <= 0xFFFF) {
-            RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
-            PutUnsafe(os, static_cast<typename OutputStream::Ch>(codepoint));
-        }
-        else {
-            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-            unsigned v = codepoint - 0x10000;
-            PutUnsafe(os, static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
-            PutUnsafe(os, static_cast<typename OutputStream::Ch>((v & 0x3FF) | 0xDC00));
-        }
-    }
-
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
-        typename InputStream::Ch c = is.Take();
-        if (c < 0xD800 || c > 0xDFFF) {
-            *codepoint = static_cast<unsigned>(c);
-            return true;
-        }
-        else if (c <= 0xDBFF) {
-            *codepoint = (static_cast<unsigned>(c) & 0x3FF) << 10;
-            c = is.Take();
-            *codepoint |= (static_cast<unsigned>(c) & 0x3FF);
-            *codepoint += 0x10000;
-            return c >= 0xDC00 && c <= 0xDFFF;
-        }
-        return false;
-    }
-
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
-        typename InputStream::Ch c;
-        os.Put(static_cast<typename OutputStream::Ch>(c = is.Take()));
-        if (c < 0xD800 || c > 0xDFFF)
-            return true;
-        else if (c <= 0xDBFF) {
-            os.Put(c = is.Take());
-            return c >= 0xDC00 && c <= 0xDFFF;
-        }
-        return false;
-    }
-};
-
-//! UTF-16 little endian encoding.
-template<typename CharType = wchar_t>
-struct UTF16LE : UTF16<CharType> {
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = Take(is);
-        return static_cast<uint16_t>(c) == 0xFEFFu ? Take(is) : c;
-    }
-
-    template <typename InputByteStream>
-    static CharType Take(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        unsigned c = static_cast<uint8_t>(is.Take());
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
-        return static_cast<CharType>(c);
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, CharType c) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(static_cast<unsigned>(c) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((static_cast<unsigned>(c) >> 8) & 0xFFu));
-    }
-};
-
-//! UTF-16 big endian encoding.
-template<typename CharType = wchar_t>
-struct UTF16BE : UTF16<CharType> {
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = Take(is);
-        return static_cast<uint16_t>(c) == 0xFEFFu ? Take(is) : c;
-    }
-
-    template <typename InputByteStream>
-    static CharType Take(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        unsigned c = static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take()));
-        return static_cast<CharType>(c);
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, CharType c) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>((static_cast<unsigned>(c) >> 8) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(static_cast<unsigned>(c) & 0xFFu));
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// UTF32
-
-//! UTF-32 encoding. 
-/*! http://en.wikipedia.org/wiki/UTF-32
-    \tparam CharType Type for storing 32-bit UTF-32 data. Default is unsigned. C++11 may use char32_t instead.
-    \note implements Encoding concept
-
-    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
-    For streaming, use UTF32LE and UTF32BE, which handle endianness.
-*/
-template<typename CharType = unsigned>
-struct UTF32 {
-    typedef CharType Ch;
-    RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 4);
-
-    enum { supportUnicode = 1 };
-
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
-        RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-        os.Put(codepoint);
-    }
-
-    template<typename OutputStream>
-    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
-        RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-        PutUnsafe(os, codepoint);
-    }
-
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
-        Ch c = is.Take();
-        *codepoint = c;
-        return c <= 0x10FFFF;
-    }
-
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
-        Ch c;
-        os.Put(c = is.Take());
-        return c <= 0x10FFFF;
-    }
-};
-
-//! UTF-32 little endian enocoding.
-template<typename CharType = unsigned>
-struct UTF32LE : UTF32<CharType> {
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = Take(is);
-        return static_cast<uint32_t>(c) == 0x0000FEFFu ? Take(is) : c;
-    }
-
-    template <typename InputByteStream>
-    static CharType Take(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        unsigned c = static_cast<uint8_t>(is.Take());
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 16;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 24;
-        return static_cast<CharType>(c);
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, CharType c) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(c & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 8) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 16) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 24) & 0xFFu));
-    }
-};
-
-//! UTF-32 big endian encoding.
-template<typename CharType = unsigned>
-struct UTF32BE : UTF32<CharType> {
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = Take(is);
-        return static_cast<uint32_t>(c) == 0x0000FEFFu ? Take(is) : c; 
-    }
-
-    template <typename InputByteStream>
-    static CharType Take(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        unsigned c = static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 24;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 16;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take()));
-        return static_cast<CharType>(c);
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, CharType c) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 24) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 16) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 8) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(c & 0xFFu));
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// ASCII
-
-//! ASCII encoding.
-/*! http://en.wikipedia.org/wiki/ASCII
-    \tparam CharType Code unit for storing 7-bit ASCII data. Default is char.
-    \note implements Encoding concept
-*/
-template<typename CharType = char>
-struct ASCII {
-    typedef CharType Ch;
-
-    enum { supportUnicode = 0 };
-
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint) {
-        RAPIDJSON_ASSERT(codepoint <= 0x7F);
-        os.Put(static_cast<Ch>(codepoint & 0xFF));
-    }
-
-    template<typename OutputStream>
-    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        RAPIDJSON_ASSERT(codepoint <= 0x7F);
-        PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
-    }
-
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint) {
-        uint8_t c = static_cast<uint8_t>(is.Take());
-        *codepoint = c;
-        return c <= 0X7F;
-    }
-
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os) {
-        uint8_t c = static_cast<uint8_t>(is.Take());
-        os.Put(static_cast<typename OutputStream::Ch>(c));
-        return c <= 0x7F;
-    }
-
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        uint8_t c = static_cast<uint8_t>(Take(is));
-        return static_cast<Ch>(c);
-    }
-
-    template <typename InputByteStream>
-    static Ch Take(InputByteStream& is) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        return static_cast<Ch>(is.Take());
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        (void)os;
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, Ch c) {
-        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(c));
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// AutoUTF
-
-//! Runtime-specified UTF encoding type of a stream.
-enum UTFType {
-    kUTF8 = 0,      //!< UTF-8.
-    kUTF16LE = 1,   //!< UTF-16 little endian.
-    kUTF16BE = 2,   //!< UTF-16 big endian.
-    kUTF32LE = 3,   //!< UTF-32 little endian.
-    kUTF32BE = 4    //!< UTF-32 big endian.
-};
-
-//! Dynamically select encoding according to stream's runtime-specified UTF encoding type.
-/*! \note This class can be used with AutoUTFInputtStream and AutoUTFOutputStream, which provides GetType().
-*/
-template<typename CharType>
-struct AutoUTF {
-    typedef CharType Ch;
-
-    enum { supportUnicode = 1 };
-
-#define RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
-
-    template<typename OutputStream>
-    static RAPIDJSON_FORCEINLINE void Encode(OutputStream& os, unsigned codepoint) {
-        typedef void (*EncodeFunc)(OutputStream&, unsigned);
-        static const EncodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Encode) };
-        (*f[os.GetType()])(os, codepoint);
-    }
-
-    template<typename OutputStream>
-    static RAPIDJSON_FORCEINLINE void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        typedef void (*EncodeFunc)(OutputStream&, unsigned);
-        static const EncodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(EncodeUnsafe) };
-        (*f[os.GetType()])(os, codepoint);
-    }
-
-    template <typename InputStream>
-    static RAPIDJSON_FORCEINLINE bool Decode(InputStream& is, unsigned* codepoint) {
-        typedef bool (*DecodeFunc)(InputStream&, unsigned*);
-        static const DecodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Decode) };
-        return (*f[is.GetType()])(is, codepoint);
-    }
-
-    template <typename InputStream, typename OutputStream>
-    static RAPIDJSON_FORCEINLINE bool Validate(InputStream& is, OutputStream& os) {
-        typedef bool (*ValidateFunc)(InputStream&, OutputStream&);
-        static const ValidateFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Validate) };
-        return (*f[is.GetType()])(is, os);
-    }
-
-#undef RAPIDJSON_ENCODINGS_FUNC
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Transcoder
-
-//! Encoding conversion.
-template<typename SourceEncoding, typename TargetEncoding>
-struct Transcoder {
-    //! Take one Unicode codepoint from source encoding, convert it to target encoding and put it to the output stream.
-    template<typename InputStream, typename OutputStream>
-    static RAPIDJSON_FORCEINLINE bool Transcode(InputStream& is, OutputStream& os) {
-        unsigned codepoint;
-        if (!SourceEncoding::Decode(is, &codepoint))
-            return false;
-        TargetEncoding::Encode(os, codepoint);
-        return true;
-    }
-
-    template<typename InputStream, typename OutputStream>
-    static RAPIDJSON_FORCEINLINE bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
-        unsigned codepoint;
-        if (!SourceEncoding::Decode(is, &codepoint))
-            return false;
-        TargetEncoding::EncodeUnsafe(os, codepoint);
-        return true;
-    }
-
-    //! Validate one Unicode codepoint from an encoded stream.
-    template<typename InputStream, typename OutputStream>
-    static RAPIDJSON_FORCEINLINE bool Validate(InputStream& is, OutputStream& os) {
-        return Transcode(is, os);   // Since source/target encoding is different, must transcode.
-    }
-};
-
-// Forward declaration.
-template<typename Stream>
-inline void PutUnsafe(Stream& stream, typename Stream::Ch c);
-
-//! Specialization of Transcoder with same source and target encoding.
-template<typename Encoding>
-struct Transcoder<Encoding, Encoding> {
-    template<typename InputStream, typename OutputStream>
-    static RAPIDJSON_FORCEINLINE bool Transcode(InputStream& is, OutputStream& os) {
-        os.Put(is.Take());  // Just copy one code unit. This semantic is different from primary template class.
-        return true;
-    }
-    
-    template<typename InputStream, typename OutputStream>
-    static RAPIDJSON_FORCEINLINE bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
-        PutUnsafe(os, is.Take());  // Just copy one code unit. This semantic is different from primary template class.
-        return true;
-    }
-    
-    template<typename InputStream, typename OutputStream>
-    static RAPIDJSON_FORCEINLINE bool Validate(InputStream& is, OutputStream& os) {
-        return Encoding::Validate(is, os);  // source/target encoding are the same
-    }
-};
-
-RAPIDJSON_NAMESPACE_END
-
-#if defined(__GNUC__) || (defined(_MSC_VER) && !defined(__clang__))
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_ENCODINGS_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/error/en.h b/src/sioclient/lib/rapidjson/include/rapidjson/error/en.h
deleted file mode 100644
index 2db838bf..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/error/en.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ERROR_EN_H_
-#define RAPIDJSON_ERROR_EN_H_
-
-#include "error.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(switch-enum)
-RAPIDJSON_DIAG_OFF(covered-switch-default)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Maps error code of parsing into error message.
-/*!
-    \ingroup RAPIDJSON_ERRORS
-    \param parseErrorCode Error code obtained in parsing.
-    \return the error message.
-    \note User can make a copy of this function for localization.
-        Using switch-case is safer for future modification of error codes.
-*/
-inline const RAPIDJSON_ERROR_CHARTYPE* GetParseError_En(ParseErrorCode parseErrorCode) {
-    switch (parseErrorCode) {
-        case kParseErrorNone:                           return RAPIDJSON_ERROR_STRING("No error.");
-
-        case kParseErrorDocumentEmpty:                  return RAPIDJSON_ERROR_STRING("The document is empty.");
-        case kParseErrorDocumentRootNotSingular:        return RAPIDJSON_ERROR_STRING("The document root must not be followed by other values.");
-    
-        case kParseErrorValueInvalid:                   return RAPIDJSON_ERROR_STRING("Invalid value.");
-    
-        case kParseErrorObjectMissName:                 return RAPIDJSON_ERROR_STRING("Missing a name for object member.");
-        case kParseErrorObjectMissColon:                return RAPIDJSON_ERROR_STRING("Missing a colon after a name of object member.");
-        case kParseErrorObjectMissCommaOrCurlyBracket:  return RAPIDJSON_ERROR_STRING("Missing a comma or '}' after an object member.");
-    
-        case kParseErrorArrayMissCommaOrSquareBracket:  return RAPIDJSON_ERROR_STRING("Missing a comma or ']' after an array element.");
-
-        case kParseErrorStringUnicodeEscapeInvalidHex:  return RAPIDJSON_ERROR_STRING("Incorrect hex digit after \\u escape in string.");
-        case kParseErrorStringUnicodeSurrogateInvalid:  return RAPIDJSON_ERROR_STRING("The surrogate pair in string is invalid.");
-        case kParseErrorStringEscapeInvalid:            return RAPIDJSON_ERROR_STRING("Invalid escape character in string.");
-        case kParseErrorStringMissQuotationMark:        return RAPIDJSON_ERROR_STRING("Missing a closing quotation mark in string.");
-        case kParseErrorStringInvalidEncoding:          return RAPIDJSON_ERROR_STRING("Invalid encoding in string.");
-
-        case kParseErrorNumberTooBig:                   return RAPIDJSON_ERROR_STRING("Number too big to be stored in double.");
-        case kParseErrorNumberMissFraction:             return RAPIDJSON_ERROR_STRING("Miss fraction part in number.");
-        case kParseErrorNumberMissExponent:             return RAPIDJSON_ERROR_STRING("Miss exponent in number.");
-
-        case kParseErrorTermination:                    return RAPIDJSON_ERROR_STRING("Terminate parsing due to Handler error.");
-        case kParseErrorUnspecificSyntaxError:          return RAPIDJSON_ERROR_STRING("Unspecific syntax error.");
-
-        default:                                        return RAPIDJSON_ERROR_STRING("Unknown error.");
-    }
-}
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_ERROR_EN_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/error/error.h b/src/sioclient/lib/rapidjson/include/rapidjson/error/error.h
deleted file mode 100644
index 9311d2f0..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/error/error.h
+++ /dev/null
@@ -1,161 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ERROR_ERROR_H_
-#define RAPIDJSON_ERROR_ERROR_H_
-
-#include "../rapidjson.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-/*! \file error.h */
-
-/*! \defgroup RAPIDJSON_ERRORS RapidJSON error handling */
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ERROR_CHARTYPE
-
-//! Character type of error messages.
-/*! \ingroup RAPIDJSON_ERRORS
-    The default character type is \c char.
-    On Windows, user can define this macro as \c TCHAR for supporting both
-    unicode/non-unicode settings.
-*/
-#ifndef RAPIDJSON_ERROR_CHARTYPE
-#define RAPIDJSON_ERROR_CHARTYPE char
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ERROR_STRING
-
-//! Macro for converting string literial to \ref RAPIDJSON_ERROR_CHARTYPE[].
-/*! \ingroup RAPIDJSON_ERRORS
-    By default this conversion macro does nothing.
-    On Windows, user can define this macro as \c _T(x) for supporting both
-    unicode/non-unicode settings.
-*/
-#ifndef RAPIDJSON_ERROR_STRING
-#define RAPIDJSON_ERROR_STRING(x) x
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// ParseErrorCode
-
-//! Error code of parsing.
-/*! \ingroup RAPIDJSON_ERRORS
-    \see GenericReader::Parse, GenericReader::GetParseErrorCode
-*/
-enum ParseErrorCode {
-    kParseErrorNone = 0,                        //!< No error.
-
-    kParseErrorDocumentEmpty,                   //!< The document is empty.
-    kParseErrorDocumentRootNotSingular,         //!< The document root must not follow by other values.
-
-    kParseErrorValueInvalid,                    //!< Invalid value.
-
-    kParseErrorObjectMissName,                  //!< Missing a name for object member.
-    kParseErrorObjectMissColon,                 //!< Missing a colon after a name of object member.
-    kParseErrorObjectMissCommaOrCurlyBracket,   //!< Missing a comma or '}' after an object member.
-
-    kParseErrorArrayMissCommaOrSquareBracket,   //!< Missing a comma or ']' after an array element.
-
-    kParseErrorStringUnicodeEscapeInvalidHex,   //!< Incorrect hex digit after \\u escape in string.
-    kParseErrorStringUnicodeSurrogateInvalid,   //!< The surrogate pair in string is invalid.
-    kParseErrorStringEscapeInvalid,             //!< Invalid escape character in string.
-    kParseErrorStringMissQuotationMark,         //!< Missing a closing quotation mark in string.
-    kParseErrorStringInvalidEncoding,           //!< Invalid encoding in string.
-
-    kParseErrorNumberTooBig,                    //!< Number too big to be stored in double.
-    kParseErrorNumberMissFraction,              //!< Miss fraction part in number.
-    kParseErrorNumberMissExponent,              //!< Miss exponent in number.
-
-    kParseErrorTermination,                     //!< Parsing was terminated.
-    kParseErrorUnspecificSyntaxError            //!< Unspecific syntax error.
-};
-
-//! Result of parsing (wraps ParseErrorCode)
-/*!
-    \ingroup RAPIDJSON_ERRORS
-    \code
-        Document doc;
-        ParseResult ok = doc.Parse("[42]");
-        if (!ok) {
-            fprintf(stderr, "JSON parse error: %s (%u)",
-                    GetParseError_En(ok.Code()), ok.Offset());
-            exit(EXIT_FAILURE);
-        }
-    \endcode
-    \see GenericReader::Parse, GenericDocument::Parse
-*/
-struct ParseResult {
-    //!! Unspecified boolean type
-    typedef bool (ParseResult::*BooleanType)() const;
-public:
-    //! Default constructor, no error.
-    ParseResult() : code_(kParseErrorNone), offset_(0) {}
-    //! Constructor to set an error.
-    ParseResult(ParseErrorCode code, size_t offset) : code_(code), offset_(offset) {}
-
-    //! Get the error code.
-    ParseErrorCode Code() const { return code_; }
-    //! Get the error offset, if \ref IsError(), 0 otherwise.
-    size_t Offset() const { return offset_; }
-
-    //! Explicit conversion to \c bool, returns \c true, iff !\ref IsError().
-    operator BooleanType() const { return !IsError() ? &ParseResult::IsError : NULL; }
-    //! Whether the result is an error.
-    bool IsError() const { return code_ != kParseErrorNone; }
-
-    bool operator==(const ParseResult& that) const { return code_ == that.code_; }
-    bool operator==(ParseErrorCode code) const { return code_ == code; }
-    friend bool operator==(ParseErrorCode code, const ParseResult & err) { return code == err.code_; }
-
-    bool operator!=(const ParseResult& that) const { return !(*this == that); }
-    bool operator!=(ParseErrorCode code) const { return !(*this == code); }
-    friend bool operator!=(ParseErrorCode code, const ParseResult & err) { return err != code; }
-
-    //! Reset error code.
-    void Clear() { Set(kParseErrorNone); }
-    //! Update error code and offset.
-    void Set(ParseErrorCode code, size_t offset = 0) { code_ = code; offset_ = offset; }
-
-private:
-    ParseErrorCode code_;
-    size_t offset_;
-};
-
-//! Function pointer type of GetParseError().
-/*! \ingroup RAPIDJSON_ERRORS
-
-    This is the prototype for \c GetParseError_X(), where \c X is a locale.
-    User can dynamically change locale in runtime, e.g.:
-\code
-    GetParseErrorFunc GetParseError = GetParseError_En; // or whatever
-    const RAPIDJSON_ERROR_CHARTYPE* s = GetParseError(document.GetParseErrorCode());
-\endcode
-*/
-typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetParseErrorFunc)(ParseErrorCode);
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_ERROR_ERROR_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/filereadstream.h b/src/sioclient/lib/rapidjson/include/rapidjson/filereadstream.h
deleted file mode 100644
index f1bfb7d0..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/filereadstream.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_FILEREADSTREAM_H_
-#define RAPIDJSON_FILEREADSTREAM_H_
-
-#include "stream.h"
-#include <cstdio>
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-RAPIDJSON_DIAG_OFF(unreachable-code)
-RAPIDJSON_DIAG_OFF(missing-noreturn)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! File byte stream for input using fread().
-/*!
-    \note implements Stream concept
-*/
-class FileReadStream {
-public:
-    typedef char Ch;    //!< Character type (byte).
-
-    //! Constructor.
-    /*!
-        \param fp File pointer opened for read.
-        \param buffer user-supplied buffer.
-        \param bufferSize size of buffer in bytes. Must >=4 bytes.
-    */
-    FileReadStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 
-        RAPIDJSON_ASSERT(fp_ != 0);
-        RAPIDJSON_ASSERT(bufferSize >= 4);
-        Read();
-    }
-
-    Ch Peek() const { return *current_; }
-    Ch Take() { Ch c = *current_; Read(); return c; }
-    size_t Tell() const { return count_ + static_cast<size_t>(current_ - buffer_); }
-
-    // Not implemented
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); } 
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-    // For encoding detection only.
-    const Ch* Peek4() const {
-        return (current_ + 4 <= bufferLast_) ? current_ : 0;
-    }
-
-private:
-    void Read() {
-        if (current_ < bufferLast_)
-            ++current_;
-        else if (!eof_) {
-            count_ += readCount_;
-            readCount_ = std::fread(buffer_, 1, bufferSize_, fp_);
-            bufferLast_ = buffer_ + readCount_ - 1;
-            current_ = buffer_;
-
-            if (readCount_ < bufferSize_) {
-                buffer_[readCount_] = '\0';
-                ++bufferLast_;
-                eof_ = true;
-            }
-        }
-    }
-
-    std::FILE* fp_;
-    Ch *buffer_;
-    size_t bufferSize_;
-    Ch *bufferLast_;
-    Ch *current_;
-    size_t readCount_;
-    size_t count_;  //!< Number of characters read
-    bool eof_;
-};
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_FILESTREAM_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/filewritestream.h b/src/sioclient/lib/rapidjson/include/rapidjson/filewritestream.h
deleted file mode 100644
index 8b48fee1..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/filewritestream.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_FILEWRITESTREAM_H_
-#define RAPIDJSON_FILEWRITESTREAM_H_
-
-#include "stream.h"
-#include <cstdio>
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(unreachable-code)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Wrapper of C file stream for output using fwrite().
-/*!
-    \note implements Stream concept
-*/
-class FileWriteStream {
-public:
-    typedef char Ch;    //!< Character type. Only support char.
-
-    FileWriteStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferEnd_(buffer + bufferSize), current_(buffer_) { 
-        RAPIDJSON_ASSERT(fp_ != 0);
-    }
-
-    void Put(char c) { 
-        if (current_ >= bufferEnd_)
-            Flush();
-
-        *current_++ = c;
-    }
-
-    void PutN(char c, size_t n) {
-        size_t avail = static_cast<size_t>(bufferEnd_ - current_);
-        while (n > avail) {
-            std::memset(current_, c, avail);
-            current_ += avail;
-            Flush();
-            n -= avail;
-            avail = static_cast<size_t>(bufferEnd_ - current_);
-        }
-
-        if (n > 0) {
-            std::memset(current_, c, n);
-            current_ += n;
-        }
-    }
-
-    void Flush() {
-        if (current_ != buffer_) {
-            size_t result = std::fwrite(buffer_, 1, static_cast<size_t>(current_ - buffer_), fp_);
-            if (result < static_cast<size_t>(current_ - buffer_)) {
-                // failure deliberately ignored at this time
-                // added to avoid warn_unused_result build errors
-            }
-            current_ = buffer_;
-        }
-    }
-
-    // Not implemented
-    char Peek() const { RAPIDJSON_ASSERT(false); return 0; }
-    char Take() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
-    char* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(char*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    FileWriteStream(const FileWriteStream&);
-    FileWriteStream& operator=(const FileWriteStream&);
-
-    std::FILE* fp_;
-    char *buffer_;
-    char *bufferEnd_;
-    char *current_;
-};
-
-//! Implement specialized version of PutN() with memset() for better performance.
-template<>
-inline void PutN(FileWriteStream& stream, char c, size_t n) {
-    stream.PutN(c, n);
-}
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_FILESTREAM_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/fwd.h b/src/sioclient/lib/rapidjson/include/rapidjson/fwd.h
deleted file mode 100644
index e8104e84..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/fwd.h
+++ /dev/null
@@ -1,151 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_FWD_H_
-#define RAPIDJSON_FWD_H_
-
-#include "rapidjson.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-// encodings.h
-
-template<typename CharType> struct UTF8;
-template<typename CharType> struct UTF16;
-template<typename CharType> struct UTF16BE;
-template<typename CharType> struct UTF16LE;
-template<typename CharType> struct UTF32;
-template<typename CharType> struct UTF32BE;
-template<typename CharType> struct UTF32LE;
-template<typename CharType> struct ASCII;
-template<typename CharType> struct AutoUTF;
-
-template<typename SourceEncoding, typename TargetEncoding>
-struct Transcoder;
-
-// allocators.h
-
-class CrtAllocator;
-
-template <typename BaseAllocator>
-class MemoryPoolAllocator;
-
-// stream.h
-
-template <typename Encoding>
-struct GenericStringStream;
-
-typedef GenericStringStream<UTF8<char> > StringStream;
-
-template <typename Encoding>
-struct GenericInsituStringStream;
-
-typedef GenericInsituStringStream<UTF8<char> > InsituStringStream;
-
-// stringbuffer.h
-
-template <typename Encoding, typename Allocator>
-class GenericStringBuffer;
-
-typedef GenericStringBuffer<UTF8<char>, CrtAllocator> StringBuffer;
-
-// filereadstream.h
-
-class FileReadStream;
-
-// filewritestream.h
-
-class FileWriteStream;
-
-// memorybuffer.h
-
-template <typename Allocator>
-struct GenericMemoryBuffer;
-
-typedef GenericMemoryBuffer<CrtAllocator> MemoryBuffer;
-
-// memorystream.h
-
-struct MemoryStream;
-
-// reader.h
-
-template<typename Encoding, typename Derived>
-struct BaseReaderHandler;
-
-template <typename SourceEncoding, typename TargetEncoding, typename StackAllocator>
-class GenericReader;
-
-typedef GenericReader<UTF8<char>, UTF8<char>, CrtAllocator> Reader;
-
-// writer.h
-
-template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
-class Writer;
-
-// prettywriter.h
-
-template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
-class PrettyWriter;
-
-// document.h
-
-template <typename Encoding, typename Allocator> 
-struct GenericMember;
-
-template <bool Const, typename Encoding, typename Allocator>
-class GenericMemberIterator;
-
-template<typename CharType>
-struct GenericStringRef;
-
-template <typename Encoding, typename Allocator> 
-class GenericValue;
-
-typedef GenericValue<UTF8<char>, MemoryPoolAllocator<CrtAllocator> > Value;
-
-template <typename Encoding, typename Allocator, typename StackAllocator>
-class GenericDocument;
-
-typedef GenericDocument<UTF8<char>, MemoryPoolAllocator<CrtAllocator>, CrtAllocator> Document;
-
-// pointer.h
-
-template <typename ValueType, typename Allocator>
-class GenericPointer;
-
-typedef GenericPointer<Value, CrtAllocator> Pointer;
-
-// schema.h
-
-template <typename SchemaDocumentType>
-class IGenericRemoteSchemaDocumentProvider;
-
-template <typename ValueT, typename Allocator>
-class GenericSchemaDocument;
-
-typedef GenericSchemaDocument<Value, CrtAllocator> SchemaDocument;
-typedef IGenericRemoteSchemaDocumentProvider<SchemaDocument> IRemoteSchemaDocumentProvider;
-
-template <
-    typename SchemaDocumentType,
-    typename OutputHandler,
-    typename StateAllocator>
-class GenericSchemaValidator;
-
-typedef GenericSchemaValidator<SchemaDocument, BaseReaderHandler<UTF8<char>, void>, CrtAllocator> SchemaValidator;
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_RAPIDJSONFWD_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/internal/biginteger.h b/src/sioclient/lib/rapidjson/include/rapidjson/internal/biginteger.h
deleted file mode 100644
index a31c8a88..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/internal/biginteger.h
+++ /dev/null
@@ -1,290 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_BIGINTEGER_H_
-#define RAPIDJSON_BIGINTEGER_H_
-
-#include "../rapidjson.h"
-
-#if defined(_MSC_VER) && !__INTEL_COMPILER && defined(_M_AMD64)
-#include <intrin.h> // for _umul128
-#pragma intrinsic(_umul128)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-class BigInteger {
-public:
-    typedef uint64_t Type;
-
-    BigInteger(const BigInteger& rhs) : count_(rhs.count_) {
-        std::memcpy(digits_, rhs.digits_, count_ * sizeof(Type));
-    }
-
-    explicit BigInteger(uint64_t u) : count_(1) {
-        digits_[0] = u;
-    }
-
-    BigInteger(const char* decimals, size_t length) : count_(1) {
-        RAPIDJSON_ASSERT(length > 0);
-        digits_[0] = 0;
-        size_t i = 0;
-        const size_t kMaxDigitPerIteration = 19;  // 2^64 = 18446744073709551616 > 10^19
-        while (length >= kMaxDigitPerIteration) {
-            AppendDecimal64(decimals + i, decimals + i + kMaxDigitPerIteration);
-            length -= kMaxDigitPerIteration;
-            i += kMaxDigitPerIteration;
-        }
-
-        if (length > 0)
-            AppendDecimal64(decimals + i, decimals + i + length);
-    }
-    
-    BigInteger& operator=(const BigInteger &rhs)
-    {
-        if (this != &rhs) {
-            count_ = rhs.count_;
-            std::memcpy(digits_, rhs.digits_, count_ * sizeof(Type));
-        }
-        return *this;
-    }
-    
-    BigInteger& operator=(uint64_t u) {
-        digits_[0] = u;            
-        count_ = 1;
-        return *this;
-    }
-
-    BigInteger& operator+=(uint64_t u) {
-        Type backup = digits_[0];
-        digits_[0] += u;
-        for (size_t i = 0; i < count_ - 1; i++) {
-            if (digits_[i] >= backup)
-                return *this; // no carry
-            backup = digits_[i + 1];
-            digits_[i + 1] += 1;
-        }
-
-        // Last carry
-        if (digits_[count_ - 1] < backup)
-            PushBack(1);
-
-        return *this;
-    }
-
-    BigInteger& operator*=(uint64_t u) {
-        if (u == 0) return *this = 0;
-        if (u == 1) return *this;
-        if (*this == 1) return *this = u;
-
-        uint64_t k = 0;
-        for (size_t i = 0; i < count_; i++) {
-            uint64_t hi;
-            digits_[i] = MulAdd64(digits_[i], u, k, &hi);
-            k = hi;
-        }
-        
-        if (k > 0)
-            PushBack(k);
-
-        return *this;
-    }
-
-    BigInteger& operator*=(uint32_t u) {
-        if (u == 0) return *this = 0;
-        if (u == 1) return *this;
-        if (*this == 1) return *this = u;
-
-        uint64_t k = 0;
-        for (size_t i = 0; i < count_; i++) {
-            const uint64_t c = digits_[i] >> 32;
-            const uint64_t d = digits_[i] & 0xFFFFFFFF;
-            const uint64_t uc = u * c;
-            const uint64_t ud = u * d;
-            const uint64_t p0 = ud + k;
-            const uint64_t p1 = uc + (p0 >> 32);
-            digits_[i] = (p0 & 0xFFFFFFFF) | (p1 << 32);
-            k = p1 >> 32;
-        }
-        
-        if (k > 0)
-            PushBack(k);
-
-        return *this;
-    }
-
-    BigInteger& operator<<=(size_t shift) {
-        if (IsZero() || shift == 0) return *this;
-
-        size_t offset = shift / kTypeBit;
-        size_t interShift = shift % kTypeBit;
-        RAPIDJSON_ASSERT(count_ + offset <= kCapacity);
-
-        if (interShift == 0) {
-            std::memmove(digits_ + offset, digits_, count_ * sizeof(Type));
-            count_ += offset;
-        }
-        else {
-            digits_[count_] = 0;
-            for (size_t i = count_; i > 0; i--)
-                digits_[i + offset] = (digits_[i] << interShift) | (digits_[i - 1] >> (kTypeBit - interShift));
-            digits_[offset] = digits_[0] << interShift;
-            count_ += offset;
-            if (digits_[count_])
-                count_++;
-        }
-
-        std::memset(digits_, 0, offset * sizeof(Type));
-
-        return *this;
-    }
-
-    bool operator==(const BigInteger& rhs) const {
-        return count_ == rhs.count_ && std::memcmp(digits_, rhs.digits_, count_ * sizeof(Type)) == 0;
-    }
-
-    bool operator==(const Type rhs) const {
-        return count_ == 1 && digits_[0] == rhs;
-    }
-
-    BigInteger& MultiplyPow5(unsigned exp) {
-        static const uint32_t kPow5[12] = {
-            5,
-            5 * 5,
-            5 * 5 * 5,
-            5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5
-        };
-        if (exp == 0) return *this;
-        for (; exp >= 27; exp -= 27) *this *= RAPIDJSON_UINT64_C2(0X6765C793, 0XFA10079D); // 5^27
-        for (; exp >= 13; exp -= 13) *this *= static_cast<uint32_t>(1220703125u); // 5^13
-        if (exp > 0)                 *this *= kPow5[exp - 1];
-        return *this;
-    }
-
-    // Compute absolute difference of this and rhs.
-    // Assume this != rhs
-    bool Difference(const BigInteger& rhs, BigInteger* out) const {
-        int cmp = Compare(rhs);
-        RAPIDJSON_ASSERT(cmp != 0);
-        const BigInteger *a, *b;  // Makes a > b
-        bool ret;
-        if (cmp < 0) { a = &rhs; b = this; ret = true; }
-        else         { a = this; b = &rhs; ret = false; }
-
-        Type borrow = 0;
-        for (size_t i = 0; i < a->count_; i++) {
-            Type d = a->digits_[i] - borrow;
-            if (i < b->count_)
-                d -= b->digits_[i];
-            borrow = (d > a->digits_[i]) ? 1 : 0;
-            out->digits_[i] = d;
-            if (d != 0)
-                out->count_ = i + 1;
-        }
-
-        return ret;
-    }
-
-    int Compare(const BigInteger& rhs) const {
-        if (count_ != rhs.count_)
-            return count_ < rhs.count_ ? -1 : 1;
-
-        for (size_t i = count_; i-- > 0;)
-            if (digits_[i] != rhs.digits_[i])
-                return digits_[i] < rhs.digits_[i] ? -1 : 1;
-
-        return 0;
-    }
-
-    size_t GetCount() const { return count_; }
-    Type GetDigit(size_t index) const { RAPIDJSON_ASSERT(index < count_); return digits_[index]; }
-    bool IsZero() const { return count_ == 1 && digits_[0] == 0; }
-
-private:
-    void AppendDecimal64(const char* begin, const char* end) {
-        uint64_t u = ParseUint64(begin, end);
-        if (IsZero())
-            *this = u;
-        else {
-            unsigned exp = static_cast<unsigned>(end - begin);
-            (MultiplyPow5(exp) <<= exp) += u;   // *this = *this * 10^exp + u
-        }
-    }
-
-    void PushBack(Type digit) {
-        RAPIDJSON_ASSERT(count_ < kCapacity);
-        digits_[count_++] = digit;
-    }
-
-    static uint64_t ParseUint64(const char* begin, const char* end) {
-        uint64_t r = 0;
-        for (const char* p = begin; p != end; ++p) {
-            RAPIDJSON_ASSERT(*p >= '0' && *p <= '9');
-            r = r * 10u + static_cast<unsigned>(*p - '0');
-        }
-        return r;
-    }
-
-    // Assume a * b + k < 2^128
-    static uint64_t MulAdd64(uint64_t a, uint64_t b, uint64_t k, uint64_t* outHigh) {
-#if defined(_MSC_VER) && defined(_M_AMD64)
-        uint64_t low = _umul128(a, b, outHigh) + k;
-        if (low < k)
-            (*outHigh)++;
-        return low;
-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
-        __extension__ typedef unsigned __int128 uint128;
-        uint128 p = static_cast<uint128>(a) * static_cast<uint128>(b);
-        p += k;
-        *outHigh = static_cast<uint64_t>(p >> 64);
-        return static_cast<uint64_t>(p);
-#else
-        const uint64_t a0 = a & 0xFFFFFFFF, a1 = a >> 32, b0 = b & 0xFFFFFFFF, b1 = b >> 32;
-        uint64_t x0 = a0 * b0, x1 = a0 * b1, x2 = a1 * b0, x3 = a1 * b1;
-        x1 += (x0 >> 32); // can't give carry
-        x1 += x2;
-        if (x1 < x2)
-            x3 += (static_cast<uint64_t>(1) << 32);
-        uint64_t lo = (x1 << 32) + (x0 & 0xFFFFFFFF);
-        uint64_t hi = x3 + (x1 >> 32);
-
-        lo += k;
-        if (lo < k)
-            hi++;
-        *outHigh = hi;
-        return lo;
-#endif
-    }
-
-    static const size_t kBitCount = 3328;  // 64bit * 54 > 10^1000
-    static const size_t kCapacity = kBitCount / sizeof(Type);
-    static const size_t kTypeBit = sizeof(Type) * 8;
-
-    Type digits_[kCapacity];
-    size_t count_;
-};
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_BIGINTEGER_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/internal/diyfp.h b/src/sioclient/lib/rapidjson/include/rapidjson/internal/diyfp.h
deleted file mode 100644
index b6c2cf56..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/internal/diyfp.h
+++ /dev/null
@@ -1,271 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
-// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
-// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
-
-#ifndef RAPIDJSON_DIYFP_H_
-#define RAPIDJSON_DIYFP_H_
-
-#include "../rapidjson.h"
-#include <limits>
-
-#if defined(_MSC_VER) && defined(_M_AMD64) && !defined(__INTEL_COMPILER)
-#include <intrin.h>
-#pragma intrinsic(_BitScanReverse64)
-#pragma intrinsic(_umul128)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-struct DiyFp {
-    DiyFp() : f(), e() {}
-
-    DiyFp(uint64_t fp, int exp) : f(fp), e(exp) {}
-
-    explicit DiyFp(double d) {
-        union {
-            double d;
-            uint64_t u64;
-        } u = { d };
-
-        int biased_e = static_cast<int>((u.u64 & kDpExponentMask) >> kDpSignificandSize);
-        uint64_t significand = (u.u64 & kDpSignificandMask);
-        if (biased_e != 0) {
-            f = significand + kDpHiddenBit;
-            e = biased_e - kDpExponentBias;
-        }
-        else {
-            f = significand;
-            e = kDpMinExponent + 1;
-        }
-    }
-
-    DiyFp operator-(const DiyFp& rhs) const {
-        return DiyFp(f - rhs.f, e);
-    }
-
-    DiyFp operator*(const DiyFp& rhs) const {
-#if defined(_MSC_VER) && defined(_M_AMD64)
-        uint64_t h;
-        uint64_t l = _umul128(f, rhs.f, &h);
-        if (l & (uint64_t(1) << 63)) // rounding
-            h++;
-        return DiyFp(h, e + rhs.e + 64);
-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
-        __extension__ typedef unsigned __int128 uint128;
-        uint128 p = static_cast<uint128>(f) * static_cast<uint128>(rhs.f);
-        uint64_t h = static_cast<uint64_t>(p >> 64);
-        uint64_t l = static_cast<uint64_t>(p);
-        if (l & (uint64_t(1) << 63)) // rounding
-            h++;
-        return DiyFp(h, e + rhs.e + 64);
-#else
-        const uint64_t M32 = 0xFFFFFFFF;
-        const uint64_t a = f >> 32;
-        const uint64_t b = f & M32;
-        const uint64_t c = rhs.f >> 32;
-        const uint64_t d = rhs.f & M32;
-        const uint64_t ac = a * c;
-        const uint64_t bc = b * c;
-        const uint64_t ad = a * d;
-        const uint64_t bd = b * d;
-        uint64_t tmp = (bd >> 32) + (ad & M32) + (bc & M32);
-        tmp += 1U << 31;  /// mult_round
-        return DiyFp(ac + (ad >> 32) + (bc >> 32) + (tmp >> 32), e + rhs.e + 64);
-#endif
-    }
-
-    DiyFp Normalize() const {
-        RAPIDJSON_ASSERT(f != 0); // https://stackoverflow.com/a/26809183/291737
-#if defined(_MSC_VER) && defined(_M_AMD64)
-        unsigned long index;
-        _BitScanReverse64(&index, f);
-        return DiyFp(f << (63 - index), e - (63 - index));
-#elif defined(__GNUC__) && __GNUC__ >= 4
-        int s = __builtin_clzll(f);
-        return DiyFp(f << s, e - s);
-#else
-        DiyFp res = *this;
-        while (!(res.f & (static_cast<uint64_t>(1) << 63))) {
-            res.f <<= 1;
-            res.e--;
-        }
-        return res;
-#endif
-    }
-
-    DiyFp NormalizeBoundary() const {
-        DiyFp res = *this;
-        while (!(res.f & (kDpHiddenBit << 1))) {
-            res.f <<= 1;
-            res.e--;
-        }
-        res.f <<= (kDiySignificandSize - kDpSignificandSize - 2);
-        res.e = res.e - (kDiySignificandSize - kDpSignificandSize - 2);
-        return res;
-    }
-
-    void NormalizedBoundaries(DiyFp* minus, DiyFp* plus) const {
-        DiyFp pl = DiyFp((f << 1) + 1, e - 1).NormalizeBoundary();
-        DiyFp mi = (f == kDpHiddenBit) ? DiyFp((f << 2) - 1, e - 2) : DiyFp((f << 1) - 1, e - 1);
-        mi.f <<= mi.e - pl.e;
-        mi.e = pl.e;
-        *plus = pl;
-        *minus = mi;
-    }
-
-    double ToDouble() const {
-        union {
-            double d;
-            uint64_t u64;
-        }u;
-        RAPIDJSON_ASSERT(f <= kDpHiddenBit + kDpSignificandMask);
-        if (e < kDpDenormalExponent) {
-            // Underflow.
-            return 0.0;
-        }
-        if (e >= kDpMaxExponent) {
-            // Overflow.
-            return std::numeric_limits<double>::infinity();
-        }
-        const uint64_t be = (e == kDpDenormalExponent && (f & kDpHiddenBit) == 0) ? 0 :
-            static_cast<uint64_t>(e + kDpExponentBias);
-        u.u64 = (f & kDpSignificandMask) | (be << kDpSignificandSize);
-        return u.d;
-    }
-
-    static const int kDiySignificandSize = 64;
-    static const int kDpSignificandSize = 52;
-    static const int kDpExponentBias = 0x3FF + kDpSignificandSize;
-    static const int kDpMaxExponent = 0x7FF - kDpExponentBias;
-    static const int kDpMinExponent = -kDpExponentBias;
-    static const int kDpDenormalExponent = -kDpExponentBias + 1;
-    static const uint64_t kDpExponentMask = RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
-    static const uint64_t kDpSignificandMask = RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
-    static const uint64_t kDpHiddenBit = RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
-
-    uint64_t f;
-    int e;
-};
-
-inline DiyFp GetCachedPowerByIndex(size_t index) {
-    // 10^-348, 10^-340, ..., 10^340
-    static const uint64_t kCachedPowers_F[] = {
-        RAPIDJSON_UINT64_C2(0xfa8fd5a0, 0x081c0288), RAPIDJSON_UINT64_C2(0xbaaee17f, 0xa23ebf76),
-        RAPIDJSON_UINT64_C2(0x8b16fb20, 0x3055ac76), RAPIDJSON_UINT64_C2(0xcf42894a, 0x5dce35ea),
-        RAPIDJSON_UINT64_C2(0x9a6bb0aa, 0x55653b2d), RAPIDJSON_UINT64_C2(0xe61acf03, 0x3d1a45df),
-        RAPIDJSON_UINT64_C2(0xab70fe17, 0xc79ac6ca), RAPIDJSON_UINT64_C2(0xff77b1fc, 0xbebcdc4f),
-        RAPIDJSON_UINT64_C2(0xbe5691ef, 0x416bd60c), RAPIDJSON_UINT64_C2(0x8dd01fad, 0x907ffc3c),
-        RAPIDJSON_UINT64_C2(0xd3515c28, 0x31559a83), RAPIDJSON_UINT64_C2(0x9d71ac8f, 0xada6c9b5),
-        RAPIDJSON_UINT64_C2(0xea9c2277, 0x23ee8bcb), RAPIDJSON_UINT64_C2(0xaecc4991, 0x4078536d),
-        RAPIDJSON_UINT64_C2(0x823c1279, 0x5db6ce57), RAPIDJSON_UINT64_C2(0xc2109436, 0x4dfb5637),
-        RAPIDJSON_UINT64_C2(0x9096ea6f, 0x3848984f), RAPIDJSON_UINT64_C2(0xd77485cb, 0x25823ac7),
-        RAPIDJSON_UINT64_C2(0xa086cfcd, 0x97bf97f4), RAPIDJSON_UINT64_C2(0xef340a98, 0x172aace5),
-        RAPIDJSON_UINT64_C2(0xb23867fb, 0x2a35b28e), RAPIDJSON_UINT64_C2(0x84c8d4df, 0xd2c63f3b),
-        RAPIDJSON_UINT64_C2(0xc5dd4427, 0x1ad3cdba), RAPIDJSON_UINT64_C2(0x936b9fce, 0xbb25c996),
-        RAPIDJSON_UINT64_C2(0xdbac6c24, 0x7d62a584), RAPIDJSON_UINT64_C2(0xa3ab6658, 0x0d5fdaf6),
-        RAPIDJSON_UINT64_C2(0xf3e2f893, 0xdec3f126), RAPIDJSON_UINT64_C2(0xb5b5ada8, 0xaaff80b8),
-        RAPIDJSON_UINT64_C2(0x87625f05, 0x6c7c4a8b), RAPIDJSON_UINT64_C2(0xc9bcff60, 0x34c13053),
-        RAPIDJSON_UINT64_C2(0x964e858c, 0x91ba2655), RAPIDJSON_UINT64_C2(0xdff97724, 0x70297ebd),
-        RAPIDJSON_UINT64_C2(0xa6dfbd9f, 0xb8e5b88f), RAPIDJSON_UINT64_C2(0xf8a95fcf, 0x88747d94),
-        RAPIDJSON_UINT64_C2(0xb9447093, 0x8fa89bcf), RAPIDJSON_UINT64_C2(0x8a08f0f8, 0xbf0f156b),
-        RAPIDJSON_UINT64_C2(0xcdb02555, 0x653131b6), RAPIDJSON_UINT64_C2(0x993fe2c6, 0xd07b7fac),
-        RAPIDJSON_UINT64_C2(0xe45c10c4, 0x2a2b3b06), RAPIDJSON_UINT64_C2(0xaa242499, 0x697392d3),
-        RAPIDJSON_UINT64_C2(0xfd87b5f2, 0x8300ca0e), RAPIDJSON_UINT64_C2(0xbce50864, 0x92111aeb),
-        RAPIDJSON_UINT64_C2(0x8cbccc09, 0x6f5088cc), RAPIDJSON_UINT64_C2(0xd1b71758, 0xe219652c),
-        RAPIDJSON_UINT64_C2(0x9c400000, 0x00000000), RAPIDJSON_UINT64_C2(0xe8d4a510, 0x00000000),
-        RAPIDJSON_UINT64_C2(0xad78ebc5, 0xac620000), RAPIDJSON_UINT64_C2(0x813f3978, 0xf8940984),
-        RAPIDJSON_UINT64_C2(0xc097ce7b, 0xc90715b3), RAPIDJSON_UINT64_C2(0x8f7e32ce, 0x7bea5c70),
-        RAPIDJSON_UINT64_C2(0xd5d238a4, 0xabe98068), RAPIDJSON_UINT64_C2(0x9f4f2726, 0x179a2245),
-        RAPIDJSON_UINT64_C2(0xed63a231, 0xd4c4fb27), RAPIDJSON_UINT64_C2(0xb0de6538, 0x8cc8ada8),
-        RAPIDJSON_UINT64_C2(0x83c7088e, 0x1aab65db), RAPIDJSON_UINT64_C2(0xc45d1df9, 0x42711d9a),
-        RAPIDJSON_UINT64_C2(0x924d692c, 0xa61be758), RAPIDJSON_UINT64_C2(0xda01ee64, 0x1a708dea),
-        RAPIDJSON_UINT64_C2(0xa26da399, 0x9aef774a), RAPIDJSON_UINT64_C2(0xf209787b, 0xb47d6b85),
-        RAPIDJSON_UINT64_C2(0xb454e4a1, 0x79dd1877), RAPIDJSON_UINT64_C2(0x865b8692, 0x5b9bc5c2),
-        RAPIDJSON_UINT64_C2(0xc83553c5, 0xc8965d3d), RAPIDJSON_UINT64_C2(0x952ab45c, 0xfa97a0b3),
-        RAPIDJSON_UINT64_C2(0xde469fbd, 0x99a05fe3), RAPIDJSON_UINT64_C2(0xa59bc234, 0xdb398c25),
-        RAPIDJSON_UINT64_C2(0xf6c69a72, 0xa3989f5c), RAPIDJSON_UINT64_C2(0xb7dcbf53, 0x54e9bece),
-        RAPIDJSON_UINT64_C2(0x88fcf317, 0xf22241e2), RAPIDJSON_UINT64_C2(0xcc20ce9b, 0xd35c78a5),
-        RAPIDJSON_UINT64_C2(0x98165af3, 0x7b2153df), RAPIDJSON_UINT64_C2(0xe2a0b5dc, 0x971f303a),
-        RAPIDJSON_UINT64_C2(0xa8d9d153, 0x5ce3b396), RAPIDJSON_UINT64_C2(0xfb9b7cd9, 0xa4a7443c),
-        RAPIDJSON_UINT64_C2(0xbb764c4c, 0xa7a44410), RAPIDJSON_UINT64_C2(0x8bab8eef, 0xb6409c1a),
-        RAPIDJSON_UINT64_C2(0xd01fef10, 0xa657842c), RAPIDJSON_UINT64_C2(0x9b10a4e5, 0xe9913129),
-        RAPIDJSON_UINT64_C2(0xe7109bfb, 0xa19c0c9d), RAPIDJSON_UINT64_C2(0xac2820d9, 0x623bf429),
-        RAPIDJSON_UINT64_C2(0x80444b5e, 0x7aa7cf85), RAPIDJSON_UINT64_C2(0xbf21e440, 0x03acdd2d),
-        RAPIDJSON_UINT64_C2(0x8e679c2f, 0x5e44ff8f), RAPIDJSON_UINT64_C2(0xd433179d, 0x9c8cb841),
-        RAPIDJSON_UINT64_C2(0x9e19db92, 0xb4e31ba9), RAPIDJSON_UINT64_C2(0xeb96bf6e, 0xbadf77d9),
-        RAPIDJSON_UINT64_C2(0xaf87023b, 0x9bf0ee6b)
-    };
-    static const int16_t kCachedPowers_E[] = {
-        -1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007,  -980,
-        -954,  -927,  -901,  -874,  -847,  -821,  -794,  -768,  -741,  -715,
-        -688,  -661,  -635,  -608,  -582,  -555,  -529,  -502,  -475,  -449,
-        -422,  -396,  -369,  -343,  -316,  -289,  -263,  -236,  -210,  -183,
-        -157,  -130,  -103,   -77,   -50,   -24,     3,    30,    56,    83,
-        109,   136,   162,   189,   216,   242,   269,   295,   322,   348,
-        375,   402,   428,   455,   481,   508,   534,   561,   588,   614,
-        641,   667,   694,   720,   747,   774,   800,   827,   853,   880,
-        907,   933,   960,   986,  1013,  1039,  1066
-    };
-    RAPIDJSON_ASSERT(index < 87);
-    return DiyFp(kCachedPowers_F[index], kCachedPowers_E[index]);
-}
-
-inline DiyFp GetCachedPower(int e, int* K) {
-
-    //int k = static_cast<int>(ceil((-61 - e) * 0.30102999566398114)) + 374;
-    double dk = (-61 - e) * 0.30102999566398114 + 347;  // dk must be positive, so can do ceiling in positive
-    int k = static_cast<int>(dk);
-    if (dk - k > 0.0)
-        k++;
-
-    unsigned index = static_cast<unsigned>((k >> 3) + 1);
-    *K = -(-348 + static_cast<int>(index << 3));    // decimal exponent no need lookup table
-
-    return GetCachedPowerByIndex(index);
-}
-
-inline DiyFp GetCachedPower10(int exp, int *outExp) {
-    RAPIDJSON_ASSERT(exp >= -348);
-    unsigned index = static_cast<unsigned>(exp + 348) / 8u;
-    *outExp = -348 + static_cast<int>(index) * 8;
-    return GetCachedPowerByIndex(index);
-}
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_DIYFP_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/internal/dtoa.h b/src/sioclient/lib/rapidjson/include/rapidjson/internal/dtoa.h
deleted file mode 100644
index bf2e9b2e..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/internal/dtoa.h
+++ /dev/null
@@ -1,245 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
-// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
-// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
-
-#ifndef RAPIDJSON_DTOA_
-#define RAPIDJSON_DTOA_
-
-#include "itoa.h" // GetDigitsLut()
-#include "diyfp.h"
-#include "ieee754.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-RAPIDJSON_DIAG_OFF(array-bounds) // some gcc versions generate wrong warnings https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59124
-#endif
-
-inline void GrisuRound(char* buffer, int len, uint64_t delta, uint64_t rest, uint64_t ten_kappa, uint64_t wp_w) {
-    while (rest < wp_w && delta - rest >= ten_kappa &&
-           (rest + ten_kappa < wp_w ||  /// closer
-            wp_w - rest > rest + ten_kappa - wp_w)) {
-        buffer[len - 1]--;
-        rest += ten_kappa;
-    }
-}
-
-inline int CountDecimalDigit32(uint32_t n) {
-    // Simple pure C++ implementation was faster than __builtin_clz version in this situation.
-    if (n < 10) return 1;
-    if (n < 100) return 2;
-    if (n < 1000) return 3;
-    if (n < 10000) return 4;
-    if (n < 100000) return 5;
-    if (n < 1000000) return 6;
-    if (n < 10000000) return 7;
-    if (n < 100000000) return 8;
-    // Will not reach 10 digits in DigitGen()
-    //if (n < 1000000000) return 9;
-    //return 10;
-    return 9;
-}
-
-inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buffer, int* len, int* K) {
-    static const uint32_t kPow10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 };
-    const DiyFp one(uint64_t(1) << -Mp.e, Mp.e);
-    const DiyFp wp_w = Mp - W;
-    uint32_t p1 = static_cast<uint32_t>(Mp.f >> -one.e);
-    uint64_t p2 = Mp.f & (one.f - 1);
-    int kappa = CountDecimalDigit32(p1); // kappa in [0, 9]
-    *len = 0;
-
-    while (kappa > 0) {
-        uint32_t d = 0;
-        switch (kappa) {
-            case  9: d = p1 /  100000000; p1 %=  100000000; break;
-            case  8: d = p1 /   10000000; p1 %=   10000000; break;
-            case  7: d = p1 /    1000000; p1 %=    1000000; break;
-            case  6: d = p1 /     100000; p1 %=     100000; break;
-            case  5: d = p1 /      10000; p1 %=      10000; break;
-            case  4: d = p1 /       1000; p1 %=       1000; break;
-            case  3: d = p1 /        100; p1 %=        100; break;
-            case  2: d = p1 /         10; p1 %=         10; break;
-            case  1: d = p1;              p1 =           0; break;
-            default:;
-        }
-        if (d || *len)
-            buffer[(*len)++] = static_cast<char>('0' + static_cast<char>(d));
-        kappa--;
-        uint64_t tmp = (static_cast<uint64_t>(p1) << -one.e) + p2;
-        if (tmp <= delta) {
-            *K += kappa;
-            GrisuRound(buffer, *len, delta, tmp, static_cast<uint64_t>(kPow10[kappa]) << -one.e, wp_w.f);
-            return;
-        }
-    }
-
-    // kappa = 0
-    for (;;) {
-        p2 *= 10;
-        delta *= 10;
-        char d = static_cast<char>(p2 >> -one.e);
-        if (d || *len)
-            buffer[(*len)++] = static_cast<char>('0' + d);
-        p2 &= one.f - 1;
-        kappa--;
-        if (p2 < delta) {
-            *K += kappa;
-            int index = -kappa;
-            GrisuRound(buffer, *len, delta, p2, one.f, wp_w.f * (index < 9 ? kPow10[index] : 0));
-            return;
-        }
-    }
-}
-
-inline void Grisu2(double value, char* buffer, int* length, int* K) {
-    const DiyFp v(value);
-    DiyFp w_m, w_p;
-    v.NormalizedBoundaries(&w_m, &w_p);
-
-    const DiyFp c_mk = GetCachedPower(w_p.e, K);
-    const DiyFp W = v.Normalize() * c_mk;
-    DiyFp Wp = w_p * c_mk;
-    DiyFp Wm = w_m * c_mk;
-    Wm.f++;
-    Wp.f--;
-    DigitGen(W, Wp, Wp.f - Wm.f, buffer, length, K);
-}
-
-inline char* WriteExponent(int K, char* buffer) {
-    if (K < 0) {
-        *buffer++ = '-';
-        K = -K;
-    }
-
-    if (K >= 100) {
-        *buffer++ = static_cast<char>('0' + static_cast<char>(K / 100));
-        K %= 100;
-        const char* d = GetDigitsLut() + K * 2;
-        *buffer++ = d[0];
-        *buffer++ = d[1];
-    }
-    else if (K >= 10) {
-        const char* d = GetDigitsLut() + K * 2;
-        *buffer++ = d[0];
-        *buffer++ = d[1];
-    }
-    else
-        *buffer++ = static_cast<char>('0' + static_cast<char>(K));
-
-    return buffer;
-}
-
-inline char* Prettify(char* buffer, int length, int k, int maxDecimalPlaces) {
-    const int kk = length + k;  // 10^(kk-1) <= v < 10^kk
-
-    if (0 <= k && kk <= 21) {
-        // 1234e7 -> 12340000000
-        for (int i = length; i < kk; i++)
-            buffer[i] = '0';
-        buffer[kk] = '.';
-        buffer[kk + 1] = '0';
-        return &buffer[kk + 2];
-    }
-    else if (0 < kk && kk <= 21) {
-        // 1234e-2 -> 12.34
-        std::memmove(&buffer[kk + 1], &buffer[kk], static_cast<size_t>(length - kk));
-        buffer[kk] = '.';
-        if (0 > k + maxDecimalPlaces) {
-            // When maxDecimalPlaces = 2, 1.2345 -> 1.23, 1.102 -> 1.1
-            // Remove extra trailing zeros (at least one) after truncation.
-            for (int i = kk + maxDecimalPlaces; i > kk + 1; i--)
-                if (buffer[i] != '0')
-                    return &buffer[i + 1];
-            return &buffer[kk + 2]; // Reserve one zero
-        }
-        else
-            return &buffer[length + 1];
-    }
-    else if (-6 < kk && kk <= 0) {
-        // 1234e-6 -> 0.001234
-        const int offset = 2 - kk;
-        std::memmove(&buffer[offset], &buffer[0], static_cast<size_t>(length));
-        buffer[0] = '0';
-        buffer[1] = '.';
-        for (int i = 2; i < offset; i++)
-            buffer[i] = '0';
-        if (length - kk > maxDecimalPlaces) {
-            // When maxDecimalPlaces = 2, 0.123 -> 0.12, 0.102 -> 0.1
-            // Remove extra trailing zeros (at least one) after truncation.
-            for (int i = maxDecimalPlaces + 1; i > 2; i--)
-                if (buffer[i] != '0')
-                    return &buffer[i + 1];
-            return &buffer[3]; // Reserve one zero
-        }
-        else
-            return &buffer[length + offset];
-    }
-    else if (kk < -maxDecimalPlaces) {
-        // Truncate to zero
-        buffer[0] = '0';
-        buffer[1] = '.';
-        buffer[2] = '0';
-        return &buffer[3];
-    }
-    else if (length == 1) {
-        // 1e30
-        buffer[1] = 'e';
-        return WriteExponent(kk - 1, &buffer[2]);
-    }
-    else {
-        // 1234e30 -> 1.234e33
-        std::memmove(&buffer[2], &buffer[1], static_cast<size_t>(length - 1));
-        buffer[1] = '.';
-        buffer[length + 1] = 'e';
-        return WriteExponent(kk - 1, &buffer[0 + length + 2]);
-    }
-}
-
-inline char* dtoa(double value, char* buffer, int maxDecimalPlaces = 324) {
-    RAPIDJSON_ASSERT(maxDecimalPlaces >= 1);
-    Double d(value);
-    if (d.IsZero()) {
-        if (d.Sign())
-            *buffer++ = '-';     // -0.0, Issue #289
-        buffer[0] = '0';
-        buffer[1] = '.';
-        buffer[2] = '0';
-        return &buffer[3];
-    }
-    else {
-        if (value < 0) {
-            *buffer++ = '-';
-            value = -value;
-        }
-        int length, K;
-        Grisu2(value, buffer, &length, &K);
-        return Prettify(buffer, length, K, maxDecimalPlaces);
-    }
-}
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_DTOA_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/internal/ieee754.h b/src/sioclient/lib/rapidjson/include/rapidjson/internal/ieee754.h
deleted file mode 100644
index c2684ba2..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/internal/ieee754.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_IEEE754_
-#define RAPIDJSON_IEEE754_
-
-#include "../rapidjson.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-class Double {
-public:
-    Double() {}
-    Double(double d) : d_(d) {}
-    Double(uint64_t u) : u_(u) {}
-
-    double Value() const { return d_; }
-    uint64_t Uint64Value() const { return u_; }
-
-    double NextPositiveDouble() const {
-        RAPIDJSON_ASSERT(!Sign());
-        return Double(u_ + 1).Value();
-    }
-
-    bool Sign() const { return (u_ & kSignMask) != 0; }
-    uint64_t Significand() const { return u_ & kSignificandMask; }
-    int Exponent() const { return static_cast<int>(((u_ & kExponentMask) >> kSignificandSize) - kExponentBias); }
-
-    bool IsNan() const { return (u_ & kExponentMask) == kExponentMask && Significand() != 0; }
-    bool IsInf() const { return (u_ & kExponentMask) == kExponentMask && Significand() == 0; }
-    bool IsNanOrInf() const { return (u_ & kExponentMask) == kExponentMask; }
-    bool IsNormal() const { return (u_ & kExponentMask) != 0 || Significand() == 0; }
-    bool IsZero() const { return (u_ & (kExponentMask | kSignificandMask)) == 0; }
-
-    uint64_t IntegerSignificand() const { return IsNormal() ? Significand() | kHiddenBit : Significand(); }
-    int IntegerExponent() const { return (IsNormal() ? Exponent() : kDenormalExponent) - kSignificandSize; }
-    uint64_t ToBias() const { return (u_ & kSignMask) ? ~u_ + 1 : u_ | kSignMask; }
-
-    static int EffectiveSignificandSize(int order) {
-        if (order >= -1021)
-            return 53;
-        else if (order <= -1074)
-            return 0;
-        else
-            return order + 1074;
-    }
-
-private:
-    static const int kSignificandSize = 52;
-    static const int kExponentBias = 0x3FF;
-    static const int kDenormalExponent = 1 - kExponentBias;
-    static const uint64_t kSignMask = RAPIDJSON_UINT64_C2(0x80000000, 0x00000000);
-    static const uint64_t kExponentMask = RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
-    static const uint64_t kSignificandMask = RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
-    static const uint64_t kHiddenBit = RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
-
-    union {
-        double d_;
-        uint64_t u_;
-    };
-};
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_IEEE754_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/internal/itoa.h b/src/sioclient/lib/rapidjson/include/rapidjson/internal/itoa.h
deleted file mode 100644
index a39accb8..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/internal/itoa.h
+++ /dev/null
@@ -1,309 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ITOA_
-#define RAPIDJSON_ITOA_
-
-#include "../rapidjson.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-inline const char* GetDigitsLut() {
-    static const char cDigitsLut[200] = {
-        '0','0','0','1','0','2','0','3','0','4','0','5','0','6','0','7','0','8','0','9',
-        '1','0','1','1','1','2','1','3','1','4','1','5','1','6','1','7','1','8','1','9',
-        '2','0','2','1','2','2','2','3','2','4','2','5','2','6','2','7','2','8','2','9',
-        '3','0','3','1','3','2','3','3','3','4','3','5','3','6','3','7','3','8','3','9',
-        '4','0','4','1','4','2','4','3','4','4','4','5','4','6','4','7','4','8','4','9',
-        '5','0','5','1','5','2','5','3','5','4','5','5','5','6','5','7','5','8','5','9',
-        '6','0','6','1','6','2','6','3','6','4','6','5','6','6','6','7','6','8','6','9',
-        '7','0','7','1','7','2','7','3','7','4','7','5','7','6','7','7','7','8','7','9',
-        '8','0','8','1','8','2','8','3','8','4','8','5','8','6','8','7','8','8','8','9',
-        '9','0','9','1','9','2','9','3','9','4','9','5','9','6','9','7','9','8','9','9'
-    };
-    return cDigitsLut;
-}
-
-inline char* u32toa(uint32_t value, char* buffer) {
-    RAPIDJSON_ASSERT(buffer != 0);
-
-    const char* cDigitsLut = GetDigitsLut();
-
-    if (value < 10000) {
-        const uint32_t d1 = (value / 100) << 1;
-        const uint32_t d2 = (value % 100) << 1;
-
-        if (value >= 1000)
-            *buffer++ = cDigitsLut[d1];
-        if (value >= 100)
-            *buffer++ = cDigitsLut[d1 + 1];
-        if (value >= 10)
-            *buffer++ = cDigitsLut[d2];
-        *buffer++ = cDigitsLut[d2 + 1];
-    }
-    else if (value < 100000000) {
-        // value = bbbbcccc
-        const uint32_t b = value / 10000;
-        const uint32_t c = value % 10000;
-
-        const uint32_t d1 = (b / 100) << 1;
-        const uint32_t d2 = (b % 100) << 1;
-
-        const uint32_t d3 = (c / 100) << 1;
-        const uint32_t d4 = (c % 100) << 1;
-
-        if (value >= 10000000)
-            *buffer++ = cDigitsLut[d1];
-        if (value >= 1000000)
-            *buffer++ = cDigitsLut[d1 + 1];
-        if (value >= 100000)
-            *buffer++ = cDigitsLut[d2];
-        *buffer++ = cDigitsLut[d2 + 1];
-
-        *buffer++ = cDigitsLut[d3];
-        *buffer++ = cDigitsLut[d3 + 1];
-        *buffer++ = cDigitsLut[d4];
-        *buffer++ = cDigitsLut[d4 + 1];
-    }
-    else {
-        // value = aabbbbcccc in decimal
-
-        const uint32_t a = value / 100000000; // 1 to 42
-        value %= 100000000;
-
-        if (a >= 10) {
-            const unsigned i = a << 1;
-            *buffer++ = cDigitsLut[i];
-            *buffer++ = cDigitsLut[i + 1];
-        }
-        else
-            *buffer++ = static_cast<char>('0' + static_cast<char>(a));
-
-        const uint32_t b = value / 10000; // 0 to 9999
-        const uint32_t c = value % 10000; // 0 to 9999
-
-        const uint32_t d1 = (b / 100) << 1;
-        const uint32_t d2 = (b % 100) << 1;
-
-        const uint32_t d3 = (c / 100) << 1;
-        const uint32_t d4 = (c % 100) << 1;
-
-        *buffer++ = cDigitsLut[d1];
-        *buffer++ = cDigitsLut[d1 + 1];
-        *buffer++ = cDigitsLut[d2];
-        *buffer++ = cDigitsLut[d2 + 1];
-        *buffer++ = cDigitsLut[d3];
-        *buffer++ = cDigitsLut[d3 + 1];
-        *buffer++ = cDigitsLut[d4];
-        *buffer++ = cDigitsLut[d4 + 1];
-    }
-    return buffer;
-}
-
-inline char* i32toa(int32_t value, char* buffer) {
-    RAPIDJSON_ASSERT(buffer != 0);
-    uint32_t u = static_cast<uint32_t>(value);
-    if (value < 0) {
-        *buffer++ = '-';
-        u = ~u + 1;
-    }
-
-    return u32toa(u, buffer);
-}
-
-inline char* u64toa(uint64_t value, char* buffer) {
-    RAPIDJSON_ASSERT(buffer != 0);
-    const char* cDigitsLut = GetDigitsLut();
-    const uint64_t  kTen8 = 100000000;
-    const uint64_t  kTen9 = kTen8 * 10;
-    const uint64_t kTen10 = kTen8 * 100;
-    const uint64_t kTen11 = kTen8 * 1000;
-    const uint64_t kTen12 = kTen8 * 10000;
-    const uint64_t kTen13 = kTen8 * 100000;
-    const uint64_t kTen14 = kTen8 * 1000000;
-    const uint64_t kTen15 = kTen8 * 10000000;
-    const uint64_t kTen16 = kTen8 * kTen8;
-
-    if (value < kTen8) {
-        uint32_t v = static_cast<uint32_t>(value);
-        if (v < 10000) {
-            const uint32_t d1 = (v / 100) << 1;
-            const uint32_t d2 = (v % 100) << 1;
-
-            if (v >= 1000)
-                *buffer++ = cDigitsLut[d1];
-            if (v >= 100)
-                *buffer++ = cDigitsLut[d1 + 1];
-            if (v >= 10)
-                *buffer++ = cDigitsLut[d2];
-            *buffer++ = cDigitsLut[d2 + 1];
-        }
-        else {
-            // value = bbbbcccc
-            const uint32_t b = v / 10000;
-            const uint32_t c = v % 10000;
-
-            const uint32_t d1 = (b / 100) << 1;
-            const uint32_t d2 = (b % 100) << 1;
-
-            const uint32_t d3 = (c / 100) << 1;
-            const uint32_t d4 = (c % 100) << 1;
-
-            if (value >= 10000000)
-                *buffer++ = cDigitsLut[d1];
-            if (value >= 1000000)
-                *buffer++ = cDigitsLut[d1 + 1];
-            if (value >= 100000)
-                *buffer++ = cDigitsLut[d2];
-            *buffer++ = cDigitsLut[d2 + 1];
-
-            *buffer++ = cDigitsLut[d3];
-            *buffer++ = cDigitsLut[d3 + 1];
-            *buffer++ = cDigitsLut[d4];
-            *buffer++ = cDigitsLut[d4 + 1];
-        }
-    }
-    else if (value < kTen16) {
-        const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
-        const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
-
-        const uint32_t b0 = v0 / 10000;
-        const uint32_t c0 = v0 % 10000;
-
-        const uint32_t d1 = (b0 / 100) << 1;
-        const uint32_t d2 = (b0 % 100) << 1;
-
-        const uint32_t d3 = (c0 / 100) << 1;
-        const uint32_t d4 = (c0 % 100) << 1;
-
-        const uint32_t b1 = v1 / 10000;
-        const uint32_t c1 = v1 % 10000;
-
-        const uint32_t d5 = (b1 / 100) << 1;
-        const uint32_t d6 = (b1 % 100) << 1;
-
-        const uint32_t d7 = (c1 / 100) << 1;
-        const uint32_t d8 = (c1 % 100) << 1;
-
-        if (value >= kTen15)
-            *buffer++ = cDigitsLut[d1];
-        if (value >= kTen14)
-            *buffer++ = cDigitsLut[d1 + 1];
-        if (value >= kTen13)
-            *buffer++ = cDigitsLut[d2];
-        if (value >= kTen12)
-            *buffer++ = cDigitsLut[d2 + 1];
-        if (value >= kTen11)
-            *buffer++ = cDigitsLut[d3];
-        if (value >= kTen10)
-            *buffer++ = cDigitsLut[d3 + 1];
-        if (value >= kTen9)
-            *buffer++ = cDigitsLut[d4];
-        if (value >= kTen8)
-            *buffer++ = cDigitsLut[d4 + 1];
-
-        *buffer++ = cDigitsLut[d5];
-        *buffer++ = cDigitsLut[d5 + 1];
-        *buffer++ = cDigitsLut[d6];
-        *buffer++ = cDigitsLut[d6 + 1];
-        *buffer++ = cDigitsLut[d7];
-        *buffer++ = cDigitsLut[d7 + 1];
-        *buffer++ = cDigitsLut[d8];
-        *buffer++ = cDigitsLut[d8 + 1];
-    }
-    else {
-        const uint32_t a = static_cast<uint32_t>(value / kTen16); // 1 to 1844
-        value %= kTen16;
-
-        if (a < 10)
-            *buffer++ = static_cast<char>('0' + static_cast<char>(a));
-        else if (a < 100) {
-            const uint32_t i = a << 1;
-            *buffer++ = cDigitsLut[i];
-            *buffer++ = cDigitsLut[i + 1];
-        }
-        else if (a < 1000) {
-            *buffer++ = static_cast<char>('0' + static_cast<char>(a / 100));
-
-            const uint32_t i = (a % 100) << 1;
-            *buffer++ = cDigitsLut[i];
-            *buffer++ = cDigitsLut[i + 1];
-        }
-        else {
-            const uint32_t i = (a / 100) << 1;
-            const uint32_t j = (a % 100) << 1;
-            *buffer++ = cDigitsLut[i];
-            *buffer++ = cDigitsLut[i + 1];
-            *buffer++ = cDigitsLut[j];
-            *buffer++ = cDigitsLut[j + 1];
-        }
-
-        const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
-        const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
-
-        const uint32_t b0 = v0 / 10000;
-        const uint32_t c0 = v0 % 10000;
-
-        const uint32_t d1 = (b0 / 100) << 1;
-        const uint32_t d2 = (b0 % 100) << 1;
-
-        const uint32_t d3 = (c0 / 100) << 1;
-        const uint32_t d4 = (c0 % 100) << 1;
-
-        const uint32_t b1 = v1 / 10000;
-        const uint32_t c1 = v1 % 10000;
-
-        const uint32_t d5 = (b1 / 100) << 1;
-        const uint32_t d6 = (b1 % 100) << 1;
-
-        const uint32_t d7 = (c1 / 100) << 1;
-        const uint32_t d8 = (c1 % 100) << 1;
-
-        *buffer++ = cDigitsLut[d1];
-        *buffer++ = cDigitsLut[d1 + 1];
-        *buffer++ = cDigitsLut[d2];
-        *buffer++ = cDigitsLut[d2 + 1];
-        *buffer++ = cDigitsLut[d3];
-        *buffer++ = cDigitsLut[d3 + 1];
-        *buffer++ = cDigitsLut[d4];
-        *buffer++ = cDigitsLut[d4 + 1];
-        *buffer++ = cDigitsLut[d5];
-        *buffer++ = cDigitsLut[d5 + 1];
-        *buffer++ = cDigitsLut[d6];
-        *buffer++ = cDigitsLut[d6 + 1];
-        *buffer++ = cDigitsLut[d7];
-        *buffer++ = cDigitsLut[d7 + 1];
-        *buffer++ = cDigitsLut[d8];
-        *buffer++ = cDigitsLut[d8 + 1];
-    }
-
-    return buffer;
-}
-
-inline char* i64toa(int64_t value, char* buffer) {
-    RAPIDJSON_ASSERT(buffer != 0);
-    uint64_t u = static_cast<uint64_t>(value);
-    if (value < 0) {
-        *buffer++ = '-';
-        u = ~u + 1;
-    }
-
-    return u64toa(u, buffer);
-}
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_ITOA_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/internal/meta.h b/src/sioclient/lib/rapidjson/include/rapidjson/internal/meta.h
deleted file mode 100644
index d401edf8..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/internal/meta.h
+++ /dev/null
@@ -1,186 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_INTERNAL_META_H_
-#define RAPIDJSON_INTERNAL_META_H_
-
-#include "../rapidjson.h"
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#if defined(_MSC_VER) && !defined(__clang__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(6334)
-#endif
-
-#if RAPIDJSON_HAS_CXX11_TYPETRAITS
-#include <type_traits>
-#endif
-
-//@cond RAPIDJSON_INTERNAL
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-// Helper to wrap/convert arbitrary types to void, useful for arbitrary type matching
-template <typename T> struct Void { typedef void Type; };
-
-///////////////////////////////////////////////////////////////////////////////
-// BoolType, TrueType, FalseType
-//
-template <bool Cond> struct BoolType {
-    static const bool Value = Cond;
-    typedef BoolType Type;
-};
-typedef BoolType<true> TrueType;
-typedef BoolType<false> FalseType;
-
-
-///////////////////////////////////////////////////////////////////////////////
-// SelectIf, BoolExpr, NotExpr, AndExpr, OrExpr
-//
-
-template <bool C> struct SelectIfImpl { template <typename T1, typename T2> struct Apply { typedef T1 Type; }; };
-template <> struct SelectIfImpl<false> { template <typename T1, typename T2> struct Apply { typedef T2 Type; }; };
-template <bool C, typename T1, typename T2> struct SelectIfCond : SelectIfImpl<C>::template Apply<T1,T2> {};
-template <typename C, typename T1, typename T2> struct SelectIf : SelectIfCond<C::Value, T1, T2> {};
-
-template <bool Cond1, bool Cond2> struct AndExprCond : FalseType {};
-template <> struct AndExprCond<true, true> : TrueType {};
-template <bool Cond1, bool Cond2> struct OrExprCond : TrueType {};
-template <> struct OrExprCond<false, false> : FalseType {};
-
-template <typename C> struct BoolExpr : SelectIf<C,TrueType,FalseType>::Type {};
-template <typename C> struct NotExpr  : SelectIf<C,FalseType,TrueType>::Type {};
-template <typename C1, typename C2> struct AndExpr : AndExprCond<C1::Value, C2::Value>::Type {};
-template <typename C1, typename C2> struct OrExpr  : OrExprCond<C1::Value, C2::Value>::Type {};
-
-
-///////////////////////////////////////////////////////////////////////////////
-// AddConst, MaybeAddConst, RemoveConst
-template <typename T> struct AddConst { typedef const T Type; };
-template <bool Constify, typename T> struct MaybeAddConst : SelectIfCond<Constify, const T, T> {};
-template <typename T> struct RemoveConst { typedef T Type; };
-template <typename T> struct RemoveConst<const T> { typedef T Type; };
-
-
-///////////////////////////////////////////////////////////////////////////////
-// IsSame, IsConst, IsMoreConst, IsPointer
-//
-template <typename T, typename U> struct IsSame : FalseType {};
-template <typename T> struct IsSame<T, T> : TrueType {};
-
-template <typename T> struct IsConst : FalseType {};
-template <typename T> struct IsConst<const T> : TrueType {};
-
-template <typename CT, typename T>
-struct IsMoreConst
-    : AndExpr<IsSame<typename RemoveConst<CT>::Type, typename RemoveConst<T>::Type>,
-              BoolType<IsConst<CT>::Value >= IsConst<T>::Value> >::Type {};
-
-template <typename T> struct IsPointer : FalseType {};
-template <typename T> struct IsPointer<T*> : TrueType {};
-
-///////////////////////////////////////////////////////////////////////////////
-// IsBaseOf
-//
-#if RAPIDJSON_HAS_CXX11_TYPETRAITS
-
-template <typename B, typename D> struct IsBaseOf
-    : BoolType< ::std::is_base_of<B,D>::value> {};
-
-#else // simplified version adopted from Boost
-
-template<typename B, typename D> struct IsBaseOfImpl {
-    RAPIDJSON_STATIC_ASSERT(sizeof(B) != 0);
-    RAPIDJSON_STATIC_ASSERT(sizeof(D) != 0);
-
-    typedef char (&Yes)[1];
-    typedef char (&No) [2];
-
-    template <typename T>
-    static Yes Check(const D*, T);
-    static No  Check(const B*, int);
-
-    struct Host {
-        operator const B*() const;
-        operator const D*();
-    };
-
-    enum { Value = (sizeof(Check(Host(), 0)) == sizeof(Yes)) };
-};
-
-template <typename B, typename D> struct IsBaseOf
-    : OrExpr<IsSame<B, D>, BoolExpr<IsBaseOfImpl<B, D> > >::Type {};
-
-#endif // RAPIDJSON_HAS_CXX11_TYPETRAITS
-
-
-//////////////////////////////////////////////////////////////////////////
-// EnableIf / DisableIf
-//
-template <bool Condition, typename T = void> struct EnableIfCond  { typedef T Type; };
-template <typename T> struct EnableIfCond<false, T> { /* empty */ };
-
-template <bool Condition, typename T = void> struct DisableIfCond { typedef T Type; };
-template <typename T> struct DisableIfCond<true, T> { /* empty */ };
-
-template <typename Condition, typename T = void>
-struct EnableIf : EnableIfCond<Condition::Value, T> {};
-
-template <typename Condition, typename T = void>
-struct DisableIf : DisableIfCond<Condition::Value, T> {};
-
-// SFINAE helpers
-struct SfinaeTag {};
-template <typename T> struct RemoveSfinaeTag;
-template <typename T> struct RemoveSfinaeTag<SfinaeTag&(*)(T)> { typedef T Type; };
-
-#define RAPIDJSON_REMOVEFPTR_(type) \
-    typename ::RAPIDJSON_NAMESPACE::internal::RemoveSfinaeTag \
-        < ::RAPIDJSON_NAMESPACE::internal::SfinaeTag&(*) type>::Type
-
-#define RAPIDJSON_ENABLEIF(cond) \
-    typename ::RAPIDJSON_NAMESPACE::internal::EnableIf \
-        <RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
-
-#define RAPIDJSON_DISABLEIF(cond) \
-    typename ::RAPIDJSON_NAMESPACE::internal::DisableIf \
-        <RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
-
-#define RAPIDJSON_ENABLEIF_RETURN(cond,returntype) \
-    typename ::RAPIDJSON_NAMESPACE::internal::EnableIf \
-        <RAPIDJSON_REMOVEFPTR_(cond), \
-         RAPIDJSON_REMOVEFPTR_(returntype)>::Type
-
-#define RAPIDJSON_DISABLEIF_RETURN(cond,returntype) \
-    typename ::RAPIDJSON_NAMESPACE::internal::DisableIf \
-        <RAPIDJSON_REMOVEFPTR_(cond), \
-         RAPIDJSON_REMOVEFPTR_(returntype)>::Type
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-//@endcond
-
-#if defined(_MSC_VER) && !defined(__clang__)
-RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_INTERNAL_META_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/internal/pow10.h b/src/sioclient/lib/rapidjson/include/rapidjson/internal/pow10.h
deleted file mode 100644
index 02f475d7..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/internal/pow10.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_POW10_
-#define RAPIDJSON_POW10_
-
-#include "../rapidjson.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-//! Computes integer powers of 10 in double (10.0^n).
-/*! This function uses lookup table for fast and accurate results.
-    \param n non-negative exponent. Must <= 308.
-    \return 10.0^n
-*/
-inline double Pow10(int n) {
-    static const double e[] = { // 1e-0...1e308: 309 * 8 bytes = 2472 bytes
-        1e+0,  
-        1e+1,  1e+2,  1e+3,  1e+4,  1e+5,  1e+6,  1e+7,  1e+8,  1e+9,  1e+10, 1e+11, 1e+12, 1e+13, 1e+14, 1e+15, 1e+16, 1e+17, 1e+18, 1e+19, 1e+20, 
-        1e+21, 1e+22, 1e+23, 1e+24, 1e+25, 1e+26, 1e+27, 1e+28, 1e+29, 1e+30, 1e+31, 1e+32, 1e+33, 1e+34, 1e+35, 1e+36, 1e+37, 1e+38, 1e+39, 1e+40,
-        1e+41, 1e+42, 1e+43, 1e+44, 1e+45, 1e+46, 1e+47, 1e+48, 1e+49, 1e+50, 1e+51, 1e+52, 1e+53, 1e+54, 1e+55, 1e+56, 1e+57, 1e+58, 1e+59, 1e+60,
-        1e+61, 1e+62, 1e+63, 1e+64, 1e+65, 1e+66, 1e+67, 1e+68, 1e+69, 1e+70, 1e+71, 1e+72, 1e+73, 1e+74, 1e+75, 1e+76, 1e+77, 1e+78, 1e+79, 1e+80,
-        1e+81, 1e+82, 1e+83, 1e+84, 1e+85, 1e+86, 1e+87, 1e+88, 1e+89, 1e+90, 1e+91, 1e+92, 1e+93, 1e+94, 1e+95, 1e+96, 1e+97, 1e+98, 1e+99, 1e+100,
-        1e+101,1e+102,1e+103,1e+104,1e+105,1e+106,1e+107,1e+108,1e+109,1e+110,1e+111,1e+112,1e+113,1e+114,1e+115,1e+116,1e+117,1e+118,1e+119,1e+120,
-        1e+121,1e+122,1e+123,1e+124,1e+125,1e+126,1e+127,1e+128,1e+129,1e+130,1e+131,1e+132,1e+133,1e+134,1e+135,1e+136,1e+137,1e+138,1e+139,1e+140,
-        1e+141,1e+142,1e+143,1e+144,1e+145,1e+146,1e+147,1e+148,1e+149,1e+150,1e+151,1e+152,1e+153,1e+154,1e+155,1e+156,1e+157,1e+158,1e+159,1e+160,
-        1e+161,1e+162,1e+163,1e+164,1e+165,1e+166,1e+167,1e+168,1e+169,1e+170,1e+171,1e+172,1e+173,1e+174,1e+175,1e+176,1e+177,1e+178,1e+179,1e+180,
-        1e+181,1e+182,1e+183,1e+184,1e+185,1e+186,1e+187,1e+188,1e+189,1e+190,1e+191,1e+192,1e+193,1e+194,1e+195,1e+196,1e+197,1e+198,1e+199,1e+200,
-        1e+201,1e+202,1e+203,1e+204,1e+205,1e+206,1e+207,1e+208,1e+209,1e+210,1e+211,1e+212,1e+213,1e+214,1e+215,1e+216,1e+217,1e+218,1e+219,1e+220,
-        1e+221,1e+222,1e+223,1e+224,1e+225,1e+226,1e+227,1e+228,1e+229,1e+230,1e+231,1e+232,1e+233,1e+234,1e+235,1e+236,1e+237,1e+238,1e+239,1e+240,
-        1e+241,1e+242,1e+243,1e+244,1e+245,1e+246,1e+247,1e+248,1e+249,1e+250,1e+251,1e+252,1e+253,1e+254,1e+255,1e+256,1e+257,1e+258,1e+259,1e+260,
-        1e+261,1e+262,1e+263,1e+264,1e+265,1e+266,1e+267,1e+268,1e+269,1e+270,1e+271,1e+272,1e+273,1e+274,1e+275,1e+276,1e+277,1e+278,1e+279,1e+280,
-        1e+281,1e+282,1e+283,1e+284,1e+285,1e+286,1e+287,1e+288,1e+289,1e+290,1e+291,1e+292,1e+293,1e+294,1e+295,1e+296,1e+297,1e+298,1e+299,1e+300,
-        1e+301,1e+302,1e+303,1e+304,1e+305,1e+306,1e+307,1e+308
-    };
-    RAPIDJSON_ASSERT(n >= 0 && n <= 308);
-    return e[n];
-}
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_POW10_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/internal/regex.h b/src/sioclient/lib/rapidjson/include/rapidjson/internal/regex.h
deleted file mode 100644
index de06718e..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/internal/regex.h
+++ /dev/null
@@ -1,732 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_INTERNAL_REGEX_H_
-#define RAPIDJSON_INTERNAL_REGEX_H_
-
-#include "../allocators.h"
-#include "../stream.h"
-#include "stack.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-RAPIDJSON_DIAG_OFF(switch-enum)
-RAPIDJSON_DIAG_OFF(implicit-fallthrough)
-#elif defined(_MSC_VER)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
-#endif
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#if __GNUC__ >= 7
-RAPIDJSON_DIAG_OFF(implicit-fallthrough)
-#endif
-#endif
-
-#ifndef RAPIDJSON_REGEX_VERBOSE
-#define RAPIDJSON_REGEX_VERBOSE 0
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-///////////////////////////////////////////////////////////////////////////////
-// DecodedStream
-
-template <typename SourceStream, typename Encoding>
-class DecodedStream {
-public:
-    DecodedStream(SourceStream& ss) : ss_(ss), codepoint_() { Decode(); }
-    unsigned Peek() { return codepoint_; }
-    unsigned Take() {
-        unsigned c = codepoint_;
-        if (c) // No further decoding when '\0'
-            Decode();
-        return c;
-    }
-
-private:
-    void Decode() {
-        if (!Encoding::Decode(ss_, &codepoint_))
-            codepoint_ = 0;
-    }
-
-    SourceStream& ss_;
-    unsigned codepoint_;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericRegex
-
-static const SizeType kRegexInvalidState = ~SizeType(0);  //!< Represents an invalid index in GenericRegex::State::out, out1
-static const SizeType kRegexInvalidRange = ~SizeType(0);
-
-template <typename Encoding, typename Allocator>
-class GenericRegexSearch;
-
-//! Regular expression engine with subset of ECMAscript grammar.
-/*!
-    Supported regular expression syntax:
-    - \c ab     Concatenation
-    - \c a|b    Alternation
-    - \c a?     Zero or one
-    - \c a*     Zero or more
-    - \c a+     One or more
-    - \c a{3}   Exactly 3 times
-    - \c a{3,}  At least 3 times
-    - \c a{3,5} 3 to 5 times
-    - \c (ab)   Grouping
-    - \c ^a     At the beginning
-    - \c a$     At the end
-    - \c .      Any character
-    - \c [abc]  Character classes
-    - \c [a-c]  Character class range
-    - \c [a-z0-9_] Character class combination
-    - \c [^abc] Negated character classes
-    - \c [^a-c] Negated character class range
-    - \c [\b]   Backspace (U+0008)
-    - \c \\| \\\\ ...  Escape characters
-    - \c \\f Form feed (U+000C)
-    - \c \\n Line feed (U+000A)
-    - \c \\r Carriage return (U+000D)
-    - \c \\t Tab (U+0009)
-    - \c \\v Vertical tab (U+000B)
-
-    \note This is a Thompson NFA engine, implemented with reference to 
-        Cox, Russ. "Regular Expression Matching Can Be Simple And Fast (but is slow in Java, Perl, PHP, Python, Ruby,...).", 
-        https://swtch.com/~rsc/regexp/regexp1.html 
-*/
-template <typename Encoding, typename Allocator = CrtAllocator>
-class GenericRegex {
-public:
-    typedef Encoding EncodingType;
-    typedef typename Encoding::Ch Ch;
-    template <typename, typename> friend class GenericRegexSearch;
-
-    GenericRegex(const Ch* source, Allocator* allocator = 0) : 
-        states_(allocator, 256), ranges_(allocator, 256), root_(kRegexInvalidState), stateCount_(), rangeCount_(), 
-        anchorBegin_(), anchorEnd_()
-    {
-        GenericStringStream<Encoding> ss(source);
-        DecodedStream<GenericStringStream<Encoding>, Encoding> ds(ss);
-        Parse(ds);
-    }
-
-    ~GenericRegex() {}
-
-    bool IsValid() const {
-        return root_ != kRegexInvalidState;
-    }
-
-private:
-    enum Operator {
-        kZeroOrOne,
-        kZeroOrMore,
-        kOneOrMore,
-        kConcatenation,
-        kAlternation,
-        kLeftParenthesis
-    };
-
-    static const unsigned kAnyCharacterClass = 0xFFFFFFFF;   //!< For '.'
-    static const unsigned kRangeCharacterClass = 0xFFFFFFFE;
-    static const unsigned kRangeNegationFlag = 0x80000000;
-
-    struct Range {
-        unsigned start; // 
-        unsigned end;
-        SizeType next;
-    };
-
-    struct State {
-        SizeType out;     //!< Equals to kInvalid for matching state
-        SizeType out1;    //!< Equals to non-kInvalid for split
-        SizeType rangeStart;
-        unsigned codepoint;
-    };
-
-    struct Frag {
-        Frag(SizeType s, SizeType o, SizeType m) : start(s), out(o), minIndex(m) {}
-        SizeType start;
-        SizeType out; //!< link-list of all output states
-        SizeType minIndex;
-    };
-
-    State& GetState(SizeType index) {
-        RAPIDJSON_ASSERT(index < stateCount_);
-        return states_.template Bottom<State>()[index];
-    }
-
-    const State& GetState(SizeType index) const {
-        RAPIDJSON_ASSERT(index < stateCount_);
-        return states_.template Bottom<State>()[index];
-    }
-
-    Range& GetRange(SizeType index) {
-        RAPIDJSON_ASSERT(index < rangeCount_);
-        return ranges_.template Bottom<Range>()[index];
-    }
-
-    const Range& GetRange(SizeType index) const {
-        RAPIDJSON_ASSERT(index < rangeCount_);
-        return ranges_.template Bottom<Range>()[index];
-    }
-
-    template <typename InputStream>
-    void Parse(DecodedStream<InputStream, Encoding>& ds) {
-        Allocator allocator;
-        Stack<Allocator> operandStack(&allocator, 256);     // Frag
-        Stack<Allocator> operatorStack(&allocator, 256);    // Operator
-        Stack<Allocator> atomCountStack(&allocator, 256);   // unsigned (Atom per parenthesis)
-
-        *atomCountStack.template Push<unsigned>() = 0;
-
-        unsigned codepoint;
-        while (ds.Peek() != 0) {
-            switch (codepoint = ds.Take()) {
-                case '^':
-                    anchorBegin_ = true;
-                    break;
-
-                case '$':
-                    anchorEnd_ = true;
-                    break;
-
-                case '|':
-                    while (!operatorStack.Empty() && *operatorStack.template Top<Operator>() < kAlternation)
-                        if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
-                            return;
-                    *operatorStack.template Push<Operator>() = kAlternation;
-                    *atomCountStack.template Top<unsigned>() = 0;
-                    break;
-
-                case '(':
-                    *operatorStack.template Push<Operator>() = kLeftParenthesis;
-                    *atomCountStack.template Push<unsigned>() = 0;
-                    break;
-
-                case ')':
-                    while (!operatorStack.Empty() && *operatorStack.template Top<Operator>() != kLeftParenthesis)
-                        if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
-                            return;
-                    if (operatorStack.Empty())
-                        return;
-                    operatorStack.template Pop<Operator>(1);
-                    atomCountStack.template Pop<unsigned>(1);
-                    ImplicitConcatenation(atomCountStack, operatorStack);
-                    break;
-
-                case '?':
-                    if (!Eval(operandStack, kZeroOrOne))
-                        return;
-                    break;
-
-                case '*':
-                    if (!Eval(operandStack, kZeroOrMore))
-                        return;
-                    break;
-
-                case '+':
-                    if (!Eval(operandStack, kOneOrMore))
-                        return;
-                    break;
-
-                case '{':
-                    {
-                        unsigned n, m;
-                        if (!ParseUnsigned(ds, &n))
-                            return;
-
-                        if (ds.Peek() == ',') {
-                            ds.Take();
-                            if (ds.Peek() == '}')
-                                m = kInfinityQuantifier;
-                            else if (!ParseUnsigned(ds, &m) || m < n)
-                                return;
-                        }
-                        else
-                            m = n;
-
-                        if (!EvalQuantifier(operandStack, n, m) || ds.Peek() != '}')
-                            return;
-                        ds.Take();
-                    }
-                    break;
-
-                case '.':
-                    PushOperand(operandStack, kAnyCharacterClass);
-                    ImplicitConcatenation(atomCountStack, operatorStack);
-                    break;
-
-                case '[':
-                    {
-                        SizeType range;
-                        if (!ParseRange(ds, &range))
-                            return;
-                        SizeType s = NewState(kRegexInvalidState, kRegexInvalidState, kRangeCharacterClass);
-                        GetState(s).rangeStart = range;
-                        *operandStack.template Push<Frag>() = Frag(s, s, s);
-                    }
-                    ImplicitConcatenation(atomCountStack, operatorStack);
-                    break;
-
-                case '\\': // Escape character
-                    if (!CharacterEscape(ds, &codepoint))
-                        return; // Unsupported escape character
-                    // fall through to default
-
-                default: // Pattern character
-                    PushOperand(operandStack, codepoint);
-                    ImplicitConcatenation(atomCountStack, operatorStack);
-            }
-        }
-
-        while (!operatorStack.Empty())
-            if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
-                return;
-
-        // Link the operand to matching state.
-        if (operandStack.GetSize() == sizeof(Frag)) {
-            Frag* e = operandStack.template Pop<Frag>(1);
-            Patch(e->out, NewState(kRegexInvalidState, kRegexInvalidState, 0));
-            root_ = e->start;
-
-#if RAPIDJSON_REGEX_VERBOSE
-            printf("root: %d\n", root_);
-            for (SizeType i = 0; i < stateCount_ ; i++) {
-                State& s = GetState(i);
-                printf("[%2d] out: %2d out1: %2d c: '%c'\n", i, s.out, s.out1, (char)s.codepoint);
-            }
-            printf("\n");
-#endif
-        }
-    }
-
-    SizeType NewState(SizeType out, SizeType out1, unsigned codepoint) {
-        State* s = states_.template Push<State>();
-        s->out = out;
-        s->out1 = out1;
-        s->codepoint = codepoint;
-        s->rangeStart = kRegexInvalidRange;
-        return stateCount_++;
-    }
-
-    void PushOperand(Stack<Allocator>& operandStack, unsigned codepoint) {
-        SizeType s = NewState(kRegexInvalidState, kRegexInvalidState, codepoint);
-        *operandStack.template Push<Frag>() = Frag(s, s, s);
-    }
-
-    void ImplicitConcatenation(Stack<Allocator>& atomCountStack, Stack<Allocator>& operatorStack) {
-        if (*atomCountStack.template Top<unsigned>())
-            *operatorStack.template Push<Operator>() = kConcatenation;
-        (*atomCountStack.template Top<unsigned>())++;
-    }
-
-    SizeType Append(SizeType l1, SizeType l2) {
-        SizeType old = l1;
-        while (GetState(l1).out != kRegexInvalidState)
-            l1 = GetState(l1).out;
-        GetState(l1).out = l2;
-        return old;
-    }
-
-    void Patch(SizeType l, SizeType s) {
-        for (SizeType next; l != kRegexInvalidState; l = next) {
-            next = GetState(l).out;
-            GetState(l).out = s;
-        }
-    }
-
-    bool Eval(Stack<Allocator>& operandStack, Operator op) {
-        switch (op) {
-            case kConcatenation:
-                RAPIDJSON_ASSERT(operandStack.GetSize() >= sizeof(Frag) * 2);
-                {
-                    Frag e2 = *operandStack.template Pop<Frag>(1);
-                    Frag e1 = *operandStack.template Pop<Frag>(1);
-                    Patch(e1.out, e2.start);
-                    *operandStack.template Push<Frag>() = Frag(e1.start, e2.out, Min(e1.minIndex, e2.minIndex));
-                }
-                return true;
-
-            case kAlternation:
-                if (operandStack.GetSize() >= sizeof(Frag) * 2) {
-                    Frag e2 = *operandStack.template Pop<Frag>(1);
-                    Frag e1 = *operandStack.template Pop<Frag>(1);
-                    SizeType s = NewState(e1.start, e2.start, 0);
-                    *operandStack.template Push<Frag>() = Frag(s, Append(e1.out, e2.out), Min(e1.minIndex, e2.minIndex));
-                    return true;
-                }
-                return false;
-
-            case kZeroOrOne:
-                if (operandStack.GetSize() >= sizeof(Frag)) {
-                    Frag e = *operandStack.template Pop<Frag>(1);
-                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
-                    *operandStack.template Push<Frag>() = Frag(s, Append(e.out, s), e.minIndex);
-                    return true;
-                }
-                return false;
-
-            case kZeroOrMore:
-                if (operandStack.GetSize() >= sizeof(Frag)) {
-                    Frag e = *operandStack.template Pop<Frag>(1);
-                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
-                    Patch(e.out, s);
-                    *operandStack.template Push<Frag>() = Frag(s, s, e.minIndex);
-                    return true;
-                }
-                return false;
-
-            default: 
-                RAPIDJSON_ASSERT(op == kOneOrMore);
-                if (operandStack.GetSize() >= sizeof(Frag)) {
-                    Frag e = *operandStack.template Pop<Frag>(1);
-                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
-                    Patch(e.out, s);
-                    *operandStack.template Push<Frag>() = Frag(e.start, s, e.minIndex);
-                    return true;
-                }
-                return false;
-        }
-    }
-
-    bool EvalQuantifier(Stack<Allocator>& operandStack, unsigned n, unsigned m) {
-        RAPIDJSON_ASSERT(n <= m);
-        RAPIDJSON_ASSERT(operandStack.GetSize() >= sizeof(Frag));
-
-        if (n == 0) {
-            if (m == 0)                             // a{0} not support
-                return false;
-            else if (m == kInfinityQuantifier)
-                Eval(operandStack, kZeroOrMore);    // a{0,} -> a*
-            else {
-                Eval(operandStack, kZeroOrOne);         // a{0,5} -> a?
-                for (unsigned i = 0; i < m - 1; i++)
-                    CloneTopOperand(operandStack);      // a{0,5} -> a? a? a? a? a?
-                for (unsigned i = 0; i < m - 1; i++)
-                    Eval(operandStack, kConcatenation); // a{0,5} -> a?a?a?a?a?
-            }
-            return true;
-        }
-
-        for (unsigned i = 0; i < n - 1; i++)        // a{3} -> a a a
-            CloneTopOperand(operandStack);
-
-        if (m == kInfinityQuantifier)
-            Eval(operandStack, kOneOrMore);         // a{3,} -> a a a+
-        else if (m > n) {
-            CloneTopOperand(operandStack);          // a{3,5} -> a a a a
-            Eval(operandStack, kZeroOrOne);         // a{3,5} -> a a a a?
-            for (unsigned i = n; i < m - 1; i++)
-                CloneTopOperand(operandStack);      // a{3,5} -> a a a a? a?
-            for (unsigned i = n; i < m; i++)
-                Eval(operandStack, kConcatenation); // a{3,5} -> a a aa?a?
-        }
-
-        for (unsigned i = 0; i < n - 1; i++)
-            Eval(operandStack, kConcatenation);     // a{3} -> aaa, a{3,} -> aaa+, a{3.5} -> aaaa?a?
-
-        return true;
-    }
-
-    static SizeType Min(SizeType a, SizeType b) { return a < b ? a : b; }
-
-    void CloneTopOperand(Stack<Allocator>& operandStack) {
-        const Frag src = *operandStack.template Top<Frag>(); // Copy constructor to prevent invalidation
-        SizeType count = stateCount_ - src.minIndex; // Assumes top operand contains states in [src->minIndex, stateCount_)
-        State* s = states_.template Push<State>(count);
-        memcpy(s, &GetState(src.minIndex), count * sizeof(State));
-        for (SizeType j = 0; j < count; j++) {
-            if (s[j].out != kRegexInvalidState)
-                s[j].out += count;
-            if (s[j].out1 != kRegexInvalidState)
-                s[j].out1 += count;
-        }
-        *operandStack.template Push<Frag>() = Frag(src.start + count, src.out + count, src.minIndex + count);
-        stateCount_ += count;
-    }
-
-    template <typename InputStream>
-    bool ParseUnsigned(DecodedStream<InputStream, Encoding>& ds, unsigned* u) {
-        unsigned r = 0;
-        if (ds.Peek() < '0' || ds.Peek() > '9')
-            return false;
-        while (ds.Peek() >= '0' && ds.Peek() <= '9') {
-            if (r >= 429496729 && ds.Peek() > '5') // 2^32 - 1 = 4294967295
-                return false; // overflow
-            r = r * 10 + (ds.Take() - '0');
-        }
-        *u = r;
-        return true;
-    }
-
-    template <typename InputStream>
-    bool ParseRange(DecodedStream<InputStream, Encoding>& ds, SizeType* range) {
-        bool isBegin = true;
-        bool negate = false;
-        int step = 0;
-        SizeType start = kRegexInvalidRange;
-        SizeType current = kRegexInvalidRange;
-        unsigned codepoint;
-        while ((codepoint = ds.Take()) != 0) {
-            if (isBegin) {
-                isBegin = false;
-                if (codepoint == '^') {
-                    negate = true;
-                    continue;
-                }
-            }
-
-            switch (codepoint) {
-            case ']':
-                if (start == kRegexInvalidRange)
-                    return false;   // Error: nothing inside []
-                if (step == 2) { // Add trailing '-'
-                    SizeType r = NewRange('-');
-                    RAPIDJSON_ASSERT(current != kRegexInvalidRange);
-                    GetRange(current).next = r;
-                }
-                if (negate)
-                    GetRange(start).start |= kRangeNegationFlag;
-                *range = start;
-                return true;
-
-            case '\\':
-                if (ds.Peek() == 'b') {
-                    ds.Take();
-                    codepoint = 0x0008; // Escape backspace character
-                }
-                else if (!CharacterEscape(ds, &codepoint))
-                    return false;
-                // fall through to default
-
-            default:
-                switch (step) {
-                case 1:
-                    if (codepoint == '-') {
-                        step++;
-                        break;
-                    }
-                    // fall through to step 0 for other characters
-
-                case 0:
-                    {
-                        SizeType r = NewRange(codepoint);
-                        if (current != kRegexInvalidRange)
-                            GetRange(current).next = r;
-                        if (start == kRegexInvalidRange)
-                            start = r;
-                        current = r;
-                    }
-                    step = 1;
-                    break;
-
-                default:
-                    RAPIDJSON_ASSERT(step == 2);
-                    GetRange(current).end = codepoint;
-                    step = 0;
-                }
-            }
-        }
-        return false;
-    }
-    
-    SizeType NewRange(unsigned codepoint) {
-        Range* r = ranges_.template Push<Range>();
-        r->start = r->end = codepoint;
-        r->next = kRegexInvalidRange;
-        return rangeCount_++;
-    }
-
-    template <typename InputStream>
-    bool CharacterEscape(DecodedStream<InputStream, Encoding>& ds, unsigned* escapedCodepoint) {
-        unsigned codepoint;
-        switch (codepoint = ds.Take()) {
-            case '^':
-            case '$':
-            case '|':
-            case '(':
-            case ')':
-            case '?':
-            case '*':
-            case '+':
-            case '.':
-            case '[':
-            case ']':
-            case '{':
-            case '}':
-            case '\\':
-                *escapedCodepoint = codepoint; return true;
-            case 'f': *escapedCodepoint = 0x000C; return true;
-            case 'n': *escapedCodepoint = 0x000A; return true;
-            case 'r': *escapedCodepoint = 0x000D; return true;
-            case 't': *escapedCodepoint = 0x0009; return true;
-            case 'v': *escapedCodepoint = 0x000B; return true;
-            default:
-                return false; // Unsupported escape character
-        }
-    }
-
-    Stack<Allocator> states_;
-    Stack<Allocator> ranges_;
-    SizeType root_;
-    SizeType stateCount_;
-    SizeType rangeCount_;
-
-    static const unsigned kInfinityQuantifier = ~0u;
-
-    // For SearchWithAnchoring()
-    bool anchorBegin_;
-    bool anchorEnd_;
-};
-
-template <typename RegexType, typename Allocator = CrtAllocator>
-class GenericRegexSearch {
-public:
-    typedef typename RegexType::EncodingType Encoding;
-    typedef typename Encoding::Ch Ch;
-
-    GenericRegexSearch(const RegexType& regex, Allocator* allocator = 0) : 
-        regex_(regex), allocator_(allocator), ownAllocator_(0),
-        state0_(allocator, 0), state1_(allocator, 0), stateSet_()
-    {
-        RAPIDJSON_ASSERT(regex_.IsValid());
-        if (!allocator_)
-            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
-        stateSet_ = static_cast<unsigned*>(allocator_->Malloc(GetStateSetSize()));
-        state0_.template Reserve<SizeType>(regex_.stateCount_);
-        state1_.template Reserve<SizeType>(regex_.stateCount_);
-    }
-
-    ~GenericRegexSearch() {
-        Allocator::Free(stateSet_);
-        RAPIDJSON_DELETE(ownAllocator_);
-    }
-
-    template <typename InputStream>
-    bool Match(InputStream& is) {
-        return SearchWithAnchoring(is, true, true);
-    }
-
-    bool Match(const Ch* s) {
-        GenericStringStream<Encoding> is(s);
-        return Match(is);
-    }
-
-    template <typename InputStream>
-    bool Search(InputStream& is) {
-        return SearchWithAnchoring(is, regex_.anchorBegin_, regex_.anchorEnd_);
-    }
-
-    bool Search(const Ch* s) {
-        GenericStringStream<Encoding> is(s);
-        return Search(is);
-    }
-
-private:
-    typedef typename RegexType::State State;
-    typedef typename RegexType::Range Range;
-
-    template <typename InputStream>
-    bool SearchWithAnchoring(InputStream& is, bool anchorBegin, bool anchorEnd) {
-        DecodedStream<InputStream, Encoding> ds(is);
-
-        state0_.Clear();
-        Stack<Allocator> *current = &state0_, *next = &state1_;
-        const size_t stateSetSize = GetStateSetSize();
-        std::memset(stateSet_, 0, stateSetSize);
-
-        bool matched = AddState(*current, regex_.root_);
-        unsigned codepoint;
-        while (!current->Empty() && (codepoint = ds.Take()) != 0) {
-            std::memset(stateSet_, 0, stateSetSize);
-            next->Clear();
-            matched = false;
-            for (const SizeType* s = current->template Bottom<SizeType>(); s != current->template End<SizeType>(); ++s) {
-                const State& sr = regex_.GetState(*s);
-                if (sr.codepoint == codepoint ||
-                    sr.codepoint == RegexType::kAnyCharacterClass || 
-                    (sr.codepoint == RegexType::kRangeCharacterClass && MatchRange(sr.rangeStart, codepoint)))
-                {
-                    matched = AddState(*next, sr.out) || matched;
-                    if (!anchorEnd && matched)
-                        return true;
-                }
-                if (!anchorBegin)
-                    AddState(*next, regex_.root_);
-            }
-            internal::Swap(current, next);
-        }
-
-        return matched;
-    }
-
-    size_t GetStateSetSize() const {
-        return (regex_.stateCount_ + 31) / 32 * 4;
-    }
-
-    // Return whether the added states is a match state
-    bool AddState(Stack<Allocator>& l, SizeType index) {
-        RAPIDJSON_ASSERT(index != kRegexInvalidState);
-
-        const State& s = regex_.GetState(index);
-        if (s.out1 != kRegexInvalidState) { // Split
-            bool matched = AddState(l, s.out);
-            return AddState(l, s.out1) || matched;
-        }
-        else if (!(stateSet_[index >> 5] & (1u << (index & 31)))) {
-            stateSet_[index >> 5] |= (1u << (index & 31));
-            *l.template PushUnsafe<SizeType>() = index;
-        }
-        return s.out == kRegexInvalidState; // by using PushUnsafe() above, we can ensure s is not validated due to reallocation.
-    }
-
-    bool MatchRange(SizeType rangeIndex, unsigned codepoint) const {
-        bool yes = (regex_.GetRange(rangeIndex).start & RegexType::kRangeNegationFlag) == 0;
-        while (rangeIndex != kRegexInvalidRange) {
-            const Range& r = regex_.GetRange(rangeIndex);
-            if (codepoint >= (r.start & ~RegexType::kRangeNegationFlag) && codepoint <= r.end)
-                return yes;
-            rangeIndex = r.next;
-        }
-        return !yes;
-    }
-
-    const RegexType& regex_;
-    Allocator* allocator_;
-    Allocator* ownAllocator_;
-    Stack<Allocator> state0_;
-    Stack<Allocator> state1_;
-    uint32_t* stateSet_;
-};
-
-typedef GenericRegex<UTF8<> > Regex;
-typedef GenericRegexSearch<Regex> RegexSearch;
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-#if defined(__clang__) || defined(_MSC_VER)
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_INTERNAL_REGEX_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/internal/stack.h b/src/sioclient/lib/rapidjson/include/rapidjson/internal/stack.h
deleted file mode 100644
index 89558d0d..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/internal/stack.h
+++ /dev/null
@@ -1,231 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_INTERNAL_STACK_H_
-#define RAPIDJSON_INTERNAL_STACK_H_
-
-#include "../allocators.h"
-#include "swap.h"
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-///////////////////////////////////////////////////////////////////////////////
-// Stack
-
-//! A type-unsafe stack for storing different types of data.
-/*! \tparam Allocator Allocator for allocating stack memory.
-*/
-template <typename Allocator>
-class Stack {
-public:
-    // Optimization note: Do not allocate memory for stack_ in constructor.
-    // Do it lazily when first Push() -> Expand() -> Resize().
-    Stack(Allocator* allocator, size_t stackCapacity) : allocator_(allocator), ownAllocator_(0), stack_(0), stackTop_(0), stackEnd_(0), initialCapacity_(stackCapacity) {
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    Stack(Stack&& rhs)
-        : allocator_(rhs.allocator_),
-          ownAllocator_(rhs.ownAllocator_),
-          stack_(rhs.stack_),
-          stackTop_(rhs.stackTop_),
-          stackEnd_(rhs.stackEnd_),
-          initialCapacity_(rhs.initialCapacity_)
-    {
-        rhs.allocator_ = 0;
-        rhs.ownAllocator_ = 0;
-        rhs.stack_ = 0;
-        rhs.stackTop_ = 0;
-        rhs.stackEnd_ = 0;
-        rhs.initialCapacity_ = 0;
-    }
-#endif
-
-    ~Stack() {
-        Destroy();
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    Stack& operator=(Stack&& rhs) {
-        if (&rhs != this)
-        {
-            Destroy();
-
-            allocator_ = rhs.allocator_;
-            ownAllocator_ = rhs.ownAllocator_;
-            stack_ = rhs.stack_;
-            stackTop_ = rhs.stackTop_;
-            stackEnd_ = rhs.stackEnd_;
-            initialCapacity_ = rhs.initialCapacity_;
-
-            rhs.allocator_ = 0;
-            rhs.ownAllocator_ = 0;
-            rhs.stack_ = 0;
-            rhs.stackTop_ = 0;
-            rhs.stackEnd_ = 0;
-            rhs.initialCapacity_ = 0;
-        }
-        return *this;
-    }
-#endif
-
-    void Swap(Stack& rhs) RAPIDJSON_NOEXCEPT {
-        internal::Swap(allocator_, rhs.allocator_);
-        internal::Swap(ownAllocator_, rhs.ownAllocator_);
-        internal::Swap(stack_, rhs.stack_);
-        internal::Swap(stackTop_, rhs.stackTop_);
-        internal::Swap(stackEnd_, rhs.stackEnd_);
-        internal::Swap(initialCapacity_, rhs.initialCapacity_);
-    }
-
-    void Clear() { stackTop_ = stack_; }
-
-    void ShrinkToFit() { 
-        if (Empty()) {
-            // If the stack is empty, completely deallocate the memory.
-            Allocator::Free(stack_); // NOLINT (+clang-analyzer-unix.Malloc)
-            stack_ = 0;
-            stackTop_ = 0;
-            stackEnd_ = 0;
-        }
-        else
-            Resize(GetSize());
-    }
-
-    // Optimization note: try to minimize the size of this function for force inline.
-    // Expansion is run very infrequently, so it is moved to another (probably non-inline) function.
-    template<typename T>
-    RAPIDJSON_FORCEINLINE void Reserve(size_t count = 1) {
-         // Expand the stack if needed
-        if (RAPIDJSON_UNLIKELY(stackTop_ + sizeof(T) * count > stackEnd_))
-            Expand<T>(count);
-    }
-
-    template<typename T>
-    RAPIDJSON_FORCEINLINE T* Push(size_t count = 1) {
-        Reserve<T>(count);
-        return PushUnsafe<T>(count);
-    }
-
-    template<typename T>
-    RAPIDJSON_FORCEINLINE T* PushUnsafe(size_t count = 1) {
-        RAPIDJSON_ASSERT(stackTop_);
-        RAPIDJSON_ASSERT(stackTop_ + sizeof(T) * count <= stackEnd_);
-        T* ret = reinterpret_cast<T*>(stackTop_);
-        stackTop_ += sizeof(T) * count;
-        return ret;
-    }
-
-    template<typename T>
-    T* Pop(size_t count) {
-        RAPIDJSON_ASSERT(GetSize() >= count * sizeof(T));
-        stackTop_ -= count * sizeof(T);
-        return reinterpret_cast<T*>(stackTop_);
-    }
-
-    template<typename T>
-    T* Top() { 
-        RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
-        return reinterpret_cast<T*>(stackTop_ - sizeof(T));
-    }
-
-    template<typename T>
-    const T* Top() const {
-        RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
-        return reinterpret_cast<T*>(stackTop_ - sizeof(T));
-    }
-
-    template<typename T>
-    T* End() { return reinterpret_cast<T*>(stackTop_); }
-
-    template<typename T>
-    const T* End() const { return reinterpret_cast<T*>(stackTop_); }
-
-    template<typename T>
-    T* Bottom() { return reinterpret_cast<T*>(stack_); }
-
-    template<typename T>
-    const T* Bottom() const { return reinterpret_cast<T*>(stack_); }
-
-    bool HasAllocator() const {
-        return allocator_ != 0;
-    }
-
-    Allocator& GetAllocator() {
-        RAPIDJSON_ASSERT(allocator_);
-        return *allocator_;
-    }
-
-    bool Empty() const { return stackTop_ == stack_; }
-    size_t GetSize() const { return static_cast<size_t>(stackTop_ - stack_); }
-    size_t GetCapacity() const { return static_cast<size_t>(stackEnd_ - stack_); }
-
-private:
-    template<typename T>
-    void Expand(size_t count) {
-        // Only expand the capacity if the current stack exists. Otherwise just create a stack with initial capacity.
-        size_t newCapacity;
-        if (stack_ == 0) {
-            if (!allocator_)
-                ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
-            newCapacity = initialCapacity_;
-        } else {
-            newCapacity = GetCapacity();
-            newCapacity += (newCapacity + 1) / 2;
-        }
-        size_t newSize = GetSize() + sizeof(T) * count;
-        if (newCapacity < newSize)
-            newCapacity = newSize;
-
-        Resize(newCapacity);
-    }
-
-    void Resize(size_t newCapacity) {
-        const size_t size = GetSize();  // Backup the current size
-        stack_ = static_cast<char*>(allocator_->Realloc(stack_, GetCapacity(), newCapacity));
-        stackTop_ = stack_ + size;
-        stackEnd_ = stack_ + newCapacity;
-    }
-
-    void Destroy() {
-        Allocator::Free(stack_);
-        RAPIDJSON_DELETE(ownAllocator_); // Only delete if it is owned by the stack
-    }
-
-    // Prohibit copy constructor & assignment operator.
-    Stack(const Stack&);
-    Stack& operator=(const Stack&);
-
-    Allocator* allocator_;
-    Allocator* ownAllocator_;
-    char *stack_;
-    char *stackTop_;
-    char *stackEnd_;
-    size_t initialCapacity_;
-};
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_STACK_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/internal/strfunc.h b/src/sioclient/lib/rapidjson/include/rapidjson/internal/strfunc.h
deleted file mode 100644
index 226439a7..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/internal/strfunc.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_INTERNAL_STRFUNC_H_
-#define RAPIDJSON_INTERNAL_STRFUNC_H_
-
-#include "../stream.h"
-#include <cwchar>
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-//! Custom strlen() which works on different character types.
-/*! \tparam Ch Character type (e.g. char, wchar_t, short)
-    \param s Null-terminated input string.
-    \return Number of characters in the string. 
-    \note This has the same semantics as strlen(), the return value is not number of Unicode codepoints.
-*/
-template <typename Ch>
-inline SizeType StrLen(const Ch* s) {
-    RAPIDJSON_ASSERT(s != 0);
-    const Ch* p = s;
-    while (*p) ++p;
-    return SizeType(p - s);
-}
-
-template <>
-inline SizeType StrLen(const char* s) {
-    return SizeType(std::strlen(s));
-}
-
-template <>
-inline SizeType StrLen(const wchar_t* s) {
-    return SizeType(std::wcslen(s));
-}
-
-//! Returns number of code points in a encoded string.
-template<typename Encoding>
-bool CountStringCodePoint(const typename Encoding::Ch* s, SizeType length, SizeType* outCount) {
-    RAPIDJSON_ASSERT(s != 0);
-    RAPIDJSON_ASSERT(outCount != 0);
-    GenericStringStream<Encoding> is(s);
-    const typename Encoding::Ch* end = s + length;
-    SizeType count = 0;
-    while (is.src_ < end) {
-        unsigned codepoint;
-        if (!Encoding::Decode(is, &codepoint))
-            return false;
-        count++;
-    }
-    *outCount = count;
-    return true;
-}
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_INTERNAL_STRFUNC_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/internal/strtod.h b/src/sioclient/lib/rapidjson/include/rapidjson/internal/strtod.h
deleted file mode 100644
index dfca22b6..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/internal/strtod.h
+++ /dev/null
@@ -1,290 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_STRTOD_
-#define RAPIDJSON_STRTOD_
-
-#include "ieee754.h"
-#include "biginteger.h"
-#include "diyfp.h"
-#include "pow10.h"
-#include <climits>
-#include <limits>
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-inline double FastPath(double significand, int exp) {
-    if (exp < -308)
-        return 0.0;
-    else if (exp >= 0)
-        return significand * internal::Pow10(exp);
-    else
-        return significand / internal::Pow10(-exp);
-}
-
-inline double StrtodNormalPrecision(double d, int p) {
-    if (p < -308) {
-        // Prevent expSum < -308, making Pow10(p) = 0
-        d = FastPath(d, -308);
-        d = FastPath(d, p + 308);
-    }
-    else
-        d = FastPath(d, p);
-    return d;
-}
-
-template <typename T>
-inline T Min3(T a, T b, T c) {
-    T m = a;
-    if (m > b) m = b;
-    if (m > c) m = c;
-    return m;
-}
-
-inline int CheckWithinHalfULP(double b, const BigInteger& d, int dExp) {
-    const Double db(b);
-    const uint64_t bInt = db.IntegerSignificand();
-    const int bExp = db.IntegerExponent();
-    const int hExp = bExp - 1;
-
-    int dS_Exp2 = 0, dS_Exp5 = 0, bS_Exp2 = 0, bS_Exp5 = 0, hS_Exp2 = 0, hS_Exp5 = 0;
-
-    // Adjust for decimal exponent
-    if (dExp >= 0) {
-        dS_Exp2 += dExp;
-        dS_Exp5 += dExp;
-    }
-    else {
-        bS_Exp2 -= dExp;
-        bS_Exp5 -= dExp;
-        hS_Exp2 -= dExp;
-        hS_Exp5 -= dExp;
-    }
-
-    // Adjust for binary exponent
-    if (bExp >= 0)
-        bS_Exp2 += bExp;
-    else {
-        dS_Exp2 -= bExp;
-        hS_Exp2 -= bExp;
-    }
-
-    // Adjust for half ulp exponent
-    if (hExp >= 0)
-        hS_Exp2 += hExp;
-    else {
-        dS_Exp2 -= hExp;
-        bS_Exp2 -= hExp;
-    }
-
-    // Remove common power of two factor from all three scaled values
-    int common_Exp2 = Min3(dS_Exp2, bS_Exp2, hS_Exp2);
-    dS_Exp2 -= common_Exp2;
-    bS_Exp2 -= common_Exp2;
-    hS_Exp2 -= common_Exp2;
-
-    BigInteger dS = d;
-    dS.MultiplyPow5(static_cast<unsigned>(dS_Exp5)) <<= static_cast<unsigned>(dS_Exp2);
-
-    BigInteger bS(bInt);
-    bS.MultiplyPow5(static_cast<unsigned>(bS_Exp5)) <<= static_cast<unsigned>(bS_Exp2);
-
-    BigInteger hS(1);
-    hS.MultiplyPow5(static_cast<unsigned>(hS_Exp5)) <<= static_cast<unsigned>(hS_Exp2);
-
-    BigInteger delta(0);
-    dS.Difference(bS, &delta);
-
-    return delta.Compare(hS);
-}
-
-inline bool StrtodFast(double d, int p, double* result) {
-    // Use fast path for string-to-double conversion if possible
-    // see http://www.exploringbinary.com/fast-path-decimal-to-floating-point-conversion/
-    if (p > 22  && p < 22 + 16) {
-        // Fast Path Cases In Disguise
-        d *= internal::Pow10(p - 22);
-        p = 22;
-    }
-
-    if (p >= -22 && p <= 22 && d <= 9007199254740991.0) { // 2^53 - 1
-        *result = FastPath(d, p);
-        return true;
-    }
-    else
-        return false;
-}
-
-// Compute an approximation and see if it is within 1/2 ULP
-inline bool StrtodDiyFp(const char* decimals, int dLen, int dExp, double* result) {
-    uint64_t significand = 0;
-    int i = 0;   // 2^64 - 1 = 18446744073709551615, 1844674407370955161 = 0x1999999999999999    
-    for (; i < dLen; i++) {
-        if (significand  >  RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) ||
-            (significand == RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) && decimals[i] > '5'))
-            break;
-        significand = significand * 10u + static_cast<unsigned>(decimals[i] - '0');
-    }
-    
-    if (i < dLen && decimals[i] >= '5') // Rounding
-        significand++;
-
-    int remaining = dLen - i;
-    const int kUlpShift = 3;
-    const int kUlp = 1 << kUlpShift;
-    int64_t error = (remaining == 0) ? 0 : kUlp / 2;
-
-    DiyFp v(significand, 0);
-    v = v.Normalize();
-    error <<= -v.e;
-
-    dExp += remaining;
-
-    int actualExp;
-    DiyFp cachedPower = GetCachedPower10(dExp, &actualExp);
-    if (actualExp != dExp) {
-        static const DiyFp kPow10[] = {
-            DiyFp(RAPIDJSON_UINT64_C2(0xa0000000, 0x00000000), -60),  // 10^1
-            DiyFp(RAPIDJSON_UINT64_C2(0xc8000000, 0x00000000), -57),  // 10^2
-            DiyFp(RAPIDJSON_UINT64_C2(0xfa000000, 0x00000000), -54),  // 10^3
-            DiyFp(RAPIDJSON_UINT64_C2(0x9c400000, 0x00000000), -50),  // 10^4
-            DiyFp(RAPIDJSON_UINT64_C2(0xc3500000, 0x00000000), -47),  // 10^5
-            DiyFp(RAPIDJSON_UINT64_C2(0xf4240000, 0x00000000), -44),  // 10^6
-            DiyFp(RAPIDJSON_UINT64_C2(0x98968000, 0x00000000), -40)   // 10^7
-        };
-        int adjustment = dExp - actualExp;
-        RAPIDJSON_ASSERT(adjustment >= 1 && adjustment < 8);
-        v = v * kPow10[adjustment - 1];
-        if (dLen + adjustment > 19) // has more digits than decimal digits in 64-bit
-            error += kUlp / 2;
-    }
-
-    v = v * cachedPower;
-
-    error += kUlp + (error == 0 ? 0 : 1);
-
-    const int oldExp = v.e;
-    v = v.Normalize();
-    error <<= oldExp - v.e;
-
-    const int effectiveSignificandSize = Double::EffectiveSignificandSize(64 + v.e);
-    int precisionSize = 64 - effectiveSignificandSize;
-    if (precisionSize + kUlpShift >= 64) {
-        int scaleExp = (precisionSize + kUlpShift) - 63;
-        v.f >>= scaleExp;
-        v.e += scaleExp; 
-        error = (error >> scaleExp) + 1 + kUlp;
-        precisionSize -= scaleExp;
-    }
-
-    DiyFp rounded(v.f >> precisionSize, v.e + precisionSize);
-    const uint64_t precisionBits = (v.f & ((uint64_t(1) << precisionSize) - 1)) * kUlp;
-    const uint64_t halfWay = (uint64_t(1) << (precisionSize - 1)) * kUlp;
-    if (precisionBits >= halfWay + static_cast<unsigned>(error)) {
-        rounded.f++;
-        if (rounded.f & (DiyFp::kDpHiddenBit << 1)) { // rounding overflows mantissa (issue #340)
-            rounded.f >>= 1;
-            rounded.e++;
-        }
-    }
-
-    *result = rounded.ToDouble();
-
-    return halfWay - static_cast<unsigned>(error) >= precisionBits || precisionBits >= halfWay + static_cast<unsigned>(error);
-}
-
-inline double StrtodBigInteger(double approx, const char* decimals, int dLen, int dExp) {
-    RAPIDJSON_ASSERT(dLen >= 0);
-    const BigInteger dInt(decimals, static_cast<unsigned>(dLen));
-    Double a(approx);
-    int cmp = CheckWithinHalfULP(a.Value(), dInt, dExp);
-    if (cmp < 0)
-        return a.Value();  // within half ULP
-    else if (cmp == 0) {
-        // Round towards even
-        if (a.Significand() & 1)
-            return a.NextPositiveDouble();
-        else
-            return a.Value();
-    }
-    else // adjustment
-        return a.NextPositiveDouble();
-}
-
-inline double StrtodFullPrecision(double d, int p, const char* decimals, size_t length, size_t decimalPosition, int exp) {
-    RAPIDJSON_ASSERT(d >= 0.0);
-    RAPIDJSON_ASSERT(length >= 1);
-
-    double result = 0.0;
-    if (StrtodFast(d, p, &result))
-        return result;
-
-    RAPIDJSON_ASSERT(length <= INT_MAX);
-    int dLen = static_cast<int>(length);
-
-    RAPIDJSON_ASSERT(length >= decimalPosition);
-    RAPIDJSON_ASSERT(length - decimalPosition <= INT_MAX);
-    int dExpAdjust = static_cast<int>(length - decimalPosition);
-
-    RAPIDJSON_ASSERT(exp >= INT_MIN + dExpAdjust);
-    int dExp = exp - dExpAdjust;
-
-    // Make sure length+dExp does not overflow
-    RAPIDJSON_ASSERT(dExp <= INT_MAX - dLen);
-
-    // Trim leading zeros
-    while (dLen > 0 && *decimals == '0') {
-        dLen--;
-        decimals++;
-    }
-
-    // Trim trailing zeros
-    while (dLen > 0 && decimals[dLen - 1] == '0') {
-        dLen--;
-        dExp++;
-    }
-
-    if (dLen == 0) { // Buffer only contains zeros.
-        return 0.0;
-    }
-
-    // Trim right-most digits
-    const int kMaxDecimalDigit = 767 + 1;
-    if (dLen > kMaxDecimalDigit) {
-        dExp += dLen - kMaxDecimalDigit;
-        dLen = kMaxDecimalDigit;
-    }
-
-    // If too small, underflow to zero.
-    // Any x <= 10^-324 is interpreted as zero.
-    if (dLen + dExp <= -324)
-        return 0.0;
-
-    // If too large, overflow to infinity.
-    // Any x >= 10^309 is interpreted as +infinity.
-    if (dLen + dExp > 309)
-        return std::numeric_limits<double>::infinity();
-
-    if (StrtodDiyFp(decimals, dLen, dExp, &result))
-        return result;
-
-    // Use approximation from StrtodDiyFp and make adjustment with BigInteger comparison
-    return StrtodBigInteger(result, decimals, dLen, dExp);
-}
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_STRTOD_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/internal/swap.h b/src/sioclient/lib/rapidjson/include/rapidjson/internal/swap.h
deleted file mode 100644
index 666e49f9..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/internal/swap.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_INTERNAL_SWAP_H_
-#define RAPIDJSON_INTERNAL_SWAP_H_
-
-#include "../rapidjson.h"
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-//! Custom swap() to avoid dependency on C++ <algorithm> header
-/*! \tparam T Type of the arguments to swap, should be instantiated with primitive C++ types only.
-    \note This has the same semantics as std::swap().
-*/
-template <typename T>
-inline void Swap(T& a, T& b) RAPIDJSON_NOEXCEPT {
-    T tmp = a;
-        a = b;
-        b = tmp;
-}
-
-} // namespace internal
-RAPIDJSON_NAMESPACE_END
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_INTERNAL_SWAP_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/istreamwrapper.h b/src/sioclient/lib/rapidjson/include/rapidjson/istreamwrapper.h
deleted file mode 100644
index 5f816982..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/istreamwrapper.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_ISTREAMWRAPPER_H_
-#define RAPIDJSON_ISTREAMWRAPPER_H_
-
-#include "stream.h"
-#include <iosfwd>
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-#elif defined(_MSC_VER)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4351) // new behavior: elements of array 'array' will be default initialized
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Wrapper of \c std::basic_istream into RapidJSON's Stream concept.
-/*!
-    The classes can be wrapped including but not limited to:
-
-    - \c std::istringstream
-    - \c std::stringstream
-    - \c std::wistringstream
-    - \c std::wstringstream
-    - \c std::ifstream
-    - \c std::fstream
-    - \c std::wifstream
-    - \c std::wfstream
-
-    \tparam StreamType Class derived from \c std::basic_istream.
-*/
-   
-template <typename StreamType>
-class BasicIStreamWrapper {
-public:
-    typedef typename StreamType::char_type Ch;
-    BasicIStreamWrapper(StreamType& stream) : stream_(stream), count_(), peekBuffer_() {}
-
-    Ch Peek() const { 
-        typename StreamType::int_type c = stream_.peek();
-        return RAPIDJSON_LIKELY(c != StreamType::traits_type::eof()) ? static_cast<Ch>(c) : static_cast<Ch>('\0');
-    }
-
-    Ch Take() { 
-        typename StreamType::int_type c = stream_.get();
-        if (RAPIDJSON_LIKELY(c != StreamType::traits_type::eof())) {
-            count_++;
-            return static_cast<Ch>(c);
-        }
-        else
-            return '\0';
-    }
-
-    // tellg() may return -1 when failed. So we count by ourself.
-    size_t Tell() const { return count_; }
-
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-    // For encoding detection only.
-    const Ch* Peek4() const {
-        RAPIDJSON_ASSERT(sizeof(Ch) == 1); // Only usable for byte stream.
-        int i;
-        bool hasError = false;
-        for (i = 0; i < 4; ++i) {
-            typename StreamType::int_type c = stream_.get();
-            if (c == StreamType::traits_type::eof()) {
-                hasError = true;
-                stream_.clear();
-                break;
-            }
-            peekBuffer_[i] = static_cast<Ch>(c);
-        }
-        for (--i; i >= 0; --i)
-            stream_.putback(peekBuffer_[i]);
-        return !hasError ? peekBuffer_ : 0;
-    }
-
-private:
-    BasicIStreamWrapper(const BasicIStreamWrapper&);
-    BasicIStreamWrapper& operator=(const BasicIStreamWrapper&);
-
-    StreamType& stream_;
-    size_t count_;  //!< Number of characters read. Note:
-    mutable Ch peekBuffer_[4];
-};
-
-typedef BasicIStreamWrapper<std::istream> IStreamWrapper;
-typedef BasicIStreamWrapper<std::wistream> WIStreamWrapper;
-
-#if defined(__clang__) || defined(_MSC_VER)
-RAPIDJSON_DIAG_POP
-#endif
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_ISTREAMWRAPPER_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/memorybuffer.h b/src/sioclient/lib/rapidjson/include/rapidjson/memorybuffer.h
deleted file mode 100644
index 39bee1de..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/memorybuffer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_MEMORYBUFFER_H_
-#define RAPIDJSON_MEMORYBUFFER_H_
-
-#include "stream.h"
-#include "internal/stack.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Represents an in-memory output byte stream.
-/*!
-    This class is mainly for being wrapped by EncodedOutputStream or AutoUTFOutputStream.
-
-    It is similar to FileWriteBuffer but the destination is an in-memory buffer instead of a file.
-
-    Differences between MemoryBuffer and StringBuffer:
-    1. StringBuffer has Encoding but MemoryBuffer is only a byte buffer. 
-    2. StringBuffer::GetString() returns a null-terminated string. MemoryBuffer::GetBuffer() returns a buffer without terminator.
-
-    \tparam Allocator type for allocating memory buffer.
-    \note implements Stream concept
-*/
-template <typename Allocator = CrtAllocator>
-struct GenericMemoryBuffer {
-    typedef char Ch; // byte
-
-    GenericMemoryBuffer(Allocator* allocator = 0, size_t capacity = kDefaultCapacity) : stack_(allocator, capacity) {}
-
-    void Put(Ch c) { *stack_.template Push<Ch>() = c; }
-    void Flush() {}
-
-    void Clear() { stack_.Clear(); }
-    void ShrinkToFit() { stack_.ShrinkToFit(); }
-    Ch* Push(size_t count) { return stack_.template Push<Ch>(count); }
-    void Pop(size_t count) { stack_.template Pop<Ch>(count); }
-
-    const Ch* GetBuffer() const {
-        return stack_.template Bottom<Ch>();
-    }
-
-    size_t GetSize() const { return stack_.GetSize(); }
-
-    static const size_t kDefaultCapacity = 256;
-    mutable internal::Stack<Allocator> stack_;
-};
-
-typedef GenericMemoryBuffer<> MemoryBuffer;
-
-//! Implement specialized version of PutN() with memset() for better performance.
-template<>
-inline void PutN(MemoryBuffer& memoryBuffer, char c, size_t n) {
-    std::memset(memoryBuffer.stack_.Push<char>(n), c, n * sizeof(c));
-}
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_MEMORYBUFFER_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/memorystream.h b/src/sioclient/lib/rapidjson/include/rapidjson/memorystream.h
deleted file mode 100644
index 1d71d8a4..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/memorystream.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_MEMORYSTREAM_H_
-#define RAPIDJSON_MEMORYSTREAM_H_
-
-#include "stream.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(unreachable-code)
-RAPIDJSON_DIAG_OFF(missing-noreturn)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Represents an in-memory input byte stream.
-/*!
-    This class is mainly for being wrapped by EncodedInputStream or AutoUTFInputStream.
-
-    It is similar to FileReadBuffer but the source is an in-memory buffer instead of a file.
-
-    Differences between MemoryStream and StringStream:
-    1. StringStream has encoding but MemoryStream is a byte stream.
-    2. MemoryStream needs size of the source buffer and the buffer don't need to be null terminated. StringStream assume null-terminated string as source.
-    3. MemoryStream supports Peek4() for encoding detection. StringStream is specified with an encoding so it should not have Peek4().
-    \note implements Stream concept
-*/
-struct MemoryStream {
-    typedef char Ch; // byte
-
-    MemoryStream(const Ch *src, size_t size) : src_(src), begin_(src), end_(src + size), size_(size) {}
-
-    Ch Peek() const { return RAPIDJSON_UNLIKELY(src_ == end_) ? '\0' : *src_; }
-    Ch Take() { return RAPIDJSON_UNLIKELY(src_ == end_) ? '\0' : *src_++; }
-    size_t Tell() const { return static_cast<size_t>(src_ - begin_); }
-
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-    // For encoding detection only.
-    const Ch* Peek4() const {
-        return Tell() + 4 <= size_ ? src_ : 0;
-    }
-
-    const Ch* src_;     //!< Current read position.
-    const Ch* begin_;   //!< Original head of the string.
-    const Ch* end_;     //!< End of stream.
-    size_t size_;       //!< Size of the stream.
-};
-
-RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_MEMORYBUFFER_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/msinttypes/inttypes.h b/src/sioclient/lib/rapidjson/include/rapidjson/msinttypes/inttypes.h
deleted file mode 100644
index 18111286..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/msinttypes/inttypes.h
+++ /dev/null
@@ -1,316 +0,0 @@
-// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006-2013 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. Neither the name of the product nor the names of its contributors may
-//      be used to endorse or promote products derived from this software
-//      without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-// The above software in this distribution may have been modified by 
-// THL A29 Limited ("Tencent Modifications"). 
-// All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_INTTYPES_H_ // [
-#define _MSC_INTTYPES_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include "stdint.h"
-
-// miloyip: VC supports inttypes.h since VC2013
-#if _MSC_VER >= 1800
-#include <inttypes.h>
-#else
-
-// 7.8 Format conversion of integer types
-
-typedef struct {
-   intmax_t quot;
-   intmax_t rem;
-} imaxdiv_t;
-
-// 7.8.1 Macros for format specifiers
-
-#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [   See footnote 185 at page 198
-
-// The fprintf macros for signed integers are:
-#define PRId8       "d"
-#define PRIi8       "i"
-#define PRIdLEAST8  "d"
-#define PRIiLEAST8  "i"
-#define PRIdFAST8   "d"
-#define PRIiFAST8   "i"
-
-#define PRId16       "hd"
-#define PRIi16       "hi"
-#define PRIdLEAST16  "hd"
-#define PRIiLEAST16  "hi"
-#define PRIdFAST16   "hd"
-#define PRIiFAST16   "hi"
-
-#define PRId32       "I32d"
-#define PRIi32       "I32i"
-#define PRIdLEAST32  "I32d"
-#define PRIiLEAST32  "I32i"
-#define PRIdFAST32   "I32d"
-#define PRIiFAST32   "I32i"
-
-#define PRId64       "I64d"
-#define PRIi64       "I64i"
-#define PRIdLEAST64  "I64d"
-#define PRIiLEAST64  "I64i"
-#define PRIdFAST64   "I64d"
-#define PRIiFAST64   "I64i"
-
-#define PRIdMAX     "I64d"
-#define PRIiMAX     "I64i"
-
-#define PRIdPTR     "Id"
-#define PRIiPTR     "Ii"
-
-// The fprintf macros for unsigned integers are:
-#define PRIo8       "o"
-#define PRIu8       "u"
-#define PRIx8       "x"
-#define PRIX8       "X"
-#define PRIoLEAST8  "o"
-#define PRIuLEAST8  "u"
-#define PRIxLEAST8  "x"
-#define PRIXLEAST8  "X"
-#define PRIoFAST8   "o"
-#define PRIuFAST8   "u"
-#define PRIxFAST8   "x"
-#define PRIXFAST8   "X"
-
-#define PRIo16       "ho"
-#define PRIu16       "hu"
-#define PRIx16       "hx"
-#define PRIX16       "hX"
-#define PRIoLEAST16  "ho"
-#define PRIuLEAST16  "hu"
-#define PRIxLEAST16  "hx"
-#define PRIXLEAST16  "hX"
-#define PRIoFAST16   "ho"
-#define PRIuFAST16   "hu"
-#define PRIxFAST16   "hx"
-#define PRIXFAST16   "hX"
-
-#define PRIo32       "I32o"
-#define PRIu32       "I32u"
-#define PRIx32       "I32x"
-#define PRIX32       "I32X"
-#define PRIoLEAST32  "I32o"
-#define PRIuLEAST32  "I32u"
-#define PRIxLEAST32  "I32x"
-#define PRIXLEAST32  "I32X"
-#define PRIoFAST32   "I32o"
-#define PRIuFAST32   "I32u"
-#define PRIxFAST32   "I32x"
-#define PRIXFAST32   "I32X"
-
-#define PRIo64       "I64o"
-#define PRIu64       "I64u"
-#define PRIx64       "I64x"
-#define PRIX64       "I64X"
-#define PRIoLEAST64  "I64o"
-#define PRIuLEAST64  "I64u"
-#define PRIxLEAST64  "I64x"
-#define PRIXLEAST64  "I64X"
-#define PRIoFAST64   "I64o"
-#define PRIuFAST64   "I64u"
-#define PRIxFAST64   "I64x"
-#define PRIXFAST64   "I64X"
-
-#define PRIoMAX     "I64o"
-#define PRIuMAX     "I64u"
-#define PRIxMAX     "I64x"
-#define PRIXMAX     "I64X"
-
-#define PRIoPTR     "Io"
-#define PRIuPTR     "Iu"
-#define PRIxPTR     "Ix"
-#define PRIXPTR     "IX"
-
-// The fscanf macros for signed integers are:
-#define SCNd8       "d"
-#define SCNi8       "i"
-#define SCNdLEAST8  "d"
-#define SCNiLEAST8  "i"
-#define SCNdFAST8   "d"
-#define SCNiFAST8   "i"
-
-#define SCNd16       "hd"
-#define SCNi16       "hi"
-#define SCNdLEAST16  "hd"
-#define SCNiLEAST16  "hi"
-#define SCNdFAST16   "hd"
-#define SCNiFAST16   "hi"
-
-#define SCNd32       "ld"
-#define SCNi32       "li"
-#define SCNdLEAST32  "ld"
-#define SCNiLEAST32  "li"
-#define SCNdFAST32   "ld"
-#define SCNiFAST32   "li"
-
-#define SCNd64       "I64d"
-#define SCNi64       "I64i"
-#define SCNdLEAST64  "I64d"
-#define SCNiLEAST64  "I64i"
-#define SCNdFAST64   "I64d"
-#define SCNiFAST64   "I64i"
-
-#define SCNdMAX     "I64d"
-#define SCNiMAX     "I64i"
-
-#ifdef _WIN64 // [
-#  define SCNdPTR     "I64d"
-#  define SCNiPTR     "I64i"
-#else  // _WIN64 ][
-#  define SCNdPTR     "ld"
-#  define SCNiPTR     "li"
-#endif  // _WIN64 ]
-
-// The fscanf macros for unsigned integers are:
-#define SCNo8       "o"
-#define SCNu8       "u"
-#define SCNx8       "x"
-#define SCNX8       "X"
-#define SCNoLEAST8  "o"
-#define SCNuLEAST8  "u"
-#define SCNxLEAST8  "x"
-#define SCNXLEAST8  "X"
-#define SCNoFAST8   "o"
-#define SCNuFAST8   "u"
-#define SCNxFAST8   "x"
-#define SCNXFAST8   "X"
-
-#define SCNo16       "ho"
-#define SCNu16       "hu"
-#define SCNx16       "hx"
-#define SCNX16       "hX"
-#define SCNoLEAST16  "ho"
-#define SCNuLEAST16  "hu"
-#define SCNxLEAST16  "hx"
-#define SCNXLEAST16  "hX"
-#define SCNoFAST16   "ho"
-#define SCNuFAST16   "hu"
-#define SCNxFAST16   "hx"
-#define SCNXFAST16   "hX"
-
-#define SCNo32       "lo"
-#define SCNu32       "lu"
-#define SCNx32       "lx"
-#define SCNX32       "lX"
-#define SCNoLEAST32  "lo"
-#define SCNuLEAST32  "lu"
-#define SCNxLEAST32  "lx"
-#define SCNXLEAST32  "lX"
-#define SCNoFAST32   "lo"
-#define SCNuFAST32   "lu"
-#define SCNxFAST32   "lx"
-#define SCNXFAST32   "lX"
-
-#define SCNo64       "I64o"
-#define SCNu64       "I64u"
-#define SCNx64       "I64x"
-#define SCNX64       "I64X"
-#define SCNoLEAST64  "I64o"
-#define SCNuLEAST64  "I64u"
-#define SCNxLEAST64  "I64x"
-#define SCNXLEAST64  "I64X"
-#define SCNoFAST64   "I64o"
-#define SCNuFAST64   "I64u"
-#define SCNxFAST64   "I64x"
-#define SCNXFAST64   "I64X"
-
-#define SCNoMAX     "I64o"
-#define SCNuMAX     "I64u"
-#define SCNxMAX     "I64x"
-#define SCNXMAX     "I64X"
-
-#ifdef _WIN64 // [
-#  define SCNoPTR     "I64o"
-#  define SCNuPTR     "I64u"
-#  define SCNxPTR     "I64x"
-#  define SCNXPTR     "I64X"
-#else  // _WIN64 ][
-#  define SCNoPTR     "lo"
-#  define SCNuPTR     "lu"
-#  define SCNxPTR     "lx"
-#  define SCNXPTR     "lX"
-#endif  // _WIN64 ]
-
-#endif // __STDC_FORMAT_MACROS ]
-
-// 7.8.2 Functions for greatest-width integer types
-
-// 7.8.2.1 The imaxabs function
-#define imaxabs _abs64
-
-// 7.8.2.2 The imaxdiv function
-
-// This is modified version of div() function from Microsoft's div.c found
-// in %MSVC.NET%\crt\src\div.c
-#ifdef STATIC_IMAXDIV // [
-static
-#else // STATIC_IMAXDIV ][
-_inline
-#endif // STATIC_IMAXDIV ]
-imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
-{
-   imaxdiv_t result;
-
-   result.quot = numer / denom;
-   result.rem = numer % denom;
-
-   if (numer < 0 && result.rem > 0) {
-      // did division wrong; must fix up
-      ++result.quot;
-      result.rem -= denom;
-   }
-
-   return result;
-}
-
-// 7.8.2.3 The strtoimax and strtoumax functions
-#define strtoimax _strtoi64
-#define strtoumax _strtoui64
-
-// 7.8.2.4 The wcstoimax and wcstoumax functions
-#define wcstoimax _wcstoi64
-#define wcstoumax _wcstoui64
-
-#endif // _MSC_VER >= 1800
-
-#endif // _MSC_INTTYPES_H_ ]
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/msinttypes/stdint.h b/src/sioclient/lib/rapidjson/include/rapidjson/msinttypes/stdint.h
deleted file mode 100644
index 3d4477b9..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/msinttypes/stdint.h
+++ /dev/null
@@ -1,300 +0,0 @@
-// ISO C9x  compliant stdint.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006-2013 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. Neither the name of the product nor the names of its contributors may
-//      be used to endorse or promote products derived from this software
-//      without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-// The above software in this distribution may have been modified by 
-// THL A29 Limited ("Tencent Modifications"). 
-// All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-// miloyip: Originally Visual Studio 2010 uses its own stdint.h. However it generates warning with INT64_C(), so change to use this file for vs2010.
-#if _MSC_VER >= 1600 // [
-#include <stdint.h>
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
-
-#undef INT8_C
-#undef INT16_C
-#undef INT32_C
-#undef INT64_C
-#undef UINT8_C
-#undef UINT16_C
-#undef UINT32_C
-#undef UINT64_C
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val)  val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
-// Check out Issue 9 for the details.
-#ifndef INTMAX_C //   [
-#  define INTMAX_C   INT64_C
-#endif // INTMAX_C    ]
-#ifndef UINTMAX_C //  [
-#  define UINTMAX_C  UINT64_C
-#endif // UINTMAX_C   ]
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-#else // ] _MSC_VER >= 1700 [
-
-#include <limits.h>
-
-// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
-// compiling for ARM we have to wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler would give many errors like this:
-//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#if defined(__cplusplus) && !defined(_M_ARM)
-extern "C" {
-#endif
-#  include <wchar.h>
-#if defined(__cplusplus) && !defined(_M_ARM)
-}
-#endif
-
-// Define _W64 macros to mark types changing their size, like intptr_t.
-#ifndef _W64
-#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-#     define _W64 __w64
-#  else
-#     define _W64
-#  endif
-#endif
-
-
-// 7.18.1 Integer types
-
-// 7.18.1.1 Exact-width integer types
-
-// Visual Studio 6 and Embedded Visual C++ 4 doesn't
-// realize that, e.g. char has the same size as __int8
-// so we give up on __intX for them.
-#if (_MSC_VER < 1300)
-   typedef signed char       int8_t;
-   typedef signed short      int16_t;
-   typedef signed int        int32_t;
-   typedef unsigned char     uint8_t;
-   typedef unsigned short    uint16_t;
-   typedef unsigned int      uint32_t;
-#else
-   typedef signed __int8     int8_t;
-   typedef signed __int16    int16_t;
-   typedef signed __int32    int32_t;
-   typedef unsigned __int8   uint8_t;
-   typedef unsigned __int16  uint16_t;
-   typedef unsigned __int32  uint32_t;
-#endif
-typedef signed __int64       int64_t;
-typedef unsigned __int64     uint64_t;
-
-
-// 7.18.1.2 Minimum-width integer types
-typedef int8_t    int_least8_t;
-typedef int16_t   int_least16_t;
-typedef int32_t   int_least32_t;
-typedef int64_t   int_least64_t;
-typedef uint8_t   uint_least8_t;
-typedef uint16_t  uint_least16_t;
-typedef uint32_t  uint_least32_t;
-typedef uint64_t  uint_least64_t;
-
-// 7.18.1.3 Fastest minimum-width integer types
-typedef int8_t    int_fast8_t;
-typedef int16_t   int_fast16_t;
-typedef int32_t   int_fast32_t;
-typedef int64_t   int_fast64_t;
-typedef uint8_t   uint_fast8_t;
-typedef uint16_t  uint_fast16_t;
-typedef uint32_t  uint_fast32_t;
-typedef uint64_t  uint_fast64_t;
-
-// 7.18.1.4 Integer types capable of holding object pointers
-#ifdef _WIN64 // [
-   typedef signed __int64    intptr_t;
-   typedef unsigned __int64  uintptr_t;
-#else // _WIN64 ][
-   typedef _W64 signed int   intptr_t;
-   typedef _W64 unsigned int uintptr_t;
-#endif // _WIN64 ]
-
-// 7.18.1.5 Greatest-width integer types
-typedef int64_t   intmax_t;
-typedef uint64_t  uintmax_t;
-
-
-// 7.18.2 Limits of specified-width integer types
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
-
-// 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN     ((int8_t)_I8_MIN)
-#define INT8_MAX     _I8_MAX
-#define INT16_MIN    ((int16_t)_I16_MIN)
-#define INT16_MAX    _I16_MAX
-#define INT32_MIN    ((int32_t)_I32_MIN)
-#define INT32_MAX    _I32_MAX
-#define INT64_MIN    ((int64_t)_I64_MIN)
-#define INT64_MAX    _I64_MAX
-#define UINT8_MAX    _UI8_MAX
-#define UINT16_MAX   _UI16_MAX
-#define UINT32_MAX   _UI32_MAX
-#define UINT64_MAX   _UI64_MAX
-
-// 7.18.2.2 Limits of minimum-width integer types
-#define INT_LEAST8_MIN    INT8_MIN
-#define INT_LEAST8_MAX    INT8_MAX
-#define INT_LEAST16_MIN   INT16_MIN
-#define INT_LEAST16_MAX   INT16_MAX
-#define INT_LEAST32_MIN   INT32_MIN
-#define INT_LEAST32_MAX   INT32_MAX
-#define INT_LEAST64_MIN   INT64_MIN
-#define INT_LEAST64_MAX   INT64_MAX
-#define UINT_LEAST8_MAX   UINT8_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
-#define UINT_LEAST64_MAX  UINT64_MAX
-
-// 7.18.2.3 Limits of fastest minimum-width integer types
-#define INT_FAST8_MIN    INT8_MIN
-#define INT_FAST8_MAX    INT8_MAX
-#define INT_FAST16_MIN   INT16_MIN
-#define INT_FAST16_MAX   INT16_MAX
-#define INT_FAST32_MIN   INT32_MIN
-#define INT_FAST32_MAX   INT32_MAX
-#define INT_FAST64_MIN   INT64_MIN
-#define INT_FAST64_MAX   INT64_MAX
-#define UINT_FAST8_MAX   UINT8_MAX
-#define UINT_FAST16_MAX  UINT16_MAX
-#define UINT_FAST32_MAX  UINT32_MAX
-#define UINT_FAST64_MAX  UINT64_MAX
-
-// 7.18.2.4 Limits of integer types capable of holding object pointers
-#ifdef _WIN64 // [
-#  define INTPTR_MIN   INT64_MIN
-#  define INTPTR_MAX   INT64_MAX
-#  define UINTPTR_MAX  UINT64_MAX
-#else // _WIN64 ][
-#  define INTPTR_MIN   INT32_MIN
-#  define INTPTR_MAX   INT32_MAX
-#  define UINTPTR_MAX  UINT32_MAX
-#endif // _WIN64 ]
-
-// 7.18.2.5 Limits of greatest-width integer types
-#define INTMAX_MIN   INT64_MIN
-#define INTMAX_MAX   INT64_MAX
-#define UINTMAX_MAX  UINT64_MAX
-
-// 7.18.3 Limits of other integer types
-
-#ifdef _WIN64 // [
-#  define PTRDIFF_MIN  _I64_MIN
-#  define PTRDIFF_MAX  _I64_MAX
-#else  // _WIN64 ][
-#  define PTRDIFF_MIN  _I32_MIN
-#  define PTRDIFF_MAX  _I32_MAX
-#endif  // _WIN64 ]
-
-#define SIG_ATOMIC_MIN  INT_MIN
-#define SIG_ATOMIC_MAX  INT_MAX
-
-#ifndef SIZE_MAX // [
-#  ifdef _WIN64 // [
-#     define SIZE_MAX  _UI64_MAX
-#  else // _WIN64 ][
-#     define SIZE_MAX  _UI32_MAX
-#  endif // _WIN64 ]
-#endif // SIZE_MAX ]
-
-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
-#ifndef WCHAR_MIN // [
-#  define WCHAR_MIN  0
-#endif  // WCHAR_MIN ]
-#ifndef WCHAR_MAX // [
-#  define WCHAR_MAX  _UI16_MAX
-#endif  // WCHAR_MAX ]
-
-#define WINT_MIN  0
-#define WINT_MAX  _UI16_MAX
-
-#endif // __STDC_LIMIT_MACROS ]
-
-
-// 7.18.4 Limits of other integer types
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val)  val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
-// Check out Issue 9 for the details.
-#ifndef INTMAX_C //   [
-#  define INTMAX_C   INT64_C
-#endif // INTMAX_C    ]
-#ifndef UINTMAX_C //  [
-#  define UINTMAX_C  UINT64_C
-#endif // UINTMAX_C   ]
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-#endif // _MSC_VER >= 1600 ]
-
-#endif // _MSC_STDINT_H_ ]
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/ostreamwrapper.h b/src/sioclient/lib/rapidjson/include/rapidjson/ostreamwrapper.h
deleted file mode 100644
index 6f4667c0..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/ostreamwrapper.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_OSTREAMWRAPPER_H_
-#define RAPIDJSON_OSTREAMWRAPPER_H_
-
-#include "stream.h"
-#include <iosfwd>
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Wrapper of \c std::basic_ostream into RapidJSON's Stream concept.
-/*!
-    The classes can be wrapped including but not limited to:
-
-    - \c std::ostringstream
-    - \c std::stringstream
-    - \c std::wpstringstream
-    - \c std::wstringstream
-    - \c std::ifstream
-    - \c std::fstream
-    - \c std::wofstream
-    - \c std::wfstream
-
-    \tparam StreamType Class derived from \c std::basic_ostream.
-*/
-   
-template <typename StreamType>
-class BasicOStreamWrapper {
-public:
-    typedef typename StreamType::char_type Ch;
-    BasicOStreamWrapper(StreamType& stream) : stream_(stream) {}
-
-    void Put(Ch c) {
-        stream_.put(c);
-    }
-
-    void Flush() {
-        stream_.flush();
-    }
-
-    // Not implemented
-    char Peek() const { RAPIDJSON_ASSERT(false); return 0; }
-    char Take() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
-    char* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(char*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    BasicOStreamWrapper(const BasicOStreamWrapper&);
-    BasicOStreamWrapper& operator=(const BasicOStreamWrapper&);
-
-    StreamType& stream_;
-};
-
-typedef BasicOStreamWrapper<std::ostream> OStreamWrapper;
-typedef BasicOStreamWrapper<std::wostream> WOStreamWrapper;
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_OSTREAMWRAPPER_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/pointer.h b/src/sioclient/lib/rapidjson/include/rapidjson/pointer.h
deleted file mode 100644
index 3d339f24..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/pointer.h
+++ /dev/null
@@ -1,1357 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_POINTER_H_
-#define RAPIDJSON_POINTER_H_
-
-#include "document.h"
-#include "internal/itoa.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(switch-enum)
-#elif defined(_MSC_VER)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-static const SizeType kPointerInvalidIndex = ~SizeType(0);  //!< Represents an invalid index in GenericPointer::Token
-
-//! Error code of parsing.
-/*! \ingroup RAPIDJSON_ERRORS
-    \see GenericPointer::GenericPointer, GenericPointer::GetParseErrorCode
-*/
-enum PointerParseErrorCode {
-    kPointerParseErrorNone = 0,                     //!< The parse is successful
-
-    kPointerParseErrorTokenMustBeginWithSolidus,    //!< A token must begin with a '/'
-    kPointerParseErrorInvalidEscape,                //!< Invalid escape
-    kPointerParseErrorInvalidPercentEncoding,       //!< Invalid percent encoding in URI fragment
-    kPointerParseErrorCharacterMustPercentEncode    //!< A character must percent encoded in URI fragment
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericPointer
-
-//! Represents a JSON Pointer. Use Pointer for UTF8 encoding and default allocator.
-/*!
-    This class implements RFC 6901 "JavaScript Object Notation (JSON) Pointer" 
-    (https://tools.ietf.org/html/rfc6901).
-
-    A JSON pointer is for identifying a specific value in a JSON document
-    (GenericDocument). It can simplify coding of DOM tree manipulation, because it
-    can access multiple-level depth of DOM tree with single API call.
-
-    After it parses a string representation (e.g. "/foo/0" or URI fragment 
-    representation (e.g. "#/foo/0") into its internal representation (tokens),
-    it can be used to resolve a specific value in multiple documents, or sub-tree 
-    of documents.
-
-    Contrary to GenericValue, Pointer can be copy constructed and copy assigned.
-    Apart from assignment, a Pointer cannot be modified after construction.
-
-    Although Pointer is very convenient, please aware that constructing Pointer
-    involves parsing and dynamic memory allocation. A special constructor with user-
-    supplied tokens eliminates these.
-
-    GenericPointer depends on GenericDocument and GenericValue.
-    
-    \tparam ValueType The value type of the DOM tree. E.g. GenericValue<UTF8<> >
-    \tparam Allocator The allocator type for allocating memory for internal representation.
-    
-    \note GenericPointer uses same encoding of ValueType.
-    However, Allocator of GenericPointer is independent of Allocator of Value.
-*/
-template <typename ValueType, typename Allocator = CrtAllocator>
-class GenericPointer {
-public:
-    typedef typename ValueType::EncodingType EncodingType;  //!< Encoding type from Value
-    typedef typename ValueType::Ch Ch;                      //!< Character type from Value
-
-    //! A token is the basic units of internal representation.
-    /*!
-        A JSON pointer string representation "/foo/123" is parsed to two tokens: 
-        "foo" and 123. 123 will be represented in both numeric form and string form.
-        They are resolved according to the actual value type (object or array).
-
-        For token that are not numbers, or the numeric value is out of bound
-        (greater than limits of SizeType), they are only treated as string form
-        (i.e. the token's index will be equal to kPointerInvalidIndex).
-
-        This struct is public so that user can create a Pointer without parsing and 
-        allocation, using a special constructor.
-    */
-    struct Token {
-        const Ch* name;             //!< Name of the token. It has null character at the end but it can contain null character.
-        SizeType length;            //!< Length of the name.
-        SizeType index;             //!< A valid array index, if it is not equal to kPointerInvalidIndex.
-    };
-
-    //!@name Constructors and destructor.
-    //@{
-
-    //! Default constructor.
-    GenericPointer(Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
-
-    //! Constructor that parses a string or URI fragment representation.
-    /*!
-        \param source A null-terminated, string or URI fragment representation of JSON pointer.
-        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
-    */
-    explicit GenericPointer(const Ch* source, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
-        Parse(source, internal::StrLen(source));
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Constructor that parses a string or URI fragment representation.
-    /*!
-        \param source A string or URI fragment representation of JSON pointer.
-        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
-        \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
-    */
-    explicit GenericPointer(const std::basic_string<Ch>& source, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
-        Parse(source.c_str(), source.size());
-    }
-#endif
-
-    //! Constructor that parses a string or URI fragment representation, with length of the source string.
-    /*!
-        \param source A string or URI fragment representation of JSON pointer.
-        \param length Length of source.
-        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
-        \note Slightly faster than the overload without length.
-    */
-    GenericPointer(const Ch* source, size_t length, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
-        Parse(source, length);
-    }
-
-    //! Constructor with user-supplied tokens.
-    /*!
-        This constructor let user supplies const array of tokens.
-        This prevents the parsing process and eliminates allocation.
-        This is preferred for memory constrained environments.
-
-        \param tokens An constant array of tokens representing the JSON pointer.
-        \param tokenCount Number of tokens.
-
-        \b Example
-        \code
-        #define NAME(s) { s, sizeof(s) / sizeof(s[0]) - 1, kPointerInvalidIndex }
-        #define INDEX(i) { #i, sizeof(#i) - 1, i }
-
-        static const Pointer::Token kTokens[] = { NAME("foo"), INDEX(123) };
-        static const Pointer p(kTokens, sizeof(kTokens) / sizeof(kTokens[0]));
-        // Equivalent to static const Pointer p("/foo/123");
-
-        #undef NAME
-        #undef INDEX
-        \endcode
-    */
-    GenericPointer(const Token* tokens, size_t tokenCount) : allocator_(), ownAllocator_(), nameBuffer_(), tokens_(const_cast<Token*>(tokens)), tokenCount_(tokenCount), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
-
-    //! Copy constructor.
-    GenericPointer(const GenericPointer& rhs) : allocator_(rhs.allocator_), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
-        *this = rhs;
-    }
-
-    //! Copy constructor.
-    GenericPointer(const GenericPointer& rhs, Allocator* allocator) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
-        *this = rhs;
-    }
-
-    //! Destructor.
-    ~GenericPointer() {
-        if (nameBuffer_)    // If user-supplied tokens constructor is used, nameBuffer_ is nullptr and tokens_ are not deallocated.
-            Allocator::Free(tokens_);
-        RAPIDJSON_DELETE(ownAllocator_);
-    }
-
-    //! Assignment operator.
-    GenericPointer& operator=(const GenericPointer& rhs) {
-        if (this != &rhs) {
-            // Do not delete ownAllcator
-            if (nameBuffer_)
-                Allocator::Free(tokens_);
-
-            tokenCount_ = rhs.tokenCount_;
-            parseErrorOffset_ = rhs.parseErrorOffset_;
-            parseErrorCode_ = rhs.parseErrorCode_;
-
-            if (rhs.nameBuffer_)
-                CopyFromRaw(rhs); // Normally parsed tokens.
-            else {
-                tokens_ = rhs.tokens_; // User supplied const tokens.
-                nameBuffer_ = 0;
-            }
-        }
-        return *this;
-    }
-
-    //@}
-
-    //!@name Append token
-    //@{
-
-    //! Append a token and return a new Pointer
-    /*!
-        \param token Token to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(const Token& token, Allocator* allocator = 0) const {
-        GenericPointer r;
-        r.allocator_ = allocator;
-        Ch *p = r.CopyFromRaw(*this, 1, token.length + 1);
-        std::memcpy(p, token.name, (token.length + 1) * sizeof(Ch));
-        r.tokens_[tokenCount_].name = p;
-        r.tokens_[tokenCount_].length = token.length;
-        r.tokens_[tokenCount_].index = token.index;
-        return r;
-    }
-
-    //! Append a name token with length, and return a new Pointer
-    /*!
-        \param name Name to be appended.
-        \param length Length of name.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(const Ch* name, SizeType length, Allocator* allocator = 0) const {
-        Token token = { name, length, kPointerInvalidIndex };
-        return Append(token, allocator);
-    }
-
-    //! Append a name token without length, and return a new Pointer
-    /*!
-        \param name Name (const Ch*) to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >), (GenericPointer))
-    Append(T* name, Allocator* allocator = 0) const {
-        return Append(name, internal::StrLen(name), allocator);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Append a name token, and return a new Pointer
-    /*!
-        \param name Name to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(const std::basic_string<Ch>& name, Allocator* allocator = 0) const {
-        return Append(name.c_str(), static_cast<SizeType>(name.size()), allocator);
-    }
-#endif
-
-    //! Append a index token, and return a new Pointer
-    /*!
-        \param index Index to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(SizeType index, Allocator* allocator = 0) const {
-        char buffer[21];
-        char* end = sizeof(SizeType) == 4 ? internal::u32toa(index, buffer) : internal::u64toa(index, buffer);
-        SizeType length = static_cast<SizeType>(end - buffer);
-        buffer[length] = '\0';
-
-        if (sizeof(Ch) == 1) {
-            Token token = { reinterpret_cast<Ch*>(buffer), length, index };
-            return Append(token, allocator);
-        }
-        else {
-            Ch name[21];
-            for (size_t i = 0; i <= length; i++)
-                name[i] = static_cast<Ch>(buffer[i]);
-            Token token = { name, length, index };
-            return Append(token, allocator);
-        }
-    }
-
-    //! Append a token by value, and return a new Pointer
-    /*!
-        \param token token to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(const ValueType& token, Allocator* allocator = 0) const {
-        if (token.IsString())
-            return Append(token.GetString(), token.GetStringLength(), allocator);
-        else {
-            RAPIDJSON_ASSERT(token.IsUint64());
-            RAPIDJSON_ASSERT(token.GetUint64() <= SizeType(~0));
-            return Append(static_cast<SizeType>(token.GetUint64()), allocator);
-        }
-    }
-
-    //!@name Handling Parse Error
-    //@{
-
-    //! Check whether this is a valid pointer.
-    bool IsValid() const { return parseErrorCode_ == kPointerParseErrorNone; }
-
-    //! Get the parsing error offset in code unit.
-    size_t GetParseErrorOffset() const { return parseErrorOffset_; }
-
-    //! Get the parsing error code.
-    PointerParseErrorCode GetParseErrorCode() const { return parseErrorCode_; }
-
-    //@}
-
-    //! Get the allocator of this pointer.
-    Allocator& GetAllocator() { return *allocator_; }
-
-    //!@name Tokens
-    //@{
-
-    //! Get the token array (const version only).
-    const Token* GetTokens() const { return tokens_; }
-
-    //! Get the number of tokens.
-    size_t GetTokenCount() const { return tokenCount_; }
-
-    //@}
-
-    //!@name Equality/inequality operators
-    //@{
-
-    //! Equality operator.
-    /*!
-        \note When any pointers are invalid, always returns false.
-    */
-    bool operator==(const GenericPointer& rhs) const {
-        if (!IsValid() || !rhs.IsValid() || tokenCount_ != rhs.tokenCount_)
-            return false;
-
-        for (size_t i = 0; i < tokenCount_; i++) {
-            if (tokens_[i].index != rhs.tokens_[i].index ||
-                tokens_[i].length != rhs.tokens_[i].length || 
-                (tokens_[i].length != 0 && std::memcmp(tokens_[i].name, rhs.tokens_[i].name, sizeof(Ch)* tokens_[i].length) != 0))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    //! Inequality operator.
-    /*!
-        \note When any pointers are invalid, always returns true.
-    */
-    bool operator!=(const GenericPointer& rhs) const { return !(*this == rhs); }
-
-    //@}
-
-    //!@name Stringify
-    //@{
-
-    //! Stringify the pointer into string representation.
-    /*!
-        \tparam OutputStream Type of output stream.
-        \param os The output stream.
-    */
-    template<typename OutputStream>
-    bool Stringify(OutputStream& os) const {
-        return Stringify<false, OutputStream>(os);
-    }
-
-    //! Stringify the pointer into URI fragment representation.
-    /*!
-        \tparam OutputStream Type of output stream.
-        \param os The output stream.
-    */
-    template<typename OutputStream>
-    bool StringifyUriFragment(OutputStream& os) const {
-        return Stringify<true, OutputStream>(os);
-    }
-
-    //@}
-
-    //!@name Create value
-    //@{
-
-    //! Create a value in a subtree.
-    /*!
-        If the value is not exist, it creates all parent values and a JSON Null value.
-        So it always succeed and return the newly created or existing value.
-
-        Remind that it may change types of parents according to tokens, so it 
-        potentially removes previously stored values. For example, if a document 
-        was an array, and "/foo" is used to create a value, then the document 
-        will be changed to an object, and all existing array elements are lost.
-
-        \param root Root value of a DOM subtree to be resolved. It can be any value other than document root.
-        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
-        \param alreadyExist If non-null, it stores whether the resolved value is already exist.
-        \return The resolved newly created (a JSON Null value), or already exists value.
-    */
-    ValueType& Create(ValueType& root, typename ValueType::AllocatorType& allocator, bool* alreadyExist = 0) const {
-        RAPIDJSON_ASSERT(IsValid());
-        ValueType* v = &root;
-        bool exist = true;
-        for (const Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
-            if (v->IsArray() && t->name[0] == '-' && t->length == 1) {
-                v->PushBack(ValueType().Move(), allocator);
-                v = &((*v)[v->Size() - 1]);
-                exist = false;
-            }
-            else {
-                if (t->index == kPointerInvalidIndex) { // must be object name
-                    if (!v->IsObject())
-                        v->SetObject(); // Change to Object
-                }
-                else { // object name or array index
-                    if (!v->IsArray() && !v->IsObject())
-                        v->SetArray(); // Change to Array
-                }
-
-                if (v->IsArray()) {
-                    if (t->index >= v->Size()) {
-                        v->Reserve(t->index + 1, allocator);
-                        while (t->index >= v->Size())
-                            v->PushBack(ValueType().Move(), allocator);
-                        exist = false;
-                    }
-                    v = &((*v)[t->index]);
-                }
-                else {
-                    typename ValueType::MemberIterator m = v->FindMember(GenericStringRef<Ch>(t->name, t->length));
-                    if (m == v->MemberEnd()) {
-                        v->AddMember(ValueType(t->name, t->length, allocator).Move(), ValueType().Move(), allocator);
-                        v = &(--v->MemberEnd())->value; // Assumes AddMember() appends at the end
-                        exist = false;
-                    }
-                    else
-                        v = &m->value;
-                }
-            }
-        }
-
-        if (alreadyExist)
-            *alreadyExist = exist;
-
-        return *v;
-    }
-
-    //! Creates a value in a document.
-    /*!
-        \param document A document to be resolved.
-        \param alreadyExist If non-null, it stores whether the resolved value is already exist.
-        \return The resolved newly created, or already exists value.
-    */
-    template <typename stackAllocator>
-    ValueType& Create(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, bool* alreadyExist = 0) const {
-        return Create(document, document.GetAllocator(), alreadyExist);
-    }
-
-    //@}
-
-    //!@name Query value
-    //@{
-
-    //! Query a value in a subtree.
-    /*!
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \param unresolvedTokenIndex If the pointer cannot resolve a token in the pointer, this parameter can obtain the index of unresolved token.
-        \return Pointer to the value if it can be resolved. Otherwise null.
-
-        \note
-        There are only 3 situations when a value cannot be resolved:
-        1. A value in the path is not an array nor object.
-        2. An object value does not contain the token.
-        3. A token is out of range of an array value.
-
-        Use unresolvedTokenIndex to retrieve the token index.
-    */
-    ValueType* Get(ValueType& root, size_t* unresolvedTokenIndex = 0) const {
-        RAPIDJSON_ASSERT(IsValid());
-        ValueType* v = &root;
-        for (const Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
-            switch (v->GetType()) {
-            case kObjectType:
-                {
-                    typename ValueType::MemberIterator m = v->FindMember(GenericStringRef<Ch>(t->name, t->length));
-                    if (m == v->MemberEnd())
-                        break;
-                    v = &m->value;
-                }
-                continue;
-            case kArrayType:
-                if (t->index == kPointerInvalidIndex || t->index >= v->Size())
-                    break;
-                v = &((*v)[t->index]);
-                continue;
-            default:
-                break;
-            }
-
-            // Error: unresolved token
-            if (unresolvedTokenIndex)
-                *unresolvedTokenIndex = static_cast<size_t>(t - tokens_);
-            return 0;
-        }
-        return v;
-    }
-
-    //! Query a const value in a const subtree.
-    /*!
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \return Pointer to the value if it can be resolved. Otherwise null.
-    */
-    const ValueType* Get(const ValueType& root, size_t* unresolvedTokenIndex = 0) const { 
-        return Get(const_cast<ValueType&>(root), unresolvedTokenIndex);
-    }
-
-    //@}
-
-    //!@name Query a value with default
-    //@{
-
-    //! Query a value in a subtree with default value.
-    /*!
-        Similar to Get(), but if the specified value do not exists, it creates all parents and clone the default value.
-        So that this function always succeed.
-
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \param defaultValue Default value to be cloned if the value was not exists.
-        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
-        \see Create()
-    */
-    ValueType& GetWithDefault(ValueType& root, const ValueType& defaultValue, typename ValueType::AllocatorType& allocator) const {
-        bool alreadyExist;
-        ValueType& v = Create(root, allocator, &alreadyExist);
-        return alreadyExist ? v : v.CopyFrom(defaultValue, allocator);
-    }
-
-    //! Query a value in a subtree with default null-terminated string.
-    ValueType& GetWithDefault(ValueType& root, const Ch* defaultValue, typename ValueType::AllocatorType& allocator) const {
-        bool alreadyExist;
-        ValueType& v = Create(root, allocator, &alreadyExist);
-        return alreadyExist ? v : v.SetString(defaultValue, allocator);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Query a value in a subtree with default std::basic_string.
-    ValueType& GetWithDefault(ValueType& root, const std::basic_string<Ch>& defaultValue, typename ValueType::AllocatorType& allocator) const {
-        bool alreadyExist;
-        ValueType& v = Create(root, allocator, &alreadyExist);
-        return alreadyExist ? v : v.SetString(defaultValue, allocator);
-    }
-#endif
-
-    //! Query a value in a subtree with default primitive value.
-    /*!
-        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
-    GetWithDefault(ValueType& root, T defaultValue, typename ValueType::AllocatorType& allocator) const {
-        return GetWithDefault(root, ValueType(defaultValue).Move(), allocator);
-    }
-
-    //! Query a value in a document with default value.
-    template <typename stackAllocator>
-    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const ValueType& defaultValue) const {
-        return GetWithDefault(document, defaultValue, document.GetAllocator());
-    }
-
-    //! Query a value in a document with default null-terminated string.
-    template <typename stackAllocator>
-    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const Ch* defaultValue) const {
-        return GetWithDefault(document, defaultValue, document.GetAllocator());
-    }
-    
-#if RAPIDJSON_HAS_STDSTRING
-    //! Query a value in a document with default std::basic_string.
-    template <typename stackAllocator>
-    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const std::basic_string<Ch>& defaultValue) const {
-        return GetWithDefault(document, defaultValue, document.GetAllocator());
-    }
-#endif
-
-    //! Query a value in a document with default primitive value.
-    /*!
-        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
-    */
-    template <typename T, typename stackAllocator>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
-    GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, T defaultValue) const {
-        return GetWithDefault(document, defaultValue, document.GetAllocator());
-    }
-
-    //@}
-
-    //!@name Set a value
-    //@{
-
-    //! Set a value in a subtree, with move semantics.
-    /*!
-        It creates all parents if they are not exist or types are different to the tokens.
-        So this function always succeeds but potentially remove existing values.
-
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \param value Value to be set.
-        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
-        \see Create()
-    */
-    ValueType& Set(ValueType& root, ValueType& value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator) = value;
-    }
-
-    //! Set a value in a subtree, with copy semantics.
-    ValueType& Set(ValueType& root, const ValueType& value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator).CopyFrom(value, allocator);
-    }
-
-    //! Set a null-terminated string in a subtree.
-    ValueType& Set(ValueType& root, const Ch* value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator) = ValueType(value, allocator).Move();
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Set a std::basic_string in a subtree.
-    ValueType& Set(ValueType& root, const std::basic_string<Ch>& value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator) = ValueType(value, allocator).Move();
-    }
-#endif
-
-    //! Set a primitive value in a subtree.
-    /*!
-        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
-    */
-    template <typename T>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
-    Set(ValueType& root, T value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator) = ValueType(value).Move();
-    }
-
-    //! Set a value in a document, with move semantics.
-    template <typename stackAllocator>
-    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, ValueType& value) const {
-        return Create(document) = value;
-    }
-
-    //! Set a value in a document, with copy semantics.
-    template <typename stackAllocator>
-    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const ValueType& value) const {
-        return Create(document).CopyFrom(value, document.GetAllocator());
-    }
-
-    //! Set a null-terminated string in a document.
-    template <typename stackAllocator>
-    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const Ch* value) const {
-        return Create(document) = ValueType(value, document.GetAllocator()).Move();
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    //! Sets a std::basic_string in a document.
-    template <typename stackAllocator>
-    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const std::basic_string<Ch>& value) const {
-        return Create(document) = ValueType(value, document.GetAllocator()).Move();
-    }
-#endif
-
-    //! Set a primitive value in a document.
-    /*!
-    \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
-    */
-    template <typename T, typename stackAllocator>
-    RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
-        Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, T value) const {
-            return Create(document) = value;
-    }
-
-    //@}
-
-    //!@name Swap a value
-    //@{
-
-    //! Swap a value with a value in a subtree.
-    /*!
-        It creates all parents if they are not exist or types are different to the tokens.
-        So this function always succeeds but potentially remove existing values.
-
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \param value Value to be swapped.
-        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
-        \see Create()
-    */
-    ValueType& Swap(ValueType& root, ValueType& value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator).Swap(value);
-    }
-
-    //! Swap a value with a value in a document.
-    template <typename stackAllocator>
-    ValueType& Swap(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, ValueType& value) const {
-        return Create(document).Swap(value);
-    }
-
-    //@}
-
-    //! Erase a value in a subtree.
-    /*!
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \return Whether the resolved value is found and erased.
-
-        \note Erasing with an empty pointer \c Pointer(""), i.e. the root, always fail and return false.
-    */
-    bool Erase(ValueType& root) const {
-        RAPIDJSON_ASSERT(IsValid());
-        if (tokenCount_ == 0) // Cannot erase the root
-            return false;
-
-        ValueType* v = &root;
-        const Token* last = tokens_ + (tokenCount_ - 1);
-        for (const Token *t = tokens_; t != last; ++t) {
-            switch (v->GetType()) {
-            case kObjectType:
-                {
-                    typename ValueType::MemberIterator m = v->FindMember(GenericStringRef<Ch>(t->name, t->length));
-                    if (m == v->MemberEnd())
-                        return false;
-                    v = &m->value;
-                }
-                break;
-            case kArrayType:
-                if (t->index == kPointerInvalidIndex || t->index >= v->Size())
-                    return false;
-                v = &((*v)[t->index]);
-                break;
-            default:
-                return false;
-            }
-        }
-
-        switch (v->GetType()) {
-        case kObjectType:
-            return v->EraseMember(GenericStringRef<Ch>(last->name, last->length));
-        case kArrayType:
-            if (last->index == kPointerInvalidIndex || last->index >= v->Size())
-                return false;
-            v->Erase(v->Begin() + last->index);
-            return true;
-        default:
-            return false;
-        }
-    }
-
-private:
-    //! Clone the content from rhs to this.
-    /*!
-        \param rhs Source pointer.
-        \param extraToken Extra tokens to be allocated.
-        \param extraNameBufferSize Extra name buffer size (in number of Ch) to be allocated.
-        \return Start of non-occupied name buffer, for storing extra names.
-    */
-    Ch* CopyFromRaw(const GenericPointer& rhs, size_t extraToken = 0, size_t extraNameBufferSize = 0) {
-        if (!allocator_) // allocator is independently owned.
-            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
-
-        size_t nameBufferSize = rhs.tokenCount_; // null terminators for tokens
-        for (Token *t = rhs.tokens_; t != rhs.tokens_ + rhs.tokenCount_; ++t)
-            nameBufferSize += t->length;
-
-        tokenCount_ = rhs.tokenCount_ + extraToken;
-        tokens_ = static_cast<Token *>(allocator_->Malloc(tokenCount_ * sizeof(Token) + (nameBufferSize + extraNameBufferSize) * sizeof(Ch)));
-        nameBuffer_ = reinterpret_cast<Ch *>(tokens_ + tokenCount_);
-        if (rhs.tokenCount_ > 0) {
-            std::memcpy(tokens_, rhs.tokens_, rhs.tokenCount_ * sizeof(Token));
-        }
-        if (nameBufferSize > 0) {
-            std::memcpy(nameBuffer_, rhs.nameBuffer_, nameBufferSize * sizeof(Ch));
-        }
-
-        // Adjust pointers to name buffer
-        std::ptrdiff_t diff = nameBuffer_ - rhs.nameBuffer_;
-        for (Token *t = tokens_; t != tokens_ + rhs.tokenCount_; ++t)
-            t->name += diff;
-
-        return nameBuffer_ + nameBufferSize;
-    }
-
-    //! Check whether a character should be percent-encoded.
-    /*!
-        According to RFC 3986 2.3 Unreserved Characters.
-        \param c The character (code unit) to be tested.
-    */
-    bool NeedPercentEncode(Ch c) const {
-        return !((c >= '0' && c <= '9') || (c >= 'A' && c <='Z') || (c >= 'a' && c <= 'z') || c == '-' || c == '.' || c == '_' || c =='~');
-    }
-
-    //! Parse a JSON String or its URI fragment representation into tokens.
-#ifndef __clang__ // -Wdocumentation
-    /*!
-        \param source Either a JSON Pointer string, or its URI fragment representation. Not need to be null terminated.
-        \param length Length of the source string.
-        \note Source cannot be JSON String Representation of JSON Pointer, e.g. In "/\u0000", \u0000 will not be unescaped.
-    */
-#endif
-    void Parse(const Ch* source, size_t length) {
-        RAPIDJSON_ASSERT(source != NULL);
-        RAPIDJSON_ASSERT(nameBuffer_ == 0);
-        RAPIDJSON_ASSERT(tokens_ == 0);
-
-        // Create own allocator if user did not supply.
-        if (!allocator_)
-            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
-
-        // Count number of '/' as tokenCount
-        tokenCount_ = 0;
-        for (const Ch* s = source; s != source + length; s++) 
-            if (*s == '/')
-                tokenCount_++;
-
-        Token* token = tokens_ = static_cast<Token *>(allocator_->Malloc(tokenCount_ * sizeof(Token) + length * sizeof(Ch)));
-        Ch* name = nameBuffer_ = reinterpret_cast<Ch *>(tokens_ + tokenCount_);
-        size_t i = 0;
-
-        // Detect if it is a URI fragment
-        bool uriFragment = false;
-        if (source[i] == '#') {
-            uriFragment = true;
-            i++;
-        }
-
-        if (i != length && source[i] != '/') {
-            parseErrorCode_ = kPointerParseErrorTokenMustBeginWithSolidus;
-            goto error;
-        }
-
-        while (i < length) {
-            RAPIDJSON_ASSERT(source[i] == '/');
-            i++; // consumes '/'
-
-            token->name = name;
-            bool isNumber = true;
-
-            while (i < length && source[i] != '/') {
-                Ch c = source[i];
-                if (uriFragment) {
-                    // Decoding percent-encoding for URI fragment
-                    if (c == '%') {
-                        PercentDecodeStream is(&source[i], source + length);
-                        GenericInsituStringStream<EncodingType> os(name);
-                        Ch* begin = os.PutBegin();
-                        if (!Transcoder<UTF8<>, EncodingType>().Validate(is, os) || !is.IsValid()) {
-                            parseErrorCode_ = kPointerParseErrorInvalidPercentEncoding;
-                            goto error;
-                        }
-                        size_t len = os.PutEnd(begin);
-                        i += is.Tell() - 1;
-                        if (len == 1)
-                            c = *name;
-                        else {
-                            name += len;
-                            isNumber = false;
-                            i++;
-                            continue;
-                        }
-                    }
-                    else if (NeedPercentEncode(c)) {
-                        parseErrorCode_ = kPointerParseErrorCharacterMustPercentEncode;
-                        goto error;
-                    }
-                }
-
-                i++;
-                
-                // Escaping "~0" -> '~', "~1" -> '/'
-                if (c == '~') {
-                    if (i < length) {
-                        c = source[i];
-                        if (c == '0')       c = '~';
-                        else if (c == '1')  c = '/';
-                        else {
-                            parseErrorCode_ = kPointerParseErrorInvalidEscape;
-                            goto error;
-                        }
-                        i++;
-                    }
-                    else {
-                        parseErrorCode_ = kPointerParseErrorInvalidEscape;
-                        goto error;
-                    }
-                }
-
-                // First check for index: all of characters are digit
-                if (c < '0' || c > '9')
-                    isNumber = false;
-
-                *name++ = c;
-            }
-            token->length = static_cast<SizeType>(name - token->name);
-            if (token->length == 0)
-                isNumber = false;
-            *name++ = '\0'; // Null terminator
-
-            // Second check for index: more than one digit cannot have leading zero
-            if (isNumber && token->length > 1 && token->name[0] == '0')
-                isNumber = false;
-
-            // String to SizeType conversion
-            SizeType n = 0;
-            if (isNumber) {
-                for (size_t j = 0; j < token->length; j++) {
-                    SizeType m = n * 10 + static_cast<SizeType>(token->name[j] - '0');
-                    if (m < n) {   // overflow detection
-                        isNumber = false;
-                        break;
-                    }
-                    n = m;
-                }
-            }
-
-            token->index = isNumber ? n : kPointerInvalidIndex;
-            token++;
-        }
-
-        RAPIDJSON_ASSERT(name <= nameBuffer_ + length); // Should not overflow buffer
-        parseErrorCode_ = kPointerParseErrorNone;
-        return;
-
-    error:
-        Allocator::Free(tokens_);
-        nameBuffer_ = 0;
-        tokens_ = 0;
-        tokenCount_ = 0;
-        parseErrorOffset_ = i;
-        return;
-    }
-
-    //! Stringify to string or URI fragment representation.
-    /*!
-        \tparam uriFragment True for stringifying to URI fragment representation. False for string representation.
-        \tparam OutputStream type of output stream.
-        \param os The output stream.
-    */
-    template<bool uriFragment, typename OutputStream>
-    bool Stringify(OutputStream& os) const {
-        RAPIDJSON_ASSERT(IsValid());
-
-        if (uriFragment)
-            os.Put('#');
-
-        for (Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
-            os.Put('/');
-            for (size_t j = 0; j < t->length; j++) {
-                Ch c = t->name[j];
-                if (c == '~') {
-                    os.Put('~');
-                    os.Put('0');
-                }
-                else if (c == '/') {
-                    os.Put('~');
-                    os.Put('1');
-                }
-                else if (uriFragment && NeedPercentEncode(c)) { 
-                    // Transcode to UTF8 sequence
-                    GenericStringStream<typename ValueType::EncodingType> source(&t->name[j]);
-                    PercentEncodeStream<OutputStream> target(os);
-                    if (!Transcoder<EncodingType, UTF8<> >().Validate(source, target))
-                        return false;
-                    j += source.Tell() - 1;
-                }
-                else
-                    os.Put(c);
-            }
-        }
-        return true;
-    }
-
-    //! A helper stream for decoding a percent-encoded sequence into code unit.
-    /*!
-        This stream decodes %XY triplet into code unit (0-255).
-        If it encounters invalid characters, it sets output code unit as 0 and 
-        mark invalid, and to be checked by IsValid().
-    */
-    class PercentDecodeStream {
-    public:
-        typedef typename ValueType::Ch Ch;
-
-        //! Constructor
-        /*!
-            \param source Start of the stream
-            \param end Past-the-end of the stream.
-        */
-        PercentDecodeStream(const Ch* source, const Ch* end) : src_(source), head_(source), end_(end), valid_(true) {}
-
-        Ch Take() {
-            if (*src_ != '%' || src_ + 3 > end_) { // %XY triplet
-                valid_ = false;
-                return 0;
-            }
-            src_++;
-            Ch c = 0;
-            for (int j = 0; j < 2; j++) {
-                c = static_cast<Ch>(c << 4);
-                Ch h = *src_;
-                if      (h >= '0' && h <= '9') c = static_cast<Ch>(c + h - '0');
-                else if (h >= 'A' && h <= 'F') c = static_cast<Ch>(c + h - 'A' + 10);
-                else if (h >= 'a' && h <= 'f') c = static_cast<Ch>(c + h - 'a' + 10);
-                else {
-                    valid_ = false;
-                    return 0;
-                }
-                src_++;
-            }
-            return c;
-        }
-
-        size_t Tell() const { return static_cast<size_t>(src_ - head_); }
-        bool IsValid() const { return valid_; }
-
-    private:
-        const Ch* src_;     //!< Current read position.
-        const Ch* head_;    //!< Original head of the string.
-        const Ch* end_;     //!< Past-the-end position.
-        bool valid_;        //!< Whether the parsing is valid.
-    };
-
-    //! A helper stream to encode character (UTF-8 code unit) into percent-encoded sequence.
-    template <typename OutputStream>
-    class PercentEncodeStream {
-    public:
-        PercentEncodeStream(OutputStream& os) : os_(os) {}
-        void Put(char c) { // UTF-8 must be byte
-            unsigned char u = static_cast<unsigned char>(c);
-            static const char hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-            os_.Put('%');
-            os_.Put(static_cast<typename OutputStream::Ch>(hexDigits[u >> 4]));
-            os_.Put(static_cast<typename OutputStream::Ch>(hexDigits[u & 15]));
-        }
-    private:
-        OutputStream& os_;
-    };
-
-    Allocator* allocator_;                  //!< The current allocator. It is either user-supplied or equal to ownAllocator_.
-    Allocator* ownAllocator_;               //!< Allocator owned by this Pointer.
-    Ch* nameBuffer_;                        //!< A buffer containing all names in tokens.
-    Token* tokens_;                         //!< A list of tokens.
-    size_t tokenCount_;                     //!< Number of tokens in tokens_.
-    size_t parseErrorOffset_;               //!< Offset in code unit when parsing fail.
-    PointerParseErrorCode parseErrorCode_;  //!< Parsing error code.
-};
-
-//! GenericPointer for Value (UTF-8, default allocator).
-typedef GenericPointer<Value> Pointer;
-
-//!@name Helper functions for GenericPointer
-//@{
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType& CreateValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::AllocatorType& a) {
-    return pointer.Create(root, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& CreateValueByPointer(T& root, const CharType(&source)[N], typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Create(root, a);
-}
-
-// No allocator parameter
-
-template <typename DocumentType>
-typename DocumentType::ValueType& CreateValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer) {
-    return pointer.Create(document);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& CreateValueByPointer(DocumentType& document, const CharType(&source)[N]) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Create(document);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType* GetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, size_t* unresolvedTokenIndex = 0) {
-    return pointer.Get(root, unresolvedTokenIndex);
-}
-
-template <typename T>
-const typename T::ValueType* GetValueByPointer(const T& root, const GenericPointer<typename T::ValueType>& pointer, size_t* unresolvedTokenIndex = 0) {
-    return pointer.Get(root, unresolvedTokenIndex);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType* GetValueByPointer(T& root, const CharType (&source)[N], size_t* unresolvedTokenIndex = 0) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root, unresolvedTokenIndex);
-}
-
-template <typename T, typename CharType, size_t N>
-const typename T::ValueType* GetValueByPointer(const T& root, const CharType(&source)[N], size_t* unresolvedTokenIndex = 0) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root, unresolvedTokenIndex);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::ValueType& defaultValue, typename T::AllocatorType& a) {
-    return pointer.GetWithDefault(root, defaultValue, a);
-}
-
-template <typename T>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::Ch* defaultValue, typename T::AllocatorType& a) {
-    return pointer.GetWithDefault(root, defaultValue, a);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename T>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const std::basic_string<typename T::Ch>& defaultValue, typename T::AllocatorType& a) {
-    return pointer.GetWithDefault(root, defaultValue, a);
-}
-#endif
-
-template <typename T, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
-GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, T2 defaultValue, typename T::AllocatorType& a) {
-    return pointer.GetWithDefault(root, defaultValue, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const typename T::ValueType& defaultValue, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const typename T::Ch* defaultValue, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const std::basic_string<typename T::Ch>& defaultValue, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
-}
-#endif
-
-template <typename T, typename CharType, size_t N, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
-GetValueByPointerWithDefault(T& root, const CharType(&source)[N], T2 defaultValue, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
-}
-
-// No allocator parameter
-
-template <typename DocumentType>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::ValueType& defaultValue) {
-    return pointer.GetWithDefault(document, defaultValue);
-}
-
-template <typename DocumentType>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::Ch* defaultValue) {
-    return pointer.GetWithDefault(document, defaultValue);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename DocumentType>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const std::basic_string<typename DocumentType::Ch>& defaultValue) {
-    return pointer.GetWithDefault(document, defaultValue);
-}
-#endif
-
-template <typename DocumentType, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
-GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, T2 defaultValue) {
-    return pointer.GetWithDefault(document, defaultValue);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const typename DocumentType::ValueType& defaultValue) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const typename DocumentType::Ch* defaultValue) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const std::basic_string<typename DocumentType::Ch>& defaultValue) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
-}
-#endif
-
-template <typename DocumentType, typename CharType, size_t N, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
-GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], T2 defaultValue) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::ValueType& value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-
-template <typename T>
-typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::ValueType& value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-
-template <typename T>
-typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::Ch* value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename T>
-typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const std::basic_string<typename T::Ch>& value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-#endif
-
-template <typename T, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
-SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, T2 value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], typename T::ValueType& value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const typename T::ValueType& value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const typename T::Ch* value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const std::basic_string<typename T::Ch>& value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-#endif
-
-template <typename T, typename CharType, size_t N, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
-SetValueByPointer(T& root, const CharType(&source)[N], T2 value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-
-// No allocator parameter
-
-template <typename DocumentType>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, typename DocumentType::ValueType& value) {
-    return pointer.Set(document, value);
-}
-
-template <typename DocumentType>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::ValueType& value) {
-    return pointer.Set(document, value);
-}
-
-template <typename DocumentType>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::Ch* value) {
-    return pointer.Set(document, value);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename DocumentType>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const std::basic_string<typename DocumentType::Ch>& value) {
-    return pointer.Set(document, value);
-}
-#endif
-
-template <typename DocumentType, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
-SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, T2 value) {
-    return pointer.Set(document, value);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], typename DocumentType::ValueType& value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const typename DocumentType::ValueType& value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const typename DocumentType::Ch* value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const std::basic_string<typename DocumentType::Ch>& value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-#endif
-
-template <typename DocumentType, typename CharType, size_t N, typename T2>
-RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
-SetValueByPointer(DocumentType& document, const CharType(&source)[N], T2 value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType& SwapValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::ValueType& value, typename T::AllocatorType& a) {
-    return pointer.Swap(root, value, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SwapValueByPointer(T& root, const CharType(&source)[N], typename T::ValueType& value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Swap(root, value, a);
-}
-
-template <typename DocumentType>
-typename DocumentType::ValueType& SwapValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, typename DocumentType::ValueType& value) {
-    return pointer.Swap(document, value);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SwapValueByPointer(DocumentType& document, const CharType(&source)[N], typename DocumentType::ValueType& value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Swap(document, value);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-bool EraseValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer) {
-    return pointer.Erase(root);
-}
-
-template <typename T, typename CharType, size_t N>
-bool EraseValueByPointer(T& root, const CharType(&source)[N]) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Erase(root);
-}
-
-//@}
-
-RAPIDJSON_NAMESPACE_END
-
-#if defined(__clang__) || defined(_MSC_VER)
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_POINTER_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/prettywriter.h b/src/sioclient/lib/rapidjson/include/rapidjson/prettywriter.h
deleted file mode 100644
index 95bb6ff2..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/prettywriter.h
+++ /dev/null
@@ -1,277 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_PRETTYWRITER_H_
-#define RAPIDJSON_PRETTYWRITER_H_
-
-#include "writer.h"
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Combination of PrettyWriter format flags.
-/*! \see PrettyWriter::SetFormatOptions
- */
-enum PrettyFormatOptions {
-    kFormatDefault = 0,         //!< Default pretty formatting.
-    kFormatSingleLineArray = 1  //!< Format arrays on a single line.
-};
-
-//! Writer with indentation and spacing.
-/*!
-    \tparam OutputStream Type of output os.
-    \tparam SourceEncoding Encoding of source string.
-    \tparam TargetEncoding Encoding of output stream.
-    \tparam StackAllocator Type of allocator for allocating memory of stack.
-*/
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>
-class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> {
-public:
-    typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> Base;
-    typedef typename Base::Ch Ch;
-
-    //! Constructor
-    /*! \param os Output stream.
-        \param allocator User supplied allocator. If it is null, it will create a private one.
-        \param levelDepth Initial capacity of stack.
-    */
-    explicit PrettyWriter(OutputStream& os, StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
-        Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4), formatOptions_(kFormatDefault) {}
-
-
-    explicit PrettyWriter(StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
-        Base(allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    PrettyWriter(PrettyWriter&& rhs) :
-        Base(std::forward<PrettyWriter>(rhs)), indentChar_(rhs.indentChar_), indentCharCount_(rhs.indentCharCount_), formatOptions_(rhs.formatOptions_) {}
-#endif
-
-    //! Set custom indentation.
-    /*! \param indentChar       Character for indentation. Must be whitespace character (' ', '\\t', '\\n', '\\r').
-        \param indentCharCount  Number of indent characters for each indentation level.
-        \note The default indentation is 4 spaces.
-    */
-    PrettyWriter& SetIndent(Ch indentChar, unsigned indentCharCount) {
-        RAPIDJSON_ASSERT(indentChar == ' ' || indentChar == '\t' || indentChar == '\n' || indentChar == '\r');
-        indentChar_ = indentChar;
-        indentCharCount_ = indentCharCount;
-        return *this;
-    }
-
-    //! Set pretty writer formatting options.
-    /*! \param options Formatting options.
-    */
-    PrettyWriter& SetFormatOptions(PrettyFormatOptions options) {
-        formatOptions_ = options;
-        return *this;
-    }
-
-    /*! @name Implementation of Handler
-        \see Handler
-    */
-    //@{
-
-    bool Null()                 { PrettyPrefix(kNullType);   return Base::WriteNull(); }
-    bool Bool(bool b)           { PrettyPrefix(b ? kTrueType : kFalseType); return Base::WriteBool(b); }
-    bool Int(int i)             { PrettyPrefix(kNumberType); return Base::WriteInt(i); }
-    bool Uint(unsigned u)       { PrettyPrefix(kNumberType); return Base::WriteUint(u); }
-    bool Int64(int64_t i64)     { PrettyPrefix(kNumberType); return Base::WriteInt64(i64); }
-    bool Uint64(uint64_t u64)   { PrettyPrefix(kNumberType); return Base::WriteUint64(u64);  }
-    bool Double(double d)       { PrettyPrefix(kNumberType); return Base::WriteDouble(d); }
-
-    bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
-        RAPIDJSON_ASSERT(str != 0);
-        (void)copy;
-        PrettyPrefix(kNumberType);
-        return Base::WriteString(str, length);
-    }
-
-    bool String(const Ch* str, SizeType length, bool copy = false) {
-        RAPIDJSON_ASSERT(str != 0);
-        (void)copy;
-        PrettyPrefix(kStringType);
-        return Base::WriteString(str, length);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    bool String(const std::basic_string<Ch>& str) {
-        return String(str.data(), SizeType(str.size()));
-    }
-#endif
-
-    bool StartObject() {
-        PrettyPrefix(kObjectType);
-        new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(false);
-        return Base::WriteStartObject();
-    }
-
-    bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
-
-#if RAPIDJSON_HAS_STDSTRING
-    bool Key(const std::basic_string<Ch>& str) {
-        return Key(str.data(), SizeType(str.size()));
-    }
-#endif
-	
-    bool EndObject(SizeType memberCount = 0) {
-        (void)memberCount;
-        RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level)); // not inside an Object
-        RAPIDJSON_ASSERT(!Base::level_stack_.template Top<typename Base::Level>()->inArray); // currently inside an Array, not Object
-        RAPIDJSON_ASSERT(0 == Base::level_stack_.template Top<typename Base::Level>()->valueCount % 2); // Object has a Key without a Value
-       
-        bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
-
-        if (!empty) {
-            Base::os_->Put('\n');
-            WriteIndent();
-        }
-        bool ret = Base::WriteEndObject();
-        (void)ret;
-        RAPIDJSON_ASSERT(ret == true);
-        if (Base::level_stack_.Empty()) // end of json text
-            Base::Flush();
-        return true;
-    }
-
-    bool StartArray() {
-        PrettyPrefix(kArrayType);
-        new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(true);
-        return Base::WriteStartArray();
-    }
-
-    bool EndArray(SizeType memberCount = 0) {
-        (void)memberCount;
-        RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
-        RAPIDJSON_ASSERT(Base::level_stack_.template Top<typename Base::Level>()->inArray);
-        bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
-
-        if (!empty && !(formatOptions_ & kFormatSingleLineArray)) {
-            Base::os_->Put('\n');
-            WriteIndent();
-        }
-        bool ret = Base::WriteEndArray();
-        (void)ret;
-        RAPIDJSON_ASSERT(ret == true);
-        if (Base::level_stack_.Empty()) // end of json text
-            Base::Flush();
-        return true;
-    }
-
-    //@}
-
-    /*! @name Convenience extensions */
-    //@{
-
-    //! Simpler but slower overload.
-    bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
-    bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
-
-    //@}
-
-    //! Write a raw JSON value.
-    /*!
-        For user to write a stringified JSON as a value.
-
-        \param json A well-formed JSON value. It should not contain null character within [0, length - 1] range.
-        \param length Length of the json.
-        \param type Type of the root of json.
-        \note When using PrettyWriter::RawValue(), the result json may not be indented correctly.
-    */
-    bool RawValue(const Ch* json, size_t length, Type type) {
-        RAPIDJSON_ASSERT(json != 0);
-        PrettyPrefix(type);
-        return Base::WriteRawValue(json, length);
-    }
-
-protected:
-    void PrettyPrefix(Type type) {
-        (void)type;
-        if (Base::level_stack_.GetSize() != 0) { // this value is not at root
-            typename Base::Level* level = Base::level_stack_.template Top<typename Base::Level>();
-
-            if (level->inArray) {
-                if (level->valueCount > 0) {
-                    Base::os_->Put(','); // add comma if it is not the first element in array
-                    if (formatOptions_ & kFormatSingleLineArray)
-                        Base::os_->Put(' ');
-                }
-
-                if (!(formatOptions_ & kFormatSingleLineArray)) {
-                    Base::os_->Put('\n');
-                    WriteIndent();
-                }
-            }
-            else {  // in object
-                if (level->valueCount > 0) {
-                    if (level->valueCount % 2 == 0) {
-                        Base::os_->Put(',');
-                        Base::os_->Put('\n');
-                    }
-                    else {
-                        Base::os_->Put(':');
-                        Base::os_->Put(' ');
-                    }
-                }
-                else
-                    Base::os_->Put('\n');
-
-                if (level->valueCount % 2 == 0)
-                    WriteIndent();
-            }
-            if (!level->inArray && level->valueCount % 2 == 0)
-                RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
-            level->valueCount++;
-        }
-        else {
-            RAPIDJSON_ASSERT(!Base::hasRoot_);  // Should only has one and only one root.
-            Base::hasRoot_ = true;
-        }
-    }
-
-    void WriteIndent()  {
-        size_t count = (Base::level_stack_.GetSize() / sizeof(typename Base::Level)) * indentCharCount_;
-        PutN(*Base::os_, static_cast<typename OutputStream::Ch>(indentChar_), count);
-    }
-
-    Ch indentChar_;
-    unsigned indentCharCount_;
-    PrettyFormatOptions formatOptions_;
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    PrettyWriter(const PrettyWriter&);
-    PrettyWriter& operator=(const PrettyWriter&);
-};
-
-RAPIDJSON_NAMESPACE_END
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_RAPIDJSON_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/rapidjson.h b/src/sioclient/lib/rapidjson/include/rapidjson/rapidjson.h
deleted file mode 100644
index 375e7036..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/rapidjson.h
+++ /dev/null
@@ -1,632 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_RAPIDJSON_H_
-#define RAPIDJSON_RAPIDJSON_H_
-
-/*!\file rapidjson.h
-    \brief common definitions and configuration
-    
-    \see RAPIDJSON_CONFIG
- */
-
-/*! \defgroup RAPIDJSON_CONFIG RapidJSON configuration
-    \brief Configuration macros for library features
-
-    Some RapidJSON features are configurable to adapt the library to a wide
-    variety of platforms, environments and usage scenarios.  Most of the
-    features can be configured in terms of overridden or predefined
-    preprocessor macros at compile-time.
-
-    Some additional customization is available in the \ref RAPIDJSON_ERRORS APIs.
-
-    \note These macros should be given on the compiler command-line
-          (where applicable)  to avoid inconsistent values when compiling
-          different translation units of a single application.
- */
-
-#include <cstdlib>  // malloc(), realloc(), free(), size_t
-#include <cstring>  // memset(), memcpy(), memmove(), memcmp()
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_VERSION_STRING
-//
-// ALWAYS synchronize the following 3 macros with corresponding variables in /CMakeLists.txt.
-//
-
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-// token stringification
-#define RAPIDJSON_STRINGIFY(x) RAPIDJSON_DO_STRINGIFY(x)
-#define RAPIDJSON_DO_STRINGIFY(x) #x
-
-// token concatenation
-#define RAPIDJSON_JOIN(X, Y) RAPIDJSON_DO_JOIN(X, Y)
-#define RAPIDJSON_DO_JOIN(X, Y) RAPIDJSON_DO_JOIN2(X, Y)
-#define RAPIDJSON_DO_JOIN2(X, Y) X##Y
-//!@endcond
-
-/*! \def RAPIDJSON_MAJOR_VERSION
-    \ingroup RAPIDJSON_CONFIG
-    \brief Major version of RapidJSON in integer.
-*/
-/*! \def RAPIDJSON_MINOR_VERSION
-    \ingroup RAPIDJSON_CONFIG
-    \brief Minor version of RapidJSON in integer.
-*/
-/*! \def RAPIDJSON_PATCH_VERSION
-    \ingroup RAPIDJSON_CONFIG
-    \brief Patch version of RapidJSON in integer.
-*/
-/*! \def RAPIDJSON_VERSION_STRING
-    \ingroup RAPIDJSON_CONFIG
-    \brief Version of RapidJSON in "<major>.<minor>.<patch>" string format.
-*/
-#define RAPIDJSON_MAJOR_VERSION 1
-#define RAPIDJSON_MINOR_VERSION 1
-#define RAPIDJSON_PATCH_VERSION 0
-#define RAPIDJSON_VERSION_STRING \
-    RAPIDJSON_STRINGIFY(RAPIDJSON_MAJOR_VERSION.RAPIDJSON_MINOR_VERSION.RAPIDJSON_PATCH_VERSION)
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_NAMESPACE_(BEGIN|END)
-/*! \def RAPIDJSON_NAMESPACE
-    \ingroup RAPIDJSON_CONFIG
-    \brief   provide custom rapidjson namespace
-
-    In order to avoid symbol clashes and/or "One Definition Rule" errors
-    between multiple inclusions of (different versions of) RapidJSON in
-    a single binary, users can customize the name of the main RapidJSON
-    namespace.
-
-    In case of a single nesting level, defining \c RAPIDJSON_NAMESPACE
-    to a custom name (e.g. \c MyRapidJSON) is sufficient.  If multiple
-    levels are needed, both \ref RAPIDJSON_NAMESPACE_BEGIN and \ref
-    RAPIDJSON_NAMESPACE_END need to be defined as well:
-
-    \code
-    // in some .cpp file
-    #define RAPIDJSON_NAMESPACE my::rapidjson
-    #define RAPIDJSON_NAMESPACE_BEGIN namespace my { namespace rapidjson {
-    #define RAPIDJSON_NAMESPACE_END   } }
-    #include "rapidjson/..."
-    \endcode
-
-    \see rapidjson
- */
-/*! \def RAPIDJSON_NAMESPACE_BEGIN
-    \ingroup RAPIDJSON_CONFIG
-    \brief   provide custom rapidjson namespace (opening expression)
-    \see RAPIDJSON_NAMESPACE
-*/
-/*! \def RAPIDJSON_NAMESPACE_END
-    \ingroup RAPIDJSON_CONFIG
-    \brief   provide custom rapidjson namespace (closing expression)
-    \see RAPIDJSON_NAMESPACE
-*/
-#ifndef RAPIDJSON_NAMESPACE
-#define RAPIDJSON_NAMESPACE rapidjson
-#endif
-#ifndef RAPIDJSON_NAMESPACE_BEGIN
-#define RAPIDJSON_NAMESPACE_BEGIN namespace RAPIDJSON_NAMESPACE {
-#endif
-#ifndef RAPIDJSON_NAMESPACE_END
-#define RAPIDJSON_NAMESPACE_END }
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_HAS_STDSTRING
-
-#ifndef RAPIDJSON_HAS_STDSTRING
-#ifdef RAPIDJSON_DOXYGEN_RUNNING
-#define RAPIDJSON_HAS_STDSTRING 1 // force generation of documentation
-#else
-#define RAPIDJSON_HAS_STDSTRING 0 // no std::string support by default
-#endif
-/*! \def RAPIDJSON_HAS_STDSTRING
-    \ingroup RAPIDJSON_CONFIG
-    \brief Enable RapidJSON support for \c std::string
-
-    By defining this preprocessor symbol to \c 1, several convenience functions for using
-    \ref rapidjson::GenericValue with \c std::string are enabled, especially
-    for construction and comparison.
-
-    \hideinitializer
-*/
-#endif // !defined(RAPIDJSON_HAS_STDSTRING)
-
-#if RAPIDJSON_HAS_STDSTRING
-#include <string>
-#endif // RAPIDJSON_HAS_STDSTRING
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_NO_INT64DEFINE
-
-/*! \def RAPIDJSON_NO_INT64DEFINE
-    \ingroup RAPIDJSON_CONFIG
-    \brief Use external 64-bit integer types.
-
-    RapidJSON requires the 64-bit integer types \c int64_t and  \c uint64_t types
-    to be available at global scope.
-
-    If users have their own definition, define RAPIDJSON_NO_INT64DEFINE to
-    prevent RapidJSON from defining its own types.
-*/
-#ifndef RAPIDJSON_NO_INT64DEFINE
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#if defined(_MSC_VER) && (_MSC_VER < 1800)	// Visual Studio 2013
-#include "msinttypes/stdint.h"
-#include "msinttypes/inttypes.h"
-#else
-// Other compilers should have this.
-#include <stdint.h>
-#include <inttypes.h>
-#endif
-//!@endcond
-#ifdef RAPIDJSON_DOXYGEN_RUNNING
-#define RAPIDJSON_NO_INT64DEFINE
-#endif
-#endif // RAPIDJSON_NO_INT64TYPEDEF
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_FORCEINLINE
-
-#ifndef RAPIDJSON_FORCEINLINE
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#if defined(_MSC_VER) && defined(NDEBUG)
-#define RAPIDJSON_FORCEINLINE __forceinline
-#elif defined(__GNUC__) && __GNUC__ >= 4 && defined(NDEBUG)
-#define RAPIDJSON_FORCEINLINE __attribute__((always_inline))
-#else
-#define RAPIDJSON_FORCEINLINE
-#endif
-//!@endcond
-#endif // RAPIDJSON_FORCEINLINE
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ENDIAN
-#define RAPIDJSON_LITTLEENDIAN  0   //!< Little endian machine
-#define RAPIDJSON_BIGENDIAN     1   //!< Big endian machine
-
-//! Endianness of the machine.
-/*!
-    \def RAPIDJSON_ENDIAN
-    \ingroup RAPIDJSON_CONFIG
-
-    GCC 4.6 provided macro for detecting endianness of the target machine. But other
-    compilers may not have this. User can define RAPIDJSON_ENDIAN to either
-    \ref RAPIDJSON_LITTLEENDIAN or \ref RAPIDJSON_BIGENDIAN.
-
-    Default detection implemented with reference to
-    \li https://gcc.gnu.org/onlinedocs/gcc-4.6.0/cpp/Common-Predefined-Macros.html
-    \li http://www.boost.org/doc/libs/1_42_0/boost/detail/endian.hpp
-*/
-#ifndef RAPIDJSON_ENDIAN
-// Detect with GCC 4.6's macro
-#  ifdef __BYTE_ORDER__
-#    if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#      define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#    elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#      define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
-#    else
-#      error Unknown machine endianness detected. User needs to define RAPIDJSON_ENDIAN.
-#    endif // __BYTE_ORDER__
-// Detect with GLIBC's endian.h
-#  elif defined(__GLIBC__)
-#    include <endian.h>
-#    if (__BYTE_ORDER == __LITTLE_ENDIAN)
-#      define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#    elif (__BYTE_ORDER == __BIG_ENDIAN)
-#      define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
-#    else
-#      error Unknown machine endianness detected. User needs to define RAPIDJSON_ENDIAN.
-#   endif // __GLIBC__
-// Detect with _LITTLE_ENDIAN and _BIG_ENDIAN macro
-#  elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
-#    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#  elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)
-#    define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
-// Detect with architecture macros
-#  elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__)
-#    define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
-#  elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)
-#    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#  elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_ARM64))
-#    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-#  elif defined(RAPIDJSON_DOXYGEN_RUNNING)
-#    define RAPIDJSON_ENDIAN
-#  else
-#    error Unknown machine endianness detected. User needs to define RAPIDJSON_ENDIAN.   
-#  endif
-#endif // RAPIDJSON_ENDIAN
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_64BIT
-
-//! Whether using 64-bit architecture
-#ifndef RAPIDJSON_64BIT
-#if defined(__LP64__) || (defined(__x86_64__) && defined(__ILP32__)) || defined(_WIN64) || defined(__EMSCRIPTEN__)
-#define RAPIDJSON_64BIT 1
-#else
-#define RAPIDJSON_64BIT 0
-#endif
-#endif // RAPIDJSON_64BIT
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ALIGN
-
-//! Data alignment of the machine.
-/*! \ingroup RAPIDJSON_CONFIG
-    \param x pointer to align
-
-    Some machines require strict data alignment. Currently the default uses 4 bytes
-    alignment on 32-bit platforms and 8 bytes alignment for 64-bit platforms.
-    User can customize by defining the RAPIDJSON_ALIGN function macro.
-*/
-#ifndef RAPIDJSON_ALIGN
-#if RAPIDJSON_64BIT == 1
-#define RAPIDJSON_ALIGN(x) (((x) + static_cast<uint64_t>(7u)) & ~static_cast<uint64_t>(7u))
-#else
-#define RAPIDJSON_ALIGN(x) (((x) + 3u) & ~3u)
-#endif
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_UINT64_C2
-
-//! Construct a 64-bit literal by a pair of 32-bit integer.
-/*!
-    64-bit literal with or without ULL suffix is prone to compiler warnings.
-    UINT64_C() is C macro which cause compilation problems.
-    Use this macro to define 64-bit constants by a pair of 32-bit integer.
-*/
-#ifndef RAPIDJSON_UINT64_C2
-#define RAPIDJSON_UINT64_C2(high32, low32) ((static_cast<uint64_t>(high32) << 32) | static_cast<uint64_t>(low32))
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_48BITPOINTER_OPTIMIZATION
-
-//! Use only lower 48-bit address for some pointers.
-/*!
-    \ingroup RAPIDJSON_CONFIG
-
-    This optimization uses the fact that current X86-64 architecture only implement lower 48-bit virtual address.
-    The higher 16-bit can be used for storing other data.
-    \c GenericValue uses this optimization to reduce its size form 24 bytes to 16 bytes in 64-bit architecture.
-*/
-#ifndef RAPIDJSON_48BITPOINTER_OPTIMIZATION
-#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
-#define RAPIDJSON_48BITPOINTER_OPTIMIZATION 1
-#else
-#define RAPIDJSON_48BITPOINTER_OPTIMIZATION 0
-#endif
-#endif // RAPIDJSON_48BITPOINTER_OPTIMIZATION
-
-#if RAPIDJSON_48BITPOINTER_OPTIMIZATION == 1
-#if RAPIDJSON_64BIT != 1
-#error RAPIDJSON_48BITPOINTER_OPTIMIZATION can only be set to 1 when RAPIDJSON_64BIT=1
-#endif
-#define RAPIDJSON_SETPOINTER(type, p, x) (p = reinterpret_cast<type *>((reinterpret_cast<uintptr_t>(p) & static_cast<uintptr_t>(RAPIDJSON_UINT64_C2(0xFFFF0000, 0x00000000))) | reinterpret_cast<uintptr_t>(reinterpret_cast<const void*>(x))))
-#define RAPIDJSON_GETPOINTER(type, p) (reinterpret_cast<type *>(reinterpret_cast<uintptr_t>(p) & static_cast<uintptr_t>(RAPIDJSON_UINT64_C2(0x0000FFFF, 0xFFFFFFFF))))
-#else
-#define RAPIDJSON_SETPOINTER(type, p, x) (p = (x))
-#define RAPIDJSON_GETPOINTER(type, p) (p)
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_SSE2/RAPIDJSON_SSE42/RAPIDJSON_NEON/RAPIDJSON_SIMD
-
-/*! \def RAPIDJSON_SIMD
-    \ingroup RAPIDJSON_CONFIG
-    \brief Enable SSE2/SSE4.2/Neon optimization.
-
-    RapidJSON supports optimized implementations for some parsing operations
-    based on the SSE2, SSE4.2 or NEon SIMD extensions on modern Intel
-    or ARM compatible processors.
-
-    To enable these optimizations, three different symbols can be defined;
-    \code
-    // Enable SSE2 optimization.
-    #define RAPIDJSON_SSE2
-
-    // Enable SSE4.2 optimization.
-    #define RAPIDJSON_SSE42
-    \endcode
-
-    // Enable ARM Neon optimization.
-    #define RAPIDJSON_NEON
-    \endcode
-
-    \c RAPIDJSON_SSE42 takes precedence over SSE2, if both are defined.
-
-    If any of these symbols is defined, RapidJSON defines the macro
-    \c RAPIDJSON_SIMD to indicate the availability of the optimized code.
-*/
-#if defined(RAPIDJSON_SSE2) || defined(RAPIDJSON_SSE42) \
-    || defined(RAPIDJSON_NEON) || defined(RAPIDJSON_DOXYGEN_RUNNING)
-#define RAPIDJSON_SIMD
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_NO_SIZETYPEDEFINE
-
-#ifndef RAPIDJSON_NO_SIZETYPEDEFINE
-/*! \def RAPIDJSON_NO_SIZETYPEDEFINE
-    \ingroup RAPIDJSON_CONFIG
-    \brief User-provided \c SizeType definition.
-
-    In order to avoid using 32-bit size types for indexing strings and arrays,
-    define this preprocessor symbol and provide the type rapidjson::SizeType
-    before including RapidJSON:
-    \code
-    #define RAPIDJSON_NO_SIZETYPEDEFINE
-    namespace rapidjson { typedef ::std::size_t SizeType; }
-    #include "rapidjson/..."
-    \endcode
-
-    \see rapidjson::SizeType
-*/
-#ifdef RAPIDJSON_DOXYGEN_RUNNING
-#define RAPIDJSON_NO_SIZETYPEDEFINE
-#endif
-RAPIDJSON_NAMESPACE_BEGIN
-//! Size type (for string lengths, array sizes, etc.)
-/*! RapidJSON uses 32-bit array/string indices even on 64-bit platforms,
-    instead of using \c size_t. Users may override the SizeType by defining
-    \ref RAPIDJSON_NO_SIZETYPEDEFINE.
-*/
-typedef unsigned SizeType;
-RAPIDJSON_NAMESPACE_END
-#endif
-
-// always import std::size_t to rapidjson namespace
-RAPIDJSON_NAMESPACE_BEGIN
-using std::size_t;
-RAPIDJSON_NAMESPACE_END
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_ASSERT
-
-//! Assertion.
-/*! \ingroup RAPIDJSON_CONFIG
-    By default, rapidjson uses C \c assert() for internal assertions.
-    User can override it by defining RAPIDJSON_ASSERT(x) macro.
-
-    \note Parsing errors are handled and can be customized by the
-          \ref RAPIDJSON_ERRORS APIs.
-*/
-#ifndef RAPIDJSON_ASSERT
-#include <cassert>
-#define RAPIDJSON_ASSERT(x) assert(x)
-#endif // RAPIDJSON_ASSERT
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_STATIC_ASSERT
-
-// Prefer C++11 static_assert, if available
-#ifndef RAPIDJSON_STATIC_ASSERT
-#if __cplusplus >= 201103L || ( defined(_MSC_VER) && _MSC_VER >= 1800 )
-#define RAPIDJSON_STATIC_ASSERT(x) \
-   static_assert(x, RAPIDJSON_STRINGIFY(x))
-#endif // C++11
-#endif // RAPIDJSON_STATIC_ASSERT
-
-// Adopt C++03 implementation from boost
-#ifndef RAPIDJSON_STATIC_ASSERT
-#ifndef __clang__
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#endif
-RAPIDJSON_NAMESPACE_BEGIN
-template <bool x> struct STATIC_ASSERTION_FAILURE;
-template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };
-template <size_t x> struct StaticAssertTest {};
-RAPIDJSON_NAMESPACE_END
-
-#if defined(__GNUC__) || defined(__clang__)
-#define RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
-#else
-#define RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE 
-#endif
-#ifndef __clang__
-//!@endcond
-#endif
-
-/*! \def RAPIDJSON_STATIC_ASSERT
-    \brief (Internal) macro to check for conditions at compile-time
-    \param x compile-time condition
-    \hideinitializer
- */
-#define RAPIDJSON_STATIC_ASSERT(x) \
-    typedef ::RAPIDJSON_NAMESPACE::StaticAssertTest< \
-      sizeof(::RAPIDJSON_NAMESPACE::STATIC_ASSERTION_FAILURE<bool(x) >)> \
-    RAPIDJSON_JOIN(StaticAssertTypedef, __LINE__) RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE
-#endif // RAPIDJSON_STATIC_ASSERT
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_LIKELY, RAPIDJSON_UNLIKELY
-
-//! Compiler branching hint for expression with high probability to be true.
-/*!
-    \ingroup RAPIDJSON_CONFIG
-    \param x Boolean expression likely to be true.
-*/
-#ifndef RAPIDJSON_LIKELY
-#if defined(__GNUC__) || defined(__clang__)
-#define RAPIDJSON_LIKELY(x) __builtin_expect(!!(x), 1)
-#else
-#define RAPIDJSON_LIKELY(x) (x)
-#endif
-#endif
-
-//! Compiler branching hint for expression with low probability to be true.
-/*!
-    \ingroup RAPIDJSON_CONFIG
-    \param x Boolean expression unlikely to be true.
-*/
-#ifndef RAPIDJSON_UNLIKELY
-#if defined(__GNUC__) || defined(__clang__)
-#define RAPIDJSON_UNLIKELY(x) __builtin_expect(!!(x), 0)
-#else
-#define RAPIDJSON_UNLIKELY(x) (x)
-#endif
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// Helpers
-
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-
-#define RAPIDJSON_MULTILINEMACRO_BEGIN do {  
-#define RAPIDJSON_MULTILINEMACRO_END \
-} while((void)0, 0)
-
-// adopted from Boost
-#define RAPIDJSON_VERSION_CODE(x,y,z) \
-  (((x)*100000) + ((y)*100) + (z))
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_DIAG_PUSH/POP, RAPIDJSON_DIAG_OFF
-
-#if defined(__GNUC__)
-#define RAPIDJSON_GNUC \
-    RAPIDJSON_VERSION_CODE(__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__)
-#endif
-
-#if defined(__clang__) || (defined(RAPIDJSON_GNUC) && RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,2,0))
-
-#define RAPIDJSON_PRAGMA(x) _Pragma(RAPIDJSON_STRINGIFY(x))
-#define RAPIDJSON_DIAG_PRAGMA(x) RAPIDJSON_PRAGMA(GCC diagnostic x)
-#define RAPIDJSON_DIAG_OFF(x) \
-    RAPIDJSON_DIAG_PRAGMA(ignored RAPIDJSON_STRINGIFY(RAPIDJSON_JOIN(-W,x)))
-
-// push/pop support in Clang and GCC>=4.6
-#if defined(__clang__) || (defined(RAPIDJSON_GNUC) && RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0))
-#define RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_PRAGMA(push)
-#define RAPIDJSON_DIAG_POP  RAPIDJSON_DIAG_PRAGMA(pop)
-#else // GCC >= 4.2, < 4.6
-#define RAPIDJSON_DIAG_PUSH /* ignored */
-#define RAPIDJSON_DIAG_POP /* ignored */
-#endif
-
-#elif defined(_MSC_VER)
-
-// pragma (MSVC specific)
-#define RAPIDJSON_PRAGMA(x) __pragma(x)
-#define RAPIDJSON_DIAG_PRAGMA(x) RAPIDJSON_PRAGMA(warning(x))
-
-#define RAPIDJSON_DIAG_OFF(x) RAPIDJSON_DIAG_PRAGMA(disable: x)
-#define RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_PRAGMA(push)
-#define RAPIDJSON_DIAG_POP  RAPIDJSON_DIAG_PRAGMA(pop)
-
-#else
-
-#define RAPIDJSON_DIAG_OFF(x) /* ignored */
-#define RAPIDJSON_DIAG_PUSH   /* ignored */
-#define RAPIDJSON_DIAG_POP    /* ignored */
-
-#endif // RAPIDJSON_DIAG_*
-
-///////////////////////////////////////////////////////////////////////////////
-// C++11 features
-
-#ifndef RAPIDJSON_HAS_CXX11_RVALUE_REFS
-#if defined(__clang__)
-#if __has_feature(cxx_rvalue_references) && \
-    (defined(_MSC_VER) || defined(_LIBCPP_VERSION) || defined(__GLIBCXX__) && __GLIBCXX__ >= 20080306)
-#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
-#else
-#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 0
-#endif
-#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,3,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
-      (defined(_MSC_VER) && _MSC_VER >= 1600)
-
-#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
-#else
-#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 0
-#endif
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-#ifndef RAPIDJSON_HAS_CXX11_NOEXCEPT
-#if defined(__clang__)
-#define RAPIDJSON_HAS_CXX11_NOEXCEPT __has_feature(cxx_noexcept)
-#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
-    (defined(_MSC_VER) && _MSC_VER >= 1900)
-#define RAPIDJSON_HAS_CXX11_NOEXCEPT 1
-#else
-#define RAPIDJSON_HAS_CXX11_NOEXCEPT 0
-#endif
-#endif
-#if RAPIDJSON_HAS_CXX11_NOEXCEPT
-#define RAPIDJSON_NOEXCEPT noexcept
-#else
-#define RAPIDJSON_NOEXCEPT /* noexcept */
-#endif // RAPIDJSON_HAS_CXX11_NOEXCEPT
-
-// no automatic detection, yet
-#ifndef RAPIDJSON_HAS_CXX11_TYPETRAITS
-#if (defined(_MSC_VER) && _MSC_VER >= 1700)
-#define RAPIDJSON_HAS_CXX11_TYPETRAITS 1
-#else
-#define RAPIDJSON_HAS_CXX11_TYPETRAITS 0
-#endif
-#endif
-
-#ifndef RAPIDJSON_HAS_CXX11_RANGE_FOR
-#if defined(__clang__)
-#define RAPIDJSON_HAS_CXX11_RANGE_FOR __has_feature(cxx_range_for)
-#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
-      (defined(_MSC_VER) && _MSC_VER >= 1700)
-#define RAPIDJSON_HAS_CXX11_RANGE_FOR 1
-#else
-#define RAPIDJSON_HAS_CXX11_RANGE_FOR 0
-#endif
-#endif // RAPIDJSON_HAS_CXX11_RANGE_FOR
-
-//!@endcond
-
-///////////////////////////////////////////////////////////////////////////////
-// new/delete
-
-#ifndef RAPIDJSON_NEW
-///! customization point for global \c new
-#define RAPIDJSON_NEW(TypeName) new TypeName
-#endif
-#ifndef RAPIDJSON_DELETE
-///! customization point for global \c delete
-#define RAPIDJSON_DELETE(x) delete x
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// Type
-
-/*! \namespace rapidjson
-    \brief main RapidJSON namespace
-    \see RAPIDJSON_NAMESPACE
-*/
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Type of JSON value
-enum Type {
-    kNullType = 0,      //!< null
-    kFalseType = 1,     //!< false
-    kTrueType = 2,      //!< true
-    kObjectType = 3,    //!< object
-    kArrayType = 4,     //!< array 
-    kStringType = 5,    //!< string
-    kNumberType = 6     //!< number
-};
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_RAPIDJSON_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/reader.h b/src/sioclient/lib/rapidjson/include/rapidjson/reader.h
deleted file mode 100644
index 4c99c93b..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/reader.h
+++ /dev/null
@@ -1,2230 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_READER_H_
-#define RAPIDJSON_READER_H_
-
-/*! \file reader.h */
-
-#include "allocators.h"
-#include "stream.h"
-#include "encodedstream.h"
-#include "internal/meta.h"
-#include "internal/stack.h"
-#include "internal/strtod.h"
-#include <limits>
-
-#if defined(RAPIDJSON_SIMD) && defined(_MSC_VER)
-#include <intrin.h>
-#pragma intrinsic(_BitScanForward)
-#endif
-#ifdef RAPIDJSON_SSE42
-#include <nmmintrin.h>
-#elif defined(RAPIDJSON_SSE2)
-#include <emmintrin.h>
-#elif defined(RAPIDJSON_NEON)
-#include <arm_neon.h>
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(old-style-cast)
-RAPIDJSON_DIAG_OFF(padded)
-RAPIDJSON_DIAG_OFF(switch-enum)
-#elif defined(_MSC_VER)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4127)  // conditional expression is constant
-RAPIDJSON_DIAG_OFF(4702)  // unreachable code
-#endif
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#define RAPIDJSON_NOTHING /* deliberately empty */
-#ifndef RAPIDJSON_PARSE_ERROR_EARLY_RETURN
-#define RAPIDJSON_PARSE_ERROR_EARLY_RETURN(value) \
-    RAPIDJSON_MULTILINEMACRO_BEGIN \
-    if (RAPIDJSON_UNLIKELY(HasParseError())) { return value; } \
-    RAPIDJSON_MULTILINEMACRO_END
-#endif
-#define RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID \
-    RAPIDJSON_PARSE_ERROR_EARLY_RETURN(RAPIDJSON_NOTHING)
-//!@endcond
-
-/*! \def RAPIDJSON_PARSE_ERROR_NORETURN
-    \ingroup RAPIDJSON_ERRORS
-    \brief Macro to indicate a parse error.
-    \param parseErrorCode \ref rapidjson::ParseErrorCode of the error
-    \param offset  position of the error in JSON input (\c size_t)
-
-    This macros can be used as a customization point for the internal
-    error handling mechanism of RapidJSON.
-
-    A common usage model is to throw an exception instead of requiring the
-    caller to explicitly check the \ref rapidjson::GenericReader::Parse's
-    return value:
-
-    \code
-    #define RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode,offset) \
-       throw ParseException(parseErrorCode, #parseErrorCode, offset)
-
-    #include <stdexcept>               // std::runtime_error
-    #include "rapidjson/error/error.h" // rapidjson::ParseResult
-
-    struct ParseException : std::runtime_error, rapidjson::ParseResult {
-      ParseException(rapidjson::ParseErrorCode code, const char* msg, size_t offset)
-        : std::runtime_error(msg), ParseResult(code, offset) {}
-    };
-
-    #include "rapidjson/reader.h"
-    \endcode
-
-    \see RAPIDJSON_PARSE_ERROR, rapidjson::GenericReader::Parse
- */
-#ifndef RAPIDJSON_PARSE_ERROR_NORETURN
-#define RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode, offset) \
-    RAPIDJSON_MULTILINEMACRO_BEGIN \
-    RAPIDJSON_ASSERT(!HasParseError()); /* Error can only be assigned once */ \
-    SetParseError(parseErrorCode, offset); \
-    RAPIDJSON_MULTILINEMACRO_END
-#endif
-
-/*! \def RAPIDJSON_PARSE_ERROR
-    \ingroup RAPIDJSON_ERRORS
-    \brief (Internal) macro to indicate and handle a parse error.
-    \param parseErrorCode \ref rapidjson::ParseErrorCode of the error
-    \param offset  position of the error in JSON input (\c size_t)
-
-    Invokes RAPIDJSON_PARSE_ERROR_NORETURN and stops the parsing.
-
-    \see RAPIDJSON_PARSE_ERROR_NORETURN
-    \hideinitializer
- */
-#ifndef RAPIDJSON_PARSE_ERROR
-#define RAPIDJSON_PARSE_ERROR(parseErrorCode, offset) \
-    RAPIDJSON_MULTILINEMACRO_BEGIN \
-    RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode, offset); \
-    RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID; \
-    RAPIDJSON_MULTILINEMACRO_END
-#endif
-
-#include "error/error.h" // ParseErrorCode, ParseResult
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// ParseFlag
-
-/*! \def RAPIDJSON_PARSE_DEFAULT_FLAGS
-    \ingroup RAPIDJSON_CONFIG
-    \brief User-defined kParseDefaultFlags definition.
-
-    User can define this as any \c ParseFlag combinations.
-*/
-#ifndef RAPIDJSON_PARSE_DEFAULT_FLAGS
-#define RAPIDJSON_PARSE_DEFAULT_FLAGS kParseNoFlags
-#endif
-
-//! Combination of parseFlags
-/*! \see Reader::Parse, Document::Parse, Document::ParseInsitu, Document::ParseStream
- */
-enum ParseFlag {
-    kParseNoFlags = 0,              //!< No flags are set.
-    kParseInsituFlag = 1,           //!< In-situ(destructive) parsing.
-    kParseValidateEncodingFlag = 2, //!< Validate encoding of JSON strings.
-    kParseIterativeFlag = 4,        //!< Iterative(constant complexity in terms of function call stack size) parsing.
-    kParseStopWhenDoneFlag = 8,     //!< After parsing a complete JSON root from stream, stop further processing the rest of stream. When this flag is used, parser will not generate kParseErrorDocumentRootNotSingular error.
-    kParseFullPrecisionFlag = 16,   //!< Parse number in full precision (but slower).
-    kParseCommentsFlag = 32,        //!< Allow one-line (//) and multi-line (/**/) comments.
-    kParseNumbersAsStringsFlag = 64,    //!< Parse all numbers (ints/doubles) as strings.
-    kParseTrailingCommasFlag = 128, //!< Allow trailing commas at the end of objects and arrays.
-    kParseNanAndInfFlag = 256,      //!< Allow parsing NaN, Inf, Infinity, -Inf and -Infinity as doubles.
-    kParseDefaultFlags = RAPIDJSON_PARSE_DEFAULT_FLAGS  //!< Default parse flags. Can be customized by defining RAPIDJSON_PARSE_DEFAULT_FLAGS
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Handler
-
-/*! \class rapidjson::Handler
-    \brief Concept for receiving events from GenericReader upon parsing.
-    The functions return true if no error occurs. If they return false,
-    the event publisher should terminate the process.
-\code
-concept Handler {
-    typename Ch;
-
-    bool Null();
-    bool Bool(bool b);
-    bool Int(int i);
-    bool Uint(unsigned i);
-    bool Int64(int64_t i);
-    bool Uint64(uint64_t i);
-    bool Double(double d);
-    /// enabled via kParseNumbersAsStringsFlag, string is not null-terminated (use length)
-    bool RawNumber(const Ch* str, SizeType length, bool copy);
-    bool String(const Ch* str, SizeType length, bool copy);
-    bool StartObject();
-    bool Key(const Ch* str, SizeType length, bool copy);
-    bool EndObject(SizeType memberCount);
-    bool StartArray();
-    bool EndArray(SizeType elementCount);
-};
-\endcode
-*/
-///////////////////////////////////////////////////////////////////////////////
-// BaseReaderHandler
-
-//! Default implementation of Handler.
-/*! This can be used as base class of any reader handler.
-    \note implements Handler concept
-*/
-template<typename Encoding = UTF8<>, typename Derived = void>
-struct BaseReaderHandler {
-    typedef typename Encoding::Ch Ch;
-
-    typedef typename internal::SelectIf<internal::IsSame<Derived, void>, BaseReaderHandler, Derived>::Type Override;
-
-    bool Default() { return true; }
-    bool Null() { return static_cast<Override&>(*this).Default(); }
-    bool Bool(bool) { return static_cast<Override&>(*this).Default(); }
-    bool Int(int) { return static_cast<Override&>(*this).Default(); }
-    bool Uint(unsigned) { return static_cast<Override&>(*this).Default(); }
-    bool Int64(int64_t) { return static_cast<Override&>(*this).Default(); }
-    bool Uint64(uint64_t) { return static_cast<Override&>(*this).Default(); }
-    bool Double(double) { return static_cast<Override&>(*this).Default(); }
-    /// enabled via kParseNumbersAsStringsFlag, string is not null-terminated (use length)
-    bool RawNumber(const Ch* str, SizeType len, bool copy) { return static_cast<Override&>(*this).String(str, len, copy); }
-    bool String(const Ch*, SizeType, bool) { return static_cast<Override&>(*this).Default(); }
-    bool StartObject() { return static_cast<Override&>(*this).Default(); }
-    bool Key(const Ch* str, SizeType len, bool copy) { return static_cast<Override&>(*this).String(str, len, copy); }
-    bool EndObject(SizeType) { return static_cast<Override&>(*this).Default(); }
-    bool StartArray() { return static_cast<Override&>(*this).Default(); }
-    bool EndArray(SizeType) { return static_cast<Override&>(*this).Default(); }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// StreamLocalCopy
-
-namespace internal {
-
-template<typename Stream, int = StreamTraits<Stream>::copyOptimization>
-class StreamLocalCopy;
-
-//! Do copy optimization.
-template<typename Stream>
-class StreamLocalCopy<Stream, 1> {
-public:
-    StreamLocalCopy(Stream& original) : s(original), original_(original) {}
-    ~StreamLocalCopy() { original_ = s; }
-
-    Stream s;
-
-private:
-    StreamLocalCopy& operator=(const StreamLocalCopy&) /* = delete */;
-
-    Stream& original_;
-};
-
-//! Keep reference.
-template<typename Stream>
-class StreamLocalCopy<Stream, 0> {
-public:
-    StreamLocalCopy(Stream& original) : s(original) {}
-
-    Stream& s;
-
-private:
-    StreamLocalCopy& operator=(const StreamLocalCopy&) /* = delete */;
-};
-
-} // namespace internal
-
-///////////////////////////////////////////////////////////////////////////////
-// SkipWhitespace
-
-//! Skip the JSON white spaces in a stream.
-/*! \param is A input stream for skipping white spaces.
-    \note This function has SSE2/SSE4.2 specialization.
-*/
-template<typename InputStream>
-void SkipWhitespace(InputStream& is) {
-    internal::StreamLocalCopy<InputStream> copy(is);
-    InputStream& s(copy.s);
-
-    typename InputStream::Ch c;
-    while ((c = s.Peek()) == ' ' || c == '\n' || c == '\r' || c == '\t')
-        s.Take();
-}
-
-inline const char* SkipWhitespace(const char* p, const char* end) {
-    while (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
-        ++p;
-    return p;
-}
-
-#ifdef RAPIDJSON_SSE42
-//! Skip whitespace with SSE 4.2 pcmpistrm instruction, testing 16 8-byte characters at once.
-inline const char *SkipWhitespace_SIMD(const char* p) {
-    // Fast return for single non-whitespace
-    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-        ++p;
-    else
-        return p;
-
-    // 16-byte align to the next boundary
-    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-    while (p != nextAligned)
-        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-            ++p;
-        else
-            return p;
-
-    // The rest of string using SIMD
-    static const char whitespace[16] = " \n\r\t";
-    const __m128i w = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespace[0]));
-
-    for (;; p += 16) {
-        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-        const int r = _mm_cmpistri(w, s, _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT | _SIDD_NEGATIVE_POLARITY);
-        if (r != 16)    // some of characters is non-whitespace
-            return p + r;
-    }
-}
-
-inline const char *SkipWhitespace_SIMD(const char* p, const char* end) {
-    // Fast return for single non-whitespace
-    if (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
-        ++p;
-    else
-        return p;
-
-    // The middle of string using SIMD
-    static const char whitespace[16] = " \n\r\t";
-    const __m128i w = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespace[0]));
-
-    for (; p <= end - 16; p += 16) {
-        const __m128i s = _mm_loadu_si128(reinterpret_cast<const __m128i *>(p));
-        const int r = _mm_cmpistri(w, s, _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT | _SIDD_NEGATIVE_POLARITY);
-        if (r != 16)    // some of characters is non-whitespace
-            return p + r;
-    }
-
-    return SkipWhitespace(p, end);
-}
-
-#elif defined(RAPIDJSON_SSE2)
-
-//! Skip whitespace with SSE2 instructions, testing 16 8-byte characters at once.
-inline const char *SkipWhitespace_SIMD(const char* p) {
-    // Fast return for single non-whitespace
-    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-        ++p;
-    else
-        return p;
-
-    // 16-byte align to the next boundary
-    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-    while (p != nextAligned)
-        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-            ++p;
-        else
-            return p;
-
-    // The rest of string
-    #define C16(c) { c, c, c, c, c, c, c, c, c, c, c, c, c, c, c, c }
-    static const char whitespaces[4][16] = { C16(' '), C16('\n'), C16('\r'), C16('\t') };
-    #undef C16
-
-    const __m128i w0 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[0][0]));
-    const __m128i w1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[1][0]));
-    const __m128i w2 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[2][0]));
-    const __m128i w3 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[3][0]));
-
-    for (;; p += 16) {
-        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-        __m128i x = _mm_cmpeq_epi8(s, w0);
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w1));
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w2));
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w3));
-        unsigned short r = static_cast<unsigned short>(~_mm_movemask_epi8(x));
-        if (r != 0) {   // some of characters may be non-whitespace
-#ifdef _MSC_VER         // Find the index of first non-whitespace
-            unsigned long offset;
-            _BitScanForward(&offset, r);
-            return p + offset;
-#else
-            return p + __builtin_ffs(r) - 1;
-#endif
-        }
-    }
-}
-
-inline const char *SkipWhitespace_SIMD(const char* p, const char* end) {
-    // Fast return for single non-whitespace
-    if (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
-        ++p;
-    else
-        return p;
-
-    // The rest of string
-    #define C16(c) { c, c, c, c, c, c, c, c, c, c, c, c, c, c, c, c }
-    static const char whitespaces[4][16] = { C16(' '), C16('\n'), C16('\r'), C16('\t') };
-    #undef C16
-
-    const __m128i w0 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[0][0]));
-    const __m128i w1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[1][0]));
-    const __m128i w2 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[2][0]));
-    const __m128i w3 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[3][0]));
-
-    for (; p <= end - 16; p += 16) {
-        const __m128i s = _mm_loadu_si128(reinterpret_cast<const __m128i *>(p));
-        __m128i x = _mm_cmpeq_epi8(s, w0);
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w1));
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w2));
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w3));
-        unsigned short r = static_cast<unsigned short>(~_mm_movemask_epi8(x));
-        if (r != 0) {   // some of characters may be non-whitespace
-#ifdef _MSC_VER         // Find the index of first non-whitespace
-            unsigned long offset;
-            _BitScanForward(&offset, r);
-            return p + offset;
-#else
-            return p + __builtin_ffs(r) - 1;
-#endif
-        }
-    }
-
-    return SkipWhitespace(p, end);
-}
-
-#elif defined(RAPIDJSON_NEON)
-
-//! Skip whitespace with ARM Neon instructions, testing 16 8-byte characters at once.
-inline const char *SkipWhitespace_SIMD(const char* p) {
-    // Fast return for single non-whitespace
-    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-        ++p;
-    else
-        return p;
-
-    // 16-byte align to the next boundary
-    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-    while (p != nextAligned)
-        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-            ++p;
-        else
-            return p;
-
-    const uint8x16_t w0 = vmovq_n_u8(' ');
-    const uint8x16_t w1 = vmovq_n_u8('\n');
-    const uint8x16_t w2 = vmovq_n_u8('\r');
-    const uint8x16_t w3 = vmovq_n_u8('\t');
-
-    for (;; p += 16) {
-        const uint8x16_t s = vld1q_u8(reinterpret_cast<const uint8_t *>(p));
-        uint8x16_t x = vceqq_u8(s, w0);
-        x = vorrq_u8(x, vceqq_u8(s, w1));
-        x = vorrq_u8(x, vceqq_u8(s, w2));
-        x = vorrq_u8(x, vceqq_u8(s, w3));
-
-        x = vmvnq_u8(x);                       // Negate
-        x = vrev64q_u8(x);                     // Rev in 64
-        uint64_t low = vgetq_lane_u64(reinterpret_cast<uint64x2_t>(x), 0);   // extract
-        uint64_t high = vgetq_lane_u64(reinterpret_cast<uint64x2_t>(x), 1);  // extract
-
-        if (low == 0) {
-            if (high != 0) {
-                int lz =__builtin_clzll(high);;
-                return p + 8 + (lz >> 3);
-            }
-        } else {
-            int lz = __builtin_clzll(low);;
-            return p + (lz >> 3);
-        }
-    }
-}
-
-inline const char *SkipWhitespace_SIMD(const char* p, const char* end) {
-    // Fast return for single non-whitespace
-    if (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
-        ++p;
-    else
-        return p;
-
-    const uint8x16_t w0 = vmovq_n_u8(' ');
-    const uint8x16_t w1 = vmovq_n_u8('\n');
-    const uint8x16_t w2 = vmovq_n_u8('\r');
-    const uint8x16_t w3 = vmovq_n_u8('\t');
-
-    for (; p <= end - 16; p += 16) {
-        const uint8x16_t s = vld1q_u8(reinterpret_cast<const uint8_t *>(p));
-        uint8x16_t x = vceqq_u8(s, w0);
-        x = vorrq_u8(x, vceqq_u8(s, w1));
-        x = vorrq_u8(x, vceqq_u8(s, w2));
-        x = vorrq_u8(x, vceqq_u8(s, w3));
-
-        x = vmvnq_u8(x);                       // Negate
-        x = vrev64q_u8(x);                     // Rev in 64
-        uint64_t low = vgetq_lane_u64(reinterpret_cast<uint64x2_t>(x), 0);   // extract
-        uint64_t high = vgetq_lane_u64(reinterpret_cast<uint64x2_t>(x), 1);  // extract
-
-        if (low == 0) {
-            if (high != 0) {
-                int lz = __builtin_clzll(high);
-                return p + 8 + (lz >> 3);
-            }
-        } else {
-            int lz = __builtin_clzll(low);
-            return p + (lz >> 3);
-        }
-    }
-
-    return SkipWhitespace(p, end);
-}
-
-#endif // RAPIDJSON_NEON
-
-#ifdef RAPIDJSON_SIMD
-//! Template function specialization for InsituStringStream
-template<> inline void SkipWhitespace(InsituStringStream& is) {
-    is.src_ = const_cast<char*>(SkipWhitespace_SIMD(is.src_));
-}
-
-//! Template function specialization for StringStream
-template<> inline void SkipWhitespace(StringStream& is) {
-    is.src_ = SkipWhitespace_SIMD(is.src_);
-}
-
-template<> inline void SkipWhitespace(EncodedInputStream<UTF8<>, MemoryStream>& is) {
-    is.is_.src_ = SkipWhitespace_SIMD(is.is_.src_, is.is_.end_);
-}
-#endif // RAPIDJSON_SIMD
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericReader
-
-//! SAX-style JSON parser. Use \ref Reader for UTF8 encoding and default allocator.
-/*! GenericReader parses JSON text from a stream, and send events synchronously to an
-    object implementing Handler concept.
-
-    It needs to allocate a stack for storing a single decoded string during
-    non-destructive parsing.
-
-    For in-situ parsing, the decoded string is directly written to the source
-    text string, no temporary buffer is required.
-
-    A GenericReader object can be reused for parsing multiple JSON text.
-
-    \tparam SourceEncoding Encoding of the input stream.
-    \tparam TargetEncoding Encoding of the parse output.
-    \tparam StackAllocator Allocator type for stack.
-*/
-template <typename SourceEncoding, typename TargetEncoding, typename StackAllocator = CrtAllocator>
-class GenericReader {
-public:
-    typedef typename SourceEncoding::Ch Ch; //!< SourceEncoding character type
-
-    //! Constructor.
-    /*! \param stackAllocator Optional allocator for allocating stack memory. (Only use for non-destructive parsing)
-        \param stackCapacity stack capacity in bytes for storing a single decoded string.  (Only use for non-destructive parsing)
-    */
-    GenericReader(StackAllocator* stackAllocator = 0, size_t stackCapacity = kDefaultStackCapacity) :
-        stack_(stackAllocator, stackCapacity), parseResult_(), state_(IterativeParsingStartState) {}
-
-    //! Parse JSON text.
-    /*! \tparam parseFlags Combination of \ref ParseFlag.
-        \tparam InputStream Type of input stream, implementing Stream concept.
-        \tparam Handler Type of handler, implementing Handler concept.
-        \param is Input stream to be parsed.
-        \param handler The handler to receive events.
-        \return Whether the parsing is successful.
-    */
-    template <unsigned parseFlags, typename InputStream, typename Handler>
-    ParseResult Parse(InputStream& is, Handler& handler) {
-        if (parseFlags & kParseIterativeFlag)
-            return IterativeParse<parseFlags>(is, handler);
-
-        parseResult_.Clear();
-
-        ClearStackOnExit scope(*this);
-
-        SkipWhitespaceAndComments<parseFlags>(is);
-        RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-
-        if (RAPIDJSON_UNLIKELY(is.Peek() == '\0')) {
-            RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorDocumentEmpty, is.Tell());
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-        }
-        else {
-            ParseValue<parseFlags>(is, handler);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-
-            if (!(parseFlags & kParseStopWhenDoneFlag)) {
-                SkipWhitespaceAndComments<parseFlags>(is);
-                RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-
-                if (RAPIDJSON_UNLIKELY(is.Peek() != '\0')) {
-                    RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorDocumentRootNotSingular, is.Tell());
-                    RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-                }
-            }
-        }
-
-        return parseResult_;
-    }
-
-    //! Parse JSON text (with \ref kParseDefaultFlags)
-    /*! \tparam InputStream Type of input stream, implementing Stream concept
-        \tparam Handler Type of handler, implementing Handler concept.
-        \param is Input stream to be parsed.
-        \param handler The handler to receive events.
-        \return Whether the parsing is successful.
-    */
-    template <typename InputStream, typename Handler>
-    ParseResult Parse(InputStream& is, Handler& handler) {
-        return Parse<kParseDefaultFlags>(is, handler);
-    }
-
-    //! Initialize JSON text token-by-token parsing
-    /*!
-     */
-    void IterativeParseInit() {
-        parseResult_.Clear();
-        state_ = IterativeParsingStartState;
-    }
-    
-    //! Parse one token from JSON text
-    /*! \tparam InputStream Type of input stream, implementing Stream concept
-        \tparam Handler Type of handler, implementing Handler concept.
-        \param is Input stream to be parsed.
-        \param handler The handler to receive events.
-        \return Whether the parsing is successful.
-     */
-    template <unsigned parseFlags, typename InputStream, typename Handler>
-    bool IterativeParseNext(InputStream& is, Handler& handler) {
-        while (RAPIDJSON_LIKELY(is.Peek() != '\0')) {
-            SkipWhitespaceAndComments<parseFlags>(is);
-            
-            Token t = Tokenize(is.Peek());
-            IterativeParsingState n = Predict(state_, t);
-            IterativeParsingState d = Transit<parseFlags>(state_, t, n, is, handler);
-            
-            // If we've finished or hit an error...
-            if (RAPIDJSON_UNLIKELY(IsIterativeParsingCompleteState(d))) {
-                // Report errors.
-                if (d == IterativeParsingErrorState) {
-                    HandleError(state_, is);
-                    return false;
-                }
-            
-                // Transition to the finish state.
-                RAPIDJSON_ASSERT(d == IterativeParsingFinishState);
-                state_ = d;
-                
-                // If StopWhenDone is not set...
-                if (!(parseFlags & kParseStopWhenDoneFlag)) {
-                    // ... and extra non-whitespace data is found...
-                    SkipWhitespaceAndComments<parseFlags>(is);
-                    if (is.Peek() != '\0') {
-                        // ... this is considered an error.
-                        HandleError(state_, is);
-                        return false;
-                    }
-                }
-                
-                // Success! We are done!
-                return true;
-            }
-            
-            // Transition to the new state.
-            state_ = d;
-
-            // If we parsed anything other than a delimiter, we invoked the handler, so we can return true now.
-            if (!IsIterativeParsingDelimiterState(n))
-                return true;
-        }
-        
-        // We reached the end of file.
-        stack_.Clear();
-
-        if (state_ != IterativeParsingFinishState) {
-            HandleError(state_, is);
-            return false;
-        }
-        
-        return true;
-    }
-    
-    //! Check if token-by-token parsing JSON text is complete
-    /*! \return Whether the JSON has been fully decoded.
-     */
-    RAPIDJSON_FORCEINLINE bool IterativeParseComplete() const {
-        return IsIterativeParsingCompleteState(state_);
-    }
-
-    //! Whether a parse error has occurred in the last parsing.
-    bool HasParseError() const { return parseResult_.IsError(); }
-
-    //! Get the \ref ParseErrorCode of last parsing.
-    ParseErrorCode GetParseErrorCode() const { return parseResult_.Code(); }
-
-    //! Get the position of last parsing error in input, 0 otherwise.
-    size_t GetErrorOffset() const { return parseResult_.Offset(); }
-
-protected:
-    void SetParseError(ParseErrorCode code, size_t offset) { parseResult_.Set(code, offset); }
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    GenericReader(const GenericReader&);
-    GenericReader& operator=(const GenericReader&);
-
-    void ClearStack() { stack_.Clear(); }
-
-    // clear stack on any exit from ParseStream, e.g. due to exception
-    struct ClearStackOnExit {
-        explicit ClearStackOnExit(GenericReader& r) : r_(r) {}
-        ~ClearStackOnExit() { r_.ClearStack(); }
-    private:
-        GenericReader& r_;
-        ClearStackOnExit(const ClearStackOnExit&);
-        ClearStackOnExit& operator=(const ClearStackOnExit&);
-    };
-
-    template<unsigned parseFlags, typename InputStream>
-    void SkipWhitespaceAndComments(InputStream& is) {
-        SkipWhitespace(is);
-
-        if (parseFlags & kParseCommentsFlag) {
-            while (RAPIDJSON_UNLIKELY(Consume(is, '/'))) {
-                if (Consume(is, '*')) {
-                    while (true) {
-                        if (RAPIDJSON_UNLIKELY(is.Peek() == '\0'))
-                            RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell());
-                        else if (Consume(is, '*')) {
-                            if (Consume(is, '/'))
-                                break;
-                        }
-                        else
-                            is.Take();
-                    }
-                }
-                else if (RAPIDJSON_LIKELY(Consume(is, '/')))
-                    while (is.Peek() != '\0' && is.Take() != '\n') {}
-                else
-                    RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell());
-
-                SkipWhitespace(is);
-            }
-        }
-    }
-
-    // Parse object: { string : value, ... }
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseObject(InputStream& is, Handler& handler) {
-        RAPIDJSON_ASSERT(is.Peek() == '{');
-        is.Take();  // Skip '{'
-
-        if (RAPIDJSON_UNLIKELY(!handler.StartObject()))
-            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-
-        SkipWhitespaceAndComments<parseFlags>(is);
-        RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-        if (Consume(is, '}')) {
-            if (RAPIDJSON_UNLIKELY(!handler.EndObject(0)))  // empty object
-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-            return;
-        }
-
-        for (SizeType memberCount = 0;;) {
-            if (RAPIDJSON_UNLIKELY(is.Peek() != '"'))
-                RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell());
-
-            ParseString<parseFlags>(is, handler, true);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            SkipWhitespaceAndComments<parseFlags>(is);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            if (RAPIDJSON_UNLIKELY(!Consume(is, ':')))
-                RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell());
-
-            SkipWhitespaceAndComments<parseFlags>(is);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            ParseValue<parseFlags>(is, handler);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            SkipWhitespaceAndComments<parseFlags>(is);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            ++memberCount;
-
-            switch (is.Peek()) {
-                case ',':
-                    is.Take();
-                    SkipWhitespaceAndComments<parseFlags>(is);
-                    RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-                    break;
-                case '}':
-                    is.Take();
-                    if (RAPIDJSON_UNLIKELY(!handler.EndObject(memberCount)))
-                        RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                    return;
-                default:
-                    RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell()); break; // This useless break is only for making warning and coverage happy
-            }
-
-            if (parseFlags & kParseTrailingCommasFlag) {
-                if (is.Peek() == '}') {
-                    if (RAPIDJSON_UNLIKELY(!handler.EndObject(memberCount)))
-                        RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                    is.Take();
-                    return;
-                }
-            }
-        }
-    }
-
-    // Parse array: [ value, ... ]
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseArray(InputStream& is, Handler& handler) {
-        RAPIDJSON_ASSERT(is.Peek() == '[');
-        is.Take();  // Skip '['
-
-        if (RAPIDJSON_UNLIKELY(!handler.StartArray()))
-            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-
-        SkipWhitespaceAndComments<parseFlags>(is);
-        RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-        if (Consume(is, ']')) {
-            if (RAPIDJSON_UNLIKELY(!handler.EndArray(0))) // empty array
-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-            return;
-        }
-
-        for (SizeType elementCount = 0;;) {
-            ParseValue<parseFlags>(is, handler);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            ++elementCount;
-            SkipWhitespaceAndComments<parseFlags>(is);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            if (Consume(is, ',')) {
-                SkipWhitespaceAndComments<parseFlags>(is);
-                RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-            }
-            else if (Consume(is, ']')) {
-                if (RAPIDJSON_UNLIKELY(!handler.EndArray(elementCount)))
-                    RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                return;
-            }
-            else
-                RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell());
-
-            if (parseFlags & kParseTrailingCommasFlag) {
-                if (is.Peek() == ']') {
-                    if (RAPIDJSON_UNLIKELY(!handler.EndArray(elementCount)))
-                        RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                    is.Take();
-                    return;
-                }
-            }
-        }
-    }
-
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseNull(InputStream& is, Handler& handler) {
-        RAPIDJSON_ASSERT(is.Peek() == 'n');
-        is.Take();
-
-        if (RAPIDJSON_LIKELY(Consume(is, 'u') && Consume(is, 'l') && Consume(is, 'l'))) {
-            if (RAPIDJSON_UNLIKELY(!handler.Null()))
-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-        }
-        else
-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
-    }
-
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseTrue(InputStream& is, Handler& handler) {
-        RAPIDJSON_ASSERT(is.Peek() == 't');
-        is.Take();
-
-        if (RAPIDJSON_LIKELY(Consume(is, 'r') && Consume(is, 'u') && Consume(is, 'e'))) {
-            if (RAPIDJSON_UNLIKELY(!handler.Bool(true)))
-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-        }
-        else
-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
-    }
-
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseFalse(InputStream& is, Handler& handler) {
-        RAPIDJSON_ASSERT(is.Peek() == 'f');
-        is.Take();
-
-        if (RAPIDJSON_LIKELY(Consume(is, 'a') && Consume(is, 'l') && Consume(is, 's') && Consume(is, 'e'))) {
-            if (RAPIDJSON_UNLIKELY(!handler.Bool(false)))
-                RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-        }
-        else
-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
-    }
-
-    template<typename InputStream>
-    RAPIDJSON_FORCEINLINE static bool Consume(InputStream& is, typename InputStream::Ch expect) {
-        if (RAPIDJSON_LIKELY(is.Peek() == expect)) {
-            is.Take();
-            return true;
-        }
-        else
-            return false;
-    }
-
-    // Helper function to parse four hexadecimal digits in \uXXXX in ParseString().
-    template<typename InputStream>
-    unsigned ParseHex4(InputStream& is, size_t escapeOffset) {
-        unsigned codepoint = 0;
-        for (int i = 0; i < 4; i++) {
-            Ch c = is.Peek();
-            codepoint <<= 4;
-            codepoint += static_cast<unsigned>(c);
-            if (c >= '0' && c <= '9')
-                codepoint -= '0';
-            else if (c >= 'A' && c <= 'F')
-                codepoint -= 'A' - 10;
-            else if (c >= 'a' && c <= 'f')
-                codepoint -= 'a' - 10;
-            else {
-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorStringUnicodeEscapeInvalidHex, escapeOffset);
-                RAPIDJSON_PARSE_ERROR_EARLY_RETURN(0);
-            }
-            is.Take();
-        }
-        return codepoint;
-    }
-
-    template <typename CharType>
-    class StackStream {
-    public:
-        typedef CharType Ch;
-
-        StackStream(internal::Stack<StackAllocator>& stack) : stack_(stack), length_(0) {}
-        RAPIDJSON_FORCEINLINE void Put(Ch c) {
-            *stack_.template Push<Ch>() = c;
-            ++length_;
-        }
-
-        RAPIDJSON_FORCEINLINE void* Push(SizeType count) {
-            length_ += count;
-            return stack_.template Push<Ch>(count);
-        }
-
-        size_t Length() const { return length_; }
-
-        Ch* Pop() {
-            return stack_.template Pop<Ch>(length_);
-        }
-
-    private:
-        StackStream(const StackStream&);
-        StackStream& operator=(const StackStream&);
-
-        internal::Stack<StackAllocator>& stack_;
-        SizeType length_;
-    };
-
-    // Parse string and generate String event. Different code paths for kParseInsituFlag.
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseString(InputStream& is, Handler& handler, bool isKey = false) {
-        internal::StreamLocalCopy<InputStream> copy(is);
-        InputStream& s(copy.s);
-
-        RAPIDJSON_ASSERT(s.Peek() == '\"');
-        s.Take();  // Skip '\"'
-
-        bool success = false;
-        if (parseFlags & kParseInsituFlag) {
-            typename InputStream::Ch *head = s.PutBegin();
-            ParseStringToStream<parseFlags, SourceEncoding, SourceEncoding>(s, s);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-            size_t length = s.PutEnd(head) - 1;
-            RAPIDJSON_ASSERT(length <= 0xFFFFFFFF);
-            const typename TargetEncoding::Ch* const str = reinterpret_cast<typename TargetEncoding::Ch*>(head);
-            success = (isKey ? handler.Key(str, SizeType(length), false) : handler.String(str, SizeType(length), false));
-        }
-        else {
-            StackStream<typename TargetEncoding::Ch> stackStream(stack_);
-            ParseStringToStream<parseFlags, SourceEncoding, TargetEncoding>(s, stackStream);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-            SizeType length = static_cast<SizeType>(stackStream.Length()) - 1;
-            const typename TargetEncoding::Ch* const str = stackStream.Pop();
-            success = (isKey ? handler.Key(str, length, true) : handler.String(str, length, true));
-        }
-        if (RAPIDJSON_UNLIKELY(!success))
-            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, s.Tell());
-    }
-
-    // Parse string to an output is
-    // This function handles the prefix/suffix double quotes, escaping, and optional encoding validation.
-    template<unsigned parseFlags, typename SEncoding, typename TEncoding, typename InputStream, typename OutputStream>
-    RAPIDJSON_FORCEINLINE void ParseStringToStream(InputStream& is, OutputStream& os) {
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        static const char escape[256] = {
-            Z16, Z16, 0, 0,'\"', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'/',
-            Z16, Z16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'\\', 0, 0, 0,
-            0, 0,'\b', 0, 0, 0,'\f', 0, 0, 0, 0, 0, 0, 0,'\n', 0,
-            0, 0,'\r', 0,'\t', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16
-        };
-#undef Z16
-//!@endcond
-
-        for (;;) {
-            // Scan and copy string before "\\\"" or < 0x20. This is an optional optimzation.
-            if (!(parseFlags & kParseValidateEncodingFlag))
-                ScanCopyUnescapedString(is, os);
-
-            Ch c = is.Peek();
-            if (RAPIDJSON_UNLIKELY(c == '\\')) {    // Escape
-                size_t escapeOffset = is.Tell();    // For invalid escaping, report the initial '\\' as error offset
-                is.Take();
-                Ch e = is.Peek();
-                if ((sizeof(Ch) == 1 || unsigned(e) < 256) && RAPIDJSON_LIKELY(escape[static_cast<unsigned char>(e)])) {
-                    is.Take();
-                    os.Put(static_cast<typename TEncoding::Ch>(escape[static_cast<unsigned char>(e)]));
-                }
-                else if (RAPIDJSON_LIKELY(e == 'u')) {    // Unicode
-                    is.Take();
-                    unsigned codepoint = ParseHex4(is, escapeOffset);
-                    RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-                    if (RAPIDJSON_UNLIKELY(codepoint >= 0xD800 && codepoint <= 0xDBFF)) {
-                        // Handle UTF-16 surrogate pair
-                        if (RAPIDJSON_UNLIKELY(!Consume(is, '\\') || !Consume(is, 'u')))
-                            RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, escapeOffset);
-                        unsigned codepoint2 = ParseHex4(is, escapeOffset);
-                        RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-                        if (RAPIDJSON_UNLIKELY(codepoint2 < 0xDC00 || codepoint2 > 0xDFFF))
-                            RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, escapeOffset);
-                        codepoint = (((codepoint - 0xD800) << 10) | (codepoint2 - 0xDC00)) + 0x10000;
-                    }
-                    TEncoding::Encode(os, codepoint);
-                }
-                else
-                    RAPIDJSON_PARSE_ERROR(kParseErrorStringEscapeInvalid, escapeOffset);
-            }
-            else if (RAPIDJSON_UNLIKELY(c == '"')) {    // Closing double quote
-                is.Take();
-                os.Put('\0');   // null-terminate the string
-                return;
-            }
-            else if (RAPIDJSON_UNLIKELY(static_cast<unsigned>(c) < 0x20)) { // RFC 4627: unescaped = %x20-21 / %x23-5B / %x5D-10FFFF
-                if (c == '\0')
-                    RAPIDJSON_PARSE_ERROR(kParseErrorStringMissQuotationMark, is.Tell());
-                else
-                    RAPIDJSON_PARSE_ERROR(kParseErrorStringInvalidEncoding, is.Tell());
-            }
-            else {
-                size_t offset = is.Tell();
-                if (RAPIDJSON_UNLIKELY((parseFlags & kParseValidateEncodingFlag ?
-                    !Transcoder<SEncoding, TEncoding>::Validate(is, os) :
-                    !Transcoder<SEncoding, TEncoding>::Transcode(is, os))))
-                    RAPIDJSON_PARSE_ERROR(kParseErrorStringInvalidEncoding, offset);
-            }
-        }
-    }
-
-    template<typename InputStream, typename OutputStream>
-    static RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(InputStream&, OutputStream&) {
-            // Do nothing for generic version
-    }
-
-#if defined(RAPIDJSON_SSE2) || defined(RAPIDJSON_SSE42)
-    // StringStream -> StackStream<char>
-    static RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(StringStream& is, StackStream<char>& os) {
-        const char* p = is.src_;
-
-        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
-        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-        while (p != nextAligned)
-            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
-                is.src_ = p;
-                return;
-            }
-            else
-                os.Put(*p++);
-
-        // The rest of string using SIMD
-        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
-        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
-        static const char space[16]  = { 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F };
-        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
-        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
-        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
-
-        for (;; p += 16) {
-            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
-            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
-            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x1F) == 0x1F
-            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
-            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
-            if (RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
-                SizeType length;
-    #ifdef _MSC_VER         // Find the index of first escaped
-                unsigned long offset;
-                _BitScanForward(&offset, r);
-                length = offset;
-    #else
-                length = static_cast<SizeType>(__builtin_ffs(r) - 1);
-    #endif
-                if (length != 0) {
-                    char* q = reinterpret_cast<char*>(os.Push(length));
-                    for (size_t i = 0; i < length; i++)
-                        q[i] = p[i];
-
-                    p += length;
-                }
-                break;
-            }
-            _mm_storeu_si128(reinterpret_cast<__m128i *>(os.Push(16)), s);
-        }
-
-        is.src_ = p;
-    }
-
-    // InsituStringStream -> InsituStringStream
-    static RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(InsituStringStream& is, InsituStringStream& os) {
-        RAPIDJSON_ASSERT(&is == &os);
-        (void)os;
-
-        if (is.src_ == is.dst_) {
-            SkipUnescapedString(is);
-            return;
-        }
-
-        char* p = is.src_;
-        char *q = is.dst_;
-
-        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
-        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-        while (p != nextAligned)
-            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
-                is.src_ = p;
-                is.dst_ = q;
-                return;
-            }
-            else
-                *q++ = *p++;
-
-        // The rest of string using SIMD
-        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
-        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
-        static const char space[16] = { 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F };
-        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
-        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
-        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
-
-        for (;; p += 16, q += 16) {
-            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
-            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
-            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x1F) == 0x1F
-            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
-            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
-            if (RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
-                size_t length;
-#ifdef _MSC_VER         // Find the index of first escaped
-                unsigned long offset;
-                _BitScanForward(&offset, r);
-                length = offset;
-#else
-                length = static_cast<size_t>(__builtin_ffs(r) - 1);
-#endif
-                for (const char* pend = p + length; p != pend; )
-                    *q++ = *p++;
-                break;
-            }
-            _mm_storeu_si128(reinterpret_cast<__m128i *>(q), s);
-        }
-
-        is.src_ = p;
-        is.dst_ = q;
-    }
-
-    // When read/write pointers are the same for insitu stream, just skip unescaped characters
-    static RAPIDJSON_FORCEINLINE void SkipUnescapedString(InsituStringStream& is) {
-        RAPIDJSON_ASSERT(is.src_ == is.dst_);
-        char* p = is.src_;
-
-        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
-        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-        for (; p != nextAligned; p++)
-            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
-                is.src_ = is.dst_ = p;
-                return;
-            }
-
-        // The rest of string using SIMD
-        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
-        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
-        static const char space[16] = { 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F };
-        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
-        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
-        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
-
-        for (;; p += 16) {
-            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
-            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
-            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x1F) == 0x1F
-            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
-            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
-            if (RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
-                size_t length;
-#ifdef _MSC_VER         // Find the index of first escaped
-                unsigned long offset;
-                _BitScanForward(&offset, r);
-                length = offset;
-#else
-                length = static_cast<size_t>(__builtin_ffs(r) - 1);
-#endif
-                p += length;
-                break;
-            }
-        }
-
-        is.src_ = is.dst_ = p;
-    }
-#elif defined(RAPIDJSON_NEON)
-    // StringStream -> StackStream<char>
-    static RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(StringStream& is, StackStream<char>& os) {
-        const char* p = is.src_;
-
-        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
-        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-        while (p != nextAligned)
-            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
-                is.src_ = p;
-                return;
-            }
-            else
-                os.Put(*p++);
-
-        // The rest of string using SIMD
-        const uint8x16_t s0 = vmovq_n_u8('"');
-        const uint8x16_t s1 = vmovq_n_u8('\\');
-        const uint8x16_t s2 = vmovq_n_u8('\b');
-        const uint8x16_t s3 = vmovq_n_u8(32);
-
-        for (;; p += 16) {
-            const uint8x16_t s = vld1q_u8(reinterpret_cast<const uint8_t *>(p));
-            uint8x16_t x = vceqq_u8(s, s0);
-            x = vorrq_u8(x, vceqq_u8(s, s1));
-            x = vorrq_u8(x, vceqq_u8(s, s2));
-            x = vorrq_u8(x, vcltq_u8(s, s3));
-
-            x = vrev64q_u8(x);                     // Rev in 64
-            uint64_t low = vgetq_lane_u64(reinterpret_cast<uint64x2_t>(x), 0);   // extract
-            uint64_t high = vgetq_lane_u64(reinterpret_cast<uint64x2_t>(x), 1);  // extract
-
-            SizeType length = 0;
-            bool escaped = false;
-            if (low == 0) {
-                if (high != 0) {
-                    unsigned lz = (unsigned)__builtin_clzll(high);;
-                    length = 8 + (lz >> 3);
-                    escaped = true;
-                }
-            } else {
-                unsigned lz = (unsigned)__builtin_clzll(low);;
-                length = lz >> 3;
-                escaped = true;
-            }
-            if (RAPIDJSON_UNLIKELY(escaped)) {   // some of characters is escaped
-                if (length != 0) {
-                    char* q = reinterpret_cast<char*>(os.Push(length));
-                    for (size_t i = 0; i < length; i++)
-                        q[i] = p[i];
-
-                    p += length;
-                }
-                break;
-            }
-            vst1q_u8(reinterpret_cast<uint8_t *>(os.Push(16)), s);
-        }
-
-        is.src_ = p;
-    }
-
-    // InsituStringStream -> InsituStringStream
-    static RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(InsituStringStream& is, InsituStringStream& os) {
-        RAPIDJSON_ASSERT(&is == &os);
-        (void)os;
-
-        if (is.src_ == is.dst_) {
-            SkipUnescapedString(is);
-            return;
-        }
-
-        char* p = is.src_;
-        char *q = is.dst_;
-
-        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
-        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-        while (p != nextAligned)
-            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
-                is.src_ = p;
-                is.dst_ = q;
-                return;
-            }
-            else
-                *q++ = *p++;
-
-        // The rest of string using SIMD
-        const uint8x16_t s0 = vmovq_n_u8('"');
-        const uint8x16_t s1 = vmovq_n_u8('\\');
-        const uint8x16_t s2 = vmovq_n_u8('\b');
-        const uint8x16_t s3 = vmovq_n_u8(32);
-
-        for (;; p += 16, q += 16) {
-            const uint8x16_t s = vld1q_u8(reinterpret_cast<uint8_t *>(p));
-            uint8x16_t x = vceqq_u8(s, s0);
-            x = vorrq_u8(x, vceqq_u8(s, s1));
-            x = vorrq_u8(x, vceqq_u8(s, s2));
-            x = vorrq_u8(x, vcltq_u8(s, s3));
-
-            x = vrev64q_u8(x);                     // Rev in 64
-            uint64_t low = vgetq_lane_u64(reinterpret_cast<uint64x2_t>(x), 0);   // extract
-            uint64_t high = vgetq_lane_u64(reinterpret_cast<uint64x2_t>(x), 1);  // extract
-
-            SizeType length = 0;
-            bool escaped = false;
-            if (low == 0) {
-                if (high != 0) {
-                    unsigned lz = (unsigned)__builtin_clzll(high);
-                    length = 8 + (lz >> 3);
-                    escaped = true;
-                }
-            } else {
-                unsigned lz = (unsigned)__builtin_clzll(low);
-                length = lz >> 3;
-                escaped = true;
-            }
-            if (RAPIDJSON_UNLIKELY(escaped)) {   // some of characters is escaped
-                for (const char* pend = p + length; p != pend; ) {
-                    *q++ = *p++;
-                }
-                break;
-            }
-            vst1q_u8(reinterpret_cast<uint8_t *>(q), s);
-        }
-
-        is.src_ = p;
-        is.dst_ = q;
-    }
-
-    // When read/write pointers are the same for insitu stream, just skip unescaped characters
-    static RAPIDJSON_FORCEINLINE void SkipUnescapedString(InsituStringStream& is) {
-        RAPIDJSON_ASSERT(is.src_ == is.dst_);
-        char* p = is.src_;
-
-        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
-        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-        for (; p != nextAligned; p++)
-            if (RAPIDJSON_UNLIKELY(*p == '\"') || RAPIDJSON_UNLIKELY(*p == '\\') || RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
-                is.src_ = is.dst_ = p;
-                return;
-            }
-
-        // The rest of string using SIMD
-        const uint8x16_t s0 = vmovq_n_u8('"');
-        const uint8x16_t s1 = vmovq_n_u8('\\');
-        const uint8x16_t s2 = vmovq_n_u8('\b');
-        const uint8x16_t s3 = vmovq_n_u8(32);
-
-        for (;; p += 16) {
-            const uint8x16_t s = vld1q_u8(reinterpret_cast<uint8_t *>(p));
-            uint8x16_t x = vceqq_u8(s, s0);
-            x = vorrq_u8(x, vceqq_u8(s, s1));
-            x = vorrq_u8(x, vceqq_u8(s, s2));
-            x = vorrq_u8(x, vcltq_u8(s, s3));
-
-            x = vrev64q_u8(x);                     // Rev in 64
-            uint64_t low = vgetq_lane_u64(reinterpret_cast<uint64x2_t>(x), 0);   // extract
-            uint64_t high = vgetq_lane_u64(reinterpret_cast<uint64x2_t>(x), 1);  // extract
-
-            if (low == 0) {
-                if (high != 0) {
-                    int lz = __builtin_clzll(high);
-                    p += 8 + (lz >> 3);
-                    break;
-                }
-            } else {
-                int lz = __builtin_clzll(low);
-                p += lz >> 3;
-                break;
-            }
-        }
-
-        is.src_ = is.dst_ = p;
-    }
-#endif // RAPIDJSON_NEON
-
-    template<typename InputStream, bool backup, bool pushOnTake>
-    class NumberStream;
-
-    template<typename InputStream>
-    class NumberStream<InputStream, false, false> {
-    public:
-        typedef typename InputStream::Ch Ch;
-
-        NumberStream(GenericReader& reader, InputStream& s) : is(s) { (void)reader;  }
-
-        RAPIDJSON_FORCEINLINE Ch Peek() const { return is.Peek(); }
-        RAPIDJSON_FORCEINLINE Ch TakePush() { return is.Take(); }
-        RAPIDJSON_FORCEINLINE Ch Take() { return is.Take(); }
-		  RAPIDJSON_FORCEINLINE void Push(char) {}
-
-        size_t Tell() { return is.Tell(); }
-        size_t Length() { return 0; }
-        const char* Pop() { return 0; }
-
-    protected:
-        NumberStream& operator=(const NumberStream&);
-
-        InputStream& is;
-    };
-
-    template<typename InputStream>
-    class NumberStream<InputStream, true, false> : public NumberStream<InputStream, false, false> {
-        typedef NumberStream<InputStream, false, false> Base;
-    public:
-        NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is), stackStream(reader.stack_) {}
-
-        RAPIDJSON_FORCEINLINE Ch TakePush() {
-            stackStream.Put(static_cast<char>(Base::is.Peek()));
-            return Base::is.Take();
-        }
-
-        RAPIDJSON_FORCEINLINE void Push(char c) {
-            stackStream.Put(c);
-        }
-
-        size_t Length() { return stackStream.Length(); }
-
-        const char* Pop() {
-            stackStream.Put('\0');
-            return stackStream.Pop();
-        }
-
-    private:
-        StackStream<char> stackStream;
-    };
-
-    template<typename InputStream>
-    class NumberStream<InputStream, true, true> : public NumberStream<InputStream, true, false> {
-        typedef NumberStream<InputStream, true, false> Base;
-    public:
-        NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is) {}
-
-        RAPIDJSON_FORCEINLINE Ch Take() { return Base::TakePush(); }
-    };
-
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseNumber(InputStream& is, Handler& handler) {
-        internal::StreamLocalCopy<InputStream> copy(is);
-        NumberStream<InputStream,
-            ((parseFlags & kParseNumbersAsStringsFlag) != 0) ?
-                ((parseFlags & kParseInsituFlag) == 0) :
-                ((parseFlags & kParseFullPrecisionFlag) != 0),
-            (parseFlags & kParseNumbersAsStringsFlag) != 0 &&
-                (parseFlags & kParseInsituFlag) == 0> s(*this, copy.s);
-
-        size_t startOffset = s.Tell();
-        double d = 0.0;
-        bool useNanOrInf = false;
-
-        // Parse minus
-        bool minus = Consume(s, '-');
-
-        // Parse int: zero / ( digit1-9 *DIGIT )
-        unsigned i = 0;
-        uint64_t i64 = 0;
-        bool use64bit = false;
-        int significandDigit = 0;
-        if (RAPIDJSON_UNLIKELY(s.Peek() == '0')) {
-            i = 0;
-            s.TakePush();
-        }
-        else if (RAPIDJSON_LIKELY(s.Peek() >= '1' && s.Peek() <= '9')) {
-            i = static_cast<unsigned>(s.TakePush() - '0');
-
-            if (minus)
-                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                    if (RAPIDJSON_UNLIKELY(i >= 214748364)) { // 2^31 = 2147483648
-                        if (RAPIDJSON_LIKELY(i != 214748364 || s.Peek() > '8')) {
-                            i64 = i;
-                            use64bit = true;
-                            break;
-                        }
-                    }
-                    i = i * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                    significandDigit++;
-                }
-            else
-                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                    if (RAPIDJSON_UNLIKELY(i >= 429496729)) { // 2^32 - 1 = 4294967295
-                        if (RAPIDJSON_LIKELY(i != 429496729 || s.Peek() > '5')) {
-                            i64 = i;
-                            use64bit = true;
-                            break;
-                        }
-                    }
-                    i = i * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                    significandDigit++;
-                }
-        }
-        // Parse NaN or Infinity here
-        else if ((parseFlags & kParseNanAndInfFlag) && RAPIDJSON_LIKELY((s.Peek() == 'I' || s.Peek() == 'N'))) {
-            if (Consume(s, 'N')) {
-                if (Consume(s, 'a') && Consume(s, 'N')) {
-                    d = std::numeric_limits<double>::quiet_NaN();
-                    useNanOrInf = true;
-                }
-            }
-            else if (RAPIDJSON_LIKELY(Consume(s, 'I'))) {
-                if (Consume(s, 'n') && Consume(s, 'f')) {
-                    d = (minus ? -std::numeric_limits<double>::infinity() : std::numeric_limits<double>::infinity());
-                    useNanOrInf = true;
-
-                    if (RAPIDJSON_UNLIKELY(s.Peek() == 'i' && !(Consume(s, 'i') && Consume(s, 'n')
-                                                                && Consume(s, 'i') && Consume(s, 't') && Consume(s, 'y')))) {
-                        RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
-                    }
-                }
-            }
-            
-            if (RAPIDJSON_UNLIKELY(!useNanOrInf)) {
-                RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
-            }
-        }
-        else
-            RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
-
-        // Parse 64bit int
-        bool useDouble = false;
-        if (use64bit) {
-            if (minus)
-                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                     if (RAPIDJSON_UNLIKELY(i64 >= RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC))) // 2^63 = 9223372036854775808
-                        if (RAPIDJSON_LIKELY(i64 != RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC) || s.Peek() > '8')) {
-                            d = static_cast<double>(i64);
-                            useDouble = true;
-                            break;
-                        }
-                    i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                    significandDigit++;
-                }
-            else
-                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                    if (RAPIDJSON_UNLIKELY(i64 >= RAPIDJSON_UINT64_C2(0x19999999, 0x99999999))) // 2^64 - 1 = 18446744073709551615
-                        if (RAPIDJSON_LIKELY(i64 != RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) || s.Peek() > '5')) {
-                            d = static_cast<double>(i64);
-                            useDouble = true;
-                            break;
-                        }
-                    i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                    significandDigit++;
-                }
-        }
-
-        // Force double for big integer
-        if (useDouble) {
-            while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                d = d * 10 + (s.TakePush() - '0');
-            }
-        }
-
-        // Parse frac = decimal-point 1*DIGIT
-        int expFrac = 0;
-        size_t decimalPosition;
-        if (Consume(s, '.')) {
-            decimalPosition = s.Length();
-
-            if (RAPIDJSON_UNLIKELY(!(s.Peek() >= '0' && s.Peek() <= '9')))
-                RAPIDJSON_PARSE_ERROR(kParseErrorNumberMissFraction, s.Tell());
-
-            if (!useDouble) {
-#if RAPIDJSON_64BIT
-                // Use i64 to store significand in 64-bit architecture
-                if (!use64bit)
-                    i64 = i;
-
-                while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                    if (i64 > RAPIDJSON_UINT64_C2(0x1FFFFF, 0xFFFFFFFF)) // 2^53 - 1 for fast path
-                        break;
-                    else {
-                        i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                        --expFrac;
-                        if (i64 != 0)
-                            significandDigit++;
-                    }
-                }
-
-                d = static_cast<double>(i64);
-#else
-                // Use double to store significand in 32-bit architecture
-                d = static_cast<double>(use64bit ? i64 : i);
-#endif
-                useDouble = true;
-            }
-
-            while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                if (significandDigit < 17) {
-                    d = d * 10.0 + (s.TakePush() - '0');
-                    --expFrac;
-                    if (RAPIDJSON_LIKELY(d > 0.0))
-                        significandDigit++;
-                }
-                else
-                    s.TakePush();
-            }
-        }
-        else
-            decimalPosition = s.Length(); // decimal position at the end of integer.
-
-        // Parse exp = e [ minus / plus ] 1*DIGIT
-        int exp = 0;
-        if (Consume(s, 'e') || Consume(s, 'E')) {
-            if (!useDouble) {
-                d = static_cast<double>(use64bit ? i64 : i);
-                useDouble = true;
-            }
-
-            bool expMinus = false;
-            if (Consume(s, '+'))
-                ;
-            else if (Consume(s, '-'))
-                expMinus = true;
-
-            if (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                exp = static_cast<int>(s.Take() - '0');
-                if (expMinus) {
-                    // (exp + expFrac) must not underflow int => we're detecting when -exp gets
-                    // dangerously close to INT_MIN (a pessimistic next digit 9 would push it into
-                    // underflow territory):
-                    //
-                    //        -(exp * 10 + 9) + expFrac >= INT_MIN
-                    //   <=>  exp <= (expFrac - INT_MIN - 9) / 10
-                    RAPIDJSON_ASSERT(expFrac <= 0);
-                    int maxExp = (expFrac + 2147483639) / 10;
-
-                    while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                        exp = exp * 10 + static_cast<int>(s.Take() - '0');
-                        if (RAPIDJSON_UNLIKELY(exp > maxExp)) {
-                            while (RAPIDJSON_UNLIKELY(s.Peek() >= '0' && s.Peek() <= '9'))  // Consume the rest of exponent
-                                s.Take();
-                        }
-                    }
-                }
-                else {  // positive exp
-                    int maxExp = 308 - expFrac;
-                    while (RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                        exp = exp * 10 + static_cast<int>(s.Take() - '0');
-                        if (RAPIDJSON_UNLIKELY(exp > maxExp))
-                            RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, startOffset);
-                    }
-                }
-            }
-            else
-                RAPIDJSON_PARSE_ERROR(kParseErrorNumberMissExponent, s.Tell());
-
-            if (expMinus)
-                exp = -exp;
-        }
-
-        // Finish parsing, call event according to the type of number.
-        bool cont = true;
-
-        if (parseFlags & kParseNumbersAsStringsFlag) {
-            if (parseFlags & kParseInsituFlag) {
-                s.Pop();  // Pop stack no matter if it will be used or not.
-                typename InputStream::Ch* head = is.PutBegin();
-                const size_t length = s.Tell() - startOffset;
-                RAPIDJSON_ASSERT(length <= 0xFFFFFFFF);
-                // unable to insert the \0 character here, it will erase the comma after this number
-                const typename TargetEncoding::Ch* const str = reinterpret_cast<typename TargetEncoding::Ch*>(head);
-                cont = handler.RawNumber(str, SizeType(length), false);
-            }
-            else {
-                SizeType numCharsToCopy = static_cast<SizeType>(s.Length());
-                StringStream srcStream(s.Pop());
-                StackStream<typename TargetEncoding::Ch> dstStream(stack_);
-                while (numCharsToCopy--) {
-                    Transcoder<UTF8<>, TargetEncoding>::Transcode(srcStream, dstStream);
-                }
-                dstStream.Put('\0');
-                const typename TargetEncoding::Ch* str = dstStream.Pop();
-                const SizeType length = static_cast<SizeType>(dstStream.Length()) - 1;
-                cont = handler.RawNumber(str, SizeType(length), true);
-            }
-        }
-        else {
-           size_t length = s.Length();
-           const char* decimal = s.Pop();  // Pop stack no matter if it will be used or not.
-
-           if (useDouble) {
-               int p = exp + expFrac;
-               if (parseFlags & kParseFullPrecisionFlag)
-                   d = internal::StrtodFullPrecision(d, p, decimal, length, decimalPosition, exp);
-               else
-                   d = internal::StrtodNormalPrecision(d, p);
-
-               // Use > max, instead of == inf, to fix bogus warning -Wfloat-equal
-               if (d > std::numeric_limits<double>::max()) {
-                   // Overflow
-                   // TODO: internal::StrtodX should report overflow (or underflow)
-                   RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, startOffset);
-               }
-
-               cont = handler.Double(minus ? -d : d);
-           }
-           else if (useNanOrInf) {
-               cont = handler.Double(d);
-           }
-           else {
-               if (use64bit) {
-                   if (minus)
-                       cont = handler.Int64(static_cast<int64_t>(~i64 + 1));
-                   else
-                       cont = handler.Uint64(i64);
-               }
-               else {
-                   if (minus)
-                       cont = handler.Int(static_cast<int32_t>(~i + 1));
-                   else
-                       cont = handler.Uint(i);
-               }
-           }
-        }
-        if (RAPIDJSON_UNLIKELY(!cont))
-            RAPIDJSON_PARSE_ERROR(kParseErrorTermination, startOffset);
-    }
-
-    // Parse any JSON value
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseValue(InputStream& is, Handler& handler) {
-        switch (is.Peek()) {
-            case 'n': ParseNull  <parseFlags>(is, handler); break;
-            case 't': ParseTrue  <parseFlags>(is, handler); break;
-            case 'f': ParseFalse <parseFlags>(is, handler); break;
-            case '"': ParseString<parseFlags>(is, handler); break;
-            case '{': ParseObject<parseFlags>(is, handler); break;
-            case '[': ParseArray <parseFlags>(is, handler); break;
-            default :
-                      ParseNumber<parseFlags>(is, handler);
-                      break;
-
-        }
-    }
-
-    // Iterative Parsing
-
-    // States
-    enum IterativeParsingState {
-        IterativeParsingFinishState = 0, // sink states at top
-        IterativeParsingErrorState,      // sink states at top
-        IterativeParsingStartState,
-
-        // Object states
-        IterativeParsingObjectInitialState,
-        IterativeParsingMemberKeyState,
-        IterativeParsingMemberValueState,
-        IterativeParsingObjectFinishState,
-
-        // Array states
-        IterativeParsingArrayInitialState,
-        IterativeParsingElementState,
-        IterativeParsingArrayFinishState,
-
-        // Single value state
-        IterativeParsingValueState,
-        
-        // Delimiter states (at bottom)
-        IterativeParsingElementDelimiterState,
-        IterativeParsingMemberDelimiterState,
-        IterativeParsingKeyValueDelimiterState,
-        
-        cIterativeParsingStateCount
-    };
-
-    // Tokens
-    enum Token {
-        LeftBracketToken = 0,
-        RightBracketToken,
-
-        LeftCurlyBracketToken,
-        RightCurlyBracketToken,
-
-        CommaToken,
-        ColonToken,
-
-        StringToken,
-        FalseToken,
-        TrueToken,
-        NullToken,
-        NumberToken,
-
-        kTokenCount
-    };
-
-    RAPIDJSON_FORCEINLINE Token Tokenize(Ch c) const {
-
-//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#define N NumberToken
-#define N16 N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N
-        // Maps from ASCII to Token
-        static const unsigned char tokenMap[256] = {
-            N16, // 00~0F
-            N16, // 10~1F
-            N, N, StringToken, N, N, N, N, N, N, N, N, N, CommaToken, N, N, N, // 20~2F
-            N, N, N, N, N, N, N, N, N, N, ColonToken, N, N, N, N, N, // 30~3F
-            N16, // 40~4F
-            N, N, N, N, N, N, N, N, N, N, N, LeftBracketToken, N, RightBracketToken, N, N, // 50~5F
-            N, N, N, N, N, N, FalseToken, N, N, N, N, N, N, N, NullToken, N, // 60~6F
-            N, N, N, N, TrueToken, N, N, N, N, N, N, LeftCurlyBracketToken, N, RightCurlyBracketToken, N, N, // 70~7F
-            N16, N16, N16, N16, N16, N16, N16, N16 // 80~FF
-        };
-#undef N
-#undef N16
-//!@endcond
-
-        if (sizeof(Ch) == 1 || static_cast<unsigned>(c) < 256)
-            return static_cast<Token>(tokenMap[static_cast<unsigned char>(c)]);
-        else
-            return NumberToken;
-    }
-
-    RAPIDJSON_FORCEINLINE IterativeParsingState Predict(IterativeParsingState state, Token token) const {
-        // current state x one lookahead token -> new state
-        static const char G[cIterativeParsingStateCount][kTokenCount] = {
-            // Finish(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // Error(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // Start
-            {
-                IterativeParsingArrayInitialState,  // Left bracket
-                IterativeParsingErrorState,         // Right bracket
-                IterativeParsingObjectInitialState, // Left curly bracket
-                IterativeParsingErrorState,         // Right curly bracket
-                IterativeParsingErrorState,         // Comma
-                IterativeParsingErrorState,         // Colon
-                IterativeParsingValueState,         // String
-                IterativeParsingValueState,         // False
-                IterativeParsingValueState,         // True
-                IterativeParsingValueState,         // Null
-                IterativeParsingValueState          // Number
-            },
-            // ObjectInitial
-            {
-                IterativeParsingErrorState,         // Left bracket
-                IterativeParsingErrorState,         // Right bracket
-                IterativeParsingErrorState,         // Left curly bracket
-                IterativeParsingObjectFinishState,  // Right curly bracket
-                IterativeParsingErrorState,         // Comma
-                IterativeParsingErrorState,         // Colon
-                IterativeParsingMemberKeyState,     // String
-                IterativeParsingErrorState,         // False
-                IterativeParsingErrorState,         // True
-                IterativeParsingErrorState,         // Null
-                IterativeParsingErrorState          // Number
-            },
-            // MemberKey
-            {
-                IterativeParsingErrorState,             // Left bracket
-                IterativeParsingErrorState,             // Right bracket
-                IterativeParsingErrorState,             // Left curly bracket
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingErrorState,             // Comma
-                IterativeParsingKeyValueDelimiterState, // Colon
-                IterativeParsingErrorState,             // String
-                IterativeParsingErrorState,             // False
-                IterativeParsingErrorState,             // True
-                IterativeParsingErrorState,             // Null
-                IterativeParsingErrorState              // Number
-            },
-            // MemberValue
-            {
-                IterativeParsingErrorState,             // Left bracket
-                IterativeParsingErrorState,             // Right bracket
-                IterativeParsingErrorState,             // Left curly bracket
-                IterativeParsingObjectFinishState,      // Right curly bracket
-                IterativeParsingMemberDelimiterState,   // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingErrorState,             // String
-                IterativeParsingErrorState,             // False
-                IterativeParsingErrorState,             // True
-                IterativeParsingErrorState,             // Null
-                IterativeParsingErrorState              // Number
-            },
-            // ObjectFinish(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // ArrayInitial
-            {
-                IterativeParsingArrayInitialState,      // Left bracket(push Element state)
-                IterativeParsingArrayFinishState,       // Right bracket
-                IterativeParsingObjectInitialState,     // Left curly bracket(push Element state)
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingErrorState,             // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingElementState,           // String
-                IterativeParsingElementState,           // False
-                IterativeParsingElementState,           // True
-                IterativeParsingElementState,           // Null
-                IterativeParsingElementState            // Number
-            },
-            // Element
-            {
-                IterativeParsingErrorState,             // Left bracket
-                IterativeParsingArrayFinishState,       // Right bracket
-                IterativeParsingErrorState,             // Left curly bracket
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingElementDelimiterState,  // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingErrorState,             // String
-                IterativeParsingErrorState,             // False
-                IterativeParsingErrorState,             // True
-                IterativeParsingErrorState,             // Null
-                IterativeParsingErrorState              // Number
-            },
-            // ArrayFinish(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // Single Value (sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // ElementDelimiter
-            {
-                IterativeParsingArrayInitialState,      // Left bracket(push Element state)
-                IterativeParsingArrayFinishState,       // Right bracket
-                IterativeParsingObjectInitialState,     // Left curly bracket(push Element state)
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingErrorState,             // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingElementState,           // String
-                IterativeParsingElementState,           // False
-                IterativeParsingElementState,           // True
-                IterativeParsingElementState,           // Null
-                IterativeParsingElementState            // Number
-            },
-            // MemberDelimiter
-            {
-                IterativeParsingErrorState,         // Left bracket
-                IterativeParsingErrorState,         // Right bracket
-                IterativeParsingErrorState,         // Left curly bracket
-                IterativeParsingObjectFinishState,  // Right curly bracket
-                IterativeParsingErrorState,         // Comma
-                IterativeParsingErrorState,         // Colon
-                IterativeParsingMemberKeyState,     // String
-                IterativeParsingErrorState,         // False
-                IterativeParsingErrorState,         // True
-                IterativeParsingErrorState,         // Null
-                IterativeParsingErrorState          // Number
-            },
-            // KeyValueDelimiter
-            {
-                IterativeParsingArrayInitialState,      // Left bracket(push MemberValue state)
-                IterativeParsingErrorState,             // Right bracket
-                IterativeParsingObjectInitialState,     // Left curly bracket(push MemberValue state)
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingErrorState,             // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingMemberValueState,       // String
-                IterativeParsingMemberValueState,       // False
-                IterativeParsingMemberValueState,       // True
-                IterativeParsingMemberValueState,       // Null
-                IterativeParsingMemberValueState        // Number
-            },
-        }; // End of G
-
-        return static_cast<IterativeParsingState>(G[state][token]);
-    }
-
-    // Make an advance in the token stream and state based on the candidate destination state which was returned by Transit().
-    // May return a new state on state pop.
-    template <unsigned parseFlags, typename InputStream, typename Handler>
-    RAPIDJSON_FORCEINLINE IterativeParsingState Transit(IterativeParsingState src, Token token, IterativeParsingState dst, InputStream& is, Handler& handler) {
-        (void)token;
-
-        switch (dst) {
-        case IterativeParsingErrorState:
-            return dst;
-
-        case IterativeParsingObjectInitialState:
-        case IterativeParsingArrayInitialState:
-        {
-            // Push the state(Element or MemeberValue) if we are nested in another array or value of member.
-            // In this way we can get the correct state on ObjectFinish or ArrayFinish by frame pop.
-            IterativeParsingState n = src;
-            if (src == IterativeParsingArrayInitialState || src == IterativeParsingElementDelimiterState)
-                n = IterativeParsingElementState;
-            else if (src == IterativeParsingKeyValueDelimiterState)
-                n = IterativeParsingMemberValueState;
-            // Push current state.
-            *stack_.template Push<SizeType>(1) = n;
-            // Initialize and push the member/element count.
-            *stack_.template Push<SizeType>(1) = 0;
-            // Call handler
-            bool hr = (dst == IterativeParsingObjectInitialState) ? handler.StartObject() : handler.StartArray();
-            // On handler short circuits the parsing.
-            if (!hr) {
-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            else {
-                is.Take();
-                return dst;
-            }
-        }
-
-        case IterativeParsingMemberKeyState:
-            ParseString<parseFlags>(is, handler, true);
-            if (HasParseError())
-                return IterativeParsingErrorState;
-            else
-                return dst;
-
-        case IterativeParsingKeyValueDelimiterState:
-            RAPIDJSON_ASSERT(token == ColonToken);
-            is.Take();
-            return dst;
-
-        case IterativeParsingMemberValueState:
-            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
-            ParseValue<parseFlags>(is, handler);
-            if (HasParseError()) {
-                return IterativeParsingErrorState;
-            }
-            return dst;
-
-        case IterativeParsingElementState:
-            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
-            ParseValue<parseFlags>(is, handler);
-            if (HasParseError()) {
-                return IterativeParsingErrorState;
-            }
-            return dst;
-
-        case IterativeParsingMemberDelimiterState:
-        case IterativeParsingElementDelimiterState:
-            is.Take();
-            // Update member/element count.
-            *stack_.template Top<SizeType>() = *stack_.template Top<SizeType>() + 1;
-            return dst;
-
-        case IterativeParsingObjectFinishState:
-        {
-            // Transit from delimiter is only allowed when trailing commas are enabled
-            if (!(parseFlags & kParseTrailingCommasFlag) && src == IterativeParsingMemberDelimiterState) {
-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorObjectMissName, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            // Get member count.
-            SizeType c = *stack_.template Pop<SizeType>(1);
-            // If the object is not empty, count the last member.
-            if (src == IterativeParsingMemberValueState)
-                ++c;
-            // Restore the state.
-            IterativeParsingState n = static_cast<IterativeParsingState>(*stack_.template Pop<SizeType>(1));
-            // Transit to Finish state if this is the topmost scope.
-            if (n == IterativeParsingStartState)
-                n = IterativeParsingFinishState;
-            // Call handler
-            bool hr = handler.EndObject(c);
-            // On handler short circuits the parsing.
-            if (!hr) {
-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            else {
-                is.Take();
-                return n;
-            }
-        }
-
-        case IterativeParsingArrayFinishState:
-        {
-            // Transit from delimiter is only allowed when trailing commas are enabled
-            if (!(parseFlags & kParseTrailingCommasFlag) && src == IterativeParsingElementDelimiterState) {
-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorValueInvalid, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            // Get element count.
-            SizeType c = *stack_.template Pop<SizeType>(1);
-            // If the array is not empty, count the last element.
-            if (src == IterativeParsingElementState)
-                ++c;
-            // Restore the state.
-            IterativeParsingState n = static_cast<IterativeParsingState>(*stack_.template Pop<SizeType>(1));
-            // Transit to Finish state if this is the topmost scope.
-            if (n == IterativeParsingStartState)
-                n = IterativeParsingFinishState;
-            // Call handler
-            bool hr = handler.EndArray(c);
-            // On handler short circuits the parsing.
-            if (!hr) {
-                RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            else {
-                is.Take();
-                return n;
-            }
-        }
-
-        default:
-            // This branch is for IterativeParsingValueState actually.
-            // Use `default:` rather than
-            // `case IterativeParsingValueState:` is for code coverage.
-
-            // The IterativeParsingStartState is not enumerated in this switch-case.
-            // It is impossible for that case. And it can be caught by following assertion.
-
-            // The IterativeParsingFinishState is not enumerated in this switch-case either.
-            // It is a "derivative" state which cannot triggered from Predict() directly.
-            // Therefore it cannot happen here. And it can be caught by following assertion.
-            RAPIDJSON_ASSERT(dst == IterativeParsingValueState);
-
-            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
-            ParseValue<parseFlags>(is, handler);
-            if (HasParseError()) {
-                return IterativeParsingErrorState;
-            }
-            return IterativeParsingFinishState;
-        }
-    }
-
-    template <typename InputStream>
-    void HandleError(IterativeParsingState src, InputStream& is) {
-        if (HasParseError()) {
-            // Error flag has been set.
-            return;
-        }
-
-        switch (src) {
-        case IterativeParsingStartState:            RAPIDJSON_PARSE_ERROR(kParseErrorDocumentEmpty, is.Tell()); return;
-        case IterativeParsingFinishState:           RAPIDJSON_PARSE_ERROR(kParseErrorDocumentRootNotSingular, is.Tell()); return;
-        case IterativeParsingObjectInitialState:
-        case IterativeParsingMemberDelimiterState:  RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell()); return;
-        case IterativeParsingMemberKeyState:        RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell()); return;
-        case IterativeParsingMemberValueState:      RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell()); return;
-        case IterativeParsingKeyValueDelimiterState:
-        case IterativeParsingArrayInitialState:
-        case IterativeParsingElementDelimiterState: RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell()); return;
-        default: RAPIDJSON_ASSERT(src == IterativeParsingElementState); RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell()); return;
-        }
-    }
-
-    RAPIDJSON_FORCEINLINE bool IsIterativeParsingDelimiterState(IterativeParsingState s) const {
-        return s >= IterativeParsingElementDelimiterState;
-    }
-    
-    RAPIDJSON_FORCEINLINE bool IsIterativeParsingCompleteState(IterativeParsingState s) const {
-        return s <= IterativeParsingErrorState;
-    }
-    
-    template <unsigned parseFlags, typename InputStream, typename Handler>
-    ParseResult IterativeParse(InputStream& is, Handler& handler) {
-        parseResult_.Clear();
-        ClearStackOnExit scope(*this);
-        IterativeParsingState state = IterativeParsingStartState;
-        
-        SkipWhitespaceAndComments<parseFlags>(is);
-        RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-        while (is.Peek() != '\0') {
-            Token t = Tokenize(is.Peek());
-            IterativeParsingState n = Predict(state, t);
-            IterativeParsingState d = Transit<parseFlags>(state, t, n, is, handler);
-            
-            if (d == IterativeParsingErrorState) {
-                HandleError(state, is);
-                break;
-            }
-            
-            state = d;
-            
-            // Do not further consume streams if a root JSON has been parsed.
-            if ((parseFlags & kParseStopWhenDoneFlag) && state == IterativeParsingFinishState)
-                break;
-            
-            SkipWhitespaceAndComments<parseFlags>(is);
-            RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-        }
-        
-        // Handle the end of file.
-        if (state != IterativeParsingFinishState)
-            HandleError(state, is);
-        
-        return parseResult_;
-    }
-
-    static const size_t kDefaultStackCapacity = 256;    //!< Default stack capacity in bytes for storing a single decoded string.
-    internal::Stack<StackAllocator> stack_;  //!< A stack for storing decoded string temporarily during non-destructive parsing.
-    ParseResult parseResult_;
-    IterativeParsingState state_;
-}; // class GenericReader
-
-//! Reader with UTF8 encoding and default allocator.
-typedef GenericReader<UTF8<>, UTF8<> > Reader;
-
-RAPIDJSON_NAMESPACE_END
-
-#if defined(__clang__) || defined(_MSC_VER)
-RAPIDJSON_DIAG_POP
-#endif
-
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_READER_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/schema.h b/src/sioclient/lib/rapidjson/include/rapidjson/schema.h
deleted file mode 100644
index dc0af780..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/schema.h
+++ /dev/null
@@ -1,2494 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available->
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip-> All rights reserved->
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License-> You may obtain a copy of the License at
-//
-// http://opensource->org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied-> See the License for the 
-// specific language governing permissions and limitations under the License->
-
-#ifndef RAPIDJSON_SCHEMA_H_
-#define RAPIDJSON_SCHEMA_H_
-
-#include "document.h"
-#include "pointer.h"
-#include "stringbuffer.h"
-#include <cmath> // abs, floor
-
-#if !defined(RAPIDJSON_SCHEMA_USE_INTERNALREGEX)
-#define RAPIDJSON_SCHEMA_USE_INTERNALREGEX 1
-#else
-#define RAPIDJSON_SCHEMA_USE_INTERNALREGEX 0
-#endif
-
-#if !RAPIDJSON_SCHEMA_USE_INTERNALREGEX && defined(RAPIDJSON_SCHEMA_USE_STDREGEX) && (__cplusplus >=201103L || (defined(_MSC_VER) && _MSC_VER >= 1800))
-#define RAPIDJSON_SCHEMA_USE_STDREGEX 1
-#else
-#define RAPIDJSON_SCHEMA_USE_STDREGEX 0
-#endif
-
-#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX
-#include "internal/regex.h"
-#elif RAPIDJSON_SCHEMA_USE_STDREGEX
-#include <regex>
-#endif
-
-#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX || RAPIDJSON_SCHEMA_USE_STDREGEX
-#define RAPIDJSON_SCHEMA_HAS_REGEX 1
-#else
-#define RAPIDJSON_SCHEMA_HAS_REGEX 0
-#endif
-
-#ifndef RAPIDJSON_SCHEMA_VERBOSE
-#define RAPIDJSON_SCHEMA_VERBOSE 0
-#endif
-
-#if RAPIDJSON_SCHEMA_VERBOSE
-#include "stringbuffer.h"
-#endif
-
-RAPIDJSON_DIAG_PUSH
-
-#if defined(__GNUC__)
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_OFF(weak-vtables)
-RAPIDJSON_DIAG_OFF(exit-time-destructors)
-RAPIDJSON_DIAG_OFF(c++98-compat-pedantic)
-RAPIDJSON_DIAG_OFF(variadic-macros)
-#elif defined(_MSC_VER)
-RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// Verbose Utilities
-
-#if RAPIDJSON_SCHEMA_VERBOSE
-
-namespace internal {
-
-inline void PrintInvalidKeyword(const char* keyword) {
-    printf("Fail keyword: %s\n", keyword);
-}
-
-inline void PrintInvalidKeyword(const wchar_t* keyword) {
-    wprintf(L"Fail keyword: %ls\n", keyword);
-}
-
-inline void PrintInvalidDocument(const char* document) {
-    printf("Fail document: %s\n\n", document);
-}
-
-inline void PrintInvalidDocument(const wchar_t* document) {
-    wprintf(L"Fail document: %ls\n\n", document);
-}
-
-inline void PrintValidatorPointers(unsigned depth, const char* s, const char* d) {
-    printf("S: %*s%s\nD: %*s%s\n\n", depth * 4, " ", s, depth * 4, " ", d);
-}
-
-inline void PrintValidatorPointers(unsigned depth, const wchar_t* s, const wchar_t* d) {
-    wprintf(L"S: %*ls%ls\nD: %*ls%ls\n\n", depth * 4, L" ", s, depth * 4, L" ", d);
-}
-
-} // namespace internal
-
-#endif // RAPIDJSON_SCHEMA_VERBOSE
-
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_INVALID_KEYWORD_RETURN
-
-#if RAPIDJSON_SCHEMA_VERBOSE
-#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword) internal::PrintInvalidKeyword(keyword)
-#else
-#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword)
-#endif
-
-#define RAPIDJSON_INVALID_KEYWORD_RETURN(keyword)\
-RAPIDJSON_MULTILINEMACRO_BEGIN\
-    context.invalidKeyword = keyword.GetString();\
-    RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword.GetString());\
-    return false;\
-RAPIDJSON_MULTILINEMACRO_END
-
-///////////////////////////////////////////////////////////////////////////////
-// Forward declarations
-
-template <typename ValueType, typename Allocator>
-class GenericSchemaDocument;
-
-namespace internal {
-
-template <typename SchemaDocumentType>
-class Schema;
-
-///////////////////////////////////////////////////////////////////////////////
-// ISchemaValidator
-
-class ISchemaValidator {
-public:
-    virtual ~ISchemaValidator() {}
-    virtual bool IsValid() const = 0;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// ISchemaStateFactory
-
-template <typename SchemaType>
-class ISchemaStateFactory {
-public:
-    virtual ~ISchemaStateFactory() {}
-    virtual ISchemaValidator* CreateSchemaValidator(const SchemaType&) = 0;
-    virtual void DestroySchemaValidator(ISchemaValidator* validator) = 0;
-    virtual void* CreateHasher() = 0;
-    virtual uint64_t GetHashCode(void* hasher) = 0;
-    virtual void DestroryHasher(void* hasher) = 0;
-    virtual void* MallocState(size_t size) = 0;
-    virtual void FreeState(void* p) = 0;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// IValidationErrorHandler
-
-template <typename SchemaType>
-class IValidationErrorHandler {
-public:
-    typedef typename SchemaType::Ch Ch;
-    typedef typename SchemaType::SValue SValue;
-
-    virtual ~IValidationErrorHandler() {}
-
-    virtual void NotMultipleOf(int64_t actual, const SValue& expected) = 0;
-    virtual void NotMultipleOf(uint64_t actual, const SValue& expected) = 0;
-    virtual void NotMultipleOf(double actual, const SValue& expected) = 0;
-    virtual void AboveMaximum(int64_t actual, const SValue& expected, bool exclusive) = 0;
-    virtual void AboveMaximum(uint64_t actual, const SValue& expected, bool exclusive) = 0;
-    virtual void AboveMaximum(double actual, const SValue& expected, bool exclusive) = 0;
-    virtual void BelowMinimum(int64_t actual, const SValue& expected, bool exclusive) = 0;
-    virtual void BelowMinimum(uint64_t actual, const SValue& expected, bool exclusive) = 0;
-    virtual void BelowMinimum(double actual, const SValue& expected, bool exclusive) = 0;
-
-    virtual void TooLong(const Ch* str, SizeType length, SizeType expected) = 0;
-    virtual void TooShort(const Ch* str, SizeType length, SizeType expected) = 0;
-    virtual void DoesNotMatch(const Ch* str, SizeType length) = 0;
-
-    virtual void DisallowedItem(SizeType index) = 0;
-    virtual void TooFewItems(SizeType actualCount, SizeType expectedCount) = 0;
-    virtual void TooManyItems(SizeType actualCount, SizeType expectedCount) = 0;
-    virtual void DuplicateItems(SizeType index1, SizeType index2) = 0;
-
-    virtual void TooManyProperties(SizeType actualCount, SizeType expectedCount) = 0;
-    virtual void TooFewProperties(SizeType actualCount, SizeType expectedCount) = 0;
-    virtual void StartMissingProperties() = 0;
-    virtual void AddMissingProperty(const SValue& name) = 0;
-    virtual bool EndMissingProperties() = 0;
-    virtual void PropertyViolations(ISchemaValidator** subvalidators, SizeType count) = 0;
-    virtual void DisallowedProperty(const Ch* name, SizeType length) = 0;
-
-    virtual void StartDependencyErrors() = 0;
-    virtual void StartMissingDependentProperties() = 0;
-    virtual void AddMissingDependentProperty(const SValue& targetName) = 0;
-    virtual void EndMissingDependentProperties(const SValue& sourceName) = 0;
-    virtual void AddDependencySchemaError(const SValue& souceName, ISchemaValidator* subvalidator) = 0;
-    virtual bool EndDependencyErrors() = 0;
-
-    virtual void DisallowedValue() = 0;
-    virtual void StartDisallowedType() = 0;
-    virtual void AddExpectedType(const typename SchemaType::ValueType& expectedType) = 0;
-    virtual void EndDisallowedType(const typename SchemaType::ValueType& actualType) = 0;
-    virtual void NotAllOf(ISchemaValidator** subvalidators, SizeType count) = 0;
-    virtual void NoneOf(ISchemaValidator** subvalidators, SizeType count) = 0;
-    virtual void NotOneOf(ISchemaValidator** subvalidators, SizeType count) = 0;
-    virtual void Disallowed() = 0;
-};
-
-
-///////////////////////////////////////////////////////////////////////////////
-// Hasher
-
-// For comparison of compound value
-template<typename Encoding, typename Allocator>
-class Hasher {
-public:
-    typedef typename Encoding::Ch Ch;
-
-    Hasher(Allocator* allocator = 0, size_t stackCapacity = kDefaultSize) : stack_(allocator, stackCapacity) {}
-
-    bool Null() { return WriteType(kNullType); }
-    bool Bool(bool b) { return WriteType(b ? kTrueType : kFalseType); }
-    bool Int(int i) { Number n; n.u.i = i; n.d = static_cast<double>(i); return WriteNumber(n); }
-    bool Uint(unsigned u) { Number n; n.u.u = u; n.d = static_cast<double>(u); return WriteNumber(n); }
-    bool Int64(int64_t i) { Number n; n.u.i = i; n.d = static_cast<double>(i); return WriteNumber(n); }
-    bool Uint64(uint64_t u) { Number n; n.u.u = u; n.d = static_cast<double>(u); return WriteNumber(n); }
-    bool Double(double d) { 
-        Number n; 
-        if (d < 0) n.u.i = static_cast<int64_t>(d);
-        else       n.u.u = static_cast<uint64_t>(d); 
-        n.d = d;
-        return WriteNumber(n);
-    }
-
-    bool RawNumber(const Ch* str, SizeType len, bool) {
-        WriteBuffer(kNumberType, str, len * sizeof(Ch));
-        return true;
-    }
-
-    bool String(const Ch* str, SizeType len, bool) {
-        WriteBuffer(kStringType, str, len * sizeof(Ch));
-        return true;
-    }
-
-    bool StartObject() { return true; }
-    bool Key(const Ch* str, SizeType len, bool copy) { return String(str, len, copy); }
-    bool EndObject(SizeType memberCount) { 
-        uint64_t h = Hash(0, kObjectType);
-        uint64_t* kv = stack_.template Pop<uint64_t>(memberCount * 2);
-        for (SizeType i = 0; i < memberCount; i++)
-            h ^= Hash(kv[i * 2], kv[i * 2 + 1]);  // Use xor to achieve member order insensitive
-        *stack_.template Push<uint64_t>() = h;
-        return true;
-    }
-    
-    bool StartArray() { return true; }
-    bool EndArray(SizeType elementCount) { 
-        uint64_t h = Hash(0, kArrayType);
-        uint64_t* e = stack_.template Pop<uint64_t>(elementCount);
-        for (SizeType i = 0; i < elementCount; i++)
-            h = Hash(h, e[i]); // Use hash to achieve element order sensitive
-        *stack_.template Push<uint64_t>() = h;
-        return true;
-    }
-
-    bool IsValid() const { return stack_.GetSize() == sizeof(uint64_t); }
-
-    uint64_t GetHashCode() const {
-        RAPIDJSON_ASSERT(IsValid());
-        return *stack_.template Top<uint64_t>();
-    }
-
-private:
-    static const size_t kDefaultSize = 256;
-    struct Number {
-        union U {
-            uint64_t u;
-            int64_t i;
-        }u;
-        double d;
-    };
-
-    bool WriteType(Type type) { return WriteBuffer(type, 0, 0); }
-    
-    bool WriteNumber(const Number& n) { return WriteBuffer(kNumberType, &n, sizeof(n)); }
-    
-    bool WriteBuffer(Type type, const void* data, size_t len) {
-        // FNV-1a from http://isthe.com/chongo/tech/comp/fnv/
-        uint64_t h = Hash(RAPIDJSON_UINT64_C2(0x84222325, 0xcbf29ce4), type);
-        const unsigned char* d = static_cast<const unsigned char*>(data);
-        for (size_t i = 0; i < len; i++)
-            h = Hash(h, d[i]);
-        *stack_.template Push<uint64_t>() = h;
-        return true;
-    }
-
-    static uint64_t Hash(uint64_t h, uint64_t d) {
-        static const uint64_t kPrime = RAPIDJSON_UINT64_C2(0x00000100, 0x000001b3);
-        h ^= d;
-        h *= kPrime;
-        return h;
-    }
-
-    Stack<Allocator> stack_;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// SchemaValidationContext
-
-template <typename SchemaDocumentType>
-struct SchemaValidationContext {
-    typedef Schema<SchemaDocumentType> SchemaType;
-    typedef ISchemaStateFactory<SchemaType> SchemaValidatorFactoryType;
-    typedef IValidationErrorHandler<SchemaType> ErrorHandlerType;
-    typedef typename SchemaType::ValueType ValueType;
-    typedef typename ValueType::Ch Ch;
-
-    enum PatternValidatorType {
-        kPatternValidatorOnly,
-        kPatternValidatorWithProperty,
-        kPatternValidatorWithAdditionalProperty
-    };
-
-    SchemaValidationContext(SchemaValidatorFactoryType& f, ErrorHandlerType& eh, const SchemaType* s) :
-        factory(f),
-        error_handler(eh),
-        schema(s),
-        valueSchema(),
-        invalidKeyword(),
-        hasher(),
-        arrayElementHashCodes(),
-        validators(),
-        validatorCount(),
-        patternPropertiesValidators(),
-        patternPropertiesValidatorCount(),
-        patternPropertiesSchemas(),
-        patternPropertiesSchemaCount(),
-        valuePatternValidatorType(kPatternValidatorOnly),
-        propertyExist(),
-        inArray(false),
-        valueUniqueness(false),
-        arrayUniqueness(false)
-    {
-    }
-
-    ~SchemaValidationContext() {
-        if (hasher)
-            factory.DestroryHasher(hasher);
-        if (validators) {
-            for (SizeType i = 0; i < validatorCount; i++)
-                factory.DestroySchemaValidator(validators[i]);
-            factory.FreeState(validators);
-        }
-        if (patternPropertiesValidators) {
-            for (SizeType i = 0; i < patternPropertiesValidatorCount; i++)
-                factory.DestroySchemaValidator(patternPropertiesValidators[i]);
-            factory.FreeState(patternPropertiesValidators);
-        }
-        if (patternPropertiesSchemas)
-            factory.FreeState(patternPropertiesSchemas);
-        if (propertyExist)
-            factory.FreeState(propertyExist);
-    }
-
-    SchemaValidatorFactoryType& factory;
-    ErrorHandlerType& error_handler;
-    const SchemaType* schema;
-    const SchemaType* valueSchema;
-    const Ch* invalidKeyword;
-    void* hasher; // Only validator access
-    void* arrayElementHashCodes; // Only validator access this
-    ISchemaValidator** validators;
-    SizeType validatorCount;
-    ISchemaValidator** patternPropertiesValidators;
-    SizeType patternPropertiesValidatorCount;
-    const SchemaType** patternPropertiesSchemas;
-    SizeType patternPropertiesSchemaCount;
-    PatternValidatorType valuePatternValidatorType;
-    PatternValidatorType objectPatternValidatorType;
-    SizeType arrayElementIndex;
-    bool* propertyExist;
-    bool inArray;
-    bool valueUniqueness;
-    bool arrayUniqueness;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Schema
-
-template <typename SchemaDocumentType>
-class Schema {
-public:
-    typedef typename SchemaDocumentType::ValueType ValueType;
-    typedef typename SchemaDocumentType::AllocatorType AllocatorType;
-    typedef typename SchemaDocumentType::PointerType PointerType;
-    typedef typename ValueType::EncodingType EncodingType;
-    typedef typename EncodingType::Ch Ch;
-    typedef SchemaValidationContext<SchemaDocumentType> Context;
-    typedef Schema<SchemaDocumentType> SchemaType;
-    typedef GenericValue<EncodingType, AllocatorType> SValue;
-    typedef IValidationErrorHandler<Schema> ErrorHandler;
-    friend class GenericSchemaDocument<ValueType, AllocatorType>;
-
-    Schema(SchemaDocumentType* schemaDocument, const PointerType& p, const ValueType& value, const ValueType& document, AllocatorType* allocator) :
-        allocator_(allocator),
-        uri_(schemaDocument->GetURI(), *allocator),
-        pointer_(p),
-        typeless_(schemaDocument->GetTypeless()),
-        enum_(),
-        enumCount_(),
-        not_(),
-        type_((1 << kTotalSchemaType) - 1), // typeless
-        validatorCount_(),
-        notValidatorIndex_(),
-        properties_(),
-        additionalPropertiesSchema_(),
-        patternProperties_(),
-        patternPropertyCount_(),
-        propertyCount_(),
-        minProperties_(),
-        maxProperties_(SizeType(~0)),
-        additionalProperties_(true),
-        hasDependencies_(),
-        hasRequired_(),
-        hasSchemaDependencies_(),
-        additionalItemsSchema_(),
-        itemsList_(),
-        itemsTuple_(),
-        itemsTupleCount_(),
-        minItems_(),
-        maxItems_(SizeType(~0)),
-        additionalItems_(true),
-        uniqueItems_(false),
-        pattern_(),
-        minLength_(0),
-        maxLength_(~SizeType(0)),
-        exclusiveMinimum_(false),
-        exclusiveMaximum_(false),
-        defaultValueLength_(0)
-    {
-        typedef typename SchemaDocumentType::ValueType ValueType;
-        typedef typename ValueType::ConstValueIterator ConstValueIterator;
-        typedef typename ValueType::ConstMemberIterator ConstMemberIterator;
-
-        if (!value.IsObject())
-            return;
-
-        if (const ValueType* v = GetMember(value, GetTypeString())) {
-            type_ = 0;
-            if (v->IsString())
-                AddType(*v);
-            else if (v->IsArray())
-                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr)
-                    AddType(*itr);
-        }
-
-        if (const ValueType* v = GetMember(value, GetEnumString()))
-            if (v->IsArray() && v->Size() > 0) {
-                enum_ = static_cast<uint64_t*>(allocator_->Malloc(sizeof(uint64_t) * v->Size()));
-                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr) {
-                    typedef Hasher<EncodingType, MemoryPoolAllocator<> > EnumHasherType;
-                    char buffer[256 + 24];
-                    MemoryPoolAllocator<> hasherAllocator(buffer, sizeof(buffer));
-                    EnumHasherType h(&hasherAllocator, 256);
-                    itr->Accept(h);
-                    enum_[enumCount_++] = h.GetHashCode();
-                }
-            }
-
-        if (schemaDocument) {
-            AssignIfExist(allOf_, *schemaDocument, p, value, GetAllOfString(), document);
-            AssignIfExist(anyOf_, *schemaDocument, p, value, GetAnyOfString(), document);
-            AssignIfExist(oneOf_, *schemaDocument, p, value, GetOneOfString(), document);
-        }
-
-        if (const ValueType* v = GetMember(value, GetNotString())) {
-            schemaDocument->CreateSchema(&not_, p.Append(GetNotString(), allocator_), *v, document);
-            notValidatorIndex_ = validatorCount_;
-            validatorCount_++;
-        }
-
-        // Object
-
-        const ValueType* properties = GetMember(value, GetPropertiesString());
-        const ValueType* required = GetMember(value, GetRequiredString());
-        const ValueType* dependencies = GetMember(value, GetDependenciesString());
-        {
-            // Gather properties from properties/required/dependencies
-            SValue allProperties(kArrayType);
-
-            if (properties && properties->IsObject())
-                for (ConstMemberIterator itr = properties->MemberBegin(); itr != properties->MemberEnd(); ++itr)
-                    AddUniqueElement(allProperties, itr->name);
-            
-            if (required && required->IsArray())
-                for (ConstValueIterator itr = required->Begin(); itr != required->End(); ++itr)
-                    if (itr->IsString())
-                        AddUniqueElement(allProperties, *itr);
-
-            if (dependencies && dependencies->IsObject())
-                for (ConstMemberIterator itr = dependencies->MemberBegin(); itr != dependencies->MemberEnd(); ++itr) {
-                    AddUniqueElement(allProperties, itr->name);
-                    if (itr->value.IsArray())
-                        for (ConstValueIterator i = itr->value.Begin(); i != itr->value.End(); ++i)
-                            if (i->IsString())
-                                AddUniqueElement(allProperties, *i);
-                }
-
-            if (allProperties.Size() > 0) {
-                propertyCount_ = allProperties.Size();
-                properties_ = static_cast<Property*>(allocator_->Malloc(sizeof(Property) * propertyCount_));
-                for (SizeType i = 0; i < propertyCount_; i++) {
-                    new (&properties_[i]) Property();
-                    properties_[i].name = allProperties[i];
-                    properties_[i].schema = typeless_;
-                }
-            }
-        }
-
-        if (properties && properties->IsObject()) {
-            PointerType q = p.Append(GetPropertiesString(), allocator_);
-            for (ConstMemberIterator itr = properties->MemberBegin(); itr != properties->MemberEnd(); ++itr) {
-                SizeType index;
-                if (FindPropertyIndex(itr->name, &index))
-                    schemaDocument->CreateSchema(&properties_[index].schema, q.Append(itr->name, allocator_), itr->value, document);
-            }
-        }
-
-        if (const ValueType* v = GetMember(value, GetPatternPropertiesString())) {
-            PointerType q = p.Append(GetPatternPropertiesString(), allocator_);
-            patternProperties_ = static_cast<PatternProperty*>(allocator_->Malloc(sizeof(PatternProperty) * v->MemberCount()));
-            patternPropertyCount_ = 0;
-
-            for (ConstMemberIterator itr = v->MemberBegin(); itr != v->MemberEnd(); ++itr) {
-                new (&patternProperties_[patternPropertyCount_]) PatternProperty();
-                patternProperties_[patternPropertyCount_].pattern = CreatePattern(itr->name);
-                schemaDocument->CreateSchema(&patternProperties_[patternPropertyCount_].schema, q.Append(itr->name, allocator_), itr->value, document);
-                patternPropertyCount_++;
-            }
-        }
-
-        if (required && required->IsArray())
-            for (ConstValueIterator itr = required->Begin(); itr != required->End(); ++itr)
-                if (itr->IsString()) {
-                    SizeType index;
-                    if (FindPropertyIndex(*itr, &index)) {
-                        properties_[index].required = true;
-                        hasRequired_ = true;
-                    }
-                }
-
-        if (dependencies && dependencies->IsObject()) {
-            PointerType q = p.Append(GetDependenciesString(), allocator_);
-            hasDependencies_ = true;
-            for (ConstMemberIterator itr = dependencies->MemberBegin(); itr != dependencies->MemberEnd(); ++itr) {
-                SizeType sourceIndex;
-                if (FindPropertyIndex(itr->name, &sourceIndex)) {
-                    if (itr->value.IsArray()) {
-                        properties_[sourceIndex].dependencies = static_cast<bool*>(allocator_->Malloc(sizeof(bool) * propertyCount_));
-                        std::memset(properties_[sourceIndex].dependencies, 0, sizeof(bool)* propertyCount_);
-                        for (ConstValueIterator targetItr = itr->value.Begin(); targetItr != itr->value.End(); ++targetItr) {
-                            SizeType targetIndex;
-                            if (FindPropertyIndex(*targetItr, &targetIndex))
-                                properties_[sourceIndex].dependencies[targetIndex] = true;
-                        }
-                    }
-                    else if (itr->value.IsObject()) {
-                        hasSchemaDependencies_ = true;
-                        schemaDocument->CreateSchema(&properties_[sourceIndex].dependenciesSchema, q.Append(itr->name, allocator_), itr->value, document);
-                        properties_[sourceIndex].dependenciesValidatorIndex = validatorCount_;
-                        validatorCount_++;
-                    }
-                }
-            }
-        }
-
-        if (const ValueType* v = GetMember(value, GetAdditionalPropertiesString())) {
-            if (v->IsBool())
-                additionalProperties_ = v->GetBool();
-            else if (v->IsObject())
-                schemaDocument->CreateSchema(&additionalPropertiesSchema_, p.Append(GetAdditionalPropertiesString(), allocator_), *v, document);
-        }
-
-        AssignIfExist(minProperties_, value, GetMinPropertiesString());
-        AssignIfExist(maxProperties_, value, GetMaxPropertiesString());
-
-        // Array
-        if (const ValueType* v = GetMember(value, GetItemsString())) {
-            PointerType q = p.Append(GetItemsString(), allocator_);
-            if (v->IsObject()) // List validation
-                schemaDocument->CreateSchema(&itemsList_, q, *v, document);
-            else if (v->IsArray()) { // Tuple validation
-                itemsTuple_ = static_cast<const Schema**>(allocator_->Malloc(sizeof(const Schema*) * v->Size()));
-                SizeType index = 0;
-                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr, index++)
-                    schemaDocument->CreateSchema(&itemsTuple_[itemsTupleCount_++], q.Append(index, allocator_), *itr, document);
-            }
-        }
-
-        AssignIfExist(minItems_, value, GetMinItemsString());
-        AssignIfExist(maxItems_, value, GetMaxItemsString());
-
-        if (const ValueType* v = GetMember(value, GetAdditionalItemsString())) {
-            if (v->IsBool())
-                additionalItems_ = v->GetBool();
-            else if (v->IsObject())
-                schemaDocument->CreateSchema(&additionalItemsSchema_, p.Append(GetAdditionalItemsString(), allocator_), *v, document);
-        }
-
-        AssignIfExist(uniqueItems_, value, GetUniqueItemsString());
-
-        // String
-        AssignIfExist(minLength_, value, GetMinLengthString());
-        AssignIfExist(maxLength_, value, GetMaxLengthString());
-
-        if (const ValueType* v = GetMember(value, GetPatternString()))
-            pattern_ = CreatePattern(*v);
-
-        // Number
-        if (const ValueType* v = GetMember(value, GetMinimumString()))
-            if (v->IsNumber())
-                minimum_.CopyFrom(*v, *allocator_);
-
-        if (const ValueType* v = GetMember(value, GetMaximumString()))
-            if (v->IsNumber())
-                maximum_.CopyFrom(*v, *allocator_);
-
-        AssignIfExist(exclusiveMinimum_, value, GetExclusiveMinimumString());
-        AssignIfExist(exclusiveMaximum_, value, GetExclusiveMaximumString());
-
-        if (const ValueType* v = GetMember(value, GetMultipleOfString()))
-            if (v->IsNumber() && v->GetDouble() > 0.0)
-                multipleOf_.CopyFrom(*v, *allocator_);
-
-        // Default
-        if (const ValueType* v = GetMember(value, GetDefaultValueString()))
-            if (v->IsString())
-                defaultValueLength_ = v->GetStringLength();
-
-    }
-
-    ~Schema() {
-        AllocatorType::Free(enum_);
-        if (properties_) {
-            for (SizeType i = 0; i < propertyCount_; i++)
-                properties_[i].~Property();
-            AllocatorType::Free(properties_);
-        }
-        if (patternProperties_) {
-            for (SizeType i = 0; i < patternPropertyCount_; i++)
-                patternProperties_[i].~PatternProperty();
-            AllocatorType::Free(patternProperties_);
-        }
-        AllocatorType::Free(itemsTuple_);
-#if RAPIDJSON_SCHEMA_HAS_REGEX
-        if (pattern_) {
-            pattern_->~RegexType();
-            AllocatorType::Free(pattern_);
-        }
-#endif
-    }
-
-    const SValue& GetURI() const {
-        return uri_;
-    }
-
-    const PointerType& GetPointer() const {
-        return pointer_;
-    }
-
-    bool BeginValue(Context& context) const {
-        if (context.inArray) {
-            if (uniqueItems_)
-                context.valueUniqueness = true;
-
-            if (itemsList_)
-                context.valueSchema = itemsList_;
-            else if (itemsTuple_) {
-                if (context.arrayElementIndex < itemsTupleCount_)
-                    context.valueSchema = itemsTuple_[context.arrayElementIndex];
-                else if (additionalItemsSchema_)
-                    context.valueSchema = additionalItemsSchema_;
-                else if (additionalItems_)
-                    context.valueSchema = typeless_;
-                else {
-                    context.error_handler.DisallowedItem(context.arrayElementIndex);
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetItemsString());
-                }
-            }
-            else
-                context.valueSchema = typeless_;
-
-            context.arrayElementIndex++;
-        }
-        return true;
-    }
-
-    RAPIDJSON_FORCEINLINE bool EndValue(Context& context) const {
-        if (context.patternPropertiesValidatorCount > 0) {
-            bool otherValid = false;
-            SizeType count = context.patternPropertiesValidatorCount;
-            if (context.objectPatternValidatorType != Context::kPatternValidatorOnly)
-                otherValid = context.patternPropertiesValidators[--count]->IsValid();
-
-            bool patternValid = true;
-            for (SizeType i = 0; i < count; i++)
-                if (!context.patternPropertiesValidators[i]->IsValid()) {
-                    patternValid = false;
-                    break;
-                }
-
-            if (context.objectPatternValidatorType == Context::kPatternValidatorOnly) {
-                if (!patternValid) {
-                    context.error_handler.PropertyViolations(context.patternPropertiesValidators, count);
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
-                }
-            }
-            else if (context.objectPatternValidatorType == Context::kPatternValidatorWithProperty) {
-                if (!patternValid || !otherValid) {
-                    context.error_handler.PropertyViolations(context.patternPropertiesValidators, count + 1);
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
-                }
-            }
-            else if (!patternValid && !otherValid) { // kPatternValidatorWithAdditionalProperty)
-                context.error_handler.PropertyViolations(context.patternPropertiesValidators, count + 1);
-                RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
-            }
-        }
-
-        if (enum_) {
-            const uint64_t h = context.factory.GetHashCode(context.hasher);
-            for (SizeType i = 0; i < enumCount_; i++)
-                if (enum_[i] == h)
-                    goto foundEnum;
-            context.error_handler.DisallowedValue();
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetEnumString());
-            foundEnum:;
-        }
-
-        if (allOf_.schemas)
-            for (SizeType i = allOf_.begin; i < allOf_.begin + allOf_.count; i++)
-                if (!context.validators[i]->IsValid()) {
-                    context.error_handler.NotAllOf(&context.validators[allOf_.begin], allOf_.count);
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetAllOfString());
-                }
-        
-        if (anyOf_.schemas) {
-            for (SizeType i = anyOf_.begin; i < anyOf_.begin + anyOf_.count; i++)
-                if (context.validators[i]->IsValid())
-                    goto foundAny;
-            context.error_handler.NoneOf(&context.validators[anyOf_.begin], anyOf_.count);
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetAnyOfString());
-            foundAny:;
-        }
-
-        if (oneOf_.schemas) {
-            bool oneValid = false;
-            for (SizeType i = oneOf_.begin; i < oneOf_.begin + oneOf_.count; i++)
-                if (context.validators[i]->IsValid()) {
-                    if (oneValid) {
-                        context.error_handler.NotOneOf(&context.validators[oneOf_.begin], oneOf_.count);
-                        RAPIDJSON_INVALID_KEYWORD_RETURN(GetOneOfString());
-                    } else
-                        oneValid = true;
-                }
-            if (!oneValid) {
-                context.error_handler.NotOneOf(&context.validators[oneOf_.begin], oneOf_.count);
-                RAPIDJSON_INVALID_KEYWORD_RETURN(GetOneOfString());
-            }
-        }
-
-        if (not_ && context.validators[notValidatorIndex_]->IsValid()) {
-            context.error_handler.Disallowed();
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetNotString());
-        }
-
-        return true;
-    }
-
-    bool Null(Context& context) const {
-        if (!(type_ & (1 << kNullSchemaType))) {
-            DisallowedType(context, GetNullString());
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-        }
-        return CreateParallelValidator(context);
-    }
-    
-    bool Bool(Context& context, bool) const {
-        if (!(type_ & (1 << kBooleanSchemaType))) {
-            DisallowedType(context, GetBooleanString());
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-        }
-        return CreateParallelValidator(context);
-    }
-
-    bool Int(Context& context, int i) const {
-        if (!CheckInt(context, i))
-            return false;
-        return CreateParallelValidator(context);
-    }
-
-    bool Uint(Context& context, unsigned u) const {
-        if (!CheckUint(context, u))
-            return false;
-        return CreateParallelValidator(context);
-    }
-
-    bool Int64(Context& context, int64_t i) const {
-        if (!CheckInt(context, i))
-            return false;
-        return CreateParallelValidator(context);
-    }
-
-    bool Uint64(Context& context, uint64_t u) const {
-        if (!CheckUint(context, u))
-            return false;
-        return CreateParallelValidator(context);
-    }
-
-    bool Double(Context& context, double d) const {
-        if (!(type_ & (1 << kNumberSchemaType))) {
-            DisallowedType(context, GetNumberString());
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-        }
-
-        if (!minimum_.IsNull() && !CheckDoubleMinimum(context, d))
-            return false;
-
-        if (!maximum_.IsNull() && !CheckDoubleMaximum(context, d))
-            return false;
-        
-        if (!multipleOf_.IsNull() && !CheckDoubleMultipleOf(context, d))
-            return false;
-        
-        return CreateParallelValidator(context);
-    }
-    
-    bool String(Context& context, const Ch* str, SizeType length, bool) const {
-        if (!(type_ & (1 << kStringSchemaType))) {
-            DisallowedType(context, GetStringString());
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-        }
-
-        if (minLength_ != 0 || maxLength_ != SizeType(~0)) {
-            SizeType count;
-            if (internal::CountStringCodePoint<EncodingType>(str, length, &count)) {
-                if (count < minLength_) {
-                    context.error_handler.TooShort(str, length, minLength_);
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinLengthString());
-                }
-                if (count > maxLength_) {
-                    context.error_handler.TooLong(str, length, maxLength_);
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxLengthString());
-                }
-            }
-        }
-
-        if (pattern_ && !IsPatternMatch(pattern_, str, length)) {
-            context.error_handler.DoesNotMatch(str, length);
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternString());
-        }
-
-        return CreateParallelValidator(context);
-    }
-
-    bool StartObject(Context& context) const {
-        if (!(type_ & (1 << kObjectSchemaType))) {
-            DisallowedType(context, GetObjectString());
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-        }
-
-        if (hasDependencies_ || hasRequired_) {
-            context.propertyExist = static_cast<bool*>(context.factory.MallocState(sizeof(bool) * propertyCount_));
-            std::memset(context.propertyExist, 0, sizeof(bool) * propertyCount_);
-        }
-
-        if (patternProperties_) { // pre-allocate schema array
-            SizeType count = patternPropertyCount_ + 1; // extra for valuePatternValidatorType
-            context.patternPropertiesSchemas = static_cast<const SchemaType**>(context.factory.MallocState(sizeof(const SchemaType*) * count));
-            context.patternPropertiesSchemaCount = 0;
-            std::memset(context.patternPropertiesSchemas, 0, sizeof(SchemaType*) * count);
-        }
-
-        return CreateParallelValidator(context);
-    }
-    
-    bool Key(Context& context, const Ch* str, SizeType len, bool) const {
-        if (patternProperties_) {
-            context.patternPropertiesSchemaCount = 0;
-            for (SizeType i = 0; i < patternPropertyCount_; i++)
-                if (patternProperties_[i].pattern && IsPatternMatch(patternProperties_[i].pattern, str, len)) {
-                    context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = patternProperties_[i].schema;
-                    context.valueSchema = typeless_;
-                }
-        }
-
-        SizeType index;
-        if (FindPropertyIndex(ValueType(str, len).Move(), &index)) {
-            if (context.patternPropertiesSchemaCount > 0) {
-                context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = properties_[index].schema;
-                context.valueSchema = typeless_;
-                context.valuePatternValidatorType = Context::kPatternValidatorWithProperty;
-            }
-            else
-                context.valueSchema = properties_[index].schema;
-
-            if (context.propertyExist)
-                context.propertyExist[index] = true;
-
-            return true;
-        }
-
-        if (additionalPropertiesSchema_) {
-            if (additionalPropertiesSchema_ && context.patternPropertiesSchemaCount > 0) {
-                context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = additionalPropertiesSchema_;
-                context.valueSchema = typeless_;
-                context.valuePatternValidatorType = Context::kPatternValidatorWithAdditionalProperty;
-            }
-            else
-                context.valueSchema = additionalPropertiesSchema_;
-            return true;
-        }
-        else if (additionalProperties_) {
-            context.valueSchema = typeless_;
-            return true;
-        }
-
-        if (context.patternPropertiesSchemaCount == 0) { // patternProperties are not additional properties
-            context.error_handler.DisallowedProperty(str, len);
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetAdditionalPropertiesString());
-        }
-
-        return true;
-    }
-
-    bool EndObject(Context& context, SizeType memberCount) const {
-        if (hasRequired_) {
-            context.error_handler.StartMissingProperties();
-            for (SizeType index = 0; index < propertyCount_; index++)
-                if (properties_[index].required && !context.propertyExist[index])
-                    if (properties_[index].schema->defaultValueLength_ == 0 )
-                        context.error_handler.AddMissingProperty(properties_[index].name);
-            if (context.error_handler.EndMissingProperties())
-                RAPIDJSON_INVALID_KEYWORD_RETURN(GetRequiredString());
-        }
-
-        if (memberCount < minProperties_) {
-            context.error_handler.TooFewProperties(memberCount, minProperties_);
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinPropertiesString());
-        }
-
-        if (memberCount > maxProperties_) {
-            context.error_handler.TooManyProperties(memberCount, maxProperties_);
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxPropertiesString());
-        }
-
-        if (hasDependencies_) {
-            context.error_handler.StartDependencyErrors();
-            for (SizeType sourceIndex = 0; sourceIndex < propertyCount_; sourceIndex++) {
-                const Property& source = properties_[sourceIndex];
-                if (context.propertyExist[sourceIndex]) {
-                    if (source.dependencies) {
-                        context.error_handler.StartMissingDependentProperties();
-                        for (SizeType targetIndex = 0; targetIndex < propertyCount_; targetIndex++)
-                            if (source.dependencies[targetIndex] && !context.propertyExist[targetIndex])
-                                context.error_handler.AddMissingDependentProperty(properties_[targetIndex].name);
-                        context.error_handler.EndMissingDependentProperties(source.name);
-                    }
-                    else if (source.dependenciesSchema) {
-                        ISchemaValidator* dependenciesValidator = context.validators[source.dependenciesValidatorIndex];
-                        if (!dependenciesValidator->IsValid())
-                            context.error_handler.AddDependencySchemaError(source.name, dependenciesValidator);
-                    }
-                }
-            }
-            if (context.error_handler.EndDependencyErrors())
-                RAPIDJSON_INVALID_KEYWORD_RETURN(GetDependenciesString());
-        }
-
-        return true;
-    }
-
-    bool StartArray(Context& context) const {
-        if (!(type_ & (1 << kArraySchemaType))) {
-            DisallowedType(context, GetArrayString());
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-        }
-
-        context.arrayElementIndex = 0;
-        context.inArray = true;
-
-        return CreateParallelValidator(context);
-    }
-
-    bool EndArray(Context& context, SizeType elementCount) const {
-        context.inArray = false;
-        
-        if (elementCount < minItems_) {
-            context.error_handler.TooFewItems(elementCount, minItems_);
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinItemsString());
-        }
-        
-        if (elementCount > maxItems_) {
-            context.error_handler.TooManyItems(elementCount, maxItems_);
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxItemsString());
-        }
-
-        return true;
-    }
-
-    // Generate functions for string literal according to Ch
-#define RAPIDJSON_STRING_(name, ...) \
-    static const ValueType& Get##name##String() {\
-        static const Ch s[] = { __VA_ARGS__, '\0' };\
-        static const ValueType v(s, static_cast<SizeType>(sizeof(s) / sizeof(Ch) - 1));\
-        return v;\
-    }
-
-    RAPIDJSON_STRING_(Null, 'n', 'u', 'l', 'l')
-    RAPIDJSON_STRING_(Boolean, 'b', 'o', 'o', 'l', 'e', 'a', 'n')
-    RAPIDJSON_STRING_(Object, 'o', 'b', 'j', 'e', 'c', 't')
-    RAPIDJSON_STRING_(Array, 'a', 'r', 'r', 'a', 'y')
-    RAPIDJSON_STRING_(String, 's', 't', 'r', 'i', 'n', 'g')
-    RAPIDJSON_STRING_(Number, 'n', 'u', 'm', 'b', 'e', 'r')
-    RAPIDJSON_STRING_(Integer, 'i', 'n', 't', 'e', 'g', 'e', 'r')
-    RAPIDJSON_STRING_(Type, 't', 'y', 'p', 'e')
-    RAPIDJSON_STRING_(Enum, 'e', 'n', 'u', 'm')
-    RAPIDJSON_STRING_(AllOf, 'a', 'l', 'l', 'O', 'f')
-    RAPIDJSON_STRING_(AnyOf, 'a', 'n', 'y', 'O', 'f')
-    RAPIDJSON_STRING_(OneOf, 'o', 'n', 'e', 'O', 'f')
-    RAPIDJSON_STRING_(Not, 'n', 'o', 't')
-    RAPIDJSON_STRING_(Properties, 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    RAPIDJSON_STRING_(Required, 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'd')
-    RAPIDJSON_STRING_(Dependencies, 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'i', 'e', 's')
-    RAPIDJSON_STRING_(PatternProperties, 'p', 'a', 't', 't', 'e', 'r', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    RAPIDJSON_STRING_(AdditionalProperties, 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    RAPIDJSON_STRING_(MinProperties, 'm', 'i', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    RAPIDJSON_STRING_(MaxProperties, 'm', 'a', 'x', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    RAPIDJSON_STRING_(Items, 'i', 't', 'e', 'm', 's')
-    RAPIDJSON_STRING_(MinItems, 'm', 'i', 'n', 'I', 't', 'e', 'm', 's')
-    RAPIDJSON_STRING_(MaxItems, 'm', 'a', 'x', 'I', 't', 'e', 'm', 's')
-    RAPIDJSON_STRING_(AdditionalItems, 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'I', 't', 'e', 'm', 's')
-    RAPIDJSON_STRING_(UniqueItems, 'u', 'n', 'i', 'q', 'u', 'e', 'I', 't', 'e', 'm', 's')
-    RAPIDJSON_STRING_(MinLength, 'm', 'i', 'n', 'L', 'e', 'n', 'g', 't', 'h')
-    RAPIDJSON_STRING_(MaxLength, 'm', 'a', 'x', 'L', 'e', 'n', 'g', 't', 'h')
-    RAPIDJSON_STRING_(Pattern, 'p', 'a', 't', 't', 'e', 'r', 'n')
-    RAPIDJSON_STRING_(Minimum, 'm', 'i', 'n', 'i', 'm', 'u', 'm')
-    RAPIDJSON_STRING_(Maximum, 'm', 'a', 'x', 'i', 'm', 'u', 'm')
-    RAPIDJSON_STRING_(ExclusiveMinimum, 'e', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e', 'M', 'i', 'n', 'i', 'm', 'u', 'm')
-    RAPIDJSON_STRING_(ExclusiveMaximum, 'e', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e', 'M', 'a', 'x', 'i', 'm', 'u', 'm')
-    RAPIDJSON_STRING_(MultipleOf, 'm', 'u', 'l', 't', 'i', 'p', 'l', 'e', 'O', 'f')
-    RAPIDJSON_STRING_(DefaultValue, 'd', 'e', 'f', 'a', 'u', 'l', 't')
-
-#undef RAPIDJSON_STRING_
-
-private:
-    enum SchemaValueType {
-        kNullSchemaType,
-        kBooleanSchemaType,
-        kObjectSchemaType,
-        kArraySchemaType,
-        kStringSchemaType,
-        kNumberSchemaType,
-        kIntegerSchemaType,
-        kTotalSchemaType
-    };
-
-#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX
-        typedef internal::GenericRegex<EncodingType, AllocatorType> RegexType;
-#elif RAPIDJSON_SCHEMA_USE_STDREGEX
-        typedef std::basic_regex<Ch> RegexType;
-#else
-        typedef char RegexType;
-#endif
-
-    struct SchemaArray {
-        SchemaArray() : schemas(), count() {}
-        ~SchemaArray() { AllocatorType::Free(schemas); }
-        const SchemaType** schemas;
-        SizeType begin; // begin index of context.validators
-        SizeType count;
-    };
-
-    template <typename V1, typename V2>
-    void AddUniqueElement(V1& a, const V2& v) {
-        for (typename V1::ConstValueIterator itr = a.Begin(); itr != a.End(); ++itr)
-            if (*itr == v)
-                return;
-        V1 c(v, *allocator_);
-        a.PushBack(c, *allocator_);
-    }
-
-    static const ValueType* GetMember(const ValueType& value, const ValueType& name) {
-        typename ValueType::ConstMemberIterator itr = value.FindMember(name);
-        return itr != value.MemberEnd() ? &(itr->value) : 0;
-    }
-
-    static void AssignIfExist(bool& out, const ValueType& value, const ValueType& name) {
-        if (const ValueType* v = GetMember(value, name))
-            if (v->IsBool())
-                out = v->GetBool();
-    }
-
-    static void AssignIfExist(SizeType& out, const ValueType& value, const ValueType& name) {
-        if (const ValueType* v = GetMember(value, name))
-            if (v->IsUint64() && v->GetUint64() <= SizeType(~0))
-                out = static_cast<SizeType>(v->GetUint64());
-    }
-
-    void AssignIfExist(SchemaArray& out, SchemaDocumentType& schemaDocument, const PointerType& p, const ValueType& value, const ValueType& name, const ValueType& document) {
-        if (const ValueType* v = GetMember(value, name)) {
-            if (v->IsArray() && v->Size() > 0) {
-                PointerType q = p.Append(name, allocator_);
-                out.count = v->Size();
-                out.schemas = static_cast<const Schema**>(allocator_->Malloc(out.count * sizeof(const Schema*)));
-                memset(out.schemas, 0, sizeof(Schema*)* out.count);
-                for (SizeType i = 0; i < out.count; i++)
-                    schemaDocument.CreateSchema(&out.schemas[i], q.Append(i, allocator_), (*v)[i], document);
-                out.begin = validatorCount_;
-                validatorCount_ += out.count;
-            }
-        }
-    }
-
-#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX
-    template <typename ValueType>
-    RegexType* CreatePattern(const ValueType& value) {
-        if (value.IsString()) {
-            RegexType* r = new (allocator_->Malloc(sizeof(RegexType))) RegexType(value.GetString(), allocator_);
-            if (!r->IsValid()) {
-                r->~RegexType();
-                AllocatorType::Free(r);
-                r = 0;
-            }
-            return r;
-        }
-        return 0;
-    }
-
-    static bool IsPatternMatch(const RegexType* pattern, const Ch *str, SizeType) {
-        GenericRegexSearch<RegexType> rs(*pattern);
-        return rs.Search(str);
-    }
-#elif RAPIDJSON_SCHEMA_USE_STDREGEX
-    template <typename ValueType>
-    RegexType* CreatePattern(const ValueType& value) {
-        if (value.IsString())
-            try {
-                return new (allocator_->Malloc(sizeof(RegexType))) RegexType(value.GetString(), std::size_t(value.GetStringLength()), std::regex_constants::ECMAScript);
-            }
-            catch (const std::regex_error&) {
-            }
-        return 0;
-    }
-
-    static bool IsPatternMatch(const RegexType* pattern, const Ch *str, SizeType length) {
-        std::match_results<const Ch*> r;
-        return std::regex_search(str, str + length, r, *pattern);
-    }
-#else
-    template <typename ValueType>
-    RegexType* CreatePattern(const ValueType&) { return 0; }
-
-    static bool IsPatternMatch(const RegexType*, const Ch *, SizeType) { return true; }
-#endif // RAPIDJSON_SCHEMA_USE_STDREGEX
-
-    void AddType(const ValueType& type) {
-        if      (type == GetNullString()   ) type_ |= 1 << kNullSchemaType;
-        else if (type == GetBooleanString()) type_ |= 1 << kBooleanSchemaType;
-        else if (type == GetObjectString() ) type_ |= 1 << kObjectSchemaType;
-        else if (type == GetArrayString()  ) type_ |= 1 << kArraySchemaType;
-        else if (type == GetStringString() ) type_ |= 1 << kStringSchemaType;
-        else if (type == GetIntegerString()) type_ |= 1 << kIntegerSchemaType;
-        else if (type == GetNumberString() ) type_ |= (1 << kNumberSchemaType) | (1 << kIntegerSchemaType);
-    }
-
-    bool CreateParallelValidator(Context& context) const {
-        if (enum_ || context.arrayUniqueness)
-            context.hasher = context.factory.CreateHasher();
-
-        if (validatorCount_) {
-            RAPIDJSON_ASSERT(context.validators == 0);
-            context.validators = static_cast<ISchemaValidator**>(context.factory.MallocState(sizeof(ISchemaValidator*) * validatorCount_));
-            context.validatorCount = validatorCount_;
-
-            if (allOf_.schemas)
-                CreateSchemaValidators(context, allOf_);
-
-            if (anyOf_.schemas)
-                CreateSchemaValidators(context, anyOf_);
-            
-            if (oneOf_.schemas)
-                CreateSchemaValidators(context, oneOf_);
-            
-            if (not_)
-                context.validators[notValidatorIndex_] = context.factory.CreateSchemaValidator(*not_);
-            
-            if (hasSchemaDependencies_) {
-                for (SizeType i = 0; i < propertyCount_; i++)
-                    if (properties_[i].dependenciesSchema)
-                        context.validators[properties_[i].dependenciesValidatorIndex] = context.factory.CreateSchemaValidator(*properties_[i].dependenciesSchema);
-            }
-        }
-
-        return true;
-    }
-
-    void CreateSchemaValidators(Context& context, const SchemaArray& schemas) const {
-        for (SizeType i = 0; i < schemas.count; i++)
-            context.validators[schemas.begin + i] = context.factory.CreateSchemaValidator(*schemas.schemas[i]);
-    }
-
-    // O(n)
-    bool FindPropertyIndex(const ValueType& name, SizeType* outIndex) const {
-        SizeType len = name.GetStringLength();
-        const Ch* str = name.GetString();
-        for (SizeType index = 0; index < propertyCount_; index++)
-            if (properties_[index].name.GetStringLength() == len && 
-                (std::memcmp(properties_[index].name.GetString(), str, sizeof(Ch) * len) == 0))
-            {
-                *outIndex = index;
-                return true;
-            }
-        return false;
-    }
-
-    bool CheckInt(Context& context, int64_t i) const {
-        if (!(type_ & ((1 << kIntegerSchemaType) | (1 << kNumberSchemaType)))) {
-            DisallowedType(context, GetIntegerString());
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-        }
-
-        if (!minimum_.IsNull()) {
-            if (minimum_.IsInt64()) {
-                if (exclusiveMinimum_ ? i <= minimum_.GetInt64() : i < minimum_.GetInt64()) {
-                    context.error_handler.BelowMinimum(i, minimum_, exclusiveMinimum_);
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
-                }
-            }
-            else if (minimum_.IsUint64()) {
-                context.error_handler.BelowMinimum(i, minimum_, exclusiveMinimum_);
-                RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString()); // i <= max(int64_t) < minimum.GetUint64()
-            }
-            else if (!CheckDoubleMinimum(context, static_cast<double>(i)))
-                return false;
-        }
-
-        if (!maximum_.IsNull()) {
-            if (maximum_.IsInt64()) {
-                if (exclusiveMaximum_ ? i >= maximum_.GetInt64() : i > maximum_.GetInt64()) {
-                    context.error_handler.AboveMaximum(i, maximum_, exclusiveMaximum_);
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
-                }
-            }
-            else if (maximum_.IsUint64()) { }
-                /* do nothing */ // i <= max(int64_t) < maximum_.GetUint64()
-            else if (!CheckDoubleMaximum(context, static_cast<double>(i)))
-                return false;
-        }
-
-        if (!multipleOf_.IsNull()) {
-            if (multipleOf_.IsUint64()) {
-                if (static_cast<uint64_t>(i >= 0 ? i : -i) % multipleOf_.GetUint64() != 0) {
-                    context.error_handler.NotMultipleOf(i, multipleOf_);
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
-                }
-            }
-            else if (!CheckDoubleMultipleOf(context, static_cast<double>(i)))
-                return false;
-        }
-
-        return true;
-    }
-
-    bool CheckUint(Context& context, uint64_t i) const {
-        if (!(type_ & ((1 << kIntegerSchemaType) | (1 << kNumberSchemaType)))) {
-            DisallowedType(context, GetIntegerString());
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-        }
-
-        if (!minimum_.IsNull()) {
-            if (minimum_.IsUint64()) {
-                if (exclusiveMinimum_ ? i <= minimum_.GetUint64() : i < minimum_.GetUint64()) {
-                    context.error_handler.BelowMinimum(i, minimum_, exclusiveMinimum_);
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
-                }
-            }
-            else if (minimum_.IsInt64())
-                /* do nothing */; // i >= 0 > minimum.Getint64()
-            else if (!CheckDoubleMinimum(context, static_cast<double>(i)))
-                return false;
-        }
-
-        if (!maximum_.IsNull()) {
-            if (maximum_.IsUint64()) {
-                if (exclusiveMaximum_ ? i >= maximum_.GetUint64() : i > maximum_.GetUint64()) {
-                    context.error_handler.AboveMaximum(i, maximum_, exclusiveMaximum_);
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
-                }
-            }
-            else if (maximum_.IsInt64()) {
-                context.error_handler.AboveMaximum(i, maximum_, exclusiveMaximum_);
-                RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString()); // i >= 0 > maximum_
-            }
-            else if (!CheckDoubleMaximum(context, static_cast<double>(i)))
-                return false;
-        }
-
-        if (!multipleOf_.IsNull()) {
-            if (multipleOf_.IsUint64()) {
-                if (i % multipleOf_.GetUint64() != 0) {
-                    context.error_handler.NotMultipleOf(i, multipleOf_);
-                    RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
-                }
-            }
-            else if (!CheckDoubleMultipleOf(context, static_cast<double>(i)))
-                return false;
-        }
-
-        return true;
-    }
-
-    bool CheckDoubleMinimum(Context& context, double d) const {
-        if (exclusiveMinimum_ ? d <= minimum_.GetDouble() : d < minimum_.GetDouble()) {
-            context.error_handler.BelowMinimum(d, minimum_, exclusiveMinimum_);
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
-        }
-        return true;
-    }
-
-    bool CheckDoubleMaximum(Context& context, double d) const {
-        if (exclusiveMaximum_ ? d >= maximum_.GetDouble() : d > maximum_.GetDouble()) {
-            context.error_handler.AboveMaximum(d, maximum_, exclusiveMaximum_);
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
-        }
-        return true;
-    }
-
-    bool CheckDoubleMultipleOf(Context& context, double d) const {
-        double a = std::abs(d), b = std::abs(multipleOf_.GetDouble());
-        double q = std::floor(a / b);
-        double r = a - q * b;
-        if (r > 0.0) {
-            context.error_handler.NotMultipleOf(d, multipleOf_);
-            RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
-        }
-        return true;
-    }
-
-    void DisallowedType(Context& context, const ValueType& actualType) const {
-        ErrorHandler& eh = context.error_handler;
-        eh.StartDisallowedType();
-
-        if (type_ & (1 << kNullSchemaType)) eh.AddExpectedType(GetNullString());
-        if (type_ & (1 << kBooleanSchemaType)) eh.AddExpectedType(GetBooleanString());
-        if (type_ & (1 << kObjectSchemaType)) eh.AddExpectedType(GetObjectString());
-        if (type_ & (1 << kArraySchemaType)) eh.AddExpectedType(GetArrayString());
-        if (type_ & (1 << kStringSchemaType)) eh.AddExpectedType(GetStringString());
-
-        if (type_ & (1 << kNumberSchemaType)) eh.AddExpectedType(GetNumberString());
-        else if (type_ & (1 << kIntegerSchemaType)) eh.AddExpectedType(GetIntegerString());
-
-        eh.EndDisallowedType(actualType);
-    }
-
-    struct Property {
-        Property() : schema(), dependenciesSchema(), dependenciesValidatorIndex(), dependencies(), required(false) {}
-        ~Property() { AllocatorType::Free(dependencies); }
-        SValue name;
-        const SchemaType* schema;
-        const SchemaType* dependenciesSchema;
-        SizeType dependenciesValidatorIndex;
-        bool* dependencies;
-        bool required;
-    };
-
-    struct PatternProperty {
-        PatternProperty() : schema(), pattern() {}
-        ~PatternProperty() { 
-            if (pattern) {
-                pattern->~RegexType();
-                AllocatorType::Free(pattern);
-            }
-        }
-        const SchemaType* schema;
-        RegexType* pattern;
-    };
-
-    AllocatorType* allocator_;
-    SValue uri_;
-    PointerType pointer_;
-    const SchemaType* typeless_;
-    uint64_t* enum_;
-    SizeType enumCount_;
-    SchemaArray allOf_;
-    SchemaArray anyOf_;
-    SchemaArray oneOf_;
-    const SchemaType* not_;
-    unsigned type_; // bitmask of kSchemaType
-    SizeType validatorCount_;
-    SizeType notValidatorIndex_;
-
-    Property* properties_;
-    const SchemaType* additionalPropertiesSchema_;
-    PatternProperty* patternProperties_;
-    SizeType patternPropertyCount_;
-    SizeType propertyCount_;
-    SizeType minProperties_;
-    SizeType maxProperties_;
-    bool additionalProperties_;
-    bool hasDependencies_;
-    bool hasRequired_;
-    bool hasSchemaDependencies_;
-
-    const SchemaType* additionalItemsSchema_;
-    const SchemaType* itemsList_;
-    const SchemaType** itemsTuple_;
-    SizeType itemsTupleCount_;
-    SizeType minItems_;
-    SizeType maxItems_;
-    bool additionalItems_;
-    bool uniqueItems_;
-
-    RegexType* pattern_;
-    SizeType minLength_;
-    SizeType maxLength_;
-
-    SValue minimum_;
-    SValue maximum_;
-    SValue multipleOf_;
-    bool exclusiveMinimum_;
-    bool exclusiveMaximum_;
-    
-    SizeType defaultValueLength_;
-};
-
-template<typename Stack, typename Ch>
-struct TokenHelper {
-    RAPIDJSON_FORCEINLINE static void AppendIndexToken(Stack& documentStack, SizeType index) {
-        *documentStack.template Push<Ch>() = '/';
-        char buffer[21];
-        size_t length = static_cast<size_t>((sizeof(SizeType) == 4 ? u32toa(index, buffer) : u64toa(index, buffer)) - buffer);
-        for (size_t i = 0; i < length; i++)
-            *documentStack.template Push<Ch>() = static_cast<Ch>(buffer[i]);
-    }
-};
-
-// Partial specialized version for char to prevent buffer copying.
-template <typename Stack>
-struct TokenHelper<Stack, char> {
-    RAPIDJSON_FORCEINLINE static void AppendIndexToken(Stack& documentStack, SizeType index) {
-        if (sizeof(SizeType) == 4) {
-            char *buffer = documentStack.template Push<char>(1 + 10); // '/' + uint
-            *buffer++ = '/';
-            const char* end = internal::u32toa(index, buffer);
-             documentStack.template Pop<char>(static_cast<size_t>(10 - (end - buffer)));
-        }
-        else {
-            char *buffer = documentStack.template Push<char>(1 + 20); // '/' + uint64
-            *buffer++ = '/';
-            const char* end = internal::u64toa(index, buffer);
-            documentStack.template Pop<char>(static_cast<size_t>(20 - (end - buffer)));
-        }
-    }
-};
-
-} // namespace internal
-
-///////////////////////////////////////////////////////////////////////////////
-// IGenericRemoteSchemaDocumentProvider
-
-template <typename SchemaDocumentType>
-class IGenericRemoteSchemaDocumentProvider {
-public:
-    typedef typename SchemaDocumentType::Ch Ch;
-
-    virtual ~IGenericRemoteSchemaDocumentProvider() {}
-    virtual const SchemaDocumentType* GetRemoteDocument(const Ch* uri, SizeType length) = 0;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericSchemaDocument
-
-//! JSON schema document.
-/*!
-    A JSON schema document is a compiled version of a JSON schema.
-    It is basically a tree of internal::Schema.
-
-    \note This is an immutable class (i.e. its instance cannot be modified after construction).
-    \tparam ValueT Type of JSON value (e.g. \c Value ), which also determine the encoding.
-    \tparam Allocator Allocator type for allocating memory of this document.
-*/
-template <typename ValueT, typename Allocator = CrtAllocator>
-class GenericSchemaDocument {
-public:
-    typedef ValueT ValueType;
-    typedef IGenericRemoteSchemaDocumentProvider<GenericSchemaDocument> IRemoteSchemaDocumentProviderType;
-    typedef Allocator AllocatorType;
-    typedef typename ValueType::EncodingType EncodingType;
-    typedef typename EncodingType::Ch Ch;
-    typedef internal::Schema<GenericSchemaDocument> SchemaType;
-    typedef GenericPointer<ValueType, Allocator> PointerType;
-    typedef GenericValue<EncodingType, Allocator> URIType;
-    friend class internal::Schema<GenericSchemaDocument>;
-    template <typename, typename, typename>
-    friend class GenericSchemaValidator;
-
-    //! Constructor.
-    /*!
-        Compile a JSON document into schema document.
-
-        \param document A JSON document as source.
-        \param uri The base URI of this schema document for purposes of violation reporting.
-        \param uriLength Length of \c name, in code points.
-        \param remoteProvider An optional remote schema document provider for resolving remote reference. Can be null.
-        \param allocator An optional allocator instance for allocating memory. Can be null.
-    */
-    explicit GenericSchemaDocument(const ValueType& document, const Ch* uri = 0, SizeType uriLength = 0,
-        IRemoteSchemaDocumentProviderType* remoteProvider = 0, Allocator* allocator = 0) :
-        remoteProvider_(remoteProvider),
-        allocator_(allocator),
-        ownAllocator_(),
-        root_(),
-        typeless_(),
-        schemaMap_(allocator, kInitialSchemaMapSize),
-        schemaRef_(allocator, kInitialSchemaRefSize)
-    {
-        if (!allocator_)
-            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
-
-        Ch noUri[1] = {0};
-        uri_.SetString(uri ? uri : noUri, uriLength, *allocator_);
-
-        typeless_ = static_cast<SchemaType*>(allocator_->Malloc(sizeof(SchemaType)));
-        new (typeless_) SchemaType(this, PointerType(), ValueType(kObjectType).Move(), ValueType(kObjectType).Move(), allocator_);
-
-        // Generate root schema, it will call CreateSchema() to create sub-schemas,
-        // And call AddRefSchema() if there are $ref.
-        CreateSchemaRecursive(&root_, PointerType(), document, document);
-
-        // Resolve $ref
-        while (!schemaRef_.Empty()) {
-            SchemaRefEntry* refEntry = schemaRef_.template Pop<SchemaRefEntry>(1);
-            if (const SchemaType* s = GetSchema(refEntry->target)) {
-                if (refEntry->schema)
-                    *refEntry->schema = s;
-
-                // Create entry in map if not exist
-                if (!GetSchema(refEntry->source)) {
-                    new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(refEntry->source, const_cast<SchemaType*>(s), false, allocator_);
-                }
-            }
-            else if (refEntry->schema)
-                *refEntry->schema = typeless_;
-
-            refEntry->~SchemaRefEntry();
-        }
-
-        RAPIDJSON_ASSERT(root_ != 0);
-
-        schemaRef_.ShrinkToFit(); // Deallocate all memory for ref
-    }
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move constructor in C++11
-    GenericSchemaDocument(GenericSchemaDocument&& rhs) RAPIDJSON_NOEXCEPT :
-        remoteProvider_(rhs.remoteProvider_),
-        allocator_(rhs.allocator_),
-        ownAllocator_(rhs.ownAllocator_),
-        root_(rhs.root_),
-        typeless_(rhs.typeless_),
-        schemaMap_(std::move(rhs.schemaMap_)),
-        schemaRef_(std::move(rhs.schemaRef_)),
-        uri_(std::move(rhs.uri_))
-    {
-        rhs.remoteProvider_ = 0;
-        rhs.allocator_ = 0;
-        rhs.ownAllocator_ = 0;
-        rhs.typeless_ = 0;
-    }
-#endif
-
-    //! Destructor
-    ~GenericSchemaDocument() {
-        while (!schemaMap_.Empty())
-            schemaMap_.template Pop<SchemaEntry>(1)->~SchemaEntry();
-
-        if (typeless_) {
-            typeless_->~SchemaType();
-            Allocator::Free(typeless_);
-        }
-
-        RAPIDJSON_DELETE(ownAllocator_);
-    }
-
-    const URIType& GetURI() const { return uri_; }
-
-    //! Get the root schema.
-    const SchemaType& GetRoot() const { return *root_; }
-
-private:
-    //! Prohibit copying
-    GenericSchemaDocument(const GenericSchemaDocument&);
-    //! Prohibit assignment
-    GenericSchemaDocument& operator=(const GenericSchemaDocument&);
-
-    struct SchemaRefEntry {
-        SchemaRefEntry(const PointerType& s, const PointerType& t, const SchemaType** outSchema, Allocator *allocator) : source(s, allocator), target(t, allocator), schema(outSchema) {}
-        PointerType source;
-        PointerType target;
-        const SchemaType** schema;
-    };
-
-    struct SchemaEntry {
-        SchemaEntry(const PointerType& p, SchemaType* s, bool o, Allocator* allocator) : pointer(p, allocator), schema(s), owned(o) {}
-        ~SchemaEntry() {
-            if (owned) {
-                schema->~SchemaType();
-                Allocator::Free(schema);
-            }
-        }
-        PointerType pointer;
-        SchemaType* schema;
-        bool owned;
-    };
-
-    void CreateSchemaRecursive(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document) {
-        if (schema)
-            *schema = typeless_;
-
-        if (v.GetType() == kObjectType) {
-            const SchemaType* s = GetSchema(pointer);
-            if (!s)
-                CreateSchema(schema, pointer, v, document);
-
-            for (typename ValueType::ConstMemberIterator itr = v.MemberBegin(); itr != v.MemberEnd(); ++itr)
-                CreateSchemaRecursive(0, pointer.Append(itr->name, allocator_), itr->value, document);
-        }
-        else if (v.GetType() == kArrayType)
-            for (SizeType i = 0; i < v.Size(); i++)
-                CreateSchemaRecursive(0, pointer.Append(i, allocator_), v[i], document);
-    }
-
-    void CreateSchema(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document) {
-        RAPIDJSON_ASSERT(pointer.IsValid());
-        if (v.IsObject()) {
-            if (!HandleRefSchema(pointer, schema, v, document)) {
-                SchemaType* s = new (allocator_->Malloc(sizeof(SchemaType))) SchemaType(this, pointer, v, document, allocator_);
-                new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(pointer, s, true, allocator_);
-                if (schema)
-                    *schema = s;
-            }
-        }
-    }
-
-    bool HandleRefSchema(const PointerType& source, const SchemaType** schema, const ValueType& v, const ValueType& document) {
-        static const Ch kRefString[] = { '$', 'r', 'e', 'f', '\0' };
-        static const ValueType kRefValue(kRefString, 4);
-
-        typename ValueType::ConstMemberIterator itr = v.FindMember(kRefValue);
-        if (itr == v.MemberEnd())
-            return false;
-
-        if (itr->value.IsString()) {
-            SizeType len = itr->value.GetStringLength();
-            if (len > 0) {
-                const Ch* s = itr->value.GetString();
-                SizeType i = 0;
-                while (i < len && s[i] != '#') // Find the first #
-                    i++;
-
-                if (i > 0) { // Remote reference, resolve immediately
-                    if (remoteProvider_) {
-                        if (const GenericSchemaDocument* remoteDocument = remoteProvider_->GetRemoteDocument(s, i)) {
-                            PointerType pointer(&s[i], len - i, allocator_);
-                            if (pointer.IsValid()) {
-                                if (const SchemaType* sc = remoteDocument->GetSchema(pointer)) {
-                                    if (schema)
-                                        *schema = sc;
-                                    new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(source, const_cast<SchemaType*>(sc), false, allocator_);
-                                    return true;
-                                }
-                            }
-                        }
-                    }
-                }
-                else if (s[i] == '#') { // Local reference, defer resolution
-                    PointerType pointer(&s[i], len - i, allocator_);
-                    if (pointer.IsValid()) {
-                        if (const ValueType* nv = pointer.Get(document))
-                            if (HandleRefSchema(source, schema, *nv, document))
-                                return true;
-
-                        new (schemaRef_.template Push<SchemaRefEntry>()) SchemaRefEntry(source, pointer, schema, allocator_);
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    const SchemaType* GetSchema(const PointerType& pointer) const {
-        for (const SchemaEntry* target = schemaMap_.template Bottom<SchemaEntry>(); target != schemaMap_.template End<SchemaEntry>(); ++target)
-            if (pointer == target->pointer)
-                return target->schema;
-        return 0;
-    }
-
-    PointerType GetPointer(const SchemaType* schema) const {
-        for (const SchemaEntry* target = schemaMap_.template Bottom<SchemaEntry>(); target != schemaMap_.template End<SchemaEntry>(); ++target)
-            if (schema == target->schema)
-                return target->pointer;
-        return PointerType();
-    }
-
-    const SchemaType* GetTypeless() const { return typeless_; }
-
-    static const size_t kInitialSchemaMapSize = 64;
-    static const size_t kInitialSchemaRefSize = 64;
-
-    IRemoteSchemaDocumentProviderType* remoteProvider_;
-    Allocator *allocator_;
-    Allocator *ownAllocator_;
-    const SchemaType* root_;                //!< Root schema.
-    SchemaType* typeless_;
-    internal::Stack<Allocator> schemaMap_;  // Stores created Pointer -> Schemas
-    internal::Stack<Allocator> schemaRef_;  // Stores Pointer from $ref and schema which holds the $ref
-    URIType uri_;
-};
-
-//! GenericSchemaDocument using Value type.
-typedef GenericSchemaDocument<Value> SchemaDocument;
-//! IGenericRemoteSchemaDocumentProvider using SchemaDocument.
-typedef IGenericRemoteSchemaDocumentProvider<SchemaDocument> IRemoteSchemaDocumentProvider;
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericSchemaValidator
-
-//! JSON Schema Validator.
-/*!
-    A SAX style JSON schema validator.
-    It uses a \c GenericSchemaDocument to validate SAX events.
-    It delegates the incoming SAX events to an output handler.
-    The default output handler does nothing.
-    It can be reused multiple times by calling \c Reset().
-
-    \tparam SchemaDocumentType Type of schema document.
-    \tparam OutputHandler Type of output handler. Default handler does nothing.
-    \tparam StateAllocator Allocator for storing the internal validation states.
-*/
-template <
-    typename SchemaDocumentType,
-    typename OutputHandler = BaseReaderHandler<typename SchemaDocumentType::SchemaType::EncodingType>,
-    typename StateAllocator = CrtAllocator>
-class GenericSchemaValidator :
-    public internal::ISchemaStateFactory<typename SchemaDocumentType::SchemaType>, 
-    public internal::ISchemaValidator,
-    public internal::IValidationErrorHandler<typename SchemaDocumentType::SchemaType>
-{
-public:
-    typedef typename SchemaDocumentType::SchemaType SchemaType;
-    typedef typename SchemaDocumentType::PointerType PointerType;
-    typedef typename SchemaType::EncodingType EncodingType;
-    typedef typename SchemaType::SValue SValue;
-    typedef typename EncodingType::Ch Ch;
-    typedef GenericStringRef<Ch> StringRefType;
-    typedef GenericValue<EncodingType, StateAllocator> ValueType;
-
-    //! Constructor without output handler.
-    /*!
-        \param schemaDocument The schema document to conform to.
-        \param allocator Optional allocator for storing internal validation states.
-        \param schemaStackCapacity Optional initial capacity of schema path stack.
-        \param documentStackCapacity Optional initial capacity of document path stack.
-    */
-    GenericSchemaValidator(
-        const SchemaDocumentType& schemaDocument,
-        StateAllocator* allocator = 0, 
-        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
-        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
-        :
-        schemaDocument_(&schemaDocument),
-        root_(schemaDocument.GetRoot()),
-        stateAllocator_(allocator),
-        ownStateAllocator_(0),
-        schemaStack_(allocator, schemaStackCapacity),
-        documentStack_(allocator, documentStackCapacity),
-        outputHandler_(0),
-        error_(kObjectType),
-        currentError_(),
-        missingDependents_(),
-        valid_(true)
-#if RAPIDJSON_SCHEMA_VERBOSE
-        , depth_(0)
-#endif
-    {
-    }
-
-    //! Constructor with output handler.
-    /*!
-        \param schemaDocument The schema document to conform to.
-        \param allocator Optional allocator for storing internal validation states.
-        \param schemaStackCapacity Optional initial capacity of schema path stack.
-        \param documentStackCapacity Optional initial capacity of document path stack.
-    */
-    GenericSchemaValidator(
-        const SchemaDocumentType& schemaDocument,
-        OutputHandler& outputHandler,
-        StateAllocator* allocator = 0, 
-        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
-        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
-        :
-        schemaDocument_(&schemaDocument),
-        root_(schemaDocument.GetRoot()),
-        stateAllocator_(allocator),
-        ownStateAllocator_(0),
-        schemaStack_(allocator, schemaStackCapacity),
-        documentStack_(allocator, documentStackCapacity),
-        outputHandler_(&outputHandler),
-        error_(kObjectType),
-        currentError_(),
-        missingDependents_(),
-        valid_(true)
-#if RAPIDJSON_SCHEMA_VERBOSE
-        , depth_(0)
-#endif
-    {
-    }
-
-    //! Destructor.
-    ~GenericSchemaValidator() {
-        Reset();
-        RAPIDJSON_DELETE(ownStateAllocator_);
-    }
-
-    //! Reset the internal states.
-    void Reset() {
-        while (!schemaStack_.Empty())
-            PopSchema();
-        documentStack_.Clear();
-        error_.SetObject();
-        currentError_.SetNull();
-        missingDependents_.SetNull();
-        valid_ = true;
-    }
-
-    //! Checks whether the current state is valid.
-    // Implementation of ISchemaValidator
-    virtual bool IsValid() const { return valid_; }
-
-    //! Gets the error object.
-    ValueType& GetError() { return error_; }
-    const ValueType& GetError() const { return error_; }
-
-    //! Gets the JSON pointer pointed to the invalid schema.
-    PointerType GetInvalidSchemaPointer() const {
-        return schemaStack_.Empty() ? PointerType() : CurrentSchema().GetPointer();
-    }
-
-    //! Gets the keyword of invalid schema.
-    const Ch* GetInvalidSchemaKeyword() const {
-        return schemaStack_.Empty() ? 0 : CurrentContext().invalidKeyword;
-    }
-
-    //! Gets the JSON pointer pointed to the invalid value.
-    PointerType GetInvalidDocumentPointer() const {
-        if (documentStack_.Empty()) {
-            return PointerType();
-        }
-        else {
-            return PointerType(documentStack_.template Bottom<Ch>(), documentStack_.GetSize() / sizeof(Ch));
-        }
-    }
-
-    void NotMultipleOf(int64_t actual, const SValue& expected) {
-        AddNumberError(SchemaType::GetMultipleOfString(), ValueType(actual).Move(), expected);
-    }
-    void NotMultipleOf(uint64_t actual, const SValue& expected) {
-        AddNumberError(SchemaType::GetMultipleOfString(), ValueType(actual).Move(), expected);
-    }
-    void NotMultipleOf(double actual, const SValue& expected) {
-        AddNumberError(SchemaType::GetMultipleOfString(), ValueType(actual).Move(), expected);
-    }
-    void AboveMaximum(int64_t actual, const SValue& expected, bool exclusive) {
-        AddNumberError(SchemaType::GetMaximumString(), ValueType(actual).Move(), expected,
-            exclusive ? &SchemaType::GetExclusiveMaximumString : 0);
-    }
-    void AboveMaximum(uint64_t actual, const SValue& expected, bool exclusive) {
-        AddNumberError(SchemaType::GetMaximumString(), ValueType(actual).Move(), expected,
-            exclusive ? &SchemaType::GetExclusiveMaximumString : 0);
-    }
-    void AboveMaximum(double actual, const SValue& expected, bool exclusive) {
-        AddNumberError(SchemaType::GetMaximumString(), ValueType(actual).Move(), expected,
-            exclusive ? &SchemaType::GetExclusiveMaximumString : 0);
-    }
-    void BelowMinimum(int64_t actual, const SValue& expected, bool exclusive) {
-        AddNumberError(SchemaType::GetMinimumString(), ValueType(actual).Move(), expected,
-            exclusive ? &SchemaType::GetExclusiveMinimumString : 0);
-    }
-    void BelowMinimum(uint64_t actual, const SValue& expected, bool exclusive) {
-        AddNumberError(SchemaType::GetMinimumString(), ValueType(actual).Move(), expected,
-            exclusive ? &SchemaType::GetExclusiveMinimumString : 0);
-    }
-    void BelowMinimum(double actual, const SValue& expected, bool exclusive) {
-        AddNumberError(SchemaType::GetMinimumString(), ValueType(actual).Move(), expected,
-            exclusive ? &SchemaType::GetExclusiveMinimumString : 0);
-    }
-
-    void TooLong(const Ch* str, SizeType length, SizeType expected) {
-        AddNumberError(SchemaType::GetMaxLengthString(),
-            ValueType(str, length, GetStateAllocator()).Move(), SValue(expected).Move());
-    }
-    void TooShort(const Ch* str, SizeType length, SizeType expected) {
-        AddNumberError(SchemaType::GetMinLengthString(),
-            ValueType(str, length, GetStateAllocator()).Move(), SValue(expected).Move());
-    }
-    void DoesNotMatch(const Ch* str, SizeType length) {
-        currentError_.SetObject();
-        currentError_.AddMember(GetActualString(), ValueType(str, length, GetStateAllocator()).Move(), GetStateAllocator());
-        AddCurrentError(SchemaType::GetPatternString());
-    }
-
-    void DisallowedItem(SizeType index) {
-        currentError_.SetObject();
-        currentError_.AddMember(GetDisallowedString(), ValueType(index).Move(), GetStateAllocator());
-        AddCurrentError(SchemaType::GetAdditionalItemsString(), true);
-    }
-    void TooFewItems(SizeType actualCount, SizeType expectedCount) {
-        AddNumberError(SchemaType::GetMinItemsString(),
-            ValueType(actualCount).Move(), SValue(expectedCount).Move());
-    }
-    void TooManyItems(SizeType actualCount, SizeType expectedCount) {
-        AddNumberError(SchemaType::GetMaxItemsString(),
-            ValueType(actualCount).Move(), SValue(expectedCount).Move());
-    }
-    void DuplicateItems(SizeType index1, SizeType index2) {
-        ValueType duplicates(kArrayType);
-        duplicates.PushBack(index1, GetStateAllocator());
-        duplicates.PushBack(index2, GetStateAllocator());
-        currentError_.SetObject();
-        currentError_.AddMember(GetDuplicatesString(), duplicates, GetStateAllocator());
-        AddCurrentError(SchemaType::GetUniqueItemsString(), true);
-    }
-
-    void TooManyProperties(SizeType actualCount, SizeType expectedCount) {
-        AddNumberError(SchemaType::GetMaxPropertiesString(),
-            ValueType(actualCount).Move(), SValue(expectedCount).Move());
-    }
-    void TooFewProperties(SizeType actualCount, SizeType expectedCount) {
-        AddNumberError(SchemaType::GetMinPropertiesString(),
-            ValueType(actualCount).Move(), SValue(expectedCount).Move());
-    }
-    void StartMissingProperties() {
-        currentError_.SetArray();
-    }
-    void AddMissingProperty(const SValue& name) {
-        currentError_.PushBack(ValueType(name, GetStateAllocator()).Move(), GetStateAllocator());
-    }
-    bool EndMissingProperties() {
-        if (currentError_.Empty())
-            return false;
-        ValueType error(kObjectType);
-        error.AddMember(GetMissingString(), currentError_, GetStateAllocator());
-        currentError_ = error;
-        AddCurrentError(SchemaType::GetRequiredString());
-        return true;
-    }
-    void PropertyViolations(ISchemaValidator** subvalidators, SizeType count) {
-        for (SizeType i = 0; i < count; ++i)
-            MergeError(static_cast<GenericSchemaValidator*>(subvalidators[i])->GetError());
-    }
-    void DisallowedProperty(const Ch* name, SizeType length) {
-        currentError_.SetObject();
-        currentError_.AddMember(GetDisallowedString(), ValueType(name, length, GetStateAllocator()).Move(), GetStateAllocator());
-        AddCurrentError(SchemaType::GetAdditionalPropertiesString(), true);
-    }
-
-    void StartDependencyErrors() {
-        currentError_.SetObject();
-    }
-    void StartMissingDependentProperties() {
-        missingDependents_.SetArray();
-    }
-    void AddMissingDependentProperty(const SValue& targetName) {
-        missingDependents_.PushBack(ValueType(targetName, GetStateAllocator()).Move(), GetStateAllocator());
-    }
-    void EndMissingDependentProperties(const SValue& sourceName) {
-        if (!missingDependents_.Empty())
-            currentError_.AddMember(ValueType(sourceName, GetStateAllocator()).Move(),
-                missingDependents_, GetStateAllocator());
-    }
-    void AddDependencySchemaError(const SValue& sourceName, ISchemaValidator* subvalidator) {
-        currentError_.AddMember(ValueType(sourceName, GetStateAllocator()).Move(),
-            static_cast<GenericSchemaValidator*>(subvalidator)->GetError(), GetStateAllocator());
-    }
-    bool EndDependencyErrors() {
-        if (currentError_.ObjectEmpty())
-            return false;
-        ValueType error(kObjectType);
-        error.AddMember(GetErrorsString(), currentError_, GetStateAllocator());
-        currentError_ = error;
-        AddCurrentError(SchemaType::GetDependenciesString());
-        return true;
-    }
-
-    void DisallowedValue() {
-        currentError_.SetObject();
-        AddCurrentError(SchemaType::GetEnumString());
-    }
-    void StartDisallowedType() {
-        currentError_.SetArray();
-    }
-    void AddExpectedType(const typename SchemaType::ValueType& expectedType) {
-        currentError_.PushBack(ValueType(expectedType, GetStateAllocator()).Move(), GetStateAllocator());
-    }
-    void EndDisallowedType(const typename SchemaType::ValueType& actualType) {
-        ValueType error(kObjectType);
-        error.AddMember(GetExpectedString(), currentError_, GetStateAllocator());
-        error.AddMember(GetActualString(), ValueType(actualType, GetStateAllocator()).Move(), GetStateAllocator());
-        currentError_ = error;
-        AddCurrentError(SchemaType::GetTypeString());
-    }
-    void NotAllOf(ISchemaValidator** subvalidators, SizeType count) {
-        for (SizeType i = 0; i < count; ++i) {
-            MergeError(static_cast<GenericSchemaValidator*>(subvalidators[i])->GetError());
-        }
-    }
-    void NoneOf(ISchemaValidator** subvalidators, SizeType count) {
-        AddErrorArray(SchemaType::GetAnyOfString(), subvalidators, count);
-    }
-    void NotOneOf(ISchemaValidator** subvalidators, SizeType count) {
-        AddErrorArray(SchemaType::GetOneOfString(), subvalidators, count);
-    }
-    void Disallowed() {
-        currentError_.SetObject();
-        AddCurrentError(SchemaType::GetNotString());
-    }
-
-#define RAPIDJSON_STRING_(name, ...) \
-    static const StringRefType& Get##name##String() {\
-        static const Ch s[] = { __VA_ARGS__, '\0' };\
-        static const StringRefType v(s, static_cast<SizeType>(sizeof(s) / sizeof(Ch) - 1)); \
-        return v;\
-    }
-
-    RAPIDJSON_STRING_(InstanceRef, 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', 'R', 'e', 'f')
-    RAPIDJSON_STRING_(SchemaRef, 's', 'c', 'h', 'e', 'm', 'a', 'R', 'e', 'f')
-    RAPIDJSON_STRING_(Expected, 'e', 'x', 'p', 'e', 'c', 't', 'e', 'd')
-    RAPIDJSON_STRING_(Actual, 'a', 'c', 't', 'u', 'a', 'l')
-    RAPIDJSON_STRING_(Disallowed, 'd', 'i', 's', 'a', 'l', 'l', 'o', 'w', 'e', 'd')
-    RAPIDJSON_STRING_(Missing, 'm', 'i', 's', 's', 'i', 'n', 'g')
-    RAPIDJSON_STRING_(Errors, 'e', 'r', 'r', 'o', 'r', 's')
-    RAPIDJSON_STRING_(Duplicates, 'd', 'u', 'p', 'l', 'i', 'c', 'a', 't', 'e', 's')
-
-#undef RAPIDJSON_STRING_
-
-#if RAPIDJSON_SCHEMA_VERBOSE
-#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_() \
-RAPIDJSON_MULTILINEMACRO_BEGIN\
-    *documentStack_.template Push<Ch>() = '\0';\
-    documentStack_.template Pop<Ch>(1);\
-    internal::PrintInvalidDocument(documentStack_.template Bottom<Ch>());\
-RAPIDJSON_MULTILINEMACRO_END
-#else
-#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_()
-#endif
-
-#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_(method, arg1)\
-    if (!valid_) return false; \
-    if (!BeginValue() || !CurrentSchema().method arg1) {\
-        RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_();\
-        return valid_ = false;\
-    }
-
-#define RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(method, arg2)\
-    for (Context* context = schemaStack_.template Bottom<Context>(); context != schemaStack_.template End<Context>(); context++) {\
-        if (context->hasher)\
-            static_cast<HasherType*>(context->hasher)->method arg2;\
-        if (context->validators)\
-            for (SizeType i_ = 0; i_ < context->validatorCount; i_++)\
-                static_cast<GenericSchemaValidator*>(context->validators[i_])->method arg2;\
-        if (context->patternPropertiesValidators)\
-            for (SizeType i_ = 0; i_ < context->patternPropertiesValidatorCount; i_++)\
-                static_cast<GenericSchemaValidator*>(context->patternPropertiesValidators[i_])->method arg2;\
-    }
-
-#define RAPIDJSON_SCHEMA_HANDLE_END_(method, arg2)\
-    return valid_ = EndValue() && (!outputHandler_ || outputHandler_->method arg2)
-
-#define RAPIDJSON_SCHEMA_HANDLE_VALUE_(method, arg1, arg2) \
-    RAPIDJSON_SCHEMA_HANDLE_BEGIN_   (method, arg1);\
-    RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(method, arg2);\
-    RAPIDJSON_SCHEMA_HANDLE_END_     (method, arg2)
-
-    bool Null()             { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Null,   (CurrentContext()), ( )); }
-    bool Bool(bool b)       { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Bool,   (CurrentContext(), b), (b)); }
-    bool Int(int i)         { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Int,    (CurrentContext(), i), (i)); }
-    bool Uint(unsigned u)   { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Uint,   (CurrentContext(), u), (u)); }
-    bool Int64(int64_t i)   { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Int64,  (CurrentContext(), i), (i)); }
-    bool Uint64(uint64_t u) { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Uint64, (CurrentContext(), u), (u)); }
-    bool Double(double d)   { RAPIDJSON_SCHEMA_HANDLE_VALUE_(Double, (CurrentContext(), d), (d)); }
-    bool RawNumber(const Ch* str, SizeType length, bool copy)
-                                    { RAPIDJSON_SCHEMA_HANDLE_VALUE_(String, (CurrentContext(), str, length, copy), (str, length, copy)); }
-    bool String(const Ch* str, SizeType length, bool copy)
-                                    { RAPIDJSON_SCHEMA_HANDLE_VALUE_(String, (CurrentContext(), str, length, copy), (str, length, copy)); }
-
-    bool StartObject() {
-        RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartObject, (CurrentContext()));
-        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartObject, ());
-        return valid_ = !outputHandler_ || outputHandler_->StartObject();
-    }
-    
-    bool Key(const Ch* str, SizeType len, bool copy) {
-        if (!valid_) return false;
-        AppendToken(str, len);
-        if (!CurrentSchema().Key(CurrentContext(), str, len, copy)) return valid_ = false;
-        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(Key, (str, len, copy));
-        return valid_ = !outputHandler_ || outputHandler_->Key(str, len, copy);
-    }
-    
-    bool EndObject(SizeType memberCount) { 
-        if (!valid_) return false;
-        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndObject, (memberCount));
-        if (!CurrentSchema().EndObject(CurrentContext(), memberCount)) return valid_ = false;
-        RAPIDJSON_SCHEMA_HANDLE_END_(EndObject, (memberCount));
-    }
-
-    bool StartArray() {
-        RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartArray, (CurrentContext()));
-        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartArray, ());
-        return valid_ = !outputHandler_ || outputHandler_->StartArray();
-    }
-    
-    bool EndArray(SizeType elementCount) {
-        if (!valid_) return false;
-        RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndArray, (elementCount));
-        if (!CurrentSchema().EndArray(CurrentContext(), elementCount)) return valid_ = false;
-        RAPIDJSON_SCHEMA_HANDLE_END_(EndArray, (elementCount));
-    }
-
-#undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_
-#undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_
-#undef RAPIDJSON_SCHEMA_HANDLE_PARALLEL_
-#undef RAPIDJSON_SCHEMA_HANDLE_VALUE_
-
-    // Implementation of ISchemaStateFactory<SchemaType>
-    virtual ISchemaValidator* CreateSchemaValidator(const SchemaType& root) {
-        return new (GetStateAllocator().Malloc(sizeof(GenericSchemaValidator))) GenericSchemaValidator(*schemaDocument_, root, documentStack_.template Bottom<char>(), documentStack_.GetSize(),
-#if RAPIDJSON_SCHEMA_VERBOSE
-        depth_ + 1,
-#endif
-        &GetStateAllocator());
-    }
-
-    virtual void DestroySchemaValidator(ISchemaValidator* validator) {
-        GenericSchemaValidator* v = static_cast<GenericSchemaValidator*>(validator);
-        v->~GenericSchemaValidator();
-        StateAllocator::Free(v);
-    }
-
-    virtual void* CreateHasher() {
-        return new (GetStateAllocator().Malloc(sizeof(HasherType))) HasherType(&GetStateAllocator());
-    }
-
-    virtual uint64_t GetHashCode(void* hasher) {
-        return static_cast<HasherType*>(hasher)->GetHashCode();
-    }
-
-    virtual void DestroryHasher(void* hasher) {
-        HasherType* h = static_cast<HasherType*>(hasher);
-        h->~HasherType();
-        StateAllocator::Free(h);
-    }
-
-    virtual void* MallocState(size_t size) {
-        return GetStateAllocator().Malloc(size);
-    }
-
-    virtual void FreeState(void* p) {
-        StateAllocator::Free(p);
-    }
-
-private:
-    typedef typename SchemaType::Context Context;
-    typedef GenericValue<UTF8<>, StateAllocator> HashCodeArray;
-    typedef internal::Hasher<EncodingType, StateAllocator> HasherType;
-
-    GenericSchemaValidator( 
-        const SchemaDocumentType& schemaDocument,
-        const SchemaType& root,
-        const char* basePath, size_t basePathSize,
-#if RAPIDJSON_SCHEMA_VERBOSE
-        unsigned depth,
-#endif
-        StateAllocator* allocator = 0,
-        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
-        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
-        :
-        schemaDocument_(&schemaDocument),
-        root_(root),
-        stateAllocator_(allocator),
-        ownStateAllocator_(0),
-        schemaStack_(allocator, schemaStackCapacity),
-        documentStack_(allocator, documentStackCapacity),
-        outputHandler_(0),
-        error_(kObjectType),
-        currentError_(),
-        missingDependents_(),
-        valid_(true)
-#if RAPIDJSON_SCHEMA_VERBOSE
-        , depth_(depth)
-#endif
-    {
-        if (basePath && basePathSize)
-            memcpy(documentStack_.template Push<char>(basePathSize), basePath, basePathSize);
-    }
-
-    StateAllocator& GetStateAllocator() {
-        if (!stateAllocator_)
-            stateAllocator_ = ownStateAllocator_ = RAPIDJSON_NEW(StateAllocator)();
-        return *stateAllocator_;
-    }
-
-    bool BeginValue() {
-        if (schemaStack_.Empty())
-            PushSchema(root_);
-        else {
-            if (CurrentContext().inArray)
-                internal::TokenHelper<internal::Stack<StateAllocator>, Ch>::AppendIndexToken(documentStack_, CurrentContext().arrayElementIndex);
-
-            if (!CurrentSchema().BeginValue(CurrentContext()))
-                return false;
-
-            SizeType count = CurrentContext().patternPropertiesSchemaCount;
-            const SchemaType** sa = CurrentContext().patternPropertiesSchemas;
-            typename Context::PatternValidatorType patternValidatorType = CurrentContext().valuePatternValidatorType;
-            bool valueUniqueness = CurrentContext().valueUniqueness;
-            RAPIDJSON_ASSERT(CurrentContext().valueSchema);
-            PushSchema(*CurrentContext().valueSchema);
-
-            if (count > 0) {
-                CurrentContext().objectPatternValidatorType = patternValidatorType;
-                ISchemaValidator**& va = CurrentContext().patternPropertiesValidators;
-                SizeType& validatorCount = CurrentContext().patternPropertiesValidatorCount;
-                va = static_cast<ISchemaValidator**>(MallocState(sizeof(ISchemaValidator*) * count));
-                for (SizeType i = 0; i < count; i++)
-                    va[validatorCount++] = CreateSchemaValidator(*sa[i]);
-            }
-
-            CurrentContext().arrayUniqueness = valueUniqueness;
-        }
-        return true;
-    }
-
-    bool EndValue() {
-        if (!CurrentSchema().EndValue(CurrentContext()))
-            return false;
-
-#if RAPIDJSON_SCHEMA_VERBOSE
-        GenericStringBuffer<EncodingType> sb;
-        schemaDocument_->GetPointer(&CurrentSchema()).Stringify(sb);
-
-        *documentStack_.template Push<Ch>() = '\0';
-        documentStack_.template Pop<Ch>(1);
-        internal::PrintValidatorPointers(depth_, sb.GetString(), documentStack_.template Bottom<Ch>());
-#endif
-
-        uint64_t h = CurrentContext().arrayUniqueness ? static_cast<HasherType*>(CurrentContext().hasher)->GetHashCode() : 0;
-        
-        PopSchema();
-
-        if (!schemaStack_.Empty()) {
-            Context& context = CurrentContext();
-            if (context.valueUniqueness) {
-                HashCodeArray* a = static_cast<HashCodeArray*>(context.arrayElementHashCodes);
-                if (!a)
-                    CurrentContext().arrayElementHashCodes = a = new (GetStateAllocator().Malloc(sizeof(HashCodeArray))) HashCodeArray(kArrayType);
-                for (typename HashCodeArray::ConstValueIterator itr = a->Begin(); itr != a->End(); ++itr)
-                    if (itr->GetUint64() == h) {
-                        DuplicateItems(static_cast<SizeType>(itr - a->Begin()), a->Size());
-                        RAPIDJSON_INVALID_KEYWORD_RETURN(SchemaType::GetUniqueItemsString());
-                    }
-                a->PushBack(h, GetStateAllocator());
-            }
-        }
-
-        // Remove the last token of document pointer
-        while (!documentStack_.Empty() && *documentStack_.template Pop<Ch>(1) != '/')
-            ;
-
-        return true;
-    }
-
-    void AppendToken(const Ch* str, SizeType len) {
-        documentStack_.template Reserve<Ch>(1 + len * 2); // worst case all characters are escaped as two characters
-        *documentStack_.template PushUnsafe<Ch>() = '/';
-        for (SizeType i = 0; i < len; i++) {
-            if (str[i] == '~') {
-                *documentStack_.template PushUnsafe<Ch>() = '~';
-                *documentStack_.template PushUnsafe<Ch>() = '0';
-            }
-            else if (str[i] == '/') {
-                *documentStack_.template PushUnsafe<Ch>() = '~';
-                *documentStack_.template PushUnsafe<Ch>() = '1';
-            }
-            else
-                *documentStack_.template PushUnsafe<Ch>() = str[i];
-        }
-    }
-
-    RAPIDJSON_FORCEINLINE void PushSchema(const SchemaType& schema) { new (schemaStack_.template Push<Context>()) Context(*this, *this, &schema); }
-    
-    RAPIDJSON_FORCEINLINE void PopSchema() {
-        Context* c = schemaStack_.template Pop<Context>(1);
-        if (HashCodeArray* a = static_cast<HashCodeArray*>(c->arrayElementHashCodes)) {
-            a->~HashCodeArray();
-            StateAllocator::Free(a);
-        }
-        c->~Context();
-    }
-
-    void AddErrorLocation(ValueType& result, bool parent) {
-        GenericStringBuffer<EncodingType> sb;
-        PointerType instancePointer = GetInvalidDocumentPointer();
-        ((parent && instancePointer.GetTokenCount() > 0)
-            ? PointerType(instancePointer.GetTokens(), instancePointer.GetTokenCount() - 1)
-            : instancePointer).StringifyUriFragment(sb);
-        ValueType instanceRef(sb.GetString(), static_cast<SizeType>(sb.GetSize() / sizeof(Ch)),
-            GetStateAllocator());
-        result.AddMember(GetInstanceRefString(), instanceRef, GetStateAllocator());
-        sb.Clear();
-        memcpy(sb.Push(CurrentSchema().GetURI().GetStringLength()),
-            CurrentSchema().GetURI().GetString(),
-            CurrentSchema().GetURI().GetStringLength() * sizeof(Ch));
-        GetInvalidSchemaPointer().StringifyUriFragment(sb);
-        ValueType schemaRef(sb.GetString(), static_cast<SizeType>(sb.GetSize() / sizeof(Ch)),
-            GetStateAllocator());
-        result.AddMember(GetSchemaRefString(), schemaRef, GetStateAllocator());
-    }
-
-    void AddError(ValueType& keyword, ValueType& error) {
-        typename ValueType::MemberIterator member = error_.FindMember(keyword);
-        if (member == error_.MemberEnd())
-            error_.AddMember(keyword, error, GetStateAllocator());
-        else {
-            if (member->value.IsObject()) {
-                ValueType errors(kArrayType);
-                errors.PushBack(member->value, GetStateAllocator());
-                member->value = errors;
-            }
-            member->value.PushBack(error, GetStateAllocator());
-        }
-    }
-
-    void AddCurrentError(const typename SchemaType::ValueType& keyword, bool parent = false) {
-        AddErrorLocation(currentError_, parent);
-        AddError(ValueType(keyword, GetStateAllocator(), false).Move(), currentError_);
-    }
-
-    void MergeError(ValueType& other) {
-        for (typename ValueType::MemberIterator it = other.MemberBegin(), end = other.MemberEnd(); it != end; ++it) {
-            AddError(it->name, it->value);
-        }
-    }
-
-    void AddNumberError(const typename SchemaType::ValueType& keyword, ValueType& actual, const SValue& expected,
-        const typename SchemaType::ValueType& (*exclusive)() = 0) {
-        currentError_.SetObject();
-        currentError_.AddMember(GetActualString(), actual, GetStateAllocator());
-        currentError_.AddMember(GetExpectedString(), ValueType(expected, GetStateAllocator()).Move(), GetStateAllocator());
-        if (exclusive)
-            currentError_.AddMember(ValueType(exclusive(), GetStateAllocator()).Move(), true, GetStateAllocator());
-        AddCurrentError(keyword);
-    }
-
-    void AddErrorArray(const typename SchemaType::ValueType& keyword,
-        ISchemaValidator** subvalidators, SizeType count) {
-        ValueType errors(kArrayType);
-        for (SizeType i = 0; i < count; ++i)
-            errors.PushBack(static_cast<GenericSchemaValidator*>(subvalidators[i])->GetError(), GetStateAllocator());
-        currentError_.SetObject();
-        currentError_.AddMember(GetErrorsString(), errors, GetStateAllocator());
-        AddCurrentError(keyword);
-    }
-
-    const SchemaType& CurrentSchema() const { return *schemaStack_.template Top<Context>()->schema; }
-    Context& CurrentContext() { return *schemaStack_.template Top<Context>(); }
-    const Context& CurrentContext() const { return *schemaStack_.template Top<Context>(); }
-
-    static const size_t kDefaultSchemaStackCapacity = 1024;
-    static const size_t kDefaultDocumentStackCapacity = 256;
-    const SchemaDocumentType* schemaDocument_;
-    const SchemaType& root_;
-    StateAllocator* stateAllocator_;
-    StateAllocator* ownStateAllocator_;
-    internal::Stack<StateAllocator> schemaStack_;    //!< stack to store the current path of schema (BaseSchemaType *)
-    internal::Stack<StateAllocator> documentStack_;  //!< stack to store the current path of validating document (Ch)
-    OutputHandler* outputHandler_;
-    ValueType error_;
-    ValueType currentError_;
-    ValueType missingDependents_;
-    bool valid_;
-#if RAPIDJSON_SCHEMA_VERBOSE
-    unsigned depth_;
-#endif
-};
-
-typedef GenericSchemaValidator<SchemaDocument> SchemaValidator;
-
-///////////////////////////////////////////////////////////////////////////////
-// SchemaValidatingReader
-
-//! A helper class for parsing with validation.
-/*!
-    This helper class is a functor, designed as a parameter of \ref GenericDocument::Populate().
-
-    \tparam parseFlags Combination of \ref ParseFlag.
-    \tparam InputStream Type of input stream, implementing Stream concept.
-    \tparam SourceEncoding Encoding of the input stream.
-    \tparam SchemaDocumentType Type of schema document.
-    \tparam StackAllocator Allocator type for stack.
-*/
-template <
-    unsigned parseFlags,
-    typename InputStream,
-    typename SourceEncoding,
-    typename SchemaDocumentType = SchemaDocument,
-    typename StackAllocator = CrtAllocator>
-class SchemaValidatingReader {
-public:
-    typedef typename SchemaDocumentType::PointerType PointerType;
-    typedef typename InputStream::Ch Ch;
-    typedef GenericValue<SourceEncoding, StackAllocator> ValueType;
-
-    //! Constructor
-    /*!
-        \param is Input stream.
-        \param sd Schema document.
-    */
-    SchemaValidatingReader(InputStream& is, const SchemaDocumentType& sd) : is_(is), sd_(sd), invalidSchemaKeyword_(), error_(kObjectType), isValid_(true) {}
-
-    template <typename Handler>
-    bool operator()(Handler& handler) {
-        GenericReader<SourceEncoding, typename SchemaDocumentType::EncodingType, StackAllocator> reader;
-        GenericSchemaValidator<SchemaDocumentType, Handler> validator(sd_, handler);
-        parseResult_ = reader.template Parse<parseFlags>(is_, validator);
-
-        isValid_ = validator.IsValid();
-        if (isValid_) {
-            invalidSchemaPointer_ = PointerType();
-            invalidSchemaKeyword_ = 0;
-            invalidDocumentPointer_ = PointerType();
-            error_.SetObject();
-        }
-        else {
-            invalidSchemaPointer_ = validator.GetInvalidSchemaPointer();
-            invalidSchemaKeyword_ = validator.GetInvalidSchemaKeyword();
-            invalidDocumentPointer_ = validator.GetInvalidDocumentPointer();
-            error_.CopyFrom(validator.GetError(), allocator_);
-        }
-
-        return parseResult_;
-    }
-
-    const ParseResult& GetParseResult() const { return parseResult_; }
-    bool IsValid() const { return isValid_; }
-    const PointerType& GetInvalidSchemaPointer() const { return invalidSchemaPointer_; }
-    const Ch* GetInvalidSchemaKeyword() const { return invalidSchemaKeyword_; }
-    const PointerType& GetInvalidDocumentPointer() const { return invalidDocumentPointer_; }
-    const ValueType& GetError() const { return error_; }
-
-private:
-    InputStream& is_;
-    const SchemaDocumentType& sd_;
-
-    ParseResult parseResult_;
-    PointerType invalidSchemaPointer_;
-    const Ch* invalidSchemaKeyword_;
-    PointerType invalidDocumentPointer_;
-    StackAllocator allocator_;
-    ValueType error_;
-    bool isValid_;
-};
-
-RAPIDJSON_NAMESPACE_END
-RAPIDJSON_DIAG_POP
-
-#endif // RAPIDJSON_SCHEMA_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/stream.h b/src/sioclient/lib/rapidjson/include/rapidjson/stream.h
deleted file mode 100644
index 7f2643e4..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/stream.h
+++ /dev/null
@@ -1,223 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#include "rapidjson.h"
-
-#ifndef RAPIDJSON_STREAM_H_
-#define RAPIDJSON_STREAM_H_
-
-#include "encodings.h"
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-//  Stream
-
-/*! \class rapidjson::Stream
-    \brief Concept for reading and writing characters.
-
-    For read-only stream, no need to implement PutBegin(), Put(), Flush() and PutEnd().
-
-    For write-only stream, only need to implement Put() and Flush().
-
-\code
-concept Stream {
-    typename Ch;    //!< Character type of the stream.
-
-    //! Read the current character from stream without moving the read cursor.
-    Ch Peek() const;
-
-    //! Read the current character from stream and moving the read cursor to next character.
-    Ch Take();
-
-    //! Get the current read cursor.
-    //! \return Number of characters read from start.
-    size_t Tell();
-
-    //! Begin writing operation at the current read pointer.
-    //! \return The begin writer pointer.
-    Ch* PutBegin();
-
-    //! Write a character.
-    void Put(Ch c);
-
-    //! Flush the buffer.
-    void Flush();
-
-    //! End the writing operation.
-    //! \param begin The begin write pointer returned by PutBegin().
-    //! \return Number of characters written.
-    size_t PutEnd(Ch* begin);
-}
-\endcode
-*/
-
-//! Provides additional information for stream.
-/*!
-    By using traits pattern, this type provides a default configuration for stream.
-    For custom stream, this type can be specialized for other configuration.
-    See TEST(Reader, CustomStringStream) in readertest.cpp for example.
-*/
-template<typename Stream>
-struct StreamTraits {
-    //! Whether to make local copy of stream for optimization during parsing.
-    /*!
-        By default, for safety, streams do not use local copy optimization.
-        Stream that can be copied fast should specialize this, like StreamTraits<StringStream>.
-    */
-    enum { copyOptimization = 0 };
-};
-
-//! Reserve n characters for writing to a stream.
-template<typename Stream>
-inline void PutReserve(Stream& stream, size_t count) {
-    (void)stream;
-    (void)count;
-}
-
-//! Write character to a stream, presuming buffer is reserved.
-template<typename Stream>
-inline void PutUnsafe(Stream& stream, typename Stream::Ch c) {
-    stream.Put(c);
-}
-
-//! Put N copies of a character to a stream.
-template<typename Stream, typename Ch>
-inline void PutN(Stream& stream, Ch c, size_t n) {
-    PutReserve(stream, n);
-    for (size_t i = 0; i < n; i++)
-        PutUnsafe(stream, c);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericStreamWrapper
-
-//! A Stream Wrapper
-/*! \tThis string stream is a wrapper for any stream by just forwarding any
-    \treceived message to the origin stream.
-    \note implements Stream concept
-*/
-
-#if defined(_MSC_VER) && _MSC_VER <= 1800
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4702)  // unreachable code
-RAPIDJSON_DIAG_OFF(4512)  // assignment operator could not be generated
-#endif
-
-template <typename InputStream, typename Encoding = UTF8<> >
-class GenericStreamWrapper {
-public:
-    typedef typename Encoding::Ch Ch;
-    GenericStreamWrapper(InputStream& is): is_(is) {}
-
-    Ch Peek() const { return is_.Peek(); }
-    Ch Take() { return is_.Take(); }
-    size_t Tell() { return is_.Tell(); }
-    Ch* PutBegin() { return is_.PutBegin(); }
-    void Put(Ch ch) { is_.Put(ch); }
-    void Flush() { is_.Flush(); }
-    size_t PutEnd(Ch* ch) { return is_.PutEnd(ch); }
-
-    // wrapper for MemoryStream
-    const Ch* Peek4() const { return is_.Peek4(); }
-
-    // wrapper for AutoUTFInputStream
-    UTFType GetType() const { return is_.GetType(); }
-    bool HasBOM() const { return is_.HasBOM(); }
-
-protected:
-    InputStream& is_;
-};
-
-#if defined(_MSC_VER) && _MSC_VER <= 1800
-RAPIDJSON_DIAG_POP
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// StringStream
-
-//! Read-only string stream.
-/*! \note implements Stream concept
-*/
-template <typename Encoding>
-struct GenericStringStream {
-    typedef typename Encoding::Ch Ch;
-
-    GenericStringStream(const Ch *src) : src_(src), head_(src) {}
-
-    Ch Peek() const { return *src_; }
-    Ch Take() { return *src_++; }
-    size_t Tell() const { return static_cast<size_t>(src_ - head_); }
-
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-    const Ch* src_;     //!< Current read position.
-    const Ch* head_;    //!< Original head of the string.
-};
-
-template <typename Encoding>
-struct StreamTraits<GenericStringStream<Encoding> > {
-    enum { copyOptimization = 1 };
-};
-
-//! String stream with UTF8 encoding.
-typedef GenericStringStream<UTF8<> > StringStream;
-
-///////////////////////////////////////////////////////////////////////////////
-// InsituStringStream
-
-//! A read-write string stream.
-/*! This string stream is particularly designed for in-situ parsing.
-    \note implements Stream concept
-*/
-template <typename Encoding>
-struct GenericInsituStringStream {
-    typedef typename Encoding::Ch Ch;
-
-    GenericInsituStringStream(Ch *src) : src_(src), dst_(0), head_(src) {}
-
-    // Read
-    Ch Peek() { return *src_; }
-    Ch Take() { return *src_++; }
-    size_t Tell() { return static_cast<size_t>(src_ - head_); }
-
-    // Write
-    void Put(Ch c) { RAPIDJSON_ASSERT(dst_ != 0); *dst_++ = c; }
-
-    Ch* PutBegin() { return dst_ = src_; }
-    size_t PutEnd(Ch* begin) { return static_cast<size_t>(dst_ - begin); }
-    void Flush() {}
-
-    Ch* Push(size_t count) { Ch* begin = dst_; dst_ += count; return begin; }
-    void Pop(size_t count) { dst_ -= count; }
-
-    Ch* src_;
-    Ch* dst_;
-    Ch* head_;
-};
-
-template <typename Encoding>
-struct StreamTraits<GenericInsituStringStream<Encoding> > {
-    enum { copyOptimization = 1 };
-};
-
-//! Insitu string stream with UTF8 encoding.
-typedef GenericInsituStringStream<UTF8<> > InsituStringStream;
-
-RAPIDJSON_NAMESPACE_END
-
-#endif // RAPIDJSON_STREAM_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/stringbuffer.h b/src/sioclient/lib/rapidjson/include/rapidjson/stringbuffer.h
deleted file mode 100644
index 4e38b82c..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/stringbuffer.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_STRINGBUFFER_H_
-#define RAPIDJSON_STRINGBUFFER_H_
-
-#include "stream.h"
-#include "internal/stack.h"
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-#include <utility> // std::move
-#endif
-
-#include "internal/stack.h"
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-//! Represents an in-memory output stream.
-/*!
-    \tparam Encoding Encoding of the stream.
-    \tparam Allocator type for allocating memory buffer.
-    \note implements Stream concept
-*/
-template <typename Encoding, typename Allocator = CrtAllocator>
-class GenericStringBuffer {
-public:
-    typedef typename Encoding::Ch Ch;
-
-    GenericStringBuffer(Allocator* allocator = 0, size_t capacity = kDefaultCapacity) : stack_(allocator, capacity) {}
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericStringBuffer(GenericStringBuffer&& rhs) : stack_(std::move(rhs.stack_)) {}
-    GenericStringBuffer& operator=(GenericStringBuffer&& rhs) {
-        if (&rhs != this)
-            stack_ = std::move(rhs.stack_);
-        return *this;
-    }
-#endif
-
-    void Put(Ch c) { *stack_.template Push<Ch>() = c; }
-    void PutUnsafe(Ch c) { *stack_.template PushUnsafe<Ch>() = c; }
-    void Flush() {}
-
-    void Clear() { stack_.Clear(); }
-    void ShrinkToFit() {
-        // Push and pop a null terminator. This is safe.
-        *stack_.template Push<Ch>() = '\0';
-        stack_.ShrinkToFit();
-        stack_.template Pop<Ch>(1);
-    }
-
-    void Reserve(size_t count) { stack_.template Reserve<Ch>(count); }
-    Ch* Push(size_t count) { return stack_.template Push<Ch>(count); }
-    Ch* PushUnsafe(size_t count) { return stack_.template PushUnsafe<Ch>(count); }
-    void Pop(size_t count) { stack_.template Pop<Ch>(count); }
-
-    const Ch* GetString() const {
-        // Push and pop a null terminator. This is safe.
-        *stack_.template Push<Ch>() = '\0';
-        stack_.template Pop<Ch>(1);
-
-        return stack_.template Bottom<Ch>();
-    }
-
-    //! Get the size of string in bytes in the string buffer.
-    size_t GetSize() const { return stack_.GetSize(); }
-
-    //! Get the length of string in Ch in the string buffer.
-    size_t GetLength() const { return stack_.GetSize() / sizeof(Ch); }
-
-    static const size_t kDefaultCapacity = 256;
-    mutable internal::Stack<Allocator> stack_;
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    GenericStringBuffer(const GenericStringBuffer&);
-    GenericStringBuffer& operator=(const GenericStringBuffer&);
-};
-
-//! String buffer with UTF8 encoding
-typedef GenericStringBuffer<UTF8<> > StringBuffer;
-
-template<typename Encoding, typename Allocator>
-inline void PutReserve(GenericStringBuffer<Encoding, Allocator>& stream, size_t count) {
-    stream.Reserve(count);
-}
-
-template<typename Encoding, typename Allocator>
-inline void PutUnsafe(GenericStringBuffer<Encoding, Allocator>& stream, typename Encoding::Ch c) {
-    stream.PutUnsafe(c);
-}
-
-//! Implement specialized version of PutN() with memset() for better performance.
-template<>
-inline void PutN(GenericStringBuffer<UTF8<> >& stream, char c, size_t n) {
-    std::memset(stream.stack_.Push<char>(n), c, n * sizeof(c));
-}
-
-RAPIDJSON_NAMESPACE_END
-
-#if defined(__clang__)
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_STRINGBUFFER_H_
diff --git a/src/sioclient/lib/rapidjson/include/rapidjson/writer.h b/src/sioclient/lib/rapidjson/include/rapidjson/writer.h
deleted file mode 100644
index 49cc0fb4..00000000
--- a/src/sioclient/lib/rapidjson/include/rapidjson/writer.h
+++ /dev/null
@@ -1,710 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef RAPIDJSON_WRITER_H_
-#define RAPIDJSON_WRITER_H_
-
-#include "stream.h"
-#include "internal/meta.h"
-#include "internal/stack.h"
-#include "internal/strfunc.h"
-#include "internal/dtoa.h"
-#include "internal/itoa.h"
-#include "stringbuffer.h"
-#include <new>      // placement new
-
-#if defined(RAPIDJSON_SIMD) && defined(_MSC_VER)
-#include <intrin.h>
-#pragma intrinsic(_BitScanForward)
-#endif
-#ifdef RAPIDJSON_SSE42
-#include <nmmintrin.h>
-#elif defined(RAPIDJSON_SSE2)
-#include <emmintrin.h>
-#elif defined(RAPIDJSON_NEON)
-#include <arm_neon.h>
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(padded)
-RAPIDJSON_DIAG_OFF(unreachable-code)
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#elif defined(_MSC_VER)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
-#endif
-
-RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// WriteFlag
-
-/*! \def RAPIDJSON_WRITE_DEFAULT_FLAGS 
-    \ingroup RAPIDJSON_CONFIG
-    \brief User-defined kWriteDefaultFlags definition.
-
-    User can define this as any \c WriteFlag combinations.
-*/
-#ifndef RAPIDJSON_WRITE_DEFAULT_FLAGS
-#define RAPIDJSON_WRITE_DEFAULT_FLAGS kWriteNoFlags
-#endif
-
-//! Combination of writeFlags
-enum WriteFlag {
-    kWriteNoFlags = 0,              //!< No flags are set.
-    kWriteValidateEncodingFlag = 1, //!< Validate encoding of JSON strings.
-    kWriteNanAndInfFlag = 2,        //!< Allow writing of Infinity, -Infinity and NaN.
-    kWriteDefaultFlags = RAPIDJSON_WRITE_DEFAULT_FLAGS  //!< Default write flags. Can be customized by defining RAPIDJSON_WRITE_DEFAULT_FLAGS
-};
-
-//! JSON writer
-/*! Writer implements the concept Handler.
-    It generates JSON text by events to an output os.
-
-    User may programmatically calls the functions of a writer to generate JSON text.
-
-    On the other side, a writer can also be passed to objects that generates events, 
-
-    for example Reader::Parse() and Document::Accept().
-
-    \tparam OutputStream Type of output stream.
-    \tparam SourceEncoding Encoding of source string.
-    \tparam TargetEncoding Encoding of output stream.
-    \tparam StackAllocator Type of allocator for allocating memory of stack.
-    \note implements Handler concept
-*/
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>
-class Writer {
-public:
-    typedef typename SourceEncoding::Ch Ch;
-
-    static const int kDefaultMaxDecimalPlaces = 324;
-
-    //! Constructor
-    /*! \param os Output stream.
-        \param stackAllocator User supplied allocator. If it is null, it will create a private one.
-        \param levelDepth Initial capacity of stack.
-    */
-    explicit
-    Writer(OutputStream& os, StackAllocator* stackAllocator = 0, size_t levelDepth = kDefaultLevelDepth) : 
-        os_(&os), level_stack_(stackAllocator, levelDepth * sizeof(Level)), maxDecimalPlaces_(kDefaultMaxDecimalPlaces), hasRoot_(false) {}
-
-    explicit
-    Writer(StackAllocator* allocator = 0, size_t levelDepth = kDefaultLevelDepth) :
-        os_(0), level_stack_(allocator, levelDepth * sizeof(Level)), maxDecimalPlaces_(kDefaultMaxDecimalPlaces), hasRoot_(false) {}
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    Writer(Writer&& rhs) :
-        os_(rhs.os_), level_stack_(std::move(rhs.level_stack_)), maxDecimalPlaces_(rhs.maxDecimalPlaces_), hasRoot_(rhs.hasRoot_) {
-        rhs.os_ = 0;
-    }
-#endif
-
-    //! Reset the writer with a new stream.
-    /*!
-        This function reset the writer with a new stream and default settings,
-        in order to make a Writer object reusable for output multiple JSONs.
-
-        \param os New output stream.
-        \code
-        Writer<OutputStream> writer(os1);
-        writer.StartObject();
-        // ...
-        writer.EndObject();
-
-        writer.Reset(os2);
-        writer.StartObject();
-        // ...
-        writer.EndObject();
-        \endcode
-    */
-    void Reset(OutputStream& os) {
-        os_ = &os;
-        hasRoot_ = false;
-        level_stack_.Clear();
-    }
-
-    //! Checks whether the output is a complete JSON.
-    /*!
-        A complete JSON has a complete root object or array.
-    */
-    bool IsComplete() const {
-        return hasRoot_ && level_stack_.Empty();
-    }
-
-    int GetMaxDecimalPlaces() const {
-        return maxDecimalPlaces_;
-    }
-
-    //! Sets the maximum number of decimal places for double output.
-    /*!
-        This setting truncates the output with specified number of decimal places.
-
-        For example, 
-
-        \code
-        writer.SetMaxDecimalPlaces(3);
-        writer.StartArray();
-        writer.Double(0.12345);                 // "0.123"
-        writer.Double(0.0001);                  // "0.0"
-        writer.Double(1.234567890123456e30);    // "1.234567890123456e30" (do not truncate significand for positive exponent)
-        writer.Double(1.23e-4);                 // "0.0"                  (do truncate significand for negative exponent)
-        writer.EndArray();
-        \endcode
-
-        The default setting does not truncate any decimal places. You can restore to this setting by calling
-        \code
-        writer.SetMaxDecimalPlaces(Writer::kDefaultMaxDecimalPlaces);
-        \endcode
-    */
-    void SetMaxDecimalPlaces(int maxDecimalPlaces) {
-        maxDecimalPlaces_ = maxDecimalPlaces;
-    }
-
-    /*!@name Implementation of Handler
-        \see Handler
-    */
-    //@{
-
-    bool Null()                 { Prefix(kNullType);   return EndValue(WriteNull()); }
-    bool Bool(bool b)           { Prefix(b ? kTrueType : kFalseType); return EndValue(WriteBool(b)); }
-    bool Int(int i)             { Prefix(kNumberType); return EndValue(WriteInt(i)); }
-    bool Uint(unsigned u)       { Prefix(kNumberType); return EndValue(WriteUint(u)); }
-    bool Int64(int64_t i64)     { Prefix(kNumberType); return EndValue(WriteInt64(i64)); }
-    bool Uint64(uint64_t u64)   { Prefix(kNumberType); return EndValue(WriteUint64(u64)); }
-
-    //! Writes the given \c double value to the stream
-    /*!
-        \param d The value to be written.
-        \return Whether it is succeed.
-    */
-    bool Double(double d)       { Prefix(kNumberType); return EndValue(WriteDouble(d)); }
-
-    bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
-        RAPIDJSON_ASSERT(str != 0);
-        (void)copy;
-        Prefix(kNumberType);
-        return EndValue(WriteString(str, length));
-    }
-
-    bool String(const Ch* str, SizeType length, bool copy = false) {
-        RAPIDJSON_ASSERT(str != 0);
-        (void)copy;
-        Prefix(kStringType);
-        return EndValue(WriteString(str, length));
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    bool String(const std::basic_string<Ch>& str) {
-        return String(str.data(), SizeType(str.size()));
-    }
-#endif
-
-    bool StartObject() {
-        Prefix(kObjectType);
-        new (level_stack_.template Push<Level>()) Level(false);
-        return WriteStartObject();
-    }
-
-    bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
-
-#if RAPIDJSON_HAS_STDSTRING
-    bool Key(const std::basic_string<Ch>& str)
-    {
-      return Key(str.data(), SizeType(str.size()));
-    }
-#endif
-	
-    bool EndObject(SizeType memberCount = 0) {
-        (void)memberCount;
-        RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level)); // not inside an Object
-        RAPIDJSON_ASSERT(!level_stack_.template Top<Level>()->inArray); // currently inside an Array, not Object
-        RAPIDJSON_ASSERT(0 == level_stack_.template Top<Level>()->valueCount % 2); // Object has a Key without a Value
-        level_stack_.template Pop<Level>(1);
-        return EndValue(WriteEndObject());
-    }
-
-    bool StartArray() {
-        Prefix(kArrayType);
-        new (level_stack_.template Push<Level>()) Level(true);
-        return WriteStartArray();
-    }
-
-    bool EndArray(SizeType elementCount = 0) {
-        (void)elementCount;
-        RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
-        RAPIDJSON_ASSERT(level_stack_.template Top<Level>()->inArray);
-        level_stack_.template Pop<Level>(1);
-        return EndValue(WriteEndArray());
-    }
-    //@}
-
-    /*! @name Convenience extensions */
-    //@{
-
-    //! Simpler but slower overload.
-    bool String(const Ch* const& str) { return String(str, internal::StrLen(str)); }
-    bool Key(const Ch* const& str) { return Key(str, internal::StrLen(str)); }
-    
-    //@}
-
-    //! Write a raw JSON value.
-    /*!
-        For user to write a stringified JSON as a value.
-
-        \param json A well-formed JSON value. It should not contain null character within [0, length - 1] range.
-        \param length Length of the json.
-        \param type Type of the root of json.
-    */
-    bool RawValue(const Ch* json, size_t length, Type type) {
-        RAPIDJSON_ASSERT(json != 0);
-        Prefix(type);
-        return EndValue(WriteRawValue(json, length));
-    }
-
-    //! Flush the output stream.
-    /*!
-        Allows the user to flush the output stream immediately.
-     */
-    void Flush() {
-        os_->Flush();
-    }
-
-protected:
-    //! Information for each nested level
-    struct Level {
-        Level(bool inArray_) : valueCount(0), inArray(inArray_) {}
-        size_t valueCount;  //!< number of values in this level
-        bool inArray;       //!< true if in array, otherwise in object
-    };
-
-    static const size_t kDefaultLevelDepth = 32;
-
-    bool WriteNull()  {
-        PutReserve(*os_, 4);
-        PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 'l'); return true;
-    }
-
-    bool WriteBool(bool b)  {
-        if (b) {
-            PutReserve(*os_, 4);
-            PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'r'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'e');
-        }
-        else {
-            PutReserve(*os_, 5);
-            PutUnsafe(*os_, 'f'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 's'); PutUnsafe(*os_, 'e');
-        }
-        return true;
-    }
-
-    bool WriteInt(int i) {
-        char buffer[11];
-        const char* end = internal::i32toa(i, buffer);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (const char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename OutputStream::Ch>(*p));
-        return true;
-    }
-
-    bool WriteUint(unsigned u) {
-        char buffer[10];
-        const char* end = internal::u32toa(u, buffer);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (const char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename OutputStream::Ch>(*p));
-        return true;
-    }
-
-    bool WriteInt64(int64_t i64) {
-        char buffer[21];
-        const char* end = internal::i64toa(i64, buffer);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (const char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename OutputStream::Ch>(*p));
-        return true;
-    }
-
-    bool WriteUint64(uint64_t u64) {
-        char buffer[20];
-        char* end = internal::u64toa(u64, buffer);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename OutputStream::Ch>(*p));
-        return true;
-    }
-
-    bool WriteDouble(double d) {
-        if (internal::Double(d).IsNanOrInf()) {
-            if (!(writeFlags & kWriteNanAndInfFlag))
-                return false;
-            if (internal::Double(d).IsNan()) {
-                PutReserve(*os_, 3);
-                PutUnsafe(*os_, 'N'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'N');
-                return true;
-            }
-            if (internal::Double(d).Sign()) {
-                PutReserve(*os_, 9);
-                PutUnsafe(*os_, '-');
-            }
-            else
-                PutReserve(*os_, 8);
-            PutUnsafe(*os_, 'I'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'f');
-            PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'y');
-            return true;
-        }
-
-        char buffer[25];
-        char* end = internal::dtoa(d, buffer, maxDecimalPlaces_);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename OutputStream::Ch>(*p));
-        return true;
-    }
-
-    bool WriteString(const Ch* str, SizeType length)  {
-        static const typename OutputStream::Ch hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-        static const char escape[256] = {
-#define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            //0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
-            'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'b', 't', 'n', 'u', 'f', 'r', 'u', 'u', // 00
-            'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', // 10
-              0,   0, '"',   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 20
-            Z16, Z16,                                                                       // 30~4F
-              0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,'\\',   0,   0,   0, // 50
-            Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16                                // 60~FF
-#undef Z16
-        };
-
-        if (TargetEncoding::supportUnicode)
-            PutReserve(*os_, 2 + length * 6); // "\uxxxx..."
-        else
-            PutReserve(*os_, 2 + length * 12);  // "\uxxxx\uyyyy..."
-
-        PutUnsafe(*os_, '\"');
-        GenericStringStream<SourceEncoding> is(str);
-        while (ScanWriteUnescapedString(is, length)) {
-            const Ch c = is.Peek();
-            if (!TargetEncoding::supportUnicode && static_cast<unsigned>(c) >= 0x80) {
-                // Unicode escaping
-                unsigned codepoint;
-                if (RAPIDJSON_UNLIKELY(!SourceEncoding::Decode(is, &codepoint)))
-                    return false;
-                PutUnsafe(*os_, '\\');
-                PutUnsafe(*os_, 'u');
-                if (codepoint <= 0xD7FF || (codepoint >= 0xE000 && codepoint <= 0xFFFF)) {
-                    PutUnsafe(*os_, hexDigits[(codepoint >> 12) & 15]);
-                    PutUnsafe(*os_, hexDigits[(codepoint >>  8) & 15]);
-                    PutUnsafe(*os_, hexDigits[(codepoint >>  4) & 15]);
-                    PutUnsafe(*os_, hexDigits[(codepoint      ) & 15]);
-                }
-                else {
-                    RAPIDJSON_ASSERT(codepoint >= 0x010000 && codepoint <= 0x10FFFF);
-                    // Surrogate pair
-                    unsigned s = codepoint - 0x010000;
-                    unsigned lead = (s >> 10) + 0xD800;
-                    unsigned trail = (s & 0x3FF) + 0xDC00;
-                    PutUnsafe(*os_, hexDigits[(lead >> 12) & 15]);
-                    PutUnsafe(*os_, hexDigits[(lead >>  8) & 15]);
-                    PutUnsafe(*os_, hexDigits[(lead >>  4) & 15]);
-                    PutUnsafe(*os_, hexDigits[(lead      ) & 15]);
-                    PutUnsafe(*os_, '\\');
-                    PutUnsafe(*os_, 'u');
-                    PutUnsafe(*os_, hexDigits[(trail >> 12) & 15]);
-                    PutUnsafe(*os_, hexDigits[(trail >>  8) & 15]);
-                    PutUnsafe(*os_, hexDigits[(trail >>  4) & 15]);
-                    PutUnsafe(*os_, hexDigits[(trail      ) & 15]);                    
-                }
-            }
-            else if ((sizeof(Ch) == 1 || static_cast<unsigned>(c) < 256) && RAPIDJSON_UNLIKELY(escape[static_cast<unsigned char>(c)]))  {
-                is.Take();
-                PutUnsafe(*os_, '\\');
-                PutUnsafe(*os_, static_cast<typename OutputStream::Ch>(escape[static_cast<unsigned char>(c)]));
-                if (escape[static_cast<unsigned char>(c)] == 'u') {
-                    PutUnsafe(*os_, '0');
-                    PutUnsafe(*os_, '0');
-                    PutUnsafe(*os_, hexDigits[static_cast<unsigned char>(c) >> 4]);
-                    PutUnsafe(*os_, hexDigits[static_cast<unsigned char>(c) & 0xF]);
-                }
-            }
-            else if (RAPIDJSON_UNLIKELY(!(writeFlags & kWriteValidateEncodingFlag ? 
-                Transcoder<SourceEncoding, TargetEncoding>::Validate(is, *os_) :
-                Transcoder<SourceEncoding, TargetEncoding>::TranscodeUnsafe(is, *os_))))
-                return false;
-        }
-        PutUnsafe(*os_, '\"');
-        return true;
-    }
-
-    bool ScanWriteUnescapedString(GenericStringStream<SourceEncoding>& is, size_t length) {
-        return RAPIDJSON_LIKELY(is.Tell() < length);
-    }
-
-    bool WriteStartObject() { os_->Put('{'); return true; }
-    bool WriteEndObject()   { os_->Put('}'); return true; }
-    bool WriteStartArray()  { os_->Put('['); return true; }
-    bool WriteEndArray()    { os_->Put(']'); return true; }
-
-    bool WriteRawValue(const Ch* json, size_t length) {
-        PutReserve(*os_, length);
-        GenericStringStream<SourceEncoding> is(json);
-        while (RAPIDJSON_LIKELY(is.Tell() < length)) {
-            const Ch c = is.Peek();
-            RAPIDJSON_ASSERT(c != '\0');
-            if (RAPIDJSON_UNLIKELY(!(writeFlags & kWriteValidateEncodingFlag ? 
-                Transcoder<SourceEncoding, TargetEncoding>::Validate(is, *os_) :
-                Transcoder<SourceEncoding, TargetEncoding>::TranscodeUnsafe(is, *os_))))
-                return false;
-        }
-        return true;
-    }
-
-    void Prefix(Type type) {
-        (void)type;
-        if (RAPIDJSON_LIKELY(level_stack_.GetSize() != 0)) { // this value is not at root
-            Level* level = level_stack_.template Top<Level>();
-            if (level->valueCount > 0) {
-                if (level->inArray) 
-                    os_->Put(','); // add comma if it is not the first element in array
-                else  // in object
-                    os_->Put((level->valueCount % 2 == 0) ? ',' : ':');
-            }
-            if (!level->inArray && level->valueCount % 2 == 0)
-                RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
-            level->valueCount++;
-        }
-        else {
-            RAPIDJSON_ASSERT(!hasRoot_);    // Should only has one and only one root.
-            hasRoot_ = true;
-        }
-    }
-
-    // Flush the value if it is the top level one.
-    bool EndValue(bool ret) {
-        if (RAPIDJSON_UNLIKELY(level_stack_.Empty()))   // end of json text
-            Flush();
-        return ret;
-    }
-
-    OutputStream* os_;
-    internal::Stack<StackAllocator> level_stack_;
-    int maxDecimalPlaces_;
-    bool hasRoot_;
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    Writer(const Writer&);
-    Writer& operator=(const Writer&);
-};
-
-// Full specialization for StringStream to prevent memory copying
-
-template<>
-inline bool Writer<StringBuffer>::WriteInt(int i) {
-    char *buffer = os_->Push(11);
-    const char* end = internal::i32toa(i, buffer);
-    os_->Pop(static_cast<size_t>(11 - (end - buffer)));
-    return true;
-}
-
-template<>
-inline bool Writer<StringBuffer>::WriteUint(unsigned u) {
-    char *buffer = os_->Push(10);
-    const char* end = internal::u32toa(u, buffer);
-    os_->Pop(static_cast<size_t>(10 - (end - buffer)));
-    return true;
-}
-
-template<>
-inline bool Writer<StringBuffer>::WriteInt64(int64_t i64) {
-    char *buffer = os_->Push(21);
-    const char* end = internal::i64toa(i64, buffer);
-    os_->Pop(static_cast<size_t>(21 - (end - buffer)));
-    return true;
-}
-
-template<>
-inline bool Writer<StringBuffer>::WriteUint64(uint64_t u) {
-    char *buffer = os_->Push(20);
-    const char* end = internal::u64toa(u, buffer);
-    os_->Pop(static_cast<size_t>(20 - (end - buffer)));
-    return true;
-}
-
-template<>
-inline bool Writer<StringBuffer>::WriteDouble(double d) {
-    if (internal::Double(d).IsNanOrInf()) {
-        // Note: This code path can only be reached if (RAPIDJSON_WRITE_DEFAULT_FLAGS & kWriteNanAndInfFlag).
-        if (!(kWriteDefaultFlags & kWriteNanAndInfFlag))
-            return false;
-        if (internal::Double(d).IsNan()) {
-            PutReserve(*os_, 3);
-            PutUnsafe(*os_, 'N'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'N');
-            return true;
-        }
-        if (internal::Double(d).Sign()) {
-            PutReserve(*os_, 9);
-            PutUnsafe(*os_, '-');
-        }
-        else
-            PutReserve(*os_, 8);
-        PutUnsafe(*os_, 'I'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'f');
-        PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'y');
-        return true;
-    }
-    
-    char *buffer = os_->Push(25);
-    char* end = internal::dtoa(d, buffer, maxDecimalPlaces_);
-    os_->Pop(static_cast<size_t>(25 - (end - buffer)));
-    return true;
-}
-
-#if defined(RAPIDJSON_SSE2) || defined(RAPIDJSON_SSE42)
-template<>
-inline bool Writer<StringBuffer>::ScanWriteUnescapedString(StringStream& is, size_t length) {
-    if (length < 16)
-        return RAPIDJSON_LIKELY(is.Tell() < length);
-
-    if (!RAPIDJSON_LIKELY(is.Tell() < length))
-        return false;
-
-    const char* p = is.src_;
-    const char* end = is.head_ + length;
-    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-    const char* endAligned = reinterpret_cast<const char*>(reinterpret_cast<size_t>(end) & static_cast<size_t>(~15));
-    if (nextAligned > end)
-        return true;
-
-    while (p != nextAligned)
-        if (*p < 0x20 || *p == '\"' || *p == '\\') {
-            is.src_ = p;
-            return RAPIDJSON_LIKELY(is.Tell() < length);
-        }
-        else
-            os_->PutUnsafe(*p++);
-
-    // The rest of string using SIMD
-    static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
-    static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
-    static const char space[16]  = { 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F };
-    const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
-    const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
-    const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
-
-    for (; p != endAligned; p += 16) {
-        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-        const __m128i t1 = _mm_cmpeq_epi8(s, dq);
-        const __m128i t2 = _mm_cmpeq_epi8(s, bs);
-        const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x1F) == 0x1F
-        const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
-        unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
-        if (RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
-            SizeType len;
-#ifdef _MSC_VER         // Find the index of first escaped
-            unsigned long offset;
-            _BitScanForward(&offset, r);
-            len = offset;
-#else
-            len = static_cast<SizeType>(__builtin_ffs(r) - 1);
-#endif
-            char* q = reinterpret_cast<char*>(os_->PushUnsafe(len));
-            for (size_t i = 0; i < len; i++)
-                q[i] = p[i];
-
-            p += len;
-            break;
-        }
-        _mm_storeu_si128(reinterpret_cast<__m128i *>(os_->PushUnsafe(16)), s);
-    }
-
-    is.src_ = p;
-    return RAPIDJSON_LIKELY(is.Tell() < length);
-}
-#elif defined(RAPIDJSON_NEON)
-template<>
-inline bool Writer<StringBuffer>::ScanWriteUnescapedString(StringStream& is, size_t length) {
-    if (length < 16)
-        return RAPIDJSON_LIKELY(is.Tell() < length);
-
-    if (!RAPIDJSON_LIKELY(is.Tell() < length))
-        return false;
-
-    const char* p = is.src_;
-    const char* end = is.head_ + length;
-    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-    const char* endAligned = reinterpret_cast<const char*>(reinterpret_cast<size_t>(end) & static_cast<size_t>(~15));
-    if (nextAligned > end)
-        return true;
-
-    while (p != nextAligned)
-        if (*p < 0x20 || *p == '\"' || *p == '\\') {
-            is.src_ = p;
-            return RAPIDJSON_LIKELY(is.Tell() < length);
-        }
-        else
-            os_->PutUnsafe(*p++);
-
-    // The rest of string using SIMD
-    const uint8x16_t s0 = vmovq_n_u8('"');
-    const uint8x16_t s1 = vmovq_n_u8('\\');
-    const uint8x16_t s2 = vmovq_n_u8('\b');
-    const uint8x16_t s3 = vmovq_n_u8(32);
-
-    for (; p != endAligned; p += 16) {
-        const uint8x16_t s = vld1q_u8(reinterpret_cast<const uint8_t *>(p));
-        uint8x16_t x = vceqq_u8(s, s0);
-        x = vorrq_u8(x, vceqq_u8(s, s1));
-        x = vorrq_u8(x, vceqq_u8(s, s2));
-        x = vorrq_u8(x, vcltq_u8(s, s3));
-
-        x = vrev64q_u8(x);                     // Rev in 64
-        uint64_t low = vgetq_lane_u64(reinterpret_cast<uint64x2_t>(x), 0);   // extract
-        uint64_t high = vgetq_lane_u64(reinterpret_cast<uint64x2_t>(x), 1);  // extract
-
-        SizeType len = 0;
-        bool escaped = false;
-        if (low == 0) {
-            if (high != 0) {
-                unsigned lz = (unsigned)__builtin_clzll(high);
-                len = 8 + (lz >> 3);
-                escaped = true;
-            }
-        } else {
-            unsigned lz = (unsigned)__builtin_clzll(low);
-            len = lz >> 3;
-            escaped = true;
-        }
-        if (RAPIDJSON_UNLIKELY(escaped)) {   // some of characters is escaped
-            char* q = reinterpret_cast<char*>(os_->PushUnsafe(len));
-            for (size_t i = 0; i < len; i++)
-                q[i] = p[i];
-
-            p += len;
-            break;
-        }
-        vst1q_u8(reinterpret_cast<uint8_t *>(os_->PushUnsafe(16)), s);
-    }
-
-    is.src_ = p;
-    return RAPIDJSON_LIKELY(is.Tell() < length);
-}
-#endif // RAPIDJSON_NEON
-
-RAPIDJSON_NAMESPACE_END
-
-#if defined(_MSC_VER) || defined(__clang__)
-RAPIDJSON_DIAG_POP
-#endif
-
-#endif // RAPIDJSON_RAPIDJSON_H_
diff --git a/src/sioclient/lib/rapidjson/include_dirs.js b/src/sioclient/lib/rapidjson/include_dirs.js
deleted file mode 100644
index b373e85f..00000000
--- a/src/sioclient/lib/rapidjson/include_dirs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-var path = require('path');
-console.log(path.join(path.relative('.', __dirname), 'include'));
diff --git a/src/sioclient/lib/rapidjson/library.json b/src/sioclient/lib/rapidjson/library.json
deleted file mode 100644
index 2210fcd6..00000000
--- a/src/sioclient/lib/rapidjson/library.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "RapidJSON",
-  "version": "1.1.0",
-  "keywords": "json, sax, dom, parser, generator",
-  "description": "A fast JSON parser/generator for C++ with both SAX/DOM style API",
-  "export": {
-    "include": "include"
-  },
-  "examples": "example/*/*.cpp",
-  "repository":
-  {
-    "type": "git",
-    "url": "https://github.com/Tencent/rapidjson"
-  }
-}
diff --git a/src/sioclient/lib/rapidjson/license.txt b/src/sioclient/lib/rapidjson/license.txt
deleted file mode 100644
index 7ccc161c..00000000
--- a/src/sioclient/lib/rapidjson/license.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-Tencent is pleased to support the open source community by making RapidJSON available. 
- 
-Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.
-
-If you have downloaded a copy of the RapidJSON binary from Tencent, please note that the RapidJSON binary is licensed under the MIT License.
-If you have downloaded a copy of the RapidJSON source code from Tencent, please note that RapidJSON source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms.  Your integration of RapidJSON into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within RapidJSON. To avoid the problematic JSON license in your own projects, it's sufficient to exclude the bin/jsonchecker/ directory, as it's the only code under the JSON license.
-A copy of the MIT License is included in this file.
-
-Other dependencies and licenses:
-
-Open Source Software Licensed Under the BSD License:
---------------------------------------------------------------------
-
-The msinttypes r29 
-Copyright (c) 2006-2013 Alexander Chemeris 
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of  copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Open Source Software Licensed Under the JSON License:
---------------------------------------------------------------------
-
-json.org 
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-JSON_checker
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-	
-Terms of the JSON License:
----------------------------------------------------
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Terms of the MIT License:
---------------------------------------------------------------------
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/sioclient/lib/rapidjson/package.json b/src/sioclient/lib/rapidjson/package.json
deleted file mode 100644
index 129581a6..00000000
--- a/src/sioclient/lib/rapidjson/package.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "rapidjson",
-  "version": "1.0.4",
-  "description": "![](doc/logo/rapidjson.png)",
-  "main": "include_dirs.js",
-  "directories": {
-    "doc": "doc",
-    "example": "example",
-    "test": "test"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Tencent/rapidjson.git"
-  },
-  "author": "",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/Tencent/rapidjson/issues"
-  },
-  "homepage": "https://github.com/Tencent/rapidjson#readme"
-}
diff --git a/src/sioclient/lib/rapidjson/rapidjson.autopkg b/src/sioclient/lib/rapidjson/rapidjson.autopkg
deleted file mode 100644
index fe72030a..00000000
--- a/src/sioclient/lib/rapidjson/rapidjson.autopkg
+++ /dev/null
@@ -1,77 +0,0 @@
-nuget {
-	//Usage:  Write-NuGetPackage rapidjson.autopkg -defines:MYVERSION=1.1.0
-	//Be sure you are running Powershell 3.0 and have the CoApp powershell extensions installed properly.
-	nuspec {
-		id = rapidjson;
-		version : ${MYVERSION};
-		title: "rapidjson";
-		authors: {"https://github.com/Tencent/rapidjson/releases/tag/v1.1.0"};
-		owners: {"@lsantos (github)"};
-		licenseUrl: "https://github.com/Tencent/rapidjson/blob/master/license.txt";
-		projectUrl: "https://github.com/Tencent/rapidjson/";
-		iconUrl: "https://cdn1.iconfinder.com/data/icons/fatcow/32x32/json.png";
-		requireLicenseAcceptance:false;
-		summary: @"A fast JSON parser/generator for C++ with both SAX/DOM style API";
-		
-		// if you need to span several lines you can prefix a string with an @ symbol (exactly like c# does).
-		description: @"Rapidjson is an attempt to create the fastest JSON parser and generator.
-
-              - Small but complete. Supports both SAX and DOM style API. SAX parser only a few hundred lines of code.
-              - Fast. In the order of magnitude of strlen(). Optionally supports SSE2/SSE4.2 for acceleration.
-              - Self-contained. Minimal dependency on standard libraries. No BOOST, not even STL.
-              - Compact. Each JSON value is 16 or 20 bytes for 32 or 64-bit machines respectively (excluding text string storage). With the custom memory allocator, parser allocates memory compactly during parsing.
-              - Full  RFC4627 compliance. Supports UTF-8, UTF-16 and UTF-32.
-              - Support both in-situ parsing (directly decode strings into the source JSON text) and non-destructive parsing (decode strings into new buffers).
-              - Parse number to int/unsigned/int64_t/uint64_t/double depending on input
-              - Support custom memory allocation. Also, the default memory pool allocator can also be supplied with a user buffer (such as a buffer allocated on user's heap or - programme stack) to minimize allocation.
-
-              As the name implies, rapidjson is inspired by rapidxml.";
-		
-		releaseNotes: @"
-Added
-	Add Value::XXXMember(...) overloads for std::string (#335)
-
-Fixed
-	Include rapidjson.h for all internal/error headers.
-	Parsing some numbers incorrectly in full-precision mode (kFullPrecisionParseFlag) (#342)
-	Fix alignment of 64bit platforms (#328)
-	Fix MemoryPoolAllocator::Clear() to clear user-buffer (0691502)
-
-Changed
-	CMakeLists for include as a thirdparty in projects (#334, #337)
-	Change Document::ParseStream() to use stack allocator for Reader (ffbe386)";
-
-		copyright: "Copyright 2015";
-		tags: { native, coapp, JSON, nativepackage };
-		language: en-US;
-	};
-	
-	dependencies {
-		packages : {
-			//TODO:  Add dependencies here in [pkg.name]/[version] form per newline		
-			//zlib/[1.2.8],			
-		};
-	}
-	
-	// the files that go into the content folders
-	files {	
-		#defines {
-			SDK_ROOT 	 = .\;			
-		}
-
-		// grab all the files in the include folder
-		// the folder that contains all the .h files will 
-		// automatically get added to the Includes path.
-		nestedinclude += {
-			#destination = ${d_include}rapidjson;
-			"${SDK_ROOT}include\rapidjson\**\*.h"
-		};
-	};
-	
-	targets {
-		// We're trying to be standard about these sorts of thing. (Will help with config.h later :D)
-		//Defines += HAS_EQCORE;
-		// Fix creating the package with Raggles' fork of CoApp
-		Includes += "$(MSBuildThisFileDirectory)../..${d_include}";
-	};
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/readme.md b/src/sioclient/lib/rapidjson/readme.md
deleted file mode 100644
index 78c9540d..00000000
--- a/src/sioclient/lib/rapidjson/readme.md
+++ /dev/null
@@ -1,160 +0,0 @@
-![RapidJSON logo](doc/logo/rapidjson.png)
-
-![Release version](https://img.shields.io/badge/release-v1.1.0-blue.svg)
-
-## A fast JSON parser/generator for C++ with both SAX/DOM style API
-
-Tencent is pleased to support the open source community by making RapidJSON available.
-
-Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-
-* [RapidJSON GitHub](https://github.com/Tencent/rapidjson/)
-* RapidJSON Documentation
-  * [English](http://rapidjson.org/)
-  * [简体中文](http://rapidjson.org/zh-cn/)
-  * [GitBook](https://www.gitbook.com/book/miloyip/rapidjson/) with downloadable PDF/EPUB/MOBI, without API reference.
-
-## Build status
-
-| [Linux][lin-link] | [Windows][win-link] | [Coveralls][cov-link] |
-| :---------------: | :-----------------: | :-------------------: |
-| ![lin-badge]      | ![win-badge]        | ![cov-badge]          |
-
-[lin-badge]: https://travis-ci.org/Tencent/rapidjson.svg?branch=master "Travis build status"
-[lin-link]:  https://travis-ci.org/Tencent/rapidjson "Travis build status"
-[win-badge]: https://ci.appveyor.com/api/projects/status/l6qulgqahcayidrf/branch/master?svg=true "AppVeyor build status"
-[win-link]:  https://ci.appveyor.com/project/miloyip/rapidjson-0fdqj/branch/master "AppVeyor build status"
-[cov-badge]: https://coveralls.io/repos/Tencent/rapidjson/badge.svg?branch=master "Coveralls coverage"
-[cov-link]:  https://coveralls.io/r/Tencent/rapidjson?branch=master "Coveralls coverage"
-
-## Introduction
-
-RapidJSON is a JSON parser and generator for C++. It was inspired by [RapidXml](http://rapidxml.sourceforge.net/).
-
-* RapidJSON is **small** but **complete**. It supports both SAX and DOM style API. The SAX parser is only a half thousand lines of code.
-
-* RapidJSON is **fast**. Its performance can be comparable to `strlen()`. It also optionally supports SSE2/SSE4.2 for acceleration.
-
-* RapidJSON is **self-contained** and **header-only**. It does not depend on external libraries such as BOOST. It even does not depend on STL.
-
-* RapidJSON is **memory-friendly**. Each JSON value occupies exactly 16 bytes for most 32/64-bit machines (excluding text string). By default it uses a fast memory allocator, and the parser allocates memory compactly during parsing.
-
-* RapidJSON is **Unicode-friendly**. It supports UTF-8, UTF-16, UTF-32 (LE & BE), and their detection, validation and transcoding internally. For example, you can read a UTF-8 file and let RapidJSON transcode the JSON strings into UTF-16 in the DOM. It also supports surrogates and "\u0000" (null character).
-
-More features can be read [here](doc/features.md).
-
-JSON(JavaScript Object Notation) is a light-weight data exchange format. RapidJSON should be in full compliance with RFC7159/ECMA-404, with optional support of relaxed syntax. More information about JSON can be obtained at
-* [Introducing JSON](http://json.org/)
-* [RFC7159: The JavaScript Object Notation (JSON) Data Interchange Format](https://tools.ietf.org/html/rfc7159)
-* [Standard ECMA-404: The JSON Data Interchange Format](https://www.ecma-international.org/publications/standards/Ecma-404.htm)
-
-## Highlights in v1.1 (2016-8-25)
-
-* Added [JSON Pointer](doc/pointer.md)
-* Added [JSON Schema](doc/schema.md)
-* Added [relaxed JSON syntax](doc/dom.md) (comment, trailing comma, NaN/Infinity)
-* Iterating array/object with [C++11 Range-based for loop](doc/tutorial.md)
-* Reduce memory overhead of each `Value` from 24 bytes to 16 bytes in x86-64 architecture.
-
-For other changes please refer to [change log](CHANGELOG.md).
-
-## Compatibility
-
-RapidJSON is cross-platform. Some platform/compiler combinations which have been tested are shown as follows.
-* Visual C++ 2008/2010/2013 on Windows (32/64-bit)
-* GNU C++ 3.8.x on Cygwin
-* Clang 3.4 on Mac OS X (32/64-bit) and iOS
-* Clang 3.4 on Android NDK
-
-Users can build and run the unit tests on their platform/compiler.
-
-## Installation
-
-RapidJSON is a header-only C++ library. Just copy the `include/rapidjson` folder to system or project's include path.
-
-RapidJSON uses following software as its dependencies:
-* [CMake](https://cmake.org/) as a general build tool
-* (optional) [Doxygen](http://www.doxygen.org) to build documentation
-* (optional) [googletest](https://github.com/google/googletest) for unit and performance testing
-
-To generate user documentation and run tests please proceed with the steps below:
-
-1. Execute `git submodule update --init` to get the files of thirdparty submodules (google test).
-2. Create directory called `build` in rapidjson source directory.
-3. Change to `build` directory and run `cmake ..` command to configure your build. Windows users can do the same with cmake-gui application.
-4. On Windows, build the solution found in the build directory. On Linux, run `make` from the build directory.
-
-On successful build you will find compiled test and example binaries in `bin`
-directory. The generated documentation will be available in `doc/html`
-directory of the build tree. To run tests after finished build please run `make
-test` or `ctest` from your build tree. You can get detailed output using `ctest
--V` command.
-
-It is possible to install library system-wide by running `make install` command
-from the build tree with administrative privileges. This will install all files
-according to system preferences.  Once RapidJSON is installed, it is possible
-to use it from other CMake projects by adding `find_package(RapidJSON)` line to
-your CMakeLists.txt.
-
-## Usage at a glance
-
-This simple example parses a JSON string into a document (DOM), make a simple modification of the DOM, and finally stringify the DOM to a JSON string.
-
-~~~~~~~~~~cpp
-// rapidjson/example/simpledom/simpledom.cpp`
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include <iostream>
-
-using namespace rapidjson;
-
-int main() {
-    // 1. Parse a JSON string into DOM.
-    const char* json = "{\"project\":\"rapidjson\",\"stars\":10}";
-    Document d;
-    d.Parse(json);
-
-    // 2. Modify it by DOM.
-    Value& s = d["stars"];
-    s.SetInt(s.GetInt() + 1);
-
-    // 3. Stringify the DOM
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    d.Accept(writer);
-
-    // Output {"project":"rapidjson","stars":11}
-    std::cout << buffer.GetString() << std::endl;
-    return 0;
-}
-~~~~~~~~~~
-
-Note that this example did not handle potential errors.
-
-The following diagram shows the process.
-
-![simpledom](doc/diagram/simpledom.png)
-
-More [examples](https://github.com/Tencent/rapidjson/tree/master/example) are available:
-
-* DOM API
-  * [tutorial](https://github.com/Tencent/rapidjson/blob/master/example/tutorial/tutorial.cpp): Basic usage of DOM API.
-
-* SAX API
-  * [simplereader](https://github.com/Tencent/rapidjson/blob/master/example/simplereader/simplereader.cpp): Dumps all SAX events while parsing a JSON by `Reader`.
-  * [condense](https://github.com/Tencent/rapidjson/blob/master/example/condense/condense.cpp): A command line tool to rewrite a JSON, with all whitespaces removed.
-  * [pretty](https://github.com/Tencent/rapidjson/blob/master/example/pretty/pretty.cpp): A command line tool to rewrite a JSON with indents and newlines by `PrettyWriter`.
-  * [capitalize](https://github.com/Tencent/rapidjson/blob/master/example/capitalize/capitalize.cpp): A command line tool to capitalize strings in JSON.
-  * [messagereader](https://github.com/Tencent/rapidjson/blob/master/example/messagereader/messagereader.cpp): Parse a JSON message with SAX API.
-  * [serialize](https://github.com/Tencent/rapidjson/blob/master/example/serialize/serialize.cpp): Serialize a C++ object into JSON with SAX API.
-  * [jsonx](https://github.com/Tencent/rapidjson/blob/master/example/jsonx/jsonx.cpp): Implements a `JsonxWriter` which stringify SAX events into [JSONx](https://www-01.ibm.com/support/knowledgecenter/SS9H2Y_7.1.0/com.ibm.dp.doc/json_jsonx.html) (a kind of XML) format. The example is a command line tool which converts input JSON into JSONx format.
-
-* Schema
-  * [schemavalidator](https://github.com/Tencent/rapidjson/blob/master/example/schemavalidator/schemavalidator.cpp) : A command line tool to validate a JSON with a JSON schema.
-
-* Advanced
-  * [prettyauto](https://github.com/Tencent/rapidjson/blob/master/example/prettyauto/prettyauto.cpp): A modified version of [pretty](https://github.com/Tencent/rapidjson/blob/master/example/pretty/pretty.cpp) to automatically handle JSON with any UTF encodings.
-  * [parsebyparts](https://github.com/Tencent/rapidjson/blob/master/example/parsebyparts/parsebyparts.cpp): Implements an `AsyncDocumentParser` which can parse JSON in parts, using C++11 thread.
-  * [filterkey](https://github.com/Tencent/rapidjson/blob/master/example/filterkey/filterkey.cpp): A command line tool to remove all values with user-specified key.
-  * [filterkeydom](https://github.com/Tencent/rapidjson/blob/master/example/filterkeydom/filterkeydom.cpp): Same tool as above, but it demonstrates how to use a generator to populate a `Document`.
diff --git a/src/sioclient/lib/rapidjson/readme.zh-cn.md b/src/sioclient/lib/rapidjson/readme.zh-cn.md
deleted file mode 100644
index ccf16699..00000000
--- a/src/sioclient/lib/rapidjson/readme.zh-cn.md
+++ /dev/null
@@ -1,152 +0,0 @@
-![RapidJSON logo](doc/logo/rapidjson.png)
-
-![Release version](https://img.shields.io/badge/release-v1.1.0-blue.svg)
-
-## 高效的 C++ JSON 解析／生成器，提供 SAX 及 DOM 风格 API
-
-Tencent is pleased to support the open source community by making RapidJSON available.
-
-Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-
-* [RapidJSON GitHub](https://github.com/Tencent/rapidjson/)
-* RapidJSON 文档
-  * [English](http://rapidjson.org/)
-  * [简体中文](http://rapidjson.org/zh-cn/)
-  * [GitBook](https://www.gitbook.com/book/miloyip/rapidjson/details/zh-cn) 可下载 PDF/EPUB/MOBI，但不含 API 参考手册。
-
-## Build 状态
-
-| [Linux][lin-link] | [Windows][win-link] | [Coveralls][cov-link] |
-| :---------------: | :-----------------: | :-------------------: |
-| ![lin-badge]      | ![win-badge]        | ![cov-badge]          |
-
-[lin-badge]: https://travis-ci.org/Tencent/rapidjson.svg?branch=master "Travis build status"
-[lin-link]:  https://travis-ci.org/Tencent/rapidjson "Travis build status"
-[win-badge]: https://ci.appveyor.com/api/projects/status/l6qulgqahcayidrf/branch/master?svg=true "AppVeyor build status"
-[win-link]:  https://ci.appveyor.com/project/miloyip/rapidjson-0fdqj/branch/master "AppVeyor build status"
-[cov-badge]: https://coveralls.io/repos/Tencent/rapidjson/badge.svg?branch=master "Coveralls coverage"
-[cov-link]:  https://coveralls.io/r/Tencent/rapidjson?branch=master "Coveralls coverage"
-
-## 简介
-
-RapidJSON 是一个 C++ 的 JSON 解析器及生成器。它的灵感来自 [RapidXml](http://rapidxml.sourceforge.net/)。
-
-* RapidJSON 小而全。它同时支持 SAX 和 DOM 风格的 API。SAX 解析器只有约 500 行代码。
-
-* RapidJSON 快。它的性能可与 `strlen()` 相比。可支持 SSE2/SSE4.2 加速。
-
-* RapidJSON 独立。它不依赖于 BOOST 等外部库。它甚至不依赖于 STL。
-
-* RapidJSON 对内存友好。在大部分 32/64 位机器上，每个 JSON 值只占 16 字节（除字符串外）。它预设使用一个快速的内存分配器，令分析器可以紧凑地分配内存。
-
-* RapidJSON 对 Unicode 友好。它支持 UTF-8、UTF-16、UTF-32 (大端序／小端序)，并内部支持这些编码的检测、校验及转码。例如，RapidJSON 可以在分析一个 UTF-8 文件至 DOM 时，把当中的 JSON 字符串转码至 UTF-16。它也支持代理对（surrogate pair）及 `"\u0000"`（空字符）。
-
-在 [这里](doc/features.zh-cn.md) 可读取更多特点。
-
-JSON（JavaScript Object Notation）是一个轻量的数据交换格式。RapidJSON 应该完全遵从 RFC7159/ECMA-404，并支持可选的放宽语法。 关于 JSON 的更多信息可参考：
-* [Introducing JSON](http://json.org/)
-* [RFC7159: The JavaScript Object Notation (JSON) Data Interchange Format](https://tools.ietf.org/html/rfc7159)
-* [Standard ECMA-404: The JSON Data Interchange Format](https://www.ecma-international.org/publications/standards/Ecma-404.htm)
-
-## v1.1 中的亮点 (2016-8-25)
-
-* 加入 [JSON Pointer](doc/pointer.zh-cn.md) 功能，可更简单地访问及更改 DOM。
-* 加入 [JSON Schema](doc/schema.zh-cn.md) 功能，可在解析或生成 JSON 时进行校验。
-* 加入 [放宽的 JSON 语法](doc/dom.zh-cn.md) （注释、尾随逗号、NaN/Infinity）
-* 使用 [C++11 范围 for 循环](doc/tutorial.zh-cn.md) 去遍历 array 和 object。
-* 在 x86-64 架构下，缩减每个 `Value` 的内存开销从 24 字节至 16 字节。
-
-其他改动请参考 [change log](CHANGELOG.md).
-
-## 兼容性
-
-RapidJSON 是跨平台的。以下是一些曾测试的平台／编译器组合：
-* Visual C++ 2008/2010/2013 在 Windows (32/64-bit)
-* GNU C++ 3.8.x 在 Cygwin
-* Clang 3.4 在 Mac OS X (32/64-bit) 及 iOS
-* Clang 3.4 在 Android NDK
-
-用户也可以在他们的平台上生成及执行单元测试。
-
-## 安装
-
-RapidJSON 是只有头文件的 C++ 库。只需把 `include/rapidjson` 目录复制至系统或项目的 include 目录中。
-
-RapidJSON 依赖于以下软件：
-* [CMake](https://cmake.org/) 作为通用生成工具
-* (optional) [Doxygen](http://www.doxygen.org) 用于生成文档
-* (optional) [googletest](https://github.com/google/googletest) 用于单元及性能测试
-
-生成测试及例子的步骤：
-
-1. 执行 `git submodule update --init` 去获取 thirdparty submodules (google test)。
-2. 在 rapidjson 目录下，建立一个 `build` 目录。
-3. 在 `build` 目录下执行 `cmake ..` 命令以设置生成。Windows 用户可使用 cmake-gui 应用程序。
-4. 在 Windows 下，编译生成在 build 目录中的 solution。在 Linux 下，于 build 目录运行 `make`。
-
-成功生成后，你会在 `bin` 的目录下找到编译后的测试及例子可执行文件。而生成的文档将位于 build 下的 `doc/html` 目录。要执行测试，请在 build 下执行 `make test` 或 `ctest`。使用 `ctest -V` 命令可获取详细的输出。
-
-我们也可以把程序库安装至全系统中，只要在具管理权限下从 build 目录执行 `make install` 命令。这样会按系统的偏好设置安装所有文件。当安装 RapidJSON 后，其他的 CMake 项目需要使用它时，可以通过在 `CMakeLists.txt` 加入一句 `find_package(RapidJSON)`。
-
-## 用法一览
-
-此简单例子解析一个 JSON 字符串至一个 document (DOM)，对 DOM 作出简单修改，最终把 DOM 转换（stringify）至 JSON 字符串。
-
-~~~~~~~~~~cpp
-// rapidjson/example/simpledom/simpledom.cpp`
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include <iostream>
-
-using namespace rapidjson;
-
-int main() {
-    // 1. 把 JSON 解析至 DOM。
-    const char* json = "{\"project\":\"rapidjson\",\"stars\":10}";
-    Document d;
-    d.Parse(json);
-
-    // 2. 利用 DOM 作出修改。
-    Value& s = d["stars"];
-    s.SetInt(s.GetInt() + 1);
-
-    // 3. 把 DOM 转换（stringify）成 JSON。
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    d.Accept(writer);
-
-    // Output {"project":"rapidjson","stars":11}
-    std::cout << buffer.GetString() << std::endl;
-    return 0;
-}
-~~~~~~~~~~
-
-注意此例子并没有处理潜在错误。
-
-下图展示执行过程。
-
-![simpledom](doc/diagram/simpledom.png)
-
-还有许多 [例子](https://github.com/Tencent/rapidjson/tree/master/example) 可供参考：
-
-* DOM API
-  * [tutorial](https://github.com/Tencent/rapidjson/blob/master/example/tutorial/tutorial.cpp): DOM API 的基本使用方法。
-
-* SAX API
-  * [simplereader](https://github.com/Tencent/rapidjson/blob/master/example/simplereader/simplereader.cpp): 使用 `Reader` 解析 JSON 时，打印所有 SAX 事件。
-  * [condense](https://github.com/Tencent/rapidjson/blob/master/example/condense/condense.cpp): 移除 JSON 中所有空白符的命令行工具。
-  * [pretty](https://github.com/Tencent/rapidjson/blob/master/example/pretty/pretty.cpp): 为 JSON 加入缩进与换行的命令行工具，当中使用了 `PrettyWriter`。
-  * [capitalize](https://github.com/Tencent/rapidjson/blob/master/example/capitalize/capitalize.cpp): 把 JSON 中所有字符串改为大写的命令行工具。
-  * [messagereader](https://github.com/Tencent/rapidjson/blob/master/example/messagereader/messagereader.cpp): 使用 SAX API 去解析一个 JSON 报文。
-  * [serialize](https://github.com/Tencent/rapidjson/blob/master/example/serialize/serialize.cpp): 使用 SAX API 去序列化 C++ 对象，生成 JSON。
-  * [jsonx](https://github.com/Tencent/rapidjson/blob/master/example/jsonx/jsonx.cpp): 实现了一个 `JsonxWriter`，它能把 SAX 事件写成 [JSONx](https://www-01.ibm.com/support/knowledgecenter/SS9H2Y_7.1.0/com.ibm.dp.doc/json_jsonx.html)（一种 XML）格式。这个例子是把 JSON 输入转换成 JSONx 格式的命令行工具。
-
-* Schema API
-  * [schemavalidator](https://github.com/Tencent/rapidjson/blob/master/example/schemavalidator/schemavalidator.cpp): 使用 JSON Schema 去校验 JSON 的命令行工具。
-
-* 进阶
-  * [prettyauto](https://github.com/Tencent/rapidjson/blob/master/example/prettyauto/prettyauto.cpp): [pretty](https://github.com/Tencent/rapidjson/blob/master/example/pretty/pretty.cpp) 的修改版本，可自动处理任何 UTF 编码的 JSON。
-  * [parsebyparts](https://github.com/Tencent/rapidjson/blob/master/example/parsebyparts/parsebyparts.cpp): 这例子中的 `AsyncDocumentParser` 类使用 C++ 线程来逐段解析 JSON。
-  * [filterkey](https://github.com/Tencent/rapidjson/blob/master/example/filterkey/filterkey.cpp): 移取使用者指定的键值的命令行工具。
-  * [filterkeydom](https://github.com/Tencent/rapidjson/blob/master/example/filterkey/filterkey.cpp): 如上的工具，但展示如何使用生成器（generator）去填充一个 `Document`。
\ No newline at end of file
diff --git a/src/sioclient/lib/rapidjson/test/CMakeLists.txt b/src/sioclient/lib/rapidjson/test/CMakeLists.txt
deleted file mode 100644
index 11c1b04c..00000000
--- a/src/sioclient/lib/rapidjson/test/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-find_package(GTestSrc)
-
-IF(GTESTSRC_FOUND)
-    enable_testing()
-
-    if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW))
-        set(gtest_disable_pthreads ON)
-        set(gtest_force_shared_crt ON)
-    endif()
-
-    add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest)
-    include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
-
-    set(TEST_LIBRARIES gtest gtest_main)
-
-    add_custom_target(tests ALL)
-    add_subdirectory(perftest)
-    add_subdirectory(unittest)
-
-ENDIF(GTESTSRC_FOUND)
diff --git a/src/sioclient/lib/rapidjson/test/perftest/CMakeLists.txt b/src/sioclient/lib/rapidjson/test/perftest/CMakeLists.txt
deleted file mode 100644
index 035e544d..00000000
--- a/src/sioclient/lib/rapidjson/test/perftest/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-set(PERFTEST_SOURCES
-    misctest.cpp
-    perftest.cpp
-    platformtest.cpp
-    rapidjsontest.cpp
-    schematest.cpp)
-
-add_executable(perftest ${PERFTEST_SOURCES})
-target_link_libraries(perftest ${TEST_LIBRARIES})
-
-add_dependencies(tests perftest)
-
-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
-    endif()
-endif(CCACHE_FOUND)
-
-set_property(DIRECTORY PROPERTY COMPILE_OPTIONS ${EXTRA_CXX_FLAGS})
-
-IF(NOT (CMAKE_BUILD_TYPE STREQUAL "Debug"))
-add_test(NAME perftest
-    COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perftest
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
-ENDIF()
diff --git a/src/sioclient/lib/rapidjson/test/perftest/misctest.cpp b/src/sioclient/lib/rapidjson/test/perftest/misctest.cpp
deleted file mode 100644
index d81062f1..00000000
--- a/src/sioclient/lib/rapidjson/test/perftest/misctest.cpp
+++ /dev/null
@@ -1,974 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "perftest.h"
-
-#if TEST_MISC
-
-#define __STDC_FORMAT_MACROS
-#include "rapidjson/stringbuffer.h"
-
-#define protected public
-#include "rapidjson/writer.h"
-#undef private
-
-class Misc : public PerfTest {
-};
-
-// Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern@hoehrmann.de>
-// See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details.
-
-#define UTF8_ACCEPT 0
-#define UTF8_REJECT 12
-
-static const unsigned char utf8d[] = {
-    // The first part of the table maps bytes to character classes that
-    // to reduce the size of the transition table and create bitmasks.
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,  9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-    8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-    10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
-
-    // The second part is a transition table that maps a combination
-    // of a state of the automaton and a character class to a state.
-    0,12,24,36,60,96,84,12,12,12,48,72, 12,12,12,12,12,12,12,12,12,12,12,12,
-    12, 0,12,12,12,12,12, 0,12, 0,12,12, 12,24,12,12,12,12,12,24,12,24,12,12,
-    12,12,12,12,12,12,12,24,12,12,12,12, 12,24,12,12,12,12,12,12,12,24,12,12,
-    12,12,12,12,12,12,12,36,12,36,12,12, 12,36,12,12,12,12,12,36,12,36,12,12,
-    12,36,12,12,12,12,12,12,12,12,12,12, 
-};
-
-static unsigned inline decode(unsigned* state, unsigned* codep, unsigned byte) {
-    unsigned type = utf8d[byte];
-
-    *codep = (*state != UTF8_ACCEPT) ?
-        (byte & 0x3fu) | (*codep << 6) :
-    (0xff >> type) & (byte);
-
-    *state = utf8d[256 + *state + type];
-    return *state;
-}
-
-static bool IsUTF8(unsigned char* s) {
-    unsigned codepoint, state = 0;
-
-    while (*s)
-        decode(&state, &codepoint, *s++);
-
-    return state == UTF8_ACCEPT;
-}
-
-TEST_F(Misc, Hoehrmann_IsUTF8) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        EXPECT_TRUE(IsUTF8((unsigned char*)json_));
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// CountDecimalDigit: Count number of decimal places
-
-inline unsigned CountDecimalDigit_naive(unsigned n) {
-    unsigned count = 1;
-    while (n >= 10) {
-        n /= 10;
-        count++;
-    }
-    return count;
-}
-
-inline unsigned CountDecimalDigit_enroll4(unsigned n) {
-    unsigned count = 1;
-    while (n >= 10000) {
-        n /= 10000u;
-        count += 4;
-    }
-    if (n < 10) return count;
-    if (n < 100) return count + 1;
-    if (n < 1000) return count + 2;
-    return count + 3;
-}
-
-inline unsigned CountDecimalDigit64_enroll4(uint64_t n) {
-    unsigned count = 1;
-    while (n >= 10000) {
-        n /= 10000u;
-        count += 4;
-    }
-    if (n < 10) return count;
-    if (n < 100) return count + 1;
-    if (n < 1000) return count + 2;
-    return count + 3;
-}
-
-inline unsigned CountDecimalDigit_fast(unsigned n) {
-    static const uint32_t powers_of_10[] = {
-        0,
-        10,
-        100,
-        1000,
-        10000,
-        100000,
-        1000000,
-        10000000,
-        100000000,
-        1000000000
-    };
-
-#if defined(_M_IX86) || defined(_M_X64)
-    unsigned long i = 0;
-    _BitScanReverse(&i, n | 1);
-    uint32_t t = (i + 1) * 1233 >> 12;
-#elif defined(__GNUC__)
-    uint32_t t = (32 - __builtin_clz(n | 1)) * 1233 >> 12;
-#else
-#error
-#endif
-    return t - (n < powers_of_10[t]) + 1;
-}
-
-inline unsigned CountDecimalDigit64_fast(uint64_t n) {
-    static const uint64_t powers_of_10[] = {
-        0,
-        10,
-        100,
-        1000,
-        10000,
-        100000,
-        1000000,
-        10000000,
-        100000000,
-        1000000000,
-        10000000000,
-        100000000000,
-        1000000000000,
-        10000000000000,
-        100000000000000,
-        1000000000000000,
-        10000000000000000,
-        100000000000000000,
-        1000000000000000000,
-        10000000000000000000U
-    };
-
-#if defined(_M_IX86)
-    uint64_t m = n | 1;
-    unsigned long i = 0;
-    if (_BitScanReverse(&i, m >> 32))
-        i += 32;
-    else
-        _BitScanReverse(&i, m & 0xFFFFFFFF);
-    uint32_t t = (i + 1) * 1233 >> 12;
-#elif defined(_M_X64)
-    unsigned long i = 0;
-    _BitScanReverse64(&i, n | 1);
-    uint32_t t = (i + 1) * 1233 >> 12;
-#elif defined(__GNUC__)
-    uint32_t t = (64 - __builtin_clzll(n | 1)) * 1233 >> 12;
-#else
-#error
-#endif
-
-    return t - (n < powers_of_10[t]) + 1;
-}
-
-#if 0
-// Exhaustive, very slow
-TEST_F(Misc, CountDecimalDigit_Verify) {
-    unsigned i = 0;
-    do {
-        if (i % (65536 * 256) == 0)
-            printf("%u\n", i);
-        ASSERT_EQ(CountDecimalDigit_enroll4(i), CountDecimalDigit_fast(i));
-        i++;
-    } while (i != 0);
-}
-
-static const unsigned kDigits10Trial = 1000000000u;
-TEST_F(Misc, CountDecimalDigit_naive) {
-    unsigned sum = 0;
-    for (unsigned i = 0; i < kDigits10Trial; i++)
-        sum += CountDecimalDigit_naive(i);
-    printf("%u\n", sum);
-}
-
-TEST_F(Misc, CountDecimalDigit_enroll4) {
-    unsigned sum = 0;
-    for (unsigned i = 0; i < kDigits10Trial; i++)
-        sum += CountDecimalDigit_enroll4(i);
-    printf("%u\n", sum);
-}
-
-TEST_F(Misc, CountDecimalDigit_fast) {
-    unsigned sum = 0;
-    for (unsigned i = 0; i < kDigits10Trial; i++)
-        sum += CountDecimalDigit_fast(i);
-    printf("%u\n", sum);
-}
-#endif
-
-TEST_F(Misc, CountDecimalDigit64_VerifyFast) {
-    uint64_t i = 1, j;
-    do {
-        //printf("%" PRIu64 "\n", i);
-        ASSERT_EQ(CountDecimalDigit64_enroll4(i), CountDecimalDigit64_fast(i));
-        j = i;
-        i *= 3;
-    } while (j < i);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// integer-to-string conversion
-
-// https://gist.github.com/anonymous/7179097
-static const int randval[] ={
-     936116,  369532,  453755,  -72860,  209713,  268347,  435278, -360266, -416287, -182064,
-    -644712,  944969,  640463, -366588,  471577,  -69401, -744294, -505829,  923883,  831785,
-    -601136, -636767, -437054,  591718,  100758,  231907, -719038,  973540, -605220,  506659,
-    -871653,  462533,  764843, -919138,  404305, -630931, -288711, -751454, -173726, -718208,
-     432689, -281157,  360737,  659827,   19174, -376450,  769984, -858198,  439127,  734703,
-    -683426,       7,  386135,  186997, -643900, -744422, -604708, -629545,   42313, -933592,
-    -635566,  182308,  439024, -367219,  -73924, -516649,  421935, -470515,  413507,  -78952,
-    -427917, -561158,  737176,   94538,  572322,  405217,  709266, -357278, -908099, -425447,
-     601119,  750712, -862285, -177869,  900102,  384877,  157859, -641680,  503738, -702558,
-     278225,  463290,  268378, -212840,  580090,  347346, -473985, -950968, -114547, -839893,
-    -738032, -789424,  409540,  493495,  432099,  119755,  905004, -174834,  338266,  234298,
-      74641, -965136, -754593,  685273,  466924,  920560,  385062,  796402,  -67229,  994864,
-     376974,  299869, -647540, -128724,  469890, -163167, -547803, -743363,  486463, -621028,
-     612288,   27459, -514224,  126342,  -66612,  803409, -777155, -336453, -284002,  472451,
-     342390, -163630,  908356, -456147, -825607,  268092, -974715,  287227,  227890, -524101,
-     616370, -782456,  922098, -624001, -813690,  171605, -192962,  796151,  707183,  -95696,
-     -23163, -721260,  508892,  430715,  791331,  482048, -996102,  863274,  275406,   -8279,
-    -556239, -902076,  268647, -818565,  260069, -798232, -172924, -566311, -806503, -885992,
-     813969,  -78468,  956632,  304288,  494867, -508784,  381751,  151264,  762953,   76352,
-     594902,  375424,  271700, -743062,  390176,  924237,  772574,  676610,  435752, -153847,
-       3959, -971937, -294181, -538049, -344620, -170136,   19120, -703157,  868152, -657961,
-    -818631,  219015, -872729, -940001, -956570,  880727, -345910,  942913, -942271, -788115,
-     225294,  701108, -517736, -416071,  281940,  488730,  942698,  711494,  838382, -892302,
-    -533028,  103052,  528823,  901515,  949577,  159364,  718227, -241814, -733661, -462928,
-    -495829,  165170,  513580, -629188, -509571, -459083,  198437,   77198, -644612,  811276,
-    -422298, -860842,  -52584,  920369,  686424, -530667, -243476,   49763,  345866, -411960,
-    -114863,  470810, -302860,  683007, -509080,       2, -174981, -772163,  -48697,  447770,
-    -268246,  213268,  269215,   78810, -236340, -639140, -864323,  505113, -986569, -325215,
-     541859,  163070, -819998, -645161, -583336,  573414,  696417, -132375,       3, -294501,
-     320435,  682591,  840008,  351740,  426951,  609354,  898154, -943254,  227321, -859793,
-    -727993,   44137, -497965, -782239,   14955, -746080, -243366,    9837, -233083,  606507,
-    -995864, -615287, -994307,  602715,  770771, -315040,  610860,  446102, -307120,  710728,
-    -590392, -230474, -762625, -637525,  134963, -202700, -766902, -985541,  218163,  682009,
-     926051,  525156,  -61195,  403211, -810098,  245539, -431733,  179998, -806533,  745943,
-     447597,  131973, -187130,  826019,  286107, -937230, -577419,   20254,  681802, -340500,
-     323080,  266283, -667617,  309656,  416386,  611863,  759991, -534257,  523112, -634892,
-    -169913, -204905, -909867, -882185, -944908,  741811, -717675,  967007, -317396,  407230,
-    -412805,  792905,  994873,  744793, -456797,  713493,  355232,  116900, -945199,  880539,
-     342505, -580824, -262273,  982968, -349497, -735488,  311767, -455191,  570918,  389734,
-    -958386,   10262,  -99267,  155481,  304210,  204724,  704367, -144893, -233664, -671441,
-     896849,  408613,  762236,  322697,  981321,  688476,   13663, -970704, -379507,  896412,
-     977084,  348869,  875948,  341348,  318710,  512081,    6163,  669044,  833295,  811883,
-     708756, -802534, -536057,  608413, -389625, -694603,  541106, -110037,  720322, -540581,
-     645420,   32980,   62442,  510157, -981870,  -87093, -325960, -500494, -718291,  -67889,
-     991501,  374804,  769026, -978869,  294747,  714623,  413327, -199164,  671368,  804789,
-    -362507,  798196, -170790, -568895, -869379,   62020, -316693, -837793,  644994,  -39341,
-    -417504, -243068, -957756,   99072,  622234, -739992,  225668,    8863, -505910,   82483,
-    -559244,  241572,    1315,  -36175,  -54990,  376813,     -11,  162647, -688204, -486163,
-     -54934, -197470,  744223, -762707,  732540,  996618,  351561, -445933, -898491,  486531,
-     456151,   15276,  290186, -817110,  -52995,  313046, -452533,  -96267,   94470, -500176,
-    -818026, -398071, -810548, -143325, -819741,    1338, -897676, -101577, -855445,   37309,
-     285742,  953804, -777927, -926962, -811217, -936744, -952245, -802300, -490188, -964953,
-    -552279,  329142, -570048, -505756,  682898, -381089,  -14352,  175138,  152390, -582268,
-    -485137,  717035,  805329,  239572, -730409,  209643, -184403, -385864,  675086,  819648,
-     629058, -527109, -488666, -171981,  532788,  552441,  174666,  984921,  766514,  758787,
-     716309,  338801, -978004, -412163,  876079, -734212,  789557, -160491, -522719,   56644,
-       -991, -286038,  -53983,  663740,  809812,  919889, -717502, -137704,  220511,  184396,
-    -825740, -588447,  430870,  124309,  135956,  558662, -307087, -788055, -451328,  812260,
-     931601,  324347, -482989, -117858, -278861,  189068, -172774,  929057,  293787,  198161,
-    -342386,  -47173,  906555, -759955,  -12779,  777604,  -97869,  899320,  927486,  -25284,
-    -848550,  259450, -485856,  -17820,      88,  171400,  235492, -326783, -340793,  886886,
-     112428, -246280,    5979,  648444, -114982,  991013,  -56489,   -9497,  419706,  632820,
-    -341664,  393926, -848977,  -22538,  257307,  773731, -905319,  491153,  734883, -868212,
-    -951053,  644458, -580758,  764735,  584316,  297077,   28852, -397710, -953669,  201772,
-     879050, -198237, -588468,  448102, -116837,  770007, -231812,  642906, -582166, -885828,
-          9,  305082, -996577,  303559,   75008, -772956, -447960,  599825, -295552,  870739,
-    -386278, -950300,  485359, -457081,  629461, -850276,  550496, -451755, -620841,  -11766,
-    -950137,  832337,   28711, -273398, -507197,   91921, -271360, -705991, -753220, -388968,
-     967945,  340434, -320883, -662793, -554617, -574568,  477946,   -6148, -129519,  689217,
-     920020, -656315, -974523, -212525,   80921, -612532,  645096,  545655,  655713, -591631,
-    -307385, -816688, -618823, -113713,  526430,  673063,  735916, -809095, -850417,  639004,
-     432281, -388185,  270708,  860146,  -39902, -786157, -258180, -246169, -966720, -264957,
-     548072, -306010,  -57367, -635665,  933824,   70553, -989936, -488741,   72411, -452509,
-     529831,  956277,  449019, -577850, -360986, -803418,   48833,  296073,  203430,  609591,
-     715483,  470964,  658106, -718254,  -96424,  790163,  334739,  181070, -373578,       5,
-    -435088,  329841,  330939, -256602,  394355,  912412,  231910,  927278, -661933,  788539,
-    -769664, -893274,  -96856,  298205,  901043, -608122, -527430,  183618, -553963,  -35246,
-    -393924,  948832, -483198,  594501,   35460, -407007,   93494, -336881, -634072,  984205,
-    -812161,  944664,  -31062,  753872,  823933,  -69566,   50445,  290147,   85134,   34706,
-     551902,  405202, -991246,  -84642,  154341,  316432, -695101, -651588,   -5030,  137564,
-    -294665,  332541,  528307,  -90572, -344923,  523766, -758498, -968047,  339028,  494578,
-     593129, -725773,   31834, -718406, -208638,  159665,   -2043,  673344, -442767,   75816,
-     755442,  769257, -158730, -410272,  691688,  589550, -878398, -184121,  460679,  346312,
-     294163, -544602,  653308,  254167, -276979,   52073, -892684,  887653,  -41222,  983065,
-     -68258, -408799,  -99069, -674069, -863635,  -32890,  622757, -743862,   40872,   -4837,
-    -967228,  522370, -903951, -818669,  524459,  514702,  925801,   20007, -299229,  579348,
-     626021,  430089,  348139, -562692, -607728, -130606, -928451, -424793, -458647, -448892,
-    -312230,  143337,  109746,  880042, -339658, -785614,  938995,  540916,  118429,  661351,
-    -402967,  404729,  -40918, -976535,  743230,  713110,  440182, -381314, -499252,   74613,
-     193652,  912717,  491323,  583633,  324691,  459397,  281253,  195540,   -2764, -888651,
-     892449,  132663, -478373, -430002, -314551,  527826,  247165,  557966,  554778,  481531,
-    -946634,  431685, -769059, -348371,  174046,  184597, -354867,  584422,  227390, -850397,
-    -542924, -849093, -737769,  325359,  736314,  269101,  767940,  674809,   81413, -447458,
-     445076,  189072,  906218,  502688, -718476, -863827, -731381,  100660,  623249,  710008,
-     572060,  922203,  685740,   55096,  263394, -243695, -353910, -516788,  388471,  455165,
-     844103, -643772,  363976,  268875, -899450,  104470,  104029, -238874, -274659,  732969,
-    -676443,  953291, -916289, -861849, -242344,  958083, -479593, -970395,  799831,  277841,
-    -243236, -283462, -201510,  166263, -259105, -575706,  878926,  891064,  895297,  655262,
-     -34807, -809833,  -89281,  342585,  554920,       1,  902141, -333425,  139703,  852318,
-    -618438,  329498, -932596, -692836, -513372,  733656, -523411,   85779,  500478, -682697,
-    -502836,  138776,  156341, -420037, -557964, -556378,  710993,  -50383, -877159,  916334,
-     132996,  583516, -603392, -111615,  -12288, -780214,  476780,  123327,  137607,  519956,
-     745837,   17358, -158581,  -53490
-};
-static const size_t randvalCount = sizeof(randval) / sizeof(randval[0]);
-static const size_t kItoaTrialCount = 10000;
-
-static const char digits[201] =
-"0001020304050607080910111213141516171819"
-"2021222324252627282930313233343536373839"
-"4041424344454647484950515253545556575859"
-"6061626364656667686970717273747576777879"
-"8081828384858687888990919293949596979899";
-
-// Prevent code being optimized out
-//#define OUTPUT_LENGTH(length) printf("", length)
-#define OUTPUT_LENGTH(length) printf("%u\n", (unsigned)length)
-
-template<typename OutputStream>
-class Writer1 {
-public:
-    Writer1() : os_() {}
-    Writer1(OutputStream& os) : os_(&os) {}
-
-    void Reset(OutputStream& os) {
-        os_ = &os;
-    }
-
-    bool WriteInt(int i) {
-        if (i < 0) {
-            os_->Put('-');
-            i = -i;
-        }
-        return WriteUint((unsigned)i);
-    }
-
-    bool WriteUint(unsigned u) {
-        char buffer[10];
-        char *p = buffer;
-        do {
-            *p++ = char(u % 10) + '0';
-            u /= 10;
-        } while (u > 0);
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-    bool WriteInt64(int64_t i64) {
-        if (i64 < 0) {
-            os_->Put('-');
-            i64 = -i64;
-        }
-        WriteUint64((uint64_t)i64);
-        return true;
-    }
-
-    bool WriteUint64(uint64_t u64) {
-        char buffer[20];
-        char *p = buffer;
-        do {
-            *p++ = char(u64 % 10) + '0';
-            u64 /= 10;
-        } while (u64 > 0);
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-private:
-    OutputStream* os_;
-};
-
-template<>
-bool Writer1<rapidjson::StringBuffer>::WriteUint(unsigned u) {
-    char buffer[10];
-    char* p = buffer;
-    do {
-        *p++ = char(u % 10) + '0';
-        u /= 10;
-    } while (u > 0);
-
-    char* d = os_->Push(p - buffer);
-    do {
-        --p;
-        *d++ = *p;
-    } while (p != buffer);
-    return true;
-}
-
-// Using digits LUT to reduce division/modulo
-template<typename OutputStream>
-class Writer2 {
-public:
-    Writer2() : os_() {}
-    Writer2(OutputStream& os) : os_(&os) {}
-
-    void Reset(OutputStream& os) {
-        os_ = &os;
-    }
-
-    bool WriteInt(int i) {
-        if (i < 0) {
-            os_->Put('-');
-            i = -i;
-        }
-        return WriteUint((unsigned)i);
-    }
-
-    bool WriteUint(unsigned u) {
-        char buffer[10];
-        char* p = buffer;
-        while (u >= 100) {
-            const unsigned i = (u % 100) << 1;
-            u /= 100;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-        if (u < 10)
-            *p++ = char(u) + '0';
-        else {
-            const unsigned i = u << 1;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-    bool WriteInt64(int64_t i64) {
-        if (i64 < 0) {
-            os_->Put('-');
-            i64 = -i64;
-        }
-        WriteUint64((uint64_t)i64);
-        return true;
-    }
-
-    bool WriteUint64(uint64_t u64) {
-        char buffer[20];
-        char* p = buffer;
-        while (u64 >= 100) {
-            const unsigned i = static_cast<unsigned>(u64 % 100) << 1;
-            u64 /= 100;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-        if (u64 < 10)
-            *p++ = char(u64) + '0';
-        else {
-            const unsigned i = static_cast<unsigned>(u64) << 1;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-private:
-    OutputStream* os_;
-};
-
-// First pass to count digits
-template<typename OutputStream>
-class Writer3 {
-public:
-    Writer3() : os_() {}
-    Writer3(OutputStream& os) : os_(&os) {}
-
-    void Reset(OutputStream& os) {
-        os_ = &os;
-    }
-
-    bool WriteInt(int i) {
-        if (i < 0) {
-            os_->Put('-');
-            i = -i;
-        }
-        return WriteUint((unsigned)i);
-    }
-
-    bool WriteUint(unsigned u) {
-        char buffer[10];
-        char *p = buffer;
-        do {
-            *p++ = char(u % 10) + '0';
-            u /= 10;
-        } while (u > 0);
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-    bool WriteInt64(int64_t i64) {
-        if (i64 < 0) {
-            os_->Put('-');
-            i64 = -i64;
-        }
-        WriteUint64((uint64_t)i64);
-        return true;
-    }
-
-    bool WriteUint64(uint64_t u64) {
-        char buffer[20];
-        char *p = buffer;
-        do {
-            *p++ = char(u64 % 10) + '0';
-            u64 /= 10;
-        } while (u64 > 0);
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-private:
-    void WriteUintReverse(char* d, unsigned u) {
-        do {
-            *--d = char(u % 10) + '0';
-            u /= 10;
-        } while (u > 0);
-    }
-
-    void WriteUint64Reverse(char* d, uint64_t u) {
-        do {
-            *--d = char(u % 10) + '0';
-            u /= 10;
-        } while (u > 0);
-    }
-
-    OutputStream* os_;
-};
-
-template<>
-inline bool Writer3<rapidjson::StringBuffer>::WriteUint(unsigned u) {
-    unsigned digit = CountDecimalDigit_fast(u);
-    WriteUintReverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template<>
-inline bool Writer3<rapidjson::InsituStringStream>::WriteUint(unsigned u) {
-    unsigned digit = CountDecimalDigit_fast(u);
-    WriteUintReverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template<>
-inline bool Writer3<rapidjson::StringBuffer>::WriteUint64(uint64_t u) {
-    unsigned digit = CountDecimalDigit64_fast(u);
-    WriteUint64Reverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template<>
-inline bool Writer3<rapidjson::InsituStringStream>::WriteUint64(uint64_t u) {
-    unsigned digit = CountDecimalDigit64_fast(u);
-    WriteUint64Reverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-// Using digits LUT to reduce division/modulo, two passes
-template<typename OutputStream>
-class Writer4 {
-public:
-    Writer4() : os_() {}
-    Writer4(OutputStream& os) : os_(&os) {}
-
-    void Reset(OutputStream& os) {
-        os_ = &os;
-    }
-
-    bool WriteInt(int i) {
-        if (i < 0) {
-            os_->Put('-');
-            i = -i;
-        }
-        return WriteUint((unsigned)i);
-    }
-
-    bool WriteUint(unsigned u) {
-        char buffer[10];
-        char* p = buffer;
-        while (u >= 100) {
-            const unsigned i = (u % 100) << 1;
-            u /= 100;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-        if (u < 10)
-            *p++ = char(u) + '0';
-        else {
-            const unsigned i = u << 1;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-    bool WriteInt64(int64_t i64) {
-        if (i64 < 0) {
-            os_->Put('-');
-            i64 = -i64;
-        }
-        WriteUint64((uint64_t)i64);
-        return true;
-    }
-
-    bool WriteUint64(uint64_t u64) {
-        char buffer[20];
-        char* p = buffer;
-        while (u64 >= 100) {
-            const unsigned i = static_cast<unsigned>(u64 % 100) << 1;
-            u64 /= 100;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-        if (u64 < 10)
-            *p++ = char(u64) + '0';
-        else {
-            const unsigned i = static_cast<unsigned>(u64) << 1;
-            *p++ = digits[i + 1];
-            *p++ = digits[i];
-        }
-
-        do {
-            --p;
-            os_->Put(*p);
-        } while (p != buffer);
-        return true;
-    }
-
-private:
-    void WriteUintReverse(char* d, unsigned u) {
-        while (u >= 100) {
-            const unsigned i = (u % 100) << 1;
-            u /= 100;
-            *--d = digits[i + 1];
-            *--d = digits[i];
-        }
-        if (u < 10) {
-            *--d = char(u) + '0';
-        }
-        else {
-            const unsigned i = u << 1;
-            *--d = digits[i + 1];
-            *--d = digits[i];
-        }
-    }
-
-    void WriteUint64Reverse(char* d, uint64_t u) {
-        while (u >= 100) {
-            const unsigned i = (u % 100) << 1;
-            u /= 100;
-            *--d = digits[i + 1];
-            *--d = digits[i];
-        }
-        if (u < 10) {
-            *--d = char(u) + '0';
-        }
-        else {
-            const unsigned i = u << 1;
-            *--d = digits[i + 1];
-            *--d = digits[i];
-        }
-    }
-
-    OutputStream* os_;
-};
-
-template<>
-inline bool Writer4<rapidjson::StringBuffer>::WriteUint(unsigned u) {
-    unsigned digit = CountDecimalDigit_fast(u);
-    WriteUintReverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template<>
-inline bool Writer4<rapidjson::InsituStringStream>::WriteUint(unsigned u) {
-    unsigned digit = CountDecimalDigit_fast(u);
-    WriteUintReverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template<>
-inline bool Writer4<rapidjson::StringBuffer>::WriteUint64(uint64_t u) {
-    unsigned digit = CountDecimalDigit64_fast(u);
-    WriteUint64Reverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template<>
-inline bool Writer4<rapidjson::InsituStringStream>::WriteUint64(uint64_t u) {
-    unsigned digit = CountDecimalDigit64_fast(u);
-    WriteUint64Reverse(os_->Push(digit) + digit, u);
-    return true;
-}
-
-template <typename Writer>
-void itoa_Writer_StringBufferVerify() {
-    rapidjson::StringBuffer sb;
-    Writer writer(sb);
-    for (size_t j = 0; j < randvalCount; j++) {
-        char buffer[32];
-        sprintf(buffer, "%d", randval[j]);
-        writer.WriteInt(randval[j]);
-        ASSERT_STREQ(buffer, sb.GetString());
-        sb.Clear();
-    }
-}
-
-template <typename Writer>
-void itoa_Writer_InsituStringStreamVerify() {
-    Writer writer;
-    for (size_t j = 0; j < randvalCount; j++) {
-        char buffer[32];
-        sprintf(buffer, "%d", randval[j]);
-        char buffer2[32];
-        rapidjson::InsituStringStream ss(buffer2);
-        writer.Reset(ss);
-        char* begin = ss.PutBegin();
-        writer.WriteInt(randval[j]);
-        ss.Put('\0');
-        ss.PutEnd(begin);
-        ASSERT_STREQ(buffer, buffer2);
-    }
-}
-
-template <typename Writer>
-void itoa_Writer_StringBuffer() {
-    size_t length = 0;
-
-    rapidjson::StringBuffer sb;
-    Writer writer(sb);
-
-    for (size_t i = 0; i < kItoaTrialCount; i++) {
-        for (size_t j = 0; j < randvalCount; j++) {
-            writer.WriteInt(randval[j]);
-            length += sb.GetSize();
-            sb.Clear();
-        }
-    }
-    OUTPUT_LENGTH(length);
-}
-
-template <typename Writer>
-void itoa_Writer_InsituStringStream() {
-    size_t length = 0;
-
-    char buffer[32];
-    Writer writer;
-    for (size_t i = 0; i < kItoaTrialCount; i++) {
-        for (size_t j = 0; j < randvalCount; j++) {
-            rapidjson::InsituStringStream ss(buffer);
-            writer.Reset(ss);
-            char* begin = ss.PutBegin();
-            writer.WriteInt(randval[j]);
-            length += ss.PutEnd(begin);
-        }
-    }
-    OUTPUT_LENGTH(length);
-};
-
-template <typename Writer>
-void itoa64_Writer_StringBufferVerify() {
-    rapidjson::StringBuffer sb;
-    Writer writer(sb);
-    for (size_t j = 0; j < randvalCount; j++) {
-        char buffer[32];
-        int64_t x = randval[j] * randval[j];
-        sprintf(buffer, "%" PRIi64, x);
-        writer.WriteInt64(x);
-        ASSERT_STREQ(buffer, sb.GetString());
-        sb.Clear();
-    }
-}
-
-template <typename Writer>
-void itoa64_Writer_InsituStringStreamVerify() {
-    Writer writer;
-    for (size_t j = 0; j < randvalCount; j++) {
-        char buffer[32];
-        int64_t x = randval[j] * randval[j];
-        sprintf(buffer, "%" PRIi64, x);
-        char buffer2[32];
-        rapidjson::InsituStringStream ss(buffer2);
-        writer.Reset(ss);
-        char* begin = ss.PutBegin();
-        writer.WriteInt64(x);
-        ss.Put('\0');
-        ss.PutEnd(begin);
-        ASSERT_STREQ(buffer, buffer2);
-    }
-}
-
-template <typename Writer>
-void itoa64_Writer_StringBuffer() {
-    size_t length = 0;
-
-    rapidjson::StringBuffer sb;
-    Writer writer(sb);
-
-    for (size_t i = 0; i < kItoaTrialCount; i++) {
-        for (size_t j = 0; j < randvalCount; j++) {
-            writer.WriteInt64(randval[j] * randval[j]);
-            length += sb.GetSize();
-            sb.Clear();
-        }
-    }
-    OUTPUT_LENGTH(length);
-}
-
-template <typename Writer>
-void itoa64_Writer_InsituStringStream() {
-    size_t length = 0;
-
-    char buffer[32];
-    Writer writer;
-    for (size_t i = 0; i < kItoaTrialCount; i++) {
-        for (size_t j = 0; j < randvalCount; j++) {
-            rapidjson::InsituStringStream ss(buffer);
-            writer.Reset(ss);
-            char* begin = ss.PutBegin();
-            writer.WriteInt64(randval[j] * randval[j]);
-            length += ss.PutEnd(begin);
-        }
-    }
-    OUTPUT_LENGTH(length);
-};
-
-// Full specialization for InsituStringStream to prevent memory copying 
-// (normally we will not use InsituStringStream for writing, just for testing)
-
-namespace rapidjson {
-
-template<>
-bool rapidjson::Writer<InsituStringStream>::WriteInt(int i) {
-    char *buffer = os_->Push(11);
-    const char* end = internal::i32toa(i, buffer);
-    os_->Pop(11 - (end - buffer));
-    return true;
-}
-
-template<>
-bool Writer<InsituStringStream>::WriteUint(unsigned u) {
-    char *buffer = os_->Push(10);
-    const char* end = internal::u32toa(u, buffer);
-    os_->Pop(10 - (end - buffer));
-    return true;
-}
-
-template<>
-bool Writer<InsituStringStream>::WriteInt64(int64_t i64) {
-    char *buffer = os_->Push(21);
-    const char* end = internal::i64toa(i64, buffer);
-    os_->Pop(21 - (end - buffer));
-    return true;
-}
-
-template<>
-bool Writer<InsituStringStream>::WriteUint64(uint64_t u) {
-    char *buffer = os_->Push(20);
-    const char* end = internal::u64toa(u, buffer);
-    os_->Pop(20 - (end - buffer));
-    return true;
-}
-
-} // namespace rapidjson
-
-TEST_F(Misc, itoa_Writer_StringBufferVerify) { itoa_Writer_StringBufferVerify<rapidjson::Writer<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer1_StringBufferVerify) { itoa_Writer_StringBufferVerify<Writer1<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer2_StringBufferVerify) { itoa_Writer_StringBufferVerify<Writer2<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer3_StringBufferVerify) { itoa_Writer_StringBufferVerify<Writer3<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer4_StringBufferVerify) { itoa_Writer_StringBufferVerify<Writer4<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer_InsituStringStreamVerify) { itoa_Writer_InsituStringStreamVerify<rapidjson::Writer<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer1_InsituStringStreamVerify) { itoa_Writer_InsituStringStreamVerify<Writer1<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer2_InsituStringStreamVerify) { itoa_Writer_InsituStringStreamVerify<Writer2<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer3_InsituStringStreamVerify) { itoa_Writer_InsituStringStreamVerify<Writer3<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer4_InsituStringStreamVerify) { itoa_Writer_InsituStringStreamVerify<Writer4<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer_StringBuffer) { itoa_Writer_StringBuffer<rapidjson::Writer<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer1_StringBuffer) { itoa_Writer_StringBuffer<Writer1<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer2_StringBuffer) { itoa_Writer_StringBuffer<Writer2<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer3_StringBuffer) { itoa_Writer_StringBuffer<Writer3<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer4_StringBuffer) { itoa_Writer_StringBuffer<Writer4<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa_Writer_InsituStringStream) { itoa_Writer_InsituStringStream<rapidjson::Writer<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer1_InsituStringStream) { itoa_Writer_InsituStringStream<Writer1<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer2_InsituStringStream) { itoa_Writer_InsituStringStream<Writer2<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer3_InsituStringStream) { itoa_Writer_InsituStringStream<Writer3<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa_Writer4_InsituStringStream) { itoa_Writer_InsituStringStream<Writer4<rapidjson::InsituStringStream> >(); }
-
-TEST_F(Misc, itoa64_Writer_StringBufferVerify) { itoa64_Writer_StringBufferVerify<rapidjson::Writer<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer1_StringBufferVerify) { itoa64_Writer_StringBufferVerify<Writer1<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer2_StringBufferVerify) { itoa64_Writer_StringBufferVerify<Writer2<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer3_StringBufferVerify) { itoa64_Writer_StringBufferVerify<Writer3<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer4_StringBufferVerify) { itoa64_Writer_StringBufferVerify<Writer4<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer_InsituStringStreamVerify) { itoa64_Writer_InsituStringStreamVerify<rapidjson::Writer<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer1_InsituStringStreamVerify) { itoa64_Writer_InsituStringStreamVerify<Writer1<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer2_InsituStringStreamVerify) { itoa64_Writer_InsituStringStreamVerify<Writer2<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer3_InsituStringStreamVerify) { itoa64_Writer_InsituStringStreamVerify<Writer3<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer4_InsituStringStreamVerify) { itoa64_Writer_InsituStringStreamVerify<Writer4<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer_StringBuffer) { itoa64_Writer_StringBuffer<rapidjson::Writer<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer1_StringBuffer) { itoa64_Writer_StringBuffer<Writer1<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer2_StringBuffer) { itoa64_Writer_StringBuffer<Writer2<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer3_StringBuffer) { itoa64_Writer_StringBuffer<Writer3<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer4_StringBuffer) { itoa64_Writer_StringBuffer<Writer4<rapidjson::StringBuffer> >(); }
-TEST_F(Misc, itoa64_Writer_InsituStringStream) { itoa64_Writer_InsituStringStream<rapidjson::Writer<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer1_InsituStringStream) { itoa64_Writer_InsituStringStream<Writer1<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer2_InsituStringStream) { itoa64_Writer_InsituStringStream<Writer2<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer3_InsituStringStream) { itoa64_Writer_InsituStringStream<Writer3<rapidjson::InsituStringStream> >(); }
-TEST_F(Misc, itoa64_Writer4_InsituStringStream) { itoa64_Writer_InsituStringStream<Writer4<rapidjson::InsituStringStream> >(); }
-
-#endif // TEST_MISC
diff --git a/src/sioclient/lib/rapidjson/test/perftest/perftest.cpp b/src/sioclient/lib/rapidjson/test/perftest/perftest.cpp
deleted file mode 100644
index 4e79f1f5..00000000
--- a/src/sioclient/lib/rapidjson/test/perftest/perftest.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "perftest.h"
-
-int main(int argc, char **argv) {
-#if _MSC_VER
-    _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
-    //void *testWhetherMemoryLeakDetectionWorks = malloc(1);
-#endif
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}
diff --git a/src/sioclient/lib/rapidjson/test/perftest/perftest.h b/src/sioclient/lib/rapidjson/test/perftest/perftest.h
deleted file mode 100644
index 953f95de..00000000
--- a/src/sioclient/lib/rapidjson/test/perftest/perftest.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef PERFTEST_H_
-#define PERFTEST_H_
-
-#define TEST_RAPIDJSON  1
-#define TEST_PLATFORM   0
-#define TEST_MISC       0
-
-#define TEST_VERSION_CODE(x,y,z) \
-  (((x)*100000) + ((y)*100) + (z))
-
-// __SSE2__ and __SSE4_2__ are recognized by gcc, clang, and the Intel compiler.
-// We use -march=native with gmake to enable -msse2 and -msse4.2, if supported.
-// Likewise, __ARM_NEON is used to detect Neon.
-#if defined(__SSE4_2__)
-#  define RAPIDJSON_SSE42
-#elif defined(__SSE2__)
-#  define RAPIDJSON_SSE2
-#elif defined(__ARM_NEON)
-#  define RAPIDJSON_NEON
-#endif
-
-#define RAPIDJSON_HAS_STDSTRING 1
-
-////////////////////////////////////////////////////////////////////////////////
-// Google Test
-
-#ifdef __cplusplus
-
-// gtest indirectly included inttypes.h, without __STDC_CONSTANT_MACROS.
-#ifndef __STDC_CONSTANT_MACROS
-#  define __STDC_CONSTANT_MACROS 1 // required by C++ standard
-#endif
-
-#if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
-#if defined(__clang__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-#pragma GCC diagnostic push
-#endif
-#pragma GCC diagnostic ignored "-Weffc++"
-#endif
-
-#include "gtest/gtest.h"
-
-#if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-#pragma GCC diagnostic pop
-#endif
-
-#ifdef _MSC_VER
-#define _CRTDBG_MAP_ALLOC
-#include <crtdbg.h>
-#pragma warning(disable : 4996) // 'function': was declared deprecated
-#endif
-
-//! Base class for all performance tests
-class PerfTest : public ::testing::Test {
-public:
-    PerfTest() : filename_(), json_(), length_(), whitespace_(), whitespace_length_() {}
-
-    virtual void SetUp() {
-        {
-            const char *paths[] = {
-                "data/sample.json",
-                "bin/data/sample.json",
-                "../bin/data/sample.json",
-                "../../bin/data/sample.json",
-                "../../../bin/data/sample.json"
-            };
-
-            FILE *fp = 0;
-            for (size_t i = 0; i < sizeof(paths) / sizeof(paths[0]); i++) {
-                fp = fopen(filename_ = paths[i], "rb");
-                if (fp)
-                    break;
-            }
-            ASSERT_TRUE(fp != 0);
-
-            fseek(fp, 0, SEEK_END);
-            length_ = (size_t)ftell(fp);
-            fseek(fp, 0, SEEK_SET);
-            json_ = (char*)malloc(length_ + 1);
-            ASSERT_EQ(length_, fread(json_, 1, length_, fp));
-            json_[length_] = '\0';
-            fclose(fp);
-        }
-
-        // whitespace test
-        {
-            whitespace_length_ = 1024 * 1024;
-            whitespace_ = (char *)malloc(whitespace_length_  + 4);
-            char *p = whitespace_;
-            for (size_t i = 0; i < whitespace_length_; i += 4) {
-                *p++ = ' ';
-                *p++ = '\n';
-                *p++ = '\r';
-                *p++ = '\t';
-            }
-            *p++ = '[';
-            *p++ = '0';
-            *p++ = ']';
-            *p++ = '\0';
-        }
-
-        // types test
-        {
-            const char *typespaths[] = {
-                "data/types",
-                "bin/types",
-                "../bin/types",
-                "../../bin/types/",
-                "../../../bin/types"
-            };
-
-            const char* typesfilenames[] = {
-                "booleans.json",
-                "floats.json",
-                "guids.json",
-                "integers.json",
-                "mixed.json",
-                "nulls.json",
-                "paragraphs.json"
-            };
-
-            for (size_t j = 0; j < sizeof(typesfilenames) / sizeof(typesfilenames[0]); j++) {
-                types_[j] = 0;
-                for (size_t i = 0; i < sizeof(typespaths) / sizeof(typespaths[0]); i++) {
-                    char filename[256];
-                    sprintf(filename, "%s/%s", typespaths[i], typesfilenames[j]);
-                    if (FILE* fp = fopen(filename, "rb")) {
-                        fseek(fp, 0, SEEK_END);
-                        typesLength_[j] = (size_t)ftell(fp);
-                        fseek(fp, 0, SEEK_SET);
-                        types_[j] = (char*)malloc(typesLength_[j] + 1);
-                        ASSERT_EQ(typesLength_[j], fread(types_[j], 1, typesLength_[j], fp));
-                        types_[j][typesLength_[j]] = '\0';
-                        fclose(fp);
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    virtual void TearDown() {
-        free(json_);
-        free(whitespace_);
-        json_ = 0;
-        whitespace_ = 0;
-        for (size_t i = 0; i < 7; i++) {
-            free(types_[i]);
-            types_[i] = 0;
-        }
-    }
-
-private:
-    PerfTest(const PerfTest&);
-    PerfTest& operator=(const PerfTest&);
-
-protected:
-    const char* filename_;
-    char *json_;
-    size_t length_;
-    char *whitespace_;
-    size_t whitespace_length_;
-    char *types_[7];
-    size_t typesLength_[7];
-
-    static const size_t kTrialCount = 1000;
-};
-
-#endif // __cplusplus
-
-#endif // PERFTEST_H_
diff --git a/src/sioclient/lib/rapidjson/test/perftest/platformtest.cpp b/src/sioclient/lib/rapidjson/test/perftest/platformtest.cpp
deleted file mode 100644
index bb905ca7..00000000
--- a/src/sioclient/lib/rapidjson/test/perftest/platformtest.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "perftest.h"
-
-// This file is for giving the performance characteristics of the platform (compiler/OS/CPU).
-
-#if TEST_PLATFORM
-
-#include <cmath>
-#include <fcntl.h>
-
-// Windows
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-// UNIX
-#if defined(unix) || defined(__unix__) || defined(__unix)
-#include <unistd.h>
-#ifdef _POSIX_MAPPED_FILES
-#include <sys/mman.h>
-#endif
-#endif
-
-class Platform : public PerfTest {
-public:
-    virtual void SetUp() {
-        PerfTest::SetUp();
-
-        // temp buffer for testing
-        temp_ = (char *)malloc(length_ + 1);
-        memcpy(temp_, json_, length_);
-        checkSum_ = CheckSum();
-    }
-
-    char CheckSum() {
-        char c = 0;
-        for (size_t i = 0; i < length_; ++i)
-            c += temp_[i];
-        return c;
-    }
-
-    virtual void TearDown() {
-        PerfTest::TearDown();
-        free(temp_);
-    }
-
-protected:
-    char *temp_;
-    char checkSum_;
-};
-
-TEST_F(Platform, CheckSum) {
-    for (int i = 0; i < kTrialCount; i++)
-        EXPECT_EQ(checkSum_, CheckSum());
-}
-
-TEST_F(Platform, strlen) {
-    for (int i = 0; i < kTrialCount; i++) {
-        size_t l = strlen(json_);
-        EXPECT_EQ(length_, l);
-    }
-}
-
-TEST_F(Platform, memcmp) {
-    for (int i = 0; i < kTrialCount; i++) {
-        EXPECT_EQ(0, memcmp(temp_, json_, length_));
-    }
-}
-
-TEST_F(Platform, pow) {
-    double sum = 0;
-    for (int i = 0; i < kTrialCount * kTrialCount; i++)
-        sum += pow(10.0, i & 255);
-    EXPECT_GT(sum, 0.0);
-}
-
-TEST_F(Platform, Whitespace_strlen) {
-    for (int i = 0; i < kTrialCount; i++) {
-        size_t l = strlen(whitespace_);
-        EXPECT_GT(l, whitespace_length_);
-    }       
-}
-
-TEST_F(Platform, Whitespace_strspn) {
-    for (int i = 0; i < kTrialCount; i++) {
-        size_t l = strspn(whitespace_, " \n\r\t");
-        EXPECT_EQ(whitespace_length_, l);
-    }       
-}
-
-TEST_F(Platform, fread) {
-    for (int i = 0; i < kTrialCount; i++) {
-        FILE *fp = fopen(filename_, "rb");
-        ASSERT_EQ(length_, fread(temp_, 1, length_, fp));
-        EXPECT_EQ(checkSum_, CheckSum());
-        fclose(fp);
-    }
-}
-
-#ifdef _MSC_VER
-TEST_F(Platform, read) {
-    for (int i = 0; i < kTrialCount; i++) {
-        int fd = _open(filename_, _O_BINARY | _O_RDONLY);
-        ASSERT_NE(-1, fd);
-        ASSERT_EQ(length_, _read(fd, temp_, length_));
-        EXPECT_EQ(checkSum_, CheckSum());
-        _close(fd);
-    }
-}
-#else
-TEST_F(Platform, read) {
-    for (int i = 0; i < kTrialCount; i++) {
-        int fd = open(filename_, O_RDONLY);
-        ASSERT_NE(-1, fd);
-        ASSERT_EQ(length_, read(fd, temp_, length_));
-        EXPECT_EQ(checkSum_, CheckSum());
-        close(fd);
-    }
-}
-#endif
-
-#ifdef _WIN32
-TEST_F(Platform, MapViewOfFile) {
-    for (int i = 0; i < kTrialCount; i++) {
-        HANDLE file = CreateFile(filename_, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-        ASSERT_NE(INVALID_HANDLE_VALUE, file);
-        HANDLE mapObject = CreateFileMapping(file, NULL, PAGE_READONLY, 0, length_, NULL);
-        ASSERT_NE(INVALID_HANDLE_VALUE, mapObject);
-        void *p = MapViewOfFile(mapObject, FILE_MAP_READ, 0, 0, length_);
-        ASSERT_TRUE(p != NULL);
-        EXPECT_EQ(checkSum_, CheckSum());
-        ASSERT_TRUE(UnmapViewOfFile(p) == TRUE);
-        ASSERT_TRUE(CloseHandle(mapObject) == TRUE);
-        ASSERT_TRUE(CloseHandle(file) == TRUE);
-    }
-}
-#endif
-
-#ifdef _POSIX_MAPPED_FILES
-TEST_F(Platform, mmap) {
-    for (int i = 0; i < kTrialCount; i++) {
-        int fd = open(filename_, O_RDONLY);
-        ASSERT_NE(-1, fd);
-        void *p = mmap(NULL, length_, PROT_READ, MAP_PRIVATE, fd, 0);
-        ASSERT_TRUE(p != NULL);
-        EXPECT_EQ(checkSum_, CheckSum());
-        munmap(p, length_);
-        close(fd);
-    }
-}
-#endif
-
-#endif // TEST_PLATFORM
diff --git a/src/sioclient/lib/rapidjson/test/perftest/rapidjsontest.cpp b/src/sioclient/lib/rapidjson/test/perftest/rapidjsontest.cpp
deleted file mode 100644
index a11a557d..00000000
--- a/src/sioclient/lib/rapidjson/test/perftest/rapidjsontest.cpp
+++ /dev/null
@@ -1,472 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "perftest.h"
-
-#if TEST_RAPIDJSON
-
-#include "rapidjson/rapidjson.h"
-#include "rapidjson/document.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/memorystream.h"
-
-#ifdef RAPIDJSON_SSE2
-#define SIMD_SUFFIX(name) name##_SSE2
-#elif defined(RAPIDJSON_SSE42)
-#define SIMD_SUFFIX(name) name##_SSE42
-#elif defined(RAPIDJSON_NEON)
-#define SIMD_SUFFIX(name) name##_NEON
-#else
-#define SIMD_SUFFIX(name) name
-#endif
-
-using namespace rapidjson;
-
-class RapidJson : public PerfTest {
-public:
-    RapidJson() : temp_(), doc_() {}
-
-    virtual void SetUp() {
-        PerfTest::SetUp();
-
-        // temp buffer for insitu parsing.
-        temp_ = (char *)malloc(length_ + 1);
-
-        // Parse as a document
-        EXPECT_FALSE(doc_.Parse(json_).HasParseError());
-
-        for (size_t i = 0; i < 7; i++)
-            EXPECT_FALSE(typesDoc_[i].Parse(types_[i]).HasParseError());
-    }
-
-    virtual void TearDown() {
-        PerfTest::TearDown();
-        free(temp_);
-    }
-
-private:
-    RapidJson(const RapidJson&);
-    RapidJson& operator=(const RapidJson&);
-
-protected:
-    char *temp_;
-    Document doc_;
-    Document typesDoc_[7];
-};
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParseInsitu_DummyHandler)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        memcpy(temp_, json_, length_ + 1);
-        InsituStringStream s(temp_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseInsituFlag>(s, h));
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParseInsitu_DummyHandler_ValidateEncoding)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        memcpy(temp_, json_, length_ + 1);
-        InsituStringStream s(temp_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseInsituFlag | kParseValidateEncodingFlag>(s, h));
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParse_DummyHandler)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringStream s(json_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse(s, h));
-    }
-}
-
-#define TEST_TYPED(index, Name)\
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParse_DummyHandler_##Name)) {\
-    for (size_t i = 0; i < kTrialCount * 10; i++) {\
-        StringStream s(types_[index]);\
-        BaseReaderHandler<> h;\
-        Reader reader;\
-        EXPECT_TRUE(reader.Parse(s, h));\
-    }\
-}\
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParseInsitu_DummyHandler_##Name)) {\
-    for (size_t i = 0; i < kTrialCount * 10; i++) {\
-        memcpy(temp_, types_[index], typesLength_[index] + 1);\
-        InsituStringStream s(temp_);\
-        BaseReaderHandler<> h;\
-        Reader reader;\
-        EXPECT_TRUE(reader.Parse<kParseInsituFlag>(s, h));\
-    }\
-}
-
-TEST_TYPED(0, Booleans)
-TEST_TYPED(1, Floats)
-TEST_TYPED(2, Guids)
-TEST_TYPED(3, Integers)
-TEST_TYPED(4, Mixed)
-TEST_TYPED(5, Nulls)
-TEST_TYPED(6, Paragraphs)
-
-#undef TEST_TYPED
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParse_DummyHandler_FullPrecision)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringStream s(json_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseFullPrecisionFlag>(s, h));
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParseIterative_DummyHandler)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringStream s(json_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseIterativeFlag>(s, h));
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParseIterativeInsitu_DummyHandler)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        memcpy(temp_, json_, length_ + 1);
-        InsituStringStream s(temp_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseIterativeFlag|kParseInsituFlag>(s, h));
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParseIterativePull_DummyHandler)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringStream s(json_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        reader.IterativeParseInit();
-        while (!reader.IterativeParseComplete()) {
-            if (!reader.IterativeParseNext<kParseDefaultFlags>(s, h))
-                break;
-        }
-        EXPECT_FALSE(reader.HasParseError());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParseIterativePullInsitu_DummyHandler)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        memcpy(temp_, json_, length_ + 1);
-        InsituStringStream s(temp_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        reader.IterativeParseInit();
-        while (!reader.IterativeParseComplete()) {
-            if (!reader.IterativeParseNext<kParseDefaultFlags|kParseInsituFlag>(s, h))
-                break;
-        }
-        EXPECT_FALSE(reader.HasParseError());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParse_DummyHandler_ValidateEncoding)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringStream s(json_);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseValidateEncodingFlag>(s, h));
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParseInsitu_MemoryPoolAllocator)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        memcpy(temp_, json_, length_ + 1);
-        Document doc;
-        doc.ParseInsitu(temp_);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParseIterativeInsitu_MemoryPoolAllocator)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        memcpy(temp_, json_, length_ + 1);
-        Document doc;
-        doc.ParseInsitu<kParseIterativeFlag>(temp_);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParse_MemoryPoolAllocator)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        Document doc;
-        doc.Parse(json_);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParseLength_MemoryPoolAllocator)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        Document doc;
-        doc.Parse(json_, length_);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParseStdString_MemoryPoolAllocator)) {
-    const std::string s(json_, length_);
-    for (size_t i = 0; i < kTrialCount; i++) {
-        Document doc;
-        doc.Parse(s);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-#endif
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParseIterative_MemoryPoolAllocator)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        Document doc;
-        doc.Parse<kParseIterativeFlag>(json_);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParse_CrtAllocator)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        memcpy(temp_, json_, length_ + 1);
-        GenericDocument<UTF8<>, CrtAllocator> doc;
-        doc.Parse(temp_);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParseEncodedInputStream_MemoryStream)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        MemoryStream ms(json_, length_);
-        EncodedInputStream<UTF8<>, MemoryStream> is(ms);
-        Document doc;
-        doc.ParseStream<0, UTF8<> >(is);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(DocumentParseAutoUTFInputStream_MemoryStream)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        MemoryStream ms(json_, length_);
-        AutoUTFInputStream<unsigned, MemoryStream> is(ms);
-        Document doc;
-        doc.ParseStream<0, AutoUTF<unsigned> >(is);
-        ASSERT_TRUE(doc.IsObject());
-    }
-}
-
-template<typename T>
-size_t Traverse(const T& value) {
-    size_t count = 1;
-    switch(value.GetType()) {
-        case kObjectType:
-            for (typename T::ConstMemberIterator itr = value.MemberBegin(); itr != value.MemberEnd(); ++itr) {
-                count++;    // name
-                count += Traverse(itr->value);
-            }
-            break;
-
-        case kArrayType:
-            for (typename T::ConstValueIterator itr = value.Begin(); itr != value.End(); ++itr)
-                count += Traverse(*itr);
-            break;
-
-        default:
-            // Do nothing.
-            break;
-    }
-    return count;
-}
-
-TEST_F(RapidJson, DocumentTraverse) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        size_t count = Traverse(doc_);
-        EXPECT_EQ(4339u, count);
-        //if (i == 0)
-        //  std::cout << count << std::endl;
-    }
-}
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-struct ValueCounter : public BaseReaderHandler<> {
-    ValueCounter() : count_(1) {}   // root
-
-    bool EndObject(SizeType memberCount) { count_ += memberCount * 2; return true; }
-    bool EndArray(SizeType elementCount) { count_ += elementCount; return true; }
-
-    SizeType count_;
-};
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
-
-TEST_F(RapidJson, DocumentAccept) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        ValueCounter counter;
-        doc_.Accept(counter);
-        EXPECT_EQ(4339u, counter.count_);
-    }
-}
-
-struct NullStream {
-    typedef char Ch;
-
-    NullStream() /*: length_(0)*/ {}
-    void Put(Ch) { /*++length_;*/ }
-    void Flush() {}
-    //size_t length_;
-};
-
-TEST_F(RapidJson, Writer_NullStream) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        NullStream s;
-        Writer<NullStream> writer(s);
-        doc_.Accept(writer);
-        //if (i == 0)
-        //  std::cout << s.length_ << std::endl;
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(Writer_StringBuffer)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringBuffer s(0, 1024 * 1024);
-        Writer<StringBuffer> writer(s);
-        doc_.Accept(writer);
-        const char* str = s.GetString();
-        (void)str;
-        //if (i == 0)
-        //  std::cout << strlen(str) << std::endl;
-    }
-}
-
-#define TEST_TYPED(index, Name)\
-TEST_F(RapidJson, SIMD_SUFFIX(Writer_StringBuffer_##Name)) {\
-    for (size_t i = 0; i < kTrialCount * 10; i++) {\
-        StringBuffer s(0, 1024 * 1024);\
-        Writer<StringBuffer> writer(s);\
-        typesDoc_[index].Accept(writer);\
-        const char* str = s.GetString();\
-        (void)str;\
-    }\
-}
-
-TEST_TYPED(0, Booleans)
-TEST_TYPED(1, Floats)
-TEST_TYPED(2, Guids)
-TEST_TYPED(3, Integers)
-TEST_TYPED(4, Mixed)
-TEST_TYPED(5, Nulls)
-TEST_TYPED(6, Paragraphs)
-
-#undef TEST_TYPED
-
-TEST_F(RapidJson, SIMD_SUFFIX(PrettyWriter_StringBuffer)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringBuffer s(0, 2048 * 1024);
-        PrettyWriter<StringBuffer> writer(s);
-        writer.SetIndent(' ', 1);
-        doc_.Accept(writer);
-        const char* str = s.GetString();
-        (void)str;
-        //if (i == 0)
-        //  std::cout << strlen(str) << std::endl;
-    }
-}
-
-TEST_F(RapidJson, internal_Pow10) {
-    double sum = 0;
-    for (size_t i = 0; i < kTrialCount * kTrialCount; i++)
-        sum += internal::Pow10(int(i & 255));
-    EXPECT_GT(sum, 0.0);
-}
-
-TEST_F(RapidJson, SkipWhitespace_Basic) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        rapidjson::StringStream s(whitespace_);
-        while (s.Peek() == ' ' || s.Peek() == '\n' || s.Peek() == '\r' || s.Peek() == '\t')
-            s.Take();
-        ASSERT_EQ('[', s.Peek());
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(SkipWhitespace)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        rapidjson::StringStream s(whitespace_);
-        rapidjson::SkipWhitespace(s);
-        ASSERT_EQ('[', s.Peek());
-    }
-}
-
-TEST_F(RapidJson, SkipWhitespace_strspn) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        const char* s = whitespace_ + std::strspn(whitespace_, " \t\r\n");
-        ASSERT_EQ('[', *s);
-    }
-}
-
-TEST_F(RapidJson, UTF8_Validate) {
-    NullStream os;
-
-    for (size_t i = 0; i < kTrialCount; i++) {
-        StringStream is(json_);
-        bool result = true;
-        while (is.Peek() != '\0')
-            result &= UTF8<>::Validate(is, os);
-        EXPECT_TRUE(result);
-    }
-}
-
-TEST_F(RapidJson, FileReadStream) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        FILE *fp = fopen(filename_, "rb");
-        char buffer[65536];
-        FileReadStream s(fp, buffer, sizeof(buffer));
-        while (s.Take() != '\0')
-            ;
-        fclose(fp);
-    }
-}
-
-TEST_F(RapidJson, SIMD_SUFFIX(ReaderParse_DummyHandler_FileReadStream)) {
-    for (size_t i = 0; i < kTrialCount; i++) {
-        FILE *fp = fopen(filename_, "rb");
-        char buffer[65536];
-        FileReadStream s(fp, buffer, sizeof(buffer));
-        BaseReaderHandler<> h;
-        Reader reader;
-        reader.Parse(s, h);
-        fclose(fp);
-    }
-}
-
-TEST_F(RapidJson, StringBuffer) {
-    StringBuffer sb;
-    for (int i = 0; i < 32 * 1024 * 1024; i++)
-        sb.Put(i & 0x7f);
-}
-
-#endif // TEST_RAPIDJSON
diff --git a/src/sioclient/lib/rapidjson/test/perftest/schematest.cpp b/src/sioclient/lib/rapidjson/test/perftest/schematest.cpp
deleted file mode 100644
index 468f5fe6..00000000
--- a/src/sioclient/lib/rapidjson/test/perftest/schematest.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-#include "perftest.h"
-
-#if TEST_RAPIDJSON
-
-#include "rapidjson/schema.h"
-#include <ctime>
-#include <string>
-#include <vector>
-
-#define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0])
-
-using namespace rapidjson;
-
-template <typename Allocator>
-static char* ReadFile(const char* filename, Allocator& allocator) {
-    const char *paths[] = {
-        "",
-        "bin/",
-        "../bin/",
-        "../../bin/",
-        "../../../bin/"
-    };
-    char buffer[1024];
-    FILE *fp = 0;
-    for (size_t i = 0; i < sizeof(paths) / sizeof(paths[0]); i++) {
-        sprintf(buffer, "%s%s", paths[i], filename);
-        fp = fopen(buffer, "rb");
-        if (fp)
-            break;
-    }
-
-    if (!fp)
-        return 0;
-
-    fseek(fp, 0, SEEK_END);
-    size_t length = static_cast<size_t>(ftell(fp));
-    fseek(fp, 0, SEEK_SET);
-    char* json = reinterpret_cast<char*>(allocator.Malloc(length + 1));
-    size_t readLength = fread(json, 1, length, fp);
-    json[readLength] = '\0';
-    fclose(fp);
-    return json;
-}
-
-class Schema : public PerfTest {
-public:
-    Schema() {}
-
-    virtual void SetUp() {
-        PerfTest::SetUp();
-
-        const char* filenames[] = {
-            "additionalItems.json",
-            "additionalProperties.json",
-            "allOf.json",
-            "anyOf.json",
-            "default.json",
-            "definitions.json",
-            "dependencies.json",
-            "enum.json",
-            "items.json",
-            "maximum.json",
-            "maxItems.json",
-            "maxLength.json",
-            "maxProperties.json",
-            "minimum.json",
-            "minItems.json",
-            "minLength.json",
-            "minProperties.json",
-            "multipleOf.json",
-            "not.json",
-            "oneOf.json",
-            "pattern.json",
-            "patternProperties.json",
-            "properties.json",
-            "ref.json",
-            "refRemote.json",
-            "required.json",
-            "type.json",
-            "uniqueItems.json"
-        };
-
-        char jsonBuffer[65536];
-        MemoryPoolAllocator<> jsonAllocator(jsonBuffer, sizeof(jsonBuffer));
-
-        for (size_t i = 0; i < ARRAY_SIZE(filenames); i++) {
-            char filename[FILENAME_MAX];
-            sprintf(filename, "jsonschema/tests/draft4/%s", filenames[i]);
-            char* json = ReadFile(filename, jsonAllocator);
-            if (!json) {
-                printf("json test suite file %s not found", filename);
-                return;
-            }
-
-            Document d;
-            d.Parse(json);
-            if (d.HasParseError()) {
-                printf("json test suite file %s has parse error", filename);
-                return;
-            }
-
-            for (Value::ConstValueIterator schemaItr = d.Begin(); schemaItr != d.End(); ++schemaItr) {
-                std::string schemaDescription = (*schemaItr)["description"].GetString();
-                if (IsExcludeTestSuite(schemaDescription))
-                    continue;
-
-                TestSuite* ts = new TestSuite;
-                ts->schema = new SchemaDocument((*schemaItr)["schema"]);
-
-                const Value& tests = (*schemaItr)["tests"];
-                for (Value::ConstValueIterator testItr = tests.Begin(); testItr != tests.End(); ++testItr) {
-                    if (IsExcludeTest(schemaDescription + ", " + (*testItr)["description"].GetString()))
-                        continue;
-
-                    Document* d2 = new Document;
-                    d2->CopyFrom((*testItr)["data"], d2->GetAllocator());
-                    ts->tests.push_back(d2);
-                }
-                testSuites.push_back(ts);
-            }
-        }
-    }
-
-    virtual void TearDown() {
-        PerfTest::TearDown();
-        for (TestSuiteList::const_iterator itr = testSuites.begin(); itr != testSuites.end(); ++itr)
-            delete *itr;
-        testSuites.clear();
-    }
-
-private:
-    // Using the same exclusion in https://github.com/json-schema/JSON-Schema-Test-Suite
-    static bool IsExcludeTestSuite(const std::string& description) {
-        const char* excludeTestSuites[] = {
-            //lost failing these tests
-            "remote ref",
-            "remote ref, containing refs itself",
-            "fragment within remote ref",
-            "ref within remote ref",
-            "change resolution scope",
-            // these below were added to get jsck in the benchmarks)
-            "uniqueItems validation",
-            "valid definition",
-            "invalid definition"
-        };
-
-        for (size_t i = 0; i < ARRAY_SIZE(excludeTestSuites); i++)
-            if (excludeTestSuites[i] == description)
-                return true;
-        return false;
-    }
-
-    // Using the same exclusion in https://github.com/json-schema/JSON-Schema-Test-Suite
-    static bool IsExcludeTest(const std::string& description) {
-        const char* excludeTests[] = {
-            //lots of validators fail these
-            "invalid definition, invalid definition schema",
-            "maxLength validation, two supplementary Unicode code points is long enough",
-            "minLength validation, one supplementary Unicode code point is not long enough",
-            //this is to get tv4 in the benchmarks
-            "heterogeneous enum validation, something else is invalid"
-        };
-
-        for (size_t i = 0; i < ARRAY_SIZE(excludeTests); i++)
-            if (excludeTests[i] == description)
-                return true;
-        return false;
-    }
-
-    Schema(const Schema&);
-    Schema& operator=(const Schema&);
-
-protected:
-    typedef std::vector<Document*> DocumentList;
-
-    struct TestSuite {
-        TestSuite() : schema() {}
-        ~TestSuite() {
-            delete schema;
-            for (DocumentList::iterator itr = tests.begin(); itr != tests.end(); ++itr)
-                delete *itr;
-        }
-        SchemaDocument* schema;
-        DocumentList tests;
-    };
-
-    typedef std::vector<TestSuite* > TestSuiteList;
-    TestSuiteList testSuites;
-};
-
-TEST_F(Schema, TestSuite) {
-    char validatorBuffer[65536];
-    MemoryPoolAllocator<> validatorAllocator(validatorBuffer, sizeof(validatorBuffer));
-
-    const int trialCount = 100000;
-    int testCount = 0;
-    clock_t start = clock();
-    for (int i = 0; i < trialCount; i++) {
-        for (TestSuiteList::const_iterator itr = testSuites.begin(); itr != testSuites.end(); ++itr) {
-            const TestSuite& ts = **itr;
-            GenericSchemaValidator<SchemaDocument, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> >  validator(*ts.schema, &validatorAllocator);
-            for (DocumentList::const_iterator testItr = ts.tests.begin(); testItr != ts.tests.end(); ++testItr) {
-                validator.Reset();
-                (*testItr)->Accept(validator);
-                testCount++;
-            }
-            validatorAllocator.Clear();
-        }
-    }
-    clock_t end = clock();
-    double duration = double(end - start) / CLOCKS_PER_SEC;
-    printf("%d trials in %f s -> %f trials per sec\n", trialCount, duration, trialCount / duration);
-    printf("%d tests per trial\n", testCount / trialCount);
-}
-
-#endif
diff --git a/src/sioclient/lib/rapidjson/test/unittest/CMakeLists.txt b/src/sioclient/lib/rapidjson/test/unittest/CMakeLists.txt
deleted file mode 100644
index 072b7b15..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/CMakeLists.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-include(CheckCXXCompilerFlag)
-
-set(UNITTEST_SOURCES
-	allocatorstest.cpp
-    bigintegertest.cpp
-	cursorstreamwrappertest.cpp
-    documenttest.cpp
-    dtoatest.cpp
-    encodedstreamtest.cpp
-    encodingstest.cpp
-    fwdtest.cpp
-    filestreamtest.cpp
-    itoatest.cpp
-    istreamwrappertest.cpp
-    jsoncheckertest.cpp
-    namespacetest.cpp
-    pointertest.cpp
-    prettywritertest.cpp
-    ostreamwrappertest.cpp
-    readertest.cpp
-    regextest.cpp
-	schematest.cpp
-	simdtest.cpp
-    strfunctest.cpp
-    stringbuffertest.cpp
-    strtodtest.cpp
-    unittest.cpp
-    valuetest.cpp
-    writertest.cpp)
-
-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
-		endif()
-endif(CCACHE_FOUND)
-
-set_property(DIRECTORY PROPERTY COMPILE_OPTIONS ${EXTRA_CXX_FLAGS})
-
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    # If the user is running a newer version of Clang that includes the
-    # -Wdouble-promotion, we will ignore that warning.
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.7)
-        CHECK_CXX_COMPILER_FLAG("-Wno-double-promotion" HAS_NO_DOUBLE_PROMOTION)
-        if (HAS_NO_DOUBLE_PROMOTION)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-double-promotion")
-        endif()
-    endif()
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-    # Force to always compile with /W4
-    if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-        string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    else()
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-    endif()
-
-    # Force to always compile with /WX
-    if(CMAKE_CXX_FLAGS MATCHES "/WX-")
-        string(REGEX REPLACE "/WX-" "/WX" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    else()
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
-    endif()
-endif()
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DRAPIDJSON_HAS_STDSTRING=1")
-
-add_library(namespacetest STATIC namespacetest.cpp)
-
-add_executable(unittest ${UNITTEST_SOURCES})
-target_link_libraries(unittest ${TEST_LIBRARIES} namespacetest)
-
-add_dependencies(tests unittest)
-
-add_test(NAME unittest
-    COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
-
-if(NOT MSVC)
-    # Not running SIMD.* unit test cases for Valgrind
-    add_test(NAME valgrind_unittest
-        COMMAND valgrind --suppressions=${CMAKE_SOURCE_DIR}/test/valgrind.supp --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.*
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
-
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        add_test(NAME symbol_check
-        COMMAND sh -c "objdump -t -C libnamespacetest.a | grep rapidjson ; test $? -ne 0"
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
-
-endif(NOT MSVC)
diff --git a/src/sioclient/lib/rapidjson/test/unittest/allocatorstest.cpp b/src/sioclient/lib/rapidjson/test/unittest/allocatorstest.cpp
deleted file mode 100644
index a5958de1..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/allocatorstest.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-
-#include "rapidjson/allocators.h"
-
-using namespace rapidjson;
-
-template <typename Allocator>
-void TestAllocator(Allocator& a) {
-    EXPECT_TRUE(a.Malloc(0) == 0);
-
-    uint8_t* p = static_cast<uint8_t*>(a.Malloc(100));
-    EXPECT_TRUE(p != 0);
-    for (size_t i = 0; i < 100; i++)
-        p[i] = static_cast<uint8_t>(i);
-
-    // Expand
-    uint8_t* q = static_cast<uint8_t*>(a.Realloc(p, 100, 200));
-    EXPECT_TRUE(q != 0);
-    for (size_t i = 0; i < 100; i++)
-        EXPECT_EQ(i, q[i]);
-    for (size_t i = 100; i < 200; i++)
-        q[i] = static_cast<uint8_t>(i);
-
-    // Shrink
-    uint8_t *r = static_cast<uint8_t*>(a.Realloc(q, 200, 150));
-    EXPECT_TRUE(r != 0);
-    for (size_t i = 0; i < 150; i++)
-        EXPECT_EQ(i, r[i]);
-
-    Allocator::Free(r);
-
-    // Realloc to zero size
-    EXPECT_TRUE(a.Realloc(a.Malloc(1), 1, 0) == 0);
-}
-
-TEST(Allocator, CrtAllocator) {
-    CrtAllocator a;
-    TestAllocator(a);
-}
-
-TEST(Allocator, MemoryPoolAllocator) {
-    MemoryPoolAllocator<> a;
-    TestAllocator(a);
-
-    for (size_t i = 1; i < 1000; i++) {
-        EXPECT_TRUE(a.Malloc(i) != 0);
-        EXPECT_LE(a.Size(), a.Capacity());
-    }
-}
-
-TEST(Allocator, Alignment) {
-#if RAPIDJSON_64BIT == 1
-    EXPECT_EQ(RAPIDJSON_UINT64_C2(0x00000000, 0x00000000), RAPIDJSON_ALIGN(0));
-    for (uint64_t i = 1; i < 8; i++) {
-        EXPECT_EQ(RAPIDJSON_UINT64_C2(0x00000000, 0x00000008), RAPIDJSON_ALIGN(i));
-        EXPECT_EQ(RAPIDJSON_UINT64_C2(0x00000000, 0x00000010), RAPIDJSON_ALIGN(RAPIDJSON_UINT64_C2(0x00000000, 0x00000008) + i));
-        EXPECT_EQ(RAPIDJSON_UINT64_C2(0x00000001, 0x00000000), RAPIDJSON_ALIGN(RAPIDJSON_UINT64_C2(0x00000000, 0xFFFFFFF8) + i));
-        EXPECT_EQ(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFF8), RAPIDJSON_ALIGN(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFF0) + i));
-    }
-#else
-    EXPECT_EQ(0u, RAPIDJSON_ALIGN(0u));
-    for (uint32_t i = 1; i < 4; i++) {
-        EXPECT_EQ(4u, RAPIDJSON_ALIGN(i));
-        EXPECT_EQ(8u, RAPIDJSON_ALIGN(4u + i));
-        EXPECT_EQ(0xFFFFFFF8u, RAPIDJSON_ALIGN(0xFFFFFFF4u + i));
-        EXPECT_EQ(0xFFFFFFFCu, RAPIDJSON_ALIGN(0xFFFFFFF8u + i));
-    }
-#endif
-}
-
-TEST(Allocator, Issue399) {
-    MemoryPoolAllocator<> a;
-    void* p = a.Malloc(100);
-    void* q = a.Realloc(p, 100, 200);
-    EXPECT_EQ(p, q);
-
-    // exhuasive testing
-    for (size_t j = 1; j < 32; j++) {
-        a.Clear();
-        a.Malloc(j); // some unaligned size
-        p = a.Malloc(1);
-        for (size_t i = 1; i < 1024; i++) {
-            q = a.Realloc(p, i, i + 1);
-            EXPECT_EQ(p, q);
-            p = q;
-        }
-    }
-}
diff --git a/src/sioclient/lib/rapidjson/test/unittest/bigintegertest.cpp b/src/sioclient/lib/rapidjson/test/unittest/bigintegertest.cpp
deleted file mode 100644
index 6e9d4c6b..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/bigintegertest.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-
-#include "rapidjson/internal/biginteger.h"
-
-using namespace rapidjson::internal;
-
-#define BIGINTEGER_LITERAL(s) BigInteger(s, sizeof(s) - 1)
-
-static const BigInteger kZero(0);
-static const BigInteger kOne(1);
-static const BigInteger kUint64Max = BIGINTEGER_LITERAL("18446744073709551615");
-static const BigInteger kTwo64 = BIGINTEGER_LITERAL("18446744073709551616");
-
-TEST(BigInteger, Constructor) {
-    EXPECT_TRUE(kZero.IsZero());
-    EXPECT_TRUE(kZero == kZero);
-    EXPECT_TRUE(kZero == BIGINTEGER_LITERAL("0"));
-    EXPECT_TRUE(kZero == BIGINTEGER_LITERAL("00"));
-
-    const BigInteger a(123);
-    EXPECT_TRUE(a == a);
-    EXPECT_TRUE(a == BIGINTEGER_LITERAL("123"));
-    EXPECT_TRUE(a == BIGINTEGER_LITERAL("0123"));
-
-    EXPECT_EQ(2u, kTwo64.GetCount());
-    EXPECT_EQ(0u, kTwo64.GetDigit(0));
-    EXPECT_EQ(1u, kTwo64.GetDigit(1));
-}
-
-TEST(BigInteger, AddUint64) {
-    BigInteger a = kZero;
-    a += 0u;
-    EXPECT_TRUE(kZero == a);
-
-    a += 1u;
-    EXPECT_TRUE(kOne == a);
-
-    a += 1u;
-    EXPECT_TRUE(BigInteger(2) == a);
-
-    EXPECT_TRUE(BigInteger(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFFF)) == kUint64Max);
-    BigInteger b = kUint64Max;
-    b += 1u;
-    EXPECT_TRUE(kTwo64 == b);
-    b += RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFFF);
-    EXPECT_TRUE(BIGINTEGER_LITERAL("36893488147419103231") == b);
-}
-
-TEST(BigInteger, MultiplyUint64) {
-    BigInteger a = kZero;
-    a *= static_cast <uint64_t>(0);
-    EXPECT_TRUE(kZero == a);
-    a *= static_cast <uint64_t>(123);
-    EXPECT_TRUE(kZero == a);
-
-    BigInteger b = kOne;
-    b *= static_cast<uint64_t>(1);
-    EXPECT_TRUE(kOne == b);
-    b *= static_cast<uint64_t>(0);
-    EXPECT_TRUE(kZero == b);
-
-    BigInteger c(123);
-    c *= static_cast<uint64_t>(456u);
-    EXPECT_TRUE(BigInteger(123u * 456u) == c);
-    c *= RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFFF);
-    EXPECT_TRUE(BIGINTEGER_LITERAL("1034640981606221330982120") == c);
-    c *= RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFFF);
-    EXPECT_TRUE(BIGINTEGER_LITERAL("19085757395861596536664473018420572782123800") == c);
-}
-
-TEST(BigInteger, MultiplyUint32) {
-    BigInteger a = kZero;
-    a *= static_cast <uint32_t>(0);
-    EXPECT_TRUE(kZero == a);
-    a *= static_cast <uint32_t>(123);
-    EXPECT_TRUE(kZero == a);
-
-    BigInteger b = kOne;
-    b *= static_cast<uint32_t>(1);
-    EXPECT_TRUE(kOne == b);
-    b *= static_cast<uint32_t>(0);
-    EXPECT_TRUE(kZero == b);
-
-    BigInteger c(123);
-    c *= static_cast<uint32_t>(456u);
-    EXPECT_TRUE(BigInteger(123u * 456u) == c);
-    c *= 0xFFFFFFFFu;
-    EXPECT_TRUE(BIGINTEGER_LITERAL("240896125641960") == c);
-    c *= 0xFFFFFFFFu;
-    EXPECT_TRUE(BIGINTEGER_LITERAL("1034640981124429079698200") == c);
-}
-
-TEST(BigInteger, LeftShift) {
-    BigInteger a = kZero;
-    a <<= 1;
-    EXPECT_TRUE(kZero == a);
-    a <<= 64;
-    EXPECT_TRUE(kZero == a);
-
-    a = BigInteger(123);
-    a <<= 0;
-    EXPECT_TRUE(BigInteger(123) == a);
-    a <<= 1;
-    EXPECT_TRUE(BigInteger(246) == a);
-    a <<= 64;
-    EXPECT_TRUE(BIGINTEGER_LITERAL("4537899042132549697536") == a);
-    a <<= 99;
-    EXPECT_TRUE(BIGINTEGER_LITERAL("2876235222267216943024851750785644982682875244576768") == a);
-
-    a = 1;
-    a <<= 64; // a.count_ != 1
-    a <<= 256; // interShift == 0
-    EXPECT_TRUE(BIGINTEGER_LITERAL("2135987035920910082395021706169552114602704522356652769947041607822219725780640550022962086936576") == a);
-}
-
-TEST(BigInteger, Compare) {
-    EXPECT_EQ(0, kZero.Compare(kZero));
-    EXPECT_EQ(1, kOne.Compare(kZero));
-    EXPECT_EQ(-1, kZero.Compare(kOne));
-    EXPECT_EQ(0, kUint64Max.Compare(kUint64Max));
-    EXPECT_EQ(0, kTwo64.Compare(kTwo64));
-    EXPECT_EQ(-1, kUint64Max.Compare(kTwo64));
-    EXPECT_EQ(1, kTwo64.Compare(kUint64Max));
-}
diff --git a/src/sioclient/lib/rapidjson/test/unittest/cursorstreamwrappertest.cpp b/src/sioclient/lib/rapidjson/test/unittest/cursorstreamwrappertest.cpp
deleted file mode 100644
index a1162481..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/cursorstreamwrappertest.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/document.h"
-#include "rapidjson/cursorstreamwrapper.h"
-
-using namespace rapidjson;
-
-// static const char json[] = "{\"string\"\n\n:\"my string\",\"array\"\n:[\"1\", \"2\", \"3\"]}";
-
-bool testJson(const char *json, size_t &line, size_t &col) {
-    StringStream ss(json);
-    CursorStreamWrapper<StringStream> csw(ss);
-    Document document;
-    document.ParseStream(csw);
-    bool ret = document.HasParseError();
-    if (ret) {
-        col = csw.GetColumn();
-        line = csw.GetLine();
-    }
-    return ret;
-}
-
-TEST(CursorStreamWrapper, MissingFirstBracket) {
-    const char json[] = "\"string\"\n\n:\"my string\",\"array\"\n:[\"1\", \"2\", \"3\"]}";
-    size_t col, line;
-    bool ret = testJson(json, line, col);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(line, 3);
-    EXPECT_EQ(col, 0);
-}
-
-TEST(CursorStreamWrapper, MissingQuotes) {
-    const char json[] = "{\"string\n\n:\"my string\",\"array\"\n:[\"1\", \"2\", \"3\"]}";
-    size_t col, line;
-    bool ret = testJson(json, line, col);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(line, 1);
-    EXPECT_EQ(col, 8);
-}
-
-TEST(CursorStreamWrapper, MissingColon) {
-    const char json[] = "{\"string\"\n\n\"my string\",\"array\"\n:[\"1\", \"2\", \"3\"]}";
-    size_t col, line;
-    bool ret = testJson(json, line, col);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(line, 3);
-    EXPECT_EQ(col, 0);
-}
-
-TEST(CursorStreamWrapper, MissingSecondQuotes) {
-    const char json[] = "{\"string\"\n\n:my string\",\"array\"\n:[\"1\", \"2\", \"3\"]}";
-    size_t col, line;
-    bool ret = testJson(json, line, col);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(line, 3);
-    EXPECT_EQ(col, 1);
-}
-
-TEST(CursorStreamWrapper, MissingComma) {
-    const char json[] = "{\"string\"\n\n:\"my string\"\"array\"\n:[\"1\", \"2\", \"3\"]}";
-    size_t col, line;
-    bool ret = testJson(json, line, col);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(line, 3);
-    EXPECT_EQ(col, 12);
-}
-
-TEST(CursorStreamWrapper, MissingArrayBracket) {
-    const char json[] = "{\"string\"\n\n:\"my string\",\"array\"\n:\"1\", \"2\", \"3\"]}";
-    size_t col, line;
-    bool ret = testJson(json, line, col);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(line, 4);
-    EXPECT_EQ(col, 9);
-}
-
-TEST(CursorStreamWrapper, MissingArrayComma) {
-    const char json[] = "{\"string\"\n\n:\"my string\",\"array\"\n:[\"1\" \"2\", \"3\"]}";
-    size_t col, line;
-    bool ret = testJson(json, line, col);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(line, 4);
-    EXPECT_EQ(col, 6);
-}
-
-TEST(CursorStreamWrapper, MissingLastArrayBracket) {
-    const char json8[] = "{\"string\"\n\n:\"my string\",\"array\"\n:[\"1\", \"2\", \"3\"}";
-    size_t col, line;
-    bool ret = testJson(json8, line, col);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(line, 4);
-    EXPECT_EQ(col, 15);
-}
-
-TEST(CursorStreamWrapper, MissingLastBracket) {
-    const char json9[] = "{\"string\"\n\n:\"my string\",\"array\"\n:[\"1\", \"2\", \"3\"]";
-    size_t col, line;
-    bool ret = testJson(json9, line, col);
-    EXPECT_TRUE(ret);
-    EXPECT_EQ(line, 4);
-    EXPECT_EQ(col, 16);
-}
diff --git a/src/sioclient/lib/rapidjson/test/unittest/documenttest.cpp b/src/sioclient/lib/rapidjson/test/unittest/documenttest.cpp
deleted file mode 100644
index 54298027..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/documenttest.cpp
+++ /dev/null
@@ -1,672 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/stringbuffer.h"
-#include <sstream>
-#include <algorithm>
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(c++98-compat)
-RAPIDJSON_DIAG_OFF(missing-variable-declarations)
-#endif
-
-using namespace rapidjson;
-
-template <typename DocumentType>
-void ParseCheck(DocumentType& doc) {
-    typedef typename DocumentType::ValueType ValueType;
-
-    EXPECT_FALSE(doc.HasParseError());
-    if (doc.HasParseError())
-        printf("Error: %d at %zu\n", static_cast<int>(doc.GetParseError()), doc.GetErrorOffset());
-    EXPECT_TRUE(static_cast<ParseResult>(doc));
-
-    EXPECT_TRUE(doc.IsObject());
-
-    EXPECT_TRUE(doc.HasMember("hello"));
-    const ValueType& hello = doc["hello"];
-    EXPECT_TRUE(hello.IsString());
-    EXPECT_STREQ("world", hello.GetString());
-
-    EXPECT_TRUE(doc.HasMember("t"));
-    const ValueType& t = doc["t"];
-    EXPECT_TRUE(t.IsTrue());
-
-    EXPECT_TRUE(doc.HasMember("f"));
-    const ValueType& f = doc["f"];
-    EXPECT_TRUE(f.IsFalse());
-
-    EXPECT_TRUE(doc.HasMember("n"));
-    const ValueType& n = doc["n"];
-    EXPECT_TRUE(n.IsNull());
-
-    EXPECT_TRUE(doc.HasMember("i"));
-    const ValueType& i = doc["i"];
-    EXPECT_TRUE(i.IsNumber());
-    EXPECT_EQ(123, i.GetInt());
-
-    EXPECT_TRUE(doc.HasMember("pi"));
-    const ValueType& pi = doc["pi"];
-    EXPECT_TRUE(pi.IsNumber());
-    EXPECT_DOUBLE_EQ(3.1416, pi.GetDouble());
-
-    EXPECT_TRUE(doc.HasMember("a"));
-    const ValueType& a = doc["a"];
-    EXPECT_TRUE(a.IsArray());
-    EXPECT_EQ(4u, a.Size());
-    for (SizeType j = 0; j < 4; j++)
-        EXPECT_EQ(j + 1, a[j].GetUint());
-}
-
-template <typename Allocator, typename StackAllocator>
-void ParseTest() {
-    typedef GenericDocument<UTF8<>, Allocator, StackAllocator> DocumentType;
-    DocumentType doc;
-
-    const char* json = " { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ";
-
-    doc.Parse(json);
-    ParseCheck(doc);
-
-    doc.SetNull();
-    StringStream s(json);
-    doc.template ParseStream<0>(s);
-    ParseCheck(doc);
-
-    doc.SetNull();
-    char *buffer = strdup(json);
-    doc.ParseInsitu(buffer);
-    ParseCheck(doc);
-    free(buffer);
-
-    // Parse(const Ch*, size_t)
-    size_t length = strlen(json);
-    buffer = reinterpret_cast<char*>(malloc(length * 2));
-    memcpy(buffer, json, length);
-    memset(buffer + length, 'X', length);
-#if RAPIDJSON_HAS_STDSTRING
-    std::string s2(buffer, length); // backup buffer
-#endif
-    doc.SetNull();
-    doc.Parse(buffer, length);
-    free(buffer);
-    ParseCheck(doc);
-
-#if RAPIDJSON_HAS_STDSTRING
-    // Parse(std::string)
-    doc.SetNull();
-    doc.Parse(s2);
-    ParseCheck(doc);
-#endif
-}
-
-TEST(Document, Parse) {
-    ParseTest<MemoryPoolAllocator<>, CrtAllocator>();
-    ParseTest<MemoryPoolAllocator<>, MemoryPoolAllocator<> >();
-    ParseTest<CrtAllocator, MemoryPoolAllocator<> >();
-    ParseTest<CrtAllocator, CrtAllocator>();
-}
-
-TEST(Document, UnchangedOnParseError) {
-    Document doc;
-    doc.SetArray().PushBack(0, doc.GetAllocator());
-
-    ParseResult noError;
-    EXPECT_TRUE(noError);
-
-    ParseResult err = doc.Parse("{]");
-    EXPECT_TRUE(doc.HasParseError());
-    EXPECT_NE(err, noError);
-    EXPECT_NE(err.Code(), noError);
-    EXPECT_NE(noError, doc.GetParseError());
-    EXPECT_EQ(err.Code(), doc.GetParseError());
-    EXPECT_EQ(err.Offset(), doc.GetErrorOffset());
-    EXPECT_TRUE(doc.IsArray());
-    EXPECT_EQ(doc.Size(), 1u);
-
-    err = doc.Parse("{}");
-    EXPECT_FALSE(doc.HasParseError());
-    EXPECT_FALSE(err.IsError());
-    EXPECT_TRUE(err);
-    EXPECT_EQ(err, noError);
-    EXPECT_EQ(err.Code(), noError);
-    EXPECT_EQ(err.Code(), doc.GetParseError());
-    EXPECT_EQ(err.Offset(), doc.GetErrorOffset());
-    EXPECT_TRUE(doc.IsObject());
-    EXPECT_EQ(doc.MemberCount(), 0u);
-}
-
-static FILE* OpenEncodedFile(const char* filename) {
-    const char *paths[] = {
-        "encodings",
-        "bin/encodings",
-        "../bin/encodings",
-        "../../bin/encodings",
-        "../../../bin/encodings"
-    };
-    char buffer[1024];
-    for (size_t i = 0; i < sizeof(paths) / sizeof(paths[0]); i++) {
-        sprintf(buffer, "%s/%s", paths[i], filename);
-        FILE *fp = fopen(buffer, "rb");
-        if (fp)
-            return fp;
-    }
-    return 0;
-}
-
-TEST(Document, Parse_Encoding) {
-    const char* json = " { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ";
-
-    typedef GenericDocument<UTF16<> > DocumentType;
-    DocumentType doc;
-    
-    // Parse<unsigned, SourceEncoding>(const SourceEncoding::Ch*)
-    // doc.Parse<kParseDefaultFlags, UTF8<> >(json);
-    // EXPECT_FALSE(doc.HasParseError());
-    // EXPECT_EQ(0, StrCmp(doc[L"hello"].GetString(), L"world"));
-
-    // Parse<unsigned, SourceEncoding>(const SourceEncoding::Ch*, size_t)
-    size_t length = strlen(json);
-    char* buffer = reinterpret_cast<char*>(malloc(length * 2));
-    memcpy(buffer, json, length);
-    memset(buffer + length, 'X', length);
-#if RAPIDJSON_HAS_STDSTRING
-    std::string s2(buffer, length); // backup buffer
-#endif
-    doc.SetNull();
-    doc.Parse<kParseDefaultFlags, UTF8<> >(buffer, length);
-    free(buffer);
-    EXPECT_FALSE(doc.HasParseError());
-    if (doc.HasParseError())
-        printf("Error: %d at %zu\n", static_cast<int>(doc.GetParseError()), doc.GetErrorOffset());
-    EXPECT_EQ(0, StrCmp(doc[L"hello"].GetString(), L"world"));
-
-#if RAPIDJSON_HAS_STDSTRING
-    // Parse<unsigned, SourceEncoding>(std::string)
-    doc.SetNull();
-
-#if defined(_MSC_VER) && _MSC_VER < 1800
-    doc.Parse<kParseDefaultFlags, UTF8<> >(s2.c_str()); // VS2010 or below cannot handle templated function overloading. Use const char* instead.
-#else
-    doc.Parse<kParseDefaultFlags, UTF8<> >(s2);
-#endif
-    EXPECT_FALSE(doc.HasParseError());
-    EXPECT_EQ(0, StrCmp(doc[L"hello"].GetString(), L"world"));
-#endif
-}
-
-TEST(Document, ParseStream_EncodedInputStream) {
-    // UTF8 -> UTF16
-    FILE* fp = OpenEncodedFile("utf8.json");
-    char buffer[256];
-    FileReadStream bis(fp, buffer, sizeof(buffer));
-    EncodedInputStream<UTF8<>, FileReadStream> eis(bis);
-
-    GenericDocument<UTF16<> > d;
-    d.ParseStream<0, UTF8<> >(eis);
-    EXPECT_FALSE(d.HasParseError());
-
-    fclose(fp);
-
-    wchar_t expected[] = L"I can eat glass and it doesn't hurt me.";
-    GenericValue<UTF16<> >& v = d[L"en"];
-    EXPECT_TRUE(v.IsString());
-    EXPECT_EQ(sizeof(expected) / sizeof(wchar_t) - 1, v.GetStringLength());
-    EXPECT_EQ(0, StrCmp(expected, v.GetString()));
-
-    // UTF16 -> UTF8 in memory
-    StringBuffer bos;
-    typedef EncodedOutputStream<UTF8<>, StringBuffer> OutputStream;
-    OutputStream eos(bos, false);   // Not writing BOM
-    {
-        Writer<OutputStream, UTF16<>, UTF8<> > writer(eos);
-        d.Accept(writer);
-    }
-
-    // Condense the original file and compare.
-    fp = OpenEncodedFile("utf8.json");
-    FileReadStream is(fp, buffer, sizeof(buffer));
-    Reader reader;
-    StringBuffer bos2;
-    Writer<StringBuffer> writer2(bos2);
-    reader.Parse(is, writer2);
-    fclose(fp);
-
-    EXPECT_EQ(bos.GetSize(), bos2.GetSize());
-    EXPECT_EQ(0, memcmp(bos.GetString(), bos2.GetString(), bos2.GetSize()));
-}
-
-TEST(Document, ParseStream_AutoUTFInputStream) {
-    // Any -> UTF8
-    FILE* fp = OpenEncodedFile("utf32be.json");
-    char buffer[256];
-    FileReadStream bis(fp, buffer, sizeof(buffer));
-    AutoUTFInputStream<unsigned, FileReadStream> eis(bis);
-
-    Document d;
-    d.ParseStream<0, AutoUTF<unsigned> >(eis);
-    EXPECT_FALSE(d.HasParseError());
-
-    fclose(fp);
-
-    char expected[] = "I can eat glass and it doesn't hurt me.";
-    Value& v = d["en"];
-    EXPECT_TRUE(v.IsString());
-    EXPECT_EQ(sizeof(expected) - 1, v.GetStringLength());
-    EXPECT_EQ(0, StrCmp(expected, v.GetString()));
-
-    // UTF8 -> UTF8 in memory
-    StringBuffer bos;
-    Writer<StringBuffer> writer(bos);
-    d.Accept(writer);
-
-    // Condense the original file and compare.
-    fp = OpenEncodedFile("utf8.json");
-    FileReadStream is(fp, buffer, sizeof(buffer));
-    Reader reader;
-    StringBuffer bos2;
-    Writer<StringBuffer> writer2(bos2);
-    reader.Parse(is, writer2);
-    fclose(fp);
-
-    EXPECT_EQ(bos.GetSize(), bos2.GetSize());
-    EXPECT_EQ(0, memcmp(bos.GetString(), bos2.GetString(), bos2.GetSize()));
-}
-
-TEST(Document, Swap) {
-    Document d1;
-    Document::AllocatorType& a = d1.GetAllocator();
-
-    d1.SetArray().PushBack(1, a).PushBack(2, a);
-
-    Value o;
-    o.SetObject().AddMember("a", 1, a);
-
-    // Swap between Document and Value
-    d1.Swap(o);
-    EXPECT_TRUE(d1.IsObject());
-    EXPECT_TRUE(o.IsArray());
-
-    d1.Swap(o);
-    EXPECT_TRUE(d1.IsArray());
-    EXPECT_TRUE(o.IsObject());
-
-    o.Swap(d1);
-    EXPECT_TRUE(d1.IsObject());
-    EXPECT_TRUE(o.IsArray());
-
-    // Swap between Document and Document
-    Document d2;
-    d2.SetArray().PushBack(3, a);
-    d1.Swap(d2);
-    EXPECT_TRUE(d1.IsArray());
-    EXPECT_TRUE(d2.IsObject());
-    EXPECT_EQ(&d2.GetAllocator(), &a);
-
-    // reset value
-    Value().Swap(d1);
-    EXPECT_TRUE(d1.IsNull());
-
-    // reset document, including allocator
-    Document().Swap(d2);
-    EXPECT_TRUE(d2.IsNull());
-    EXPECT_NE(&d2.GetAllocator(), &a);
-
-    // testing std::swap compatibility
-    d1.SetBool(true);
-    using std::swap;
-    swap(d1, d2);
-    EXPECT_TRUE(d1.IsNull());
-    EXPECT_TRUE(d2.IsTrue());
-
-    swap(o, d2);
-    EXPECT_TRUE(o.IsTrue());
-    EXPECT_TRUE(d2.IsArray());
-}
-
-
-// This should be slow due to assignment in inner-loop.
-struct OutputStringStream : public std::ostringstream {
-    typedef char Ch;
-
-    virtual ~OutputStringStream();
-
-    void Put(char c) {
-        put(c);
-    }
-    void Flush() {}
-};
-
-OutputStringStream::~OutputStringStream() {}
-
-TEST(Document, AcceptWriter) {
-    Document doc;
-    doc.Parse(" { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ");
-
-    OutputStringStream os;
-    Writer<OutputStringStream> writer(os);
-    doc.Accept(writer);
-
-    EXPECT_EQ("{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3,4]}", os.str());
-}
-
-TEST(Document, UserBuffer) {
-    typedef GenericDocument<UTF8<>, MemoryPoolAllocator<>, MemoryPoolAllocator<> > DocumentType;
-    char valueBuffer[4096];
-    char parseBuffer[1024];
-    MemoryPoolAllocator<> valueAllocator(valueBuffer, sizeof(valueBuffer));
-    MemoryPoolAllocator<> parseAllocator(parseBuffer, sizeof(parseBuffer));
-    DocumentType doc(&valueAllocator, sizeof(parseBuffer) / 2, &parseAllocator);
-    doc.Parse(" { \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3, 4] } ");
-    EXPECT_FALSE(doc.HasParseError());
-    EXPECT_LE(valueAllocator.Size(), sizeof(valueBuffer));
-    EXPECT_LE(parseAllocator.Size(), sizeof(parseBuffer));
-
-    // Cover MemoryPoolAllocator::Capacity()
-    EXPECT_LE(valueAllocator.Size(), valueAllocator.Capacity());
-    EXPECT_LE(parseAllocator.Size(), parseAllocator.Capacity());
-}
-
-// Issue 226: Value of string type should not point to NULL
-TEST(Document, AssertAcceptInvalidNameType) {
-    Document doc;
-    doc.SetObject();
-    doc.AddMember("a", 0, doc.GetAllocator());
-    doc.FindMember("a")->name.SetNull(); // Change name to non-string type.
-
-    OutputStringStream os;
-    Writer<OutputStringStream> writer(os);
-    ASSERT_THROW(doc.Accept(writer), AssertException);
-}
-
-// Issue 44:    SetStringRaw doesn't work with wchar_t
-TEST(Document, UTF16_Document) {
-    GenericDocument< UTF16<> > json;
-    json.Parse<kParseValidateEncodingFlag>(L"[{\"created_at\":\"Wed Oct 30 17:13:20 +0000 2012\"}]");
-
-    ASSERT_TRUE(json.IsArray());
-    GenericValue< UTF16<> >& v = json[0];
-    ASSERT_TRUE(v.IsObject());
-
-    GenericValue< UTF16<> >& s = v[L"created_at"];
-    ASSERT_TRUE(s.IsString());
-
-    EXPECT_EQ(0, memcmp(L"Wed Oct 30 17:13:20 +0000 2012", s.GetString(), (s.GetStringLength() + 1) * sizeof(wchar_t)));
-}
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-#if 0 // Many old compiler does not support these. Turn it off temporaily.
-
-#include <type_traits>
-
-TEST(Document, Traits) {
-    static_assert(std::is_constructible<Document>::value, "");
-    static_assert(std::is_default_constructible<Document>::value, "");
-#ifndef _MSC_VER
-    static_assert(!std::is_copy_constructible<Document>::value, "");
-#endif
-    static_assert(std::is_move_constructible<Document>::value, "");
-
-    static_assert(!std::is_nothrow_constructible<Document>::value, "");
-    static_assert(!std::is_nothrow_default_constructible<Document>::value, "");
-#ifndef _MSC_VER
-    static_assert(!std::is_nothrow_copy_constructible<Document>::value, "");
-    static_assert(std::is_nothrow_move_constructible<Document>::value, "");
-#endif
-
-    static_assert(std::is_assignable<Document,Document>::value, "");
-#ifndef _MSC_VER
-  static_assert(!std::is_copy_assignable<Document>::value, "");
-#endif
-    static_assert(std::is_move_assignable<Document>::value, "");
-
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_assignable<Document, Document>::value, "");
-#endif
-    static_assert(!std::is_nothrow_copy_assignable<Document>::value, "");
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_move_assignable<Document>::value, "");
-#endif
-
-    static_assert( std::is_destructible<Document>::value, "");
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_destructible<Document>::value, "");
-#endif
-}
-
-#endif
-
-template <typename Allocator>
-struct DocumentMove: public ::testing::Test {
-};
-
-typedef ::testing::Types< CrtAllocator, MemoryPoolAllocator<> > MoveAllocatorTypes;
-TYPED_TEST_CASE(DocumentMove, MoveAllocatorTypes);
-
-TYPED_TEST(DocumentMove, MoveConstructor) {
-    typedef TypeParam Allocator;
-    typedef GenericDocument<UTF8<>, Allocator> D;
-    Allocator allocator;
-
-    D a(&allocator);
-    a.Parse("[\"one\", \"two\", \"three\"]");
-    EXPECT_FALSE(a.HasParseError());
-    EXPECT_TRUE(a.IsArray());
-    EXPECT_EQ(3u, a.Size());
-    EXPECT_EQ(&a.GetAllocator(), &allocator);
-
-    // Document b(a); // does not compile (!is_copy_constructible)
-    D b(std::move(a));
-    EXPECT_TRUE(a.IsNull());
-    EXPECT_TRUE(b.IsArray());
-    EXPECT_EQ(3u, b.Size());
-    EXPECT_THROW(a.GetAllocator(), AssertException);
-    EXPECT_EQ(&b.GetAllocator(), &allocator);
-
-    b.Parse("{\"Foo\": \"Bar\", \"Baz\": 42}");
-    EXPECT_FALSE(b.HasParseError());
-    EXPECT_TRUE(b.IsObject());
-    EXPECT_EQ(2u, b.MemberCount());
-
-    // Document c = a; // does not compile (!is_copy_constructible)
-    D c = std::move(b);
-    EXPECT_TRUE(b.IsNull());
-    EXPECT_TRUE(c.IsObject());
-    EXPECT_EQ(2u, c.MemberCount());
-    EXPECT_THROW(b.GetAllocator(), AssertException);
-    EXPECT_EQ(&c.GetAllocator(), &allocator);
-}
-
-TYPED_TEST(DocumentMove, MoveConstructorParseError) {
-    typedef TypeParam Allocator;
-    typedef GenericDocument<UTF8<>, Allocator> D;
-
-    ParseResult noError;
-    D a;
-    a.Parse("{ 4 = 4]");
-    ParseResult error(a.GetParseError(), a.GetErrorOffset());
-    EXPECT_TRUE(a.HasParseError());
-    EXPECT_NE(error, noError);
-    EXPECT_NE(error.Code(), noError);
-    EXPECT_NE(error.Code(), noError.Code());
-    EXPECT_NE(error.Offset(), noError.Offset());
-
-    D b(std::move(a));
-    EXPECT_FALSE(a.HasParseError());
-    EXPECT_TRUE(b.HasParseError());
-    EXPECT_EQ(a.GetParseError(), noError);
-    EXPECT_EQ(a.GetParseError(), noError.Code());
-    EXPECT_EQ(a.GetErrorOffset(), noError.Offset());
-    EXPECT_EQ(b.GetParseError(), error);
-    EXPECT_EQ(b.GetParseError(), error.Code());
-    EXPECT_EQ(b.GetErrorOffset(), error.Offset());
-
-    D c(std::move(b));
-    EXPECT_FALSE(b.HasParseError());
-    EXPECT_TRUE(c.HasParseError());
-    EXPECT_EQ(b.GetParseError(), noError.Code());
-    EXPECT_EQ(c.GetParseError(), error.Code());
-    EXPECT_EQ(b.GetErrorOffset(), noError.Offset());
-    EXPECT_EQ(c.GetErrorOffset(), error.Offset());
-}
-
-// This test does not properly use parsing, just for testing.
-// It must call ClearStack() explicitly to prevent memory leak.
-// But here we cannot as ClearStack() is private.
-#if 0
-TYPED_TEST(DocumentMove, MoveConstructorStack) {
-    typedef TypeParam Allocator;
-    typedef UTF8<> Encoding;
-    typedef GenericDocument<Encoding, Allocator> Document;
-
-    Document a;
-    size_t defaultCapacity = a.GetStackCapacity();
-
-    // Trick Document into getting GetStackCapacity() to return non-zero
-    typedef GenericReader<Encoding, Encoding, Allocator> Reader;
-    Reader reader(&a.GetAllocator());
-    GenericStringStream<Encoding> is("[\"one\", \"two\", \"three\"]");
-    reader.template Parse<kParseDefaultFlags>(is, a);
-    size_t capacity = a.GetStackCapacity();
-    EXPECT_GT(capacity, 0u);
-
-    Document b(std::move(a));
-    EXPECT_EQ(a.GetStackCapacity(), defaultCapacity);
-    EXPECT_EQ(b.GetStackCapacity(), capacity);
-
-    Document c = std::move(b);
-    EXPECT_EQ(b.GetStackCapacity(), defaultCapacity);
-    EXPECT_EQ(c.GetStackCapacity(), capacity);
-}
-#endif
-
-TYPED_TEST(DocumentMove, MoveAssignment) {
-    typedef TypeParam Allocator;
-    typedef GenericDocument<UTF8<>, Allocator> D;
-    Allocator allocator;
-
-    D a(&allocator);
-    a.Parse("[\"one\", \"two\", \"three\"]");
-    EXPECT_FALSE(a.HasParseError());
-    EXPECT_TRUE(a.IsArray());
-    EXPECT_EQ(3u, a.Size());
-    EXPECT_EQ(&a.GetAllocator(), &allocator);
-
-    // Document b; b = a; // does not compile (!is_copy_assignable)
-    D b;
-    b = std::move(a);
-    EXPECT_TRUE(a.IsNull());
-    EXPECT_TRUE(b.IsArray());
-    EXPECT_EQ(3u, b.Size());
-    EXPECT_THROW(a.GetAllocator(), AssertException);
-    EXPECT_EQ(&b.GetAllocator(), &allocator);
-
-    b.Parse("{\"Foo\": \"Bar\", \"Baz\": 42}");
-    EXPECT_FALSE(b.HasParseError());
-    EXPECT_TRUE(b.IsObject());
-    EXPECT_EQ(2u, b.MemberCount());
-
-    // Document c; c = a; // does not compile (see static_assert)
-    D c;
-    c = std::move(b);
-    EXPECT_TRUE(b.IsNull());
-    EXPECT_TRUE(c.IsObject());
-    EXPECT_EQ(2u, c.MemberCount());
-    EXPECT_THROW(b.GetAllocator(), AssertException);
-    EXPECT_EQ(&c.GetAllocator(), &allocator);
-}
-
-TYPED_TEST(DocumentMove, MoveAssignmentParseError) {
-    typedef TypeParam Allocator;
-    typedef GenericDocument<UTF8<>, Allocator> D;
-
-    ParseResult noError;
-    D a;
-    a.Parse("{ 4 = 4]");
-    ParseResult error(a.GetParseError(), a.GetErrorOffset());
-    EXPECT_TRUE(a.HasParseError());
-    EXPECT_NE(error.Code(), noError.Code());
-    EXPECT_NE(error.Offset(), noError.Offset());
-
-    D b;
-    b = std::move(a);
-    EXPECT_FALSE(a.HasParseError());
-    EXPECT_TRUE(b.HasParseError());
-    EXPECT_EQ(a.GetParseError(), noError.Code());
-    EXPECT_EQ(b.GetParseError(), error.Code());
-    EXPECT_EQ(a.GetErrorOffset(), noError.Offset());
-    EXPECT_EQ(b.GetErrorOffset(), error.Offset());
-
-    D c;
-    c = std::move(b);
-    EXPECT_FALSE(b.HasParseError());
-    EXPECT_TRUE(c.HasParseError());
-    EXPECT_EQ(b.GetParseError(), noError.Code());
-    EXPECT_EQ(c.GetParseError(), error.Code());
-    EXPECT_EQ(b.GetErrorOffset(), noError.Offset());
-    EXPECT_EQ(c.GetErrorOffset(), error.Offset());
-}
-
-// This test does not properly use parsing, just for testing.
-// It must call ClearStack() explicitly to prevent memory leak.
-// But here we cannot as ClearStack() is private.
-#if 0
-TYPED_TEST(DocumentMove, MoveAssignmentStack) {
-    typedef TypeParam Allocator;
-    typedef UTF8<> Encoding;
-    typedef GenericDocument<Encoding, Allocator> D;
-
-    D a;
-    size_t defaultCapacity = a.GetStackCapacity();
-
-    // Trick Document into getting GetStackCapacity() to return non-zero
-    typedef GenericReader<Encoding, Encoding, Allocator> Reader;
-    Reader reader(&a.GetAllocator());
-    GenericStringStream<Encoding> is("[\"one\", \"two\", \"three\"]");
-    reader.template Parse<kParseDefaultFlags>(is, a);
-    size_t capacity = a.GetStackCapacity();
-    EXPECT_GT(capacity, 0u);
-
-    D b;
-    b = std::move(a);
-    EXPECT_EQ(a.GetStackCapacity(), defaultCapacity);
-    EXPECT_EQ(b.GetStackCapacity(), capacity);
-
-    D c;
-    c = std::move(b);
-    EXPECT_EQ(b.GetStackCapacity(), defaultCapacity);
-    EXPECT_EQ(c.GetStackCapacity(), capacity);
-}
-#endif
-
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-// Issue 22: Memory corruption via operator=
-// Fixed by making unimplemented assignment operator private.
-//TEST(Document, Assignment) {
-//  Document d1;
-//  Document d2;
-//  d1 = d2;
-//}
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
diff --git a/src/sioclient/lib/rapidjson/test/unittest/dtoatest.cpp b/src/sioclient/lib/rapidjson/test/unittest/dtoatest.cpp
deleted file mode 100644
index afd76eb0..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/dtoatest.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/internal/dtoa.h"
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(type-limits)
-#endif
-
-using namespace rapidjson::internal;
-
-TEST(dtoa, normal) {
-    char buffer[30];
-
-#define TEST_DTOA(d, a)\
-    *dtoa(d, buffer) = '\0';\
-    EXPECT_STREQ(a, buffer)
-
-    TEST_DTOA(0.0, "0.0");
-    TEST_DTOA(-0.0, "-0.0");
-    TEST_DTOA(1.0, "1.0");
-    TEST_DTOA(-1.0, "-1.0");
-    TEST_DTOA(1.2345, "1.2345");
-    TEST_DTOA(1.2345678, "1.2345678");
-    TEST_DTOA(0.123456789012, "0.123456789012");
-    TEST_DTOA(1234567.8, "1234567.8");
-    TEST_DTOA(-79.39773355813419, "-79.39773355813419");
-    TEST_DTOA(0.000001, "0.000001");
-    TEST_DTOA(0.0000001, "1e-7");
-    TEST_DTOA(1e30, "1e30");
-    TEST_DTOA(1.234567890123456e30, "1.234567890123456e30");
-    TEST_DTOA(5e-324, "5e-324"); // Min subnormal positive double
-    TEST_DTOA(2.225073858507201e-308, "2.225073858507201e-308"); // Max subnormal positive double
-    TEST_DTOA(2.2250738585072014e-308, "2.2250738585072014e-308"); // Min normal positive double
-    TEST_DTOA(1.7976931348623157e308, "1.7976931348623157e308"); // Max double
-
-#undef TEST_DTOA
-}
-
-TEST(dtoa, maxDecimalPlaces) {
-    char buffer[30];
-
-#define TEST_DTOA(m, d, a)\
-    *dtoa(d, buffer, m) = '\0';\
-    EXPECT_STREQ(a, buffer)
-
-    TEST_DTOA(3, 0.0, "0.0");
-    TEST_DTOA(1, 0.0, "0.0");
-    TEST_DTOA(3, -0.0, "-0.0");
-    TEST_DTOA(3, 1.0, "1.0");
-    TEST_DTOA(3, -1.0, "-1.0");
-    TEST_DTOA(3, 1.2345, "1.234");
-    TEST_DTOA(2, 1.2345, "1.23");
-    TEST_DTOA(1, 1.2345, "1.2");
-    TEST_DTOA(3, 1.2345678, "1.234");
-    TEST_DTOA(3, 1.0001, "1.0");
-    TEST_DTOA(2, 1.0001, "1.0");
-    TEST_DTOA(1, 1.0001, "1.0");
-    TEST_DTOA(3, 0.123456789012, "0.123");
-    TEST_DTOA(2, 0.123456789012, "0.12");
-    TEST_DTOA(1, 0.123456789012, "0.1");
-    TEST_DTOA(4, 0.0001, "0.0001");
-    TEST_DTOA(3, 0.0001, "0.0");
-    TEST_DTOA(2, 0.0001, "0.0");
-    TEST_DTOA(1, 0.0001, "0.0");
-    TEST_DTOA(3, 1234567.8, "1234567.8");
-    TEST_DTOA(3, 1e30, "1e30");
-    TEST_DTOA(3, 5e-324, "0.0"); // Min subnormal positive double
-    TEST_DTOA(3, 2.225073858507201e-308, "0.0"); // Max subnormal positive double
-    TEST_DTOA(3, 2.2250738585072014e-308, "0.0"); // Min normal positive double
-    TEST_DTOA(3, 1.7976931348623157e308, "1.7976931348623157e308"); // Max double
-    TEST_DTOA(5, -0.14000000000000001, "-0.14");
-    TEST_DTOA(4, -0.14000000000000001, "-0.14");
-    TEST_DTOA(3, -0.14000000000000001, "-0.14");
-    TEST_DTOA(3, -0.10000000000000001, "-0.1");
-    TEST_DTOA(2, -0.10000000000000001, "-0.1");
-    TEST_DTOA(1, -0.10000000000000001, "-0.1");
-
-#undef TEST_DTOA
-}
-
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
diff --git a/src/sioclient/lib/rapidjson/test/unittest/encodedstreamtest.cpp b/src/sioclient/lib/rapidjson/test/unittest/encodedstreamtest.cpp
deleted file mode 100644
index bc234d3b..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/encodedstreamtest.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/memorystream.h"
-#include "rapidjson/memorybuffer.h"
-
-using namespace rapidjson;
-
-class EncodedStreamTest : public ::testing::Test {
-public:
-    EncodedStreamTest() : json_(), length_() {}
-    virtual ~EncodedStreamTest();
-
-    virtual void SetUp() {
-        json_ = ReadFile("utf8.json", true, &length_);
-    }
-
-    virtual void TearDown() {
-        free(json_);
-        json_ = 0;
-    }
-
-private:
-    EncodedStreamTest(const EncodedStreamTest&);
-    EncodedStreamTest& operator=(const EncodedStreamTest&);
-    
-protected:
-    static FILE* Open(const char* filename) {
-        const char *paths[] = {
-            "encodings",
-            "bin/encodings",
-            "../bin/encodings",
-            "../../bin/encodings",
-            "../../../bin/encodings"
-        };
-        char buffer[1024];
-        for (size_t i = 0; i < sizeof(paths) / sizeof(paths[0]); i++) {
-            sprintf(buffer, "%s/%s", paths[i], filename);
-            FILE *fp = fopen(buffer, "rb");
-            if (fp)
-                return fp;
-        }
-        return 0;
-    }
-
-    static char *ReadFile(const char* filename, bool appendPath, size_t* outLength) {
-        FILE *fp = appendPath ? Open(filename) : fopen(filename, "rb");
-
-        if (!fp) {
-            *outLength = 0;
-            return 0;
-        }
-
-        fseek(fp, 0, SEEK_END);
-        *outLength = static_cast<size_t>(ftell(fp));
-        fseek(fp, 0, SEEK_SET);
-        char* buffer = static_cast<char*>(malloc(*outLength + 1));
-        size_t readLength = fread(buffer, 1, *outLength, fp);
-        buffer[readLength] = '\0';
-        fclose(fp);
-        return buffer;
-    }
-
-    template <typename FileEncoding, typename MemoryEncoding>
-    void TestEncodedInputStream(const char* filename) {
-        // Test FileReadStream
-        {
-            char buffer[16];
-            FILE *fp = Open(filename);
-            ASSERT_TRUE(fp != 0);
-            FileReadStream fs(fp, buffer, sizeof(buffer));
-            EncodedInputStream<FileEncoding, FileReadStream> eis(fs);
-            StringStream s(json_);
-
-            while (eis.Peek() != '\0') {
-                unsigned expected, actual;
-                EXPECT_TRUE(UTF8<>::Decode(s, &expected));
-                EXPECT_TRUE(MemoryEncoding::Decode(eis, &actual));
-                EXPECT_EQ(expected, actual);
-            }
-            EXPECT_EQ('\0', s.Peek());
-            fclose(fp);
-        }
-
-        // Test MemoryStream
-        {
-            size_t size;
-            char* data = ReadFile(filename, true, &size);
-            MemoryStream ms(data, size);
-            EncodedInputStream<FileEncoding, MemoryStream> eis(ms);
-            StringStream s(json_);
-
-            while (eis.Peek() != '\0') {
-                unsigned expected, actual;
-                EXPECT_TRUE(UTF8<>::Decode(s, &expected));
-                EXPECT_TRUE(MemoryEncoding::Decode(eis, &actual));
-                EXPECT_EQ(expected, actual);
-            }
-            EXPECT_EQ('\0', s.Peek());
-            free(data);
-            EXPECT_EQ(size, eis.Tell());
-        }
-    }
-
-    void TestAutoUTFInputStream(const char *filename, bool expectHasBOM) {
-        // Test FileReadStream
-        {
-            char buffer[16];
-            FILE *fp = Open(filename);
-            ASSERT_TRUE(fp != 0);
-            FileReadStream fs(fp, buffer, sizeof(buffer));
-            AutoUTFInputStream<unsigned, FileReadStream> eis(fs);
-            EXPECT_EQ(expectHasBOM, eis.HasBOM());
-            StringStream s(json_);
-            while (eis.Peek() != '\0') {
-                unsigned expected, actual;
-                EXPECT_TRUE(UTF8<>::Decode(s, &expected));
-                EXPECT_TRUE(AutoUTF<unsigned>::Decode(eis, &actual));
-                EXPECT_EQ(expected, actual);
-            }
-            EXPECT_EQ('\0', s.Peek());
-            fclose(fp);
-        }
-
-        // Test MemoryStream
-        {
-            size_t size;
-            char* data = ReadFile(filename, true, &size);
-            MemoryStream ms(data, size);
-            AutoUTFInputStream<unsigned, MemoryStream> eis(ms);
-            EXPECT_EQ(expectHasBOM, eis.HasBOM());
-            StringStream s(json_);
-
-            while (eis.Peek() != '\0') {
-                unsigned expected, actual;
-                EXPECT_TRUE(UTF8<>::Decode(s, &expected));
-                EXPECT_TRUE(AutoUTF<unsigned>::Decode(eis, &actual));
-                EXPECT_EQ(expected, actual);
-            }
-            EXPECT_EQ('\0', s.Peek());
-            free(data);
-            EXPECT_EQ(size, eis.Tell());
-        }
-    }
-
-    template <typename FileEncoding, typename MemoryEncoding>
-    void TestEncodedOutputStream(const char* expectedFilename, bool putBOM) {
-        // Test FileWriteStream
-        {
-            char filename[L_tmpnam];
-            FILE* fp = TempFile(filename);
-            char buffer[16];
-            FileWriteStream os(fp, buffer, sizeof(buffer));
-            EncodedOutputStream<FileEncoding, FileWriteStream> eos(os, putBOM);
-            StringStream s(json_);
-            while (s.Peek() != '\0') {
-                bool success = Transcoder<UTF8<>, MemoryEncoding>::Transcode(s, eos);
-                EXPECT_TRUE(success);
-            }
-            eos.Flush();
-            fclose(fp);
-            EXPECT_TRUE(CompareFile(filename, expectedFilename));
-            remove(filename);
-        }
-
-        // Test MemoryBuffer
-        {
-            MemoryBuffer mb;
-            EncodedOutputStream<FileEncoding, MemoryBuffer> eos(mb, putBOM);
-            StringStream s(json_);
-            while (s.Peek() != '\0') {
-                bool success = Transcoder<UTF8<>, MemoryEncoding>::Transcode(s, eos);
-                EXPECT_TRUE(success);
-            }
-            eos.Flush();
-            EXPECT_TRUE(CompareBufferFile(mb.GetBuffer(), mb.GetSize(), expectedFilename));
-        }
-    }
-
-    void TestAutoUTFOutputStream(UTFType type, bool putBOM, const char *expectedFilename) {
-        // Test FileWriteStream
-        {
-            char filename[L_tmpnam];
-            FILE* fp = TempFile(filename);
-
-            char buffer[16];
-            FileWriteStream os(fp, buffer, sizeof(buffer));
-            AutoUTFOutputStream<unsigned, FileWriteStream> eos(os, type, putBOM);
-            StringStream s(json_);
-            while (s.Peek() != '\0') {
-                bool success = Transcoder<UTF8<>, AutoUTF<unsigned> >::Transcode(s, eos);
-                EXPECT_TRUE(success);
-            }
-            eos.Flush();
-            fclose(fp);
-            EXPECT_TRUE(CompareFile(filename, expectedFilename));
-            remove(filename);
-        }
-
-        // Test MemoryBuffer
-        {
-            MemoryBuffer mb;
-            AutoUTFOutputStream<unsigned, MemoryBuffer> eos(mb, type, putBOM);
-            StringStream s(json_);
-            while (s.Peek() != '\0') {
-                bool success = Transcoder<UTF8<>, AutoUTF<unsigned> >::Transcode(s, eos);
-                EXPECT_TRUE(success);
-            }
-            eos.Flush();
-            EXPECT_TRUE(CompareBufferFile(mb.GetBuffer(), mb.GetSize(), expectedFilename));
-        }
-    }
-
-    bool CompareFile(const char* filename, const char* expectedFilename) {
-        size_t actualLength, expectedLength;
-        char* actualBuffer = ReadFile(filename, false, &actualLength);
-        char* expectedBuffer = ReadFile(expectedFilename, true, &expectedLength);
-        bool ret = (expectedLength == actualLength) && memcmp(expectedBuffer, actualBuffer, actualLength) == 0;
-        free(actualBuffer);
-        free(expectedBuffer);
-        return ret;
-    }
-
-    bool CompareBufferFile(const char* actualBuffer, size_t actualLength, const char* expectedFilename) {
-        size_t expectedLength;
-        char* expectedBuffer = ReadFile(expectedFilename, true, &expectedLength);
-        bool ret = (expectedLength == actualLength) && memcmp(expectedBuffer, actualBuffer, actualLength) == 0;
-        free(expectedBuffer);
-        return ret;
-    }
-
-    char *json_;
-    size_t length_;
-};
-
-EncodedStreamTest::~EncodedStreamTest() {}
-
-TEST_F(EncodedStreamTest, EncodedInputStream) {
-    TestEncodedInputStream<UTF8<>,    UTF8<>  >("utf8.json");
-    TestEncodedInputStream<UTF8<>,    UTF8<>  >("utf8bom.json");
-    TestEncodedInputStream<UTF16LE<>, UTF16<> >("utf16le.json");
-    TestEncodedInputStream<UTF16LE<>, UTF16<> >("utf16lebom.json");
-    TestEncodedInputStream<UTF16BE<>, UTF16<> >("utf16be.json");
-    TestEncodedInputStream<UTF16BE<>, UTF16<> >("utf16bebom.json");
-    TestEncodedInputStream<UTF32LE<>, UTF32<> >("utf32le.json");
-    TestEncodedInputStream<UTF32LE<>, UTF32<> >("utf32lebom.json");
-    TestEncodedInputStream<UTF32BE<>, UTF32<> >("utf32be.json");
-    TestEncodedInputStream<UTF32BE<>, UTF32<> >("utf32bebom.json");
-}
-
-TEST_F(EncodedStreamTest, AutoUTFInputStream) {
-    TestAutoUTFInputStream("utf8.json",      false);
-    TestAutoUTFInputStream("utf8bom.json",   true);
-    TestAutoUTFInputStream("utf16le.json",   false);
-    TestAutoUTFInputStream("utf16lebom.json",true);
-    TestAutoUTFInputStream("utf16be.json",   false);
-    TestAutoUTFInputStream("utf16bebom.json",true);
-    TestAutoUTFInputStream("utf32le.json",   false);
-    TestAutoUTFInputStream("utf32lebom.json",true);
-    TestAutoUTFInputStream("utf32be.json",   false);
-    TestAutoUTFInputStream("utf32bebom.json", true);
-
-    {
-        // Auto detection fail, use user defined UTF type
-        const char json[] = "{ }";
-        MemoryStream ms(json, sizeof(json));
-        AutoUTFInputStream<unsigned, MemoryStream> eis(ms, kUTF8);
-        EXPECT_FALSE(eis.HasBOM());
-        EXPECT_EQ(kUTF8, eis.GetType());
-    }
-}
-
-TEST_F(EncodedStreamTest, EncodedOutputStream) {
-    TestEncodedOutputStream<UTF8<>,     UTF8<>  >("utf8.json",      false);
-    TestEncodedOutputStream<UTF8<>,     UTF8<>  >("utf8bom.json",   true);
-    TestEncodedOutputStream<UTF16LE<>,  UTF16<> >("utf16le.json",   false);
-    TestEncodedOutputStream<UTF16LE<>,  UTF16<> >("utf16lebom.json",true);
-    TestEncodedOutputStream<UTF16BE<>,  UTF16<> >("utf16be.json",   false);
-    TestEncodedOutputStream<UTF16BE<>,  UTF16<> >("utf16bebom.json",true);
-    TestEncodedOutputStream<UTF32LE<>,  UTF32<> >("utf32le.json",   false);
-    TestEncodedOutputStream<UTF32LE<>,  UTF32<> >("utf32lebom.json",true);
-    TestEncodedOutputStream<UTF32BE<>,  UTF32<> >("utf32be.json",   false);
-    TestEncodedOutputStream<UTF32BE<>,  UTF32<> >("utf32bebom.json",true);
-}
-
-TEST_F(EncodedStreamTest, AutoUTFOutputStream) {
-    TestAutoUTFOutputStream(kUTF8,      false,  "utf8.json");
-    TestAutoUTFOutputStream(kUTF8,      true,   "utf8bom.json");
-    TestAutoUTFOutputStream(kUTF16LE,   false,  "utf16le.json");
-    TestAutoUTFOutputStream(kUTF16LE,   true,   "utf16lebom.json");
-    TestAutoUTFOutputStream(kUTF16BE,   false,  "utf16be.json");
-    TestAutoUTFOutputStream(kUTF16BE,   true,   "utf16bebom.json");
-    TestAutoUTFOutputStream(kUTF32LE,   false,  "utf32le.json");
-    TestAutoUTFOutputStream(kUTF32LE,   true,   "utf32lebom.json");
-    TestAutoUTFOutputStream(kUTF32BE,   false,  "utf32be.json");
-    TestAutoUTFOutputStream(kUTF32BE,   true,   "utf32bebom.json");
-}
diff --git a/src/sioclient/lib/rapidjson/test/unittest/encodingstest.cpp b/src/sioclient/lib/rapidjson/test/unittest/encodingstest.cpp
deleted file mode 100644
index 82cf7776..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/encodingstest.cpp
+++ /dev/null
@@ -1,451 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/stringbuffer.h"
-
-using namespace rapidjson;
-
-// Verification of encoders/decoders with Hoehrmann's UTF8 decoder
-
-// http://www.unicode.org/Public/UNIDATA/Blocks.txt
-static const unsigned kCodepointRanges[] = {
-    0x0000,     0x007F,     // Basic Latin
-    0x0080,     0x00FF,     // Latin-1 Supplement
-    0x0100,     0x017F,     // Latin Extended-A
-    0x0180,     0x024F,     // Latin Extended-B
-    0x0250,     0x02AF,     // IPA Extensions
-    0x02B0,     0x02FF,     // Spacing Modifier Letters
-    0x0300,     0x036F,     // Combining Diacritical Marks
-    0x0370,     0x03FF,     // Greek and Coptic
-    0x0400,     0x04FF,     // Cyrillic
-    0x0500,     0x052F,     // Cyrillic Supplement
-    0x0530,     0x058F,     // Armenian
-    0x0590,     0x05FF,     // Hebrew
-    0x0600,     0x06FF,     // Arabic
-    0x0700,     0x074F,     // Syriac
-    0x0750,     0x077F,     // Arabic Supplement
-    0x0780,     0x07BF,     // Thaana
-    0x07C0,     0x07FF,     // NKo
-    0x0800,     0x083F,     // Samaritan
-    0x0840,     0x085F,     // Mandaic
-    0x0900,     0x097F,     // Devanagari
-    0x0980,     0x09FF,     // Bengali
-    0x0A00,     0x0A7F,     // Gurmukhi
-    0x0A80,     0x0AFF,     // Gujarati
-    0x0B00,     0x0B7F,     // Oriya
-    0x0B80,     0x0BFF,     // Tamil
-    0x0C00,     0x0C7F,     // Telugu
-    0x0C80,     0x0CFF,     // Kannada
-    0x0D00,     0x0D7F,     // Malayalam
-    0x0D80,     0x0DFF,     // Sinhala
-    0x0E00,     0x0E7F,     // Thai
-    0x0E80,     0x0EFF,     // Lao
-    0x0F00,     0x0FFF,     // Tibetan
-    0x1000,     0x109F,     // Myanmar
-    0x10A0,     0x10FF,     // Georgian
-    0x1100,     0x11FF,     // Hangul Jamo
-    0x1200,     0x137F,     // Ethiopic
-    0x1380,     0x139F,     // Ethiopic Supplement
-    0x13A0,     0x13FF,     // Cherokee
-    0x1400,     0x167F,     // Unified Canadian Aboriginal Syllabics
-    0x1680,     0x169F,     // Ogham
-    0x16A0,     0x16FF,     // Runic
-    0x1700,     0x171F,     // Tagalog
-    0x1720,     0x173F,     // Hanunoo
-    0x1740,     0x175F,     // Buhid
-    0x1760,     0x177F,     // Tagbanwa
-    0x1780,     0x17FF,     // Khmer
-    0x1800,     0x18AF,     // Mongolian
-    0x18B0,     0x18FF,     // Unified Canadian Aboriginal Syllabics Extended
-    0x1900,     0x194F,     // Limbu
-    0x1950,     0x197F,     // Tai Le
-    0x1980,     0x19DF,     // New Tai Lue
-    0x19E0,     0x19FF,     // Khmer Symbols
-    0x1A00,     0x1A1F,     // Buginese
-    0x1A20,     0x1AAF,     // Tai Tham
-    0x1B00,     0x1B7F,     // Balinese
-    0x1B80,     0x1BBF,     // Sundanese
-    0x1BC0,     0x1BFF,     // Batak
-    0x1C00,     0x1C4F,     // Lepcha
-    0x1C50,     0x1C7F,     // Ol Chiki
-    0x1CD0,     0x1CFF,     // Vedic Extensions
-    0x1D00,     0x1D7F,     // Phonetic Extensions
-    0x1D80,     0x1DBF,     // Phonetic Extensions Supplement
-    0x1DC0,     0x1DFF,     // Combining Diacritical Marks Supplement
-    0x1E00,     0x1EFF,     // Latin Extended Additional
-    0x1F00,     0x1FFF,     // Greek Extended
-    0x2000,     0x206F,     // General Punctuation
-    0x2070,     0x209F,     // Superscripts and Subscripts
-    0x20A0,     0x20CF,     // Currency Symbols
-    0x20D0,     0x20FF,     // Combining Diacritical Marks for Symbols
-    0x2100,     0x214F,     // Letterlike Symbols
-    0x2150,     0x218F,     // Number Forms
-    0x2190,     0x21FF,     // Arrows
-    0x2200,     0x22FF,     // Mathematical Operators
-    0x2300,     0x23FF,     // Miscellaneous Technical
-    0x2400,     0x243F,     // Control Pictures
-    0x2440,     0x245F,     // Optical Character Recognition
-    0x2460,     0x24FF,     // Enclosed Alphanumerics
-    0x2500,     0x257F,     // Box Drawing
-    0x2580,     0x259F,     // Block Elements
-    0x25A0,     0x25FF,     // Geometric Shapes
-    0x2600,     0x26FF,     // Miscellaneous Symbols
-    0x2700,     0x27BF,     // Dingbats
-    0x27C0,     0x27EF,     // Miscellaneous Mathematical Symbols-A
-    0x27F0,     0x27FF,     // Supplemental Arrows-A
-    0x2800,     0x28FF,     // Braille Patterns
-    0x2900,     0x297F,     // Supplemental Arrows-B
-    0x2980,     0x29FF,     // Miscellaneous Mathematical Symbols-B
-    0x2A00,     0x2AFF,     // Supplemental Mathematical Operators
-    0x2B00,     0x2BFF,     // Miscellaneous Symbols and Arrows
-    0x2C00,     0x2C5F,     // Glagolitic
-    0x2C60,     0x2C7F,     // Latin Extended-C
-    0x2C80,     0x2CFF,     // Coptic
-    0x2D00,     0x2D2F,     // Georgian Supplement
-    0x2D30,     0x2D7F,     // Tifinagh
-    0x2D80,     0x2DDF,     // Ethiopic Extended
-    0x2DE0,     0x2DFF,     // Cyrillic Extended-A
-    0x2E00,     0x2E7F,     // Supplemental Punctuation
-    0x2E80,     0x2EFF,     // CJK Radicals Supplement
-    0x2F00,     0x2FDF,     // Kangxi Radicals
-    0x2FF0,     0x2FFF,     // Ideographic Description Characters
-    0x3000,     0x303F,     // CJK Symbols and Punctuation
-    0x3040,     0x309F,     // Hiragana
-    0x30A0,     0x30FF,     // Katakana
-    0x3100,     0x312F,     // Bopomofo
-    0x3130,     0x318F,     // Hangul Compatibility Jamo
-    0x3190,     0x319F,     // Kanbun
-    0x31A0,     0x31BF,     // Bopomofo Extended
-    0x31C0,     0x31EF,     // CJK Strokes
-    0x31F0,     0x31FF,     // Katakana Phonetic Extensions
-    0x3200,     0x32FF,     // Enclosed CJK Letters and Months
-    0x3300,     0x33FF,     // CJK Compatibility
-    0x3400,     0x4DBF,     // CJK Unified Ideographs Extension A
-    0x4DC0,     0x4DFF,     // Yijing Hexagram Symbols
-    0x4E00,     0x9FFF,     // CJK Unified Ideographs
-    0xA000,     0xA48F,     // Yi Syllables
-    0xA490,     0xA4CF,     // Yi Radicals
-    0xA4D0,     0xA4FF,     // Lisu
-    0xA500,     0xA63F,     // Vai
-    0xA640,     0xA69F,     // Cyrillic Extended-B
-    0xA6A0,     0xA6FF,     // Bamum
-    0xA700,     0xA71F,     // Modifier Tone Letters
-    0xA720,     0xA7FF,     // Latin Extended-D
-    0xA800,     0xA82F,     // Syloti Nagri
-    0xA830,     0xA83F,     // Common Indic Number Forms
-    0xA840,     0xA87F,     // Phags-pa
-    0xA880,     0xA8DF,     // Saurashtra
-    0xA8E0,     0xA8FF,     // Devanagari Extended
-    0xA900,     0xA92F,     // Kayah Li
-    0xA930,     0xA95F,     // Rejang
-    0xA960,     0xA97F,     // Hangul Jamo Extended-A
-    0xA980,     0xA9DF,     // Javanese
-    0xAA00,     0xAA5F,     // Cham
-    0xAA60,     0xAA7F,     // Myanmar Extended-A
-    0xAA80,     0xAADF,     // Tai Viet
-    0xAB00,     0xAB2F,     // Ethiopic Extended-A
-    0xABC0,     0xABFF,     // Meetei Mayek
-    0xAC00,     0xD7AF,     // Hangul Syllables
-    0xD7B0,     0xD7FF,     // Hangul Jamo Extended-B
-    //0xD800,       0xDB7F,     // High Surrogates
-    //0xDB80,       0xDBFF,     // High Private Use Surrogates
-    //0xDC00,       0xDFFF,     // Low Surrogates
-    0xE000,     0xF8FF,     // Private Use Area
-    0xF900,     0xFAFF,     // CJK Compatibility Ideographs
-    0xFB00,     0xFB4F,     // Alphabetic Presentation Forms
-    0xFB50,     0xFDFF,     // Arabic Presentation Forms-A
-    0xFE00,     0xFE0F,     // Variation Selectors
-    0xFE10,     0xFE1F,     // Vertical Forms
-    0xFE20,     0xFE2F,     // Combining Half Marks
-    0xFE30,     0xFE4F,     // CJK Compatibility Forms
-    0xFE50,     0xFE6F,     // Small Form Variants
-    0xFE70,     0xFEFF,     // Arabic Presentation Forms-B
-    0xFF00,     0xFFEF,     // Halfwidth and Fullwidth Forms
-    0xFFF0,     0xFFFF,     // Specials
-    0x10000,    0x1007F,    // Linear B Syllabary
-    0x10080,    0x100FF,    // Linear B Ideograms
-    0x10100,    0x1013F,    // Aegean Numbers
-    0x10140,    0x1018F,    // Ancient Greek Numbers
-    0x10190,    0x101CF,    // Ancient Symbols
-    0x101D0,    0x101FF,    // Phaistos Disc
-    0x10280,    0x1029F,    // Lycian
-    0x102A0,    0x102DF,    // Carian
-    0x10300,    0x1032F,    // Old Italic
-    0x10330,    0x1034F,    // Gothic
-    0x10380,    0x1039F,    // Ugaritic
-    0x103A0,    0x103DF,    // Old Persian
-    0x10400,    0x1044F,    // Deseret
-    0x10450,    0x1047F,    // Shavian
-    0x10480,    0x104AF,    // Osmanya
-    0x10800,    0x1083F,    // Cypriot Syllabary
-    0x10840,    0x1085F,    // Imperial Aramaic
-    0x10900,    0x1091F,    // Phoenician
-    0x10920,    0x1093F,    // Lydian
-    0x10A00,    0x10A5F,    // Kharoshthi
-    0x10A60,    0x10A7F,    // Old South Arabian
-    0x10B00,    0x10B3F,    // Avestan
-    0x10B40,    0x10B5F,    // Inscriptional Parthian
-    0x10B60,    0x10B7F,    // Inscriptional Pahlavi
-    0x10C00,    0x10C4F,    // Old Turkic
-    0x10E60,    0x10E7F,    // Rumi Numeral Symbols
-    0x11000,    0x1107F,    // Brahmi
-    0x11080,    0x110CF,    // Kaithi
-    0x12000,    0x123FF,    // Cuneiform
-    0x12400,    0x1247F,    // Cuneiform Numbers and Punctuation
-    0x13000,    0x1342F,    // Egyptian Hieroglyphs
-    0x16800,    0x16A3F,    // Bamum Supplement
-    0x1B000,    0x1B0FF,    // Kana Supplement
-    0x1D000,    0x1D0FF,    // Byzantine Musical Symbols
-    0x1D100,    0x1D1FF,    // Musical Symbols
-    0x1D200,    0x1D24F,    // Ancient Greek Musical Notation
-    0x1D300,    0x1D35F,    // Tai Xuan Jing Symbols
-    0x1D360,    0x1D37F,    // Counting Rod Numerals
-    0x1D400,    0x1D7FF,    // Mathematical Alphanumeric Symbols
-    0x1F000,    0x1F02F,    // Mahjong Tiles
-    0x1F030,    0x1F09F,    // Domino Tiles
-    0x1F0A0,    0x1F0FF,    // Playing Cards
-    0x1F100,    0x1F1FF,    // Enclosed Alphanumeric Supplement
-    0x1F200,    0x1F2FF,    // Enclosed Ideographic Supplement
-    0x1F300,    0x1F5FF,    // Miscellaneous Symbols And Pictographs
-    0x1F600,    0x1F64F,    // Emoticons
-    0x1F680,    0x1F6FF,    // Transport And Map Symbols
-    0x1F700,    0x1F77F,    // Alchemical Symbols
-    0x20000,    0x2A6DF,    // CJK Unified Ideographs Extension B
-    0x2A700,    0x2B73F,    // CJK Unified Ideographs Extension C
-    0x2B740,    0x2B81F,    // CJK Unified Ideographs Extension D
-    0x2F800,    0x2FA1F,    // CJK Compatibility Ideographs Supplement
-    0xE0000,    0xE007F,    // Tags
-    0xE0100,    0xE01EF,    // Variation Selectors Supplement
-    0xF0000,    0xFFFFF,    // Supplementary Private Use Area-A
-    0x100000,   0x10FFFF,   // Supplementary Private Use Area-B
-    0xFFFFFFFF
-};
-
-// Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern@hoehrmann.de>
-// See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details.
-
-#define UTF8_ACCEPT 0u
-
-static const unsigned char utf8d[] = {
-    // The first part of the table maps bytes to character classes that
-    // to reduce the size of the transition table and create bitmasks.
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,  9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-    8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-    10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
-
-    // The second part is a transition table that maps a combination
-    // of a state of the automaton and a character class to a state.
-    0,12,24,36,60,96,84,12,12,12,48,72, 12,12,12,12,12,12,12,12,12,12,12,12,
-    12, 0,12,12,12,12,12, 0,12, 0,12,12, 12,24,12,12,12,12,12,24,12,24,12,12,
-    12,12,12,12,12,12,12,24,12,12,12,12, 12,24,12,12,12,12,12,12,12,24,12,12,
-    12,12,12,12,12,12,12,36,12,36,12,12, 12,36,12,12,12,12,12,36,12,36,12,12,
-    12,36,12,12,12,12,12,12,12,12,12,12, 
-};
-
-static unsigned inline decode(unsigned* state, unsigned* codep, unsigned byte) {
-    unsigned type = utf8d[byte];
-
-    *codep = (*state != UTF8_ACCEPT) ?
-        (byte & 0x3fu) | (*codep << 6) :
-    (0xffu >> type) & (byte);
-
-    *state = utf8d[256 + *state + type];
-    return *state;
-}
-
-//static bool IsUTF8(unsigned char* s) {
-//  unsigned codepoint, state = 0;
-//
-//  while (*s)
-//      decode(&state, &codepoint, *s++);
-//
-//  return state == UTF8_ACCEPT;
-//}
-
-TEST(EncodingsTest, UTF8) {
-    StringBuffer os, os2;
-    for (const unsigned* range = kCodepointRanges; *range != 0xFFFFFFFF; range += 2) {
-        for (unsigned codepoint = range[0]; codepoint <= range[1]; ++codepoint) {
-            os.Clear();
-            UTF8<>::Encode(os, codepoint);
-            const char* encodedStr = os.GetString();
-
-            // Decode with Hoehrmann
-            {
-                unsigned decodedCodepoint = 0;
-                unsigned state = 0;
-
-                unsigned decodedCount = 0;
-                for (const char* s = encodedStr; *s; ++s)
-                    if (!decode(&state, &decodedCodepoint, static_cast<unsigned char>(*s))) {
-                        EXPECT_EQ(codepoint, decodedCodepoint);
-                        decodedCount++;
-                    }
-
-                if (*encodedStr) {                  // This decoder cannot handle U+0000
-                    EXPECT_EQ(1u, decodedCount);    // Should only contain one code point
-                }
-
-                EXPECT_EQ(UTF8_ACCEPT, state);
-                if (UTF8_ACCEPT != state)
-                    std::cout << std::hex << codepoint << " " << decodedCodepoint << std::endl;
-            }
-
-            // Decode
-            {
-                StringStream is(encodedStr);
-                unsigned decodedCodepoint;
-                bool result = UTF8<>::Decode(is, &decodedCodepoint);
-                EXPECT_TRUE(result);
-                EXPECT_EQ(codepoint, decodedCodepoint);
-                if (!result || codepoint != decodedCodepoint)
-                    std::cout << std::hex << codepoint << " " << decodedCodepoint << std::endl;
-            }
-
-            // Validate
-            {
-                StringStream is(encodedStr);
-                os2.Clear();
-                bool result = UTF8<>::Validate(is, os2);
-                EXPECT_TRUE(result);
-                EXPECT_EQ(0, StrCmp(encodedStr, os2.GetString()));
-            }
-        }
-    }
-}
-
-TEST(EncodingsTest, UTF16) {
-    GenericStringBuffer<UTF16<> > os, os2;
-    GenericStringBuffer<UTF8<> > utf8os;
-    for (const unsigned* range = kCodepointRanges; *range != 0xFFFFFFFF; range += 2) {
-        for (unsigned codepoint = range[0]; codepoint <= range[1]; ++codepoint) {
-            os.Clear();
-            UTF16<>::Encode(os, codepoint);
-            const UTF16<>::Ch* encodedStr = os.GetString();
-
-            // Encode with Hoehrmann's code
-            if (codepoint != 0) // cannot handle U+0000
-            {
-                // encode with UTF8<> first
-                utf8os.Clear();
-                UTF8<>::Encode(utf8os, codepoint);
-
-                // transcode from UTF8 to UTF16 with Hoehrmann's code
-                unsigned decodedCodepoint = 0;
-                unsigned state = 0;
-                UTF16<>::Ch buffer[3], *p = &buffer[0];
-                for (const char* s = utf8os.GetString(); *s; ++s) {
-                    if (!decode(&state, &decodedCodepoint, static_cast<unsigned char>(*s)))
-                        break;
-                }
-
-                if (codepoint <= 0xFFFF)
-                    *p++ = static_cast<UTF16<>::Ch>(decodedCodepoint);
-                else {
-                    // Encode code points above U+FFFF as surrogate pair.
-                    *p++ = static_cast<UTF16<>::Ch>(0xD7C0 + (decodedCodepoint >> 10));
-                    *p++ = static_cast<UTF16<>::Ch>(0xDC00 + (decodedCodepoint & 0x3FF));
-                }
-                *p++ = '\0';
-
-                EXPECT_EQ(0, StrCmp(buffer, encodedStr));
-            }
-
-            // Decode
-            {
-                GenericStringStream<UTF16<> > is(encodedStr);
-                unsigned decodedCodepoint;
-                bool result = UTF16<>::Decode(is, &decodedCodepoint);
-                EXPECT_TRUE(result);
-                EXPECT_EQ(codepoint, decodedCodepoint);         
-                if (!result || codepoint != decodedCodepoint)
-                    std::cout << std::hex << codepoint << " " << decodedCodepoint << std::endl;
-            }
-
-            // Validate
-            {
-                GenericStringStream<UTF16<> > is(encodedStr);
-                os2.Clear();
-                bool result = UTF16<>::Validate(is, os2);
-                EXPECT_TRUE(result);
-                EXPECT_EQ(0, StrCmp(encodedStr, os2.GetString()));
-            }
-        }
-    }
-}
-
-TEST(EncodingsTest, UTF32) {
-    GenericStringBuffer<UTF32<> > os, os2;
-    for (const unsigned* range = kCodepointRanges; *range != 0xFFFFFFFF; range += 2) {
-        for (unsigned codepoint = range[0]; codepoint <= range[1]; ++codepoint) {
-            os.Clear();
-            UTF32<>::Encode(os, codepoint);
-            const UTF32<>::Ch* encodedStr = os.GetString();
-
-            // Decode
-            {
-                GenericStringStream<UTF32<> > is(encodedStr);
-                unsigned decodedCodepoint;
-                bool result = UTF32<>::Decode(is, &decodedCodepoint);
-                EXPECT_TRUE(result);
-                EXPECT_EQ(codepoint, decodedCodepoint);         
-                if (!result || codepoint != decodedCodepoint)
-                    std::cout << std::hex << codepoint << " " << decodedCodepoint << std::endl;
-            }
-
-            // Validate
-            {
-                GenericStringStream<UTF32<> > is(encodedStr);
-                os2.Clear();
-                bool result = UTF32<>::Validate(is, os2);
-                EXPECT_TRUE(result);
-                EXPECT_EQ(0, StrCmp(encodedStr, os2.GetString()));
-            }
-        }
-    }
-}
-
-TEST(EncodingsTest, ASCII) {
-    StringBuffer os, os2;
-    for (unsigned codepoint = 0; codepoint < 128; codepoint++) {
-        os.Clear();
-        ASCII<>::Encode(os, codepoint);
-        const ASCII<>::Ch* encodedStr = os.GetString();
-        {
-            StringStream is(encodedStr);
-            unsigned decodedCodepoint;
-            bool result = ASCII<>::Decode(is, &decodedCodepoint);
-            if (!result || codepoint != decodedCodepoint)
-                std::cout << std::hex << codepoint << " " << decodedCodepoint << std::endl;
-        }
-
-        // Validate
-        {
-            StringStream is(encodedStr);
-            os2.Clear();
-            bool result = ASCII<>::Validate(is, os2);
-            EXPECT_TRUE(result);
-            EXPECT_EQ(0, StrCmp(encodedStr, os2.GetString()));
-        }
-    }
-}
diff --git a/src/sioclient/lib/rapidjson/test/unittest/filestreamtest.cpp b/src/sioclient/lib/rapidjson/test/unittest/filestreamtest.cpp
deleted file mode 100644
index a38133fa..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/filestreamtest.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/encodedstream.h"
-
-using namespace rapidjson;
-
-class FileStreamTest : public ::testing::Test {
-public:
-    FileStreamTest() : filename_(), json_(), length_() {}
-    virtual ~FileStreamTest();
-
-    virtual void SetUp() {
-        const char *paths[] = {
-            "data/sample.json",
-            "bin/data/sample.json",
-            "../bin/data/sample.json",
-            "../../bin/data/sample.json",
-            "../../../bin/data/sample.json"
-        };
-        FILE* fp = 0;
-        for (size_t i = 0; i < sizeof(paths) / sizeof(paths[0]); i++) {
-            fp = fopen(paths[i], "rb");
-            if (fp) {
-                filename_ = paths[i];
-                break;
-            }
-        }
-        ASSERT_TRUE(fp != 0);
-
-        fseek(fp, 0, SEEK_END);
-        length_ = static_cast<size_t>(ftell(fp));
-        fseek(fp, 0, SEEK_SET);
-        json_ = static_cast<char*>(malloc(length_ + 1));
-        size_t readLength = fread(json_, 1, length_, fp);
-        json_[readLength] = '\0';
-        fclose(fp);
-    }
-
-    virtual void TearDown() {
-        free(json_);
-        json_ = 0;
-    }
-
-private:
-    FileStreamTest(const FileStreamTest&);
-    FileStreamTest& operator=(const FileStreamTest&);
-    
-protected:
-    const char* filename_;
-    char *json_;
-    size_t length_;
-};
-
-FileStreamTest::~FileStreamTest() {}
-
-TEST_F(FileStreamTest, FileReadStream) {
-    FILE *fp = fopen(filename_, "rb");
-    ASSERT_TRUE(fp != 0);
-    char buffer[65536];
-    FileReadStream s(fp, buffer, sizeof(buffer));
-
-    for (size_t i = 0; i < length_; i++) {
-        EXPECT_EQ(json_[i], s.Peek());
-        EXPECT_EQ(json_[i], s.Peek());  // 2nd time should be the same
-        EXPECT_EQ(json_[i], s.Take());
-    }
-
-    EXPECT_EQ(length_, s.Tell());
-    EXPECT_EQ('\0', s.Peek());
-
-    fclose(fp);
-}
-
-TEST_F(FileStreamTest, FileWriteStream) {
-    char filename[L_tmpnam];
-    FILE* fp = TempFile(filename);
-
-    char buffer[65536];
-    FileWriteStream os(fp, buffer, sizeof(buffer));
-    for (size_t i = 0; i < length_; i++)
-        os.Put(json_[i]);
-    os.Flush();
-    fclose(fp);
-
-    // Read it back to verify
-    fp = fopen(filename, "rb");
-    FileReadStream is(fp, buffer, sizeof(buffer));
-
-    for (size_t i = 0; i < length_; i++)
-        EXPECT_EQ(json_[i], is.Take());
-
-    EXPECT_EQ(length_, is.Tell());
-    fclose(fp);
-
-    //std::cout << filename << std::endl;
-    remove(filename);
-}
diff --git a/src/sioclient/lib/rapidjson/test/unittest/fwdtest.cpp b/src/sioclient/lib/rapidjson/test/unittest/fwdtest.cpp
deleted file mode 100644
index 1936d977..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/fwdtest.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-
-// Using forward declared types here.
-
-#include "rapidjson/fwd.h"
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-using namespace rapidjson;
-
-struct Foo {
-    Foo();
-    ~Foo();
-
-    // encodings.h
-    UTF8<char>* utf8;
-    UTF16<wchar_t>* utf16;
-    UTF16BE<wchar_t>* utf16be;
-    UTF16LE<wchar_t>* utf16le;
-    UTF32<unsigned>* utf32;
-    UTF32BE<unsigned>* utf32be;
-    UTF32LE<unsigned>* utf32le;
-    ASCII<char>* ascii;
-    AutoUTF<unsigned>* autoutf;
-    Transcoder<UTF8<char>, UTF8<char> >* transcoder;
-
-    // allocators.h
-    CrtAllocator* crtallocator;
-    MemoryPoolAllocator<CrtAllocator>* memorypoolallocator;
-
-    // stream.h
-    StringStream* stringstream;
-    InsituStringStream* insitustringstream;
-
-    // stringbuffer.h
-    StringBuffer* stringbuffer;
-
-    // // filereadstream.h
-    // FileReadStream* filereadstream;
-
-    // // filewritestream.h
-    // FileWriteStream* filewritestream;
-
-    // memorybuffer.h
-    MemoryBuffer* memorybuffer;
-
-    // memorystream.h
-    MemoryStream* memorystream;
-
-    // reader.h
-    BaseReaderHandler<UTF8<char>, void>* basereaderhandler;
-    Reader* reader;
-
-    // writer.h
-    Writer<StringBuffer, UTF8<char>, UTF8<char>, CrtAllocator, 0>* writer;
-
-    // prettywriter.h
-    PrettyWriter<StringBuffer, UTF8<char>, UTF8<char>, CrtAllocator, 0>* prettywriter;
-
-    // document.h
-    Value* value;
-    Document* document;
-
-    // pointer.h
-    Pointer* pointer;
-
-    // schema.h
-    SchemaDocument* schemadocument;
-    SchemaValidator* schemavalidator;
-
-    // char buffer[16];
-};
-
-// Using type definitions here.
-
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/memorybuffer.h"
-#include "rapidjson/memorystream.h"
-#include "rapidjson/document.h" // -> reader.h
-#include "rapidjson/writer.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/schema.h"   // -> pointer.h
-
-typedef Transcoder<UTF8<>, UTF8<> > TranscoderUtf8ToUtf8;
-typedef BaseReaderHandler<UTF8<>, void> BaseReaderHandlerUtf8Void;
-
-Foo::Foo() : 
-    // encodings.h
-    utf8(RAPIDJSON_NEW(UTF8<>)),
-    utf16(RAPIDJSON_NEW(UTF16<>)),
-    utf16be(RAPIDJSON_NEW(UTF16BE<>)),
-    utf16le(RAPIDJSON_NEW(UTF16LE<>)),
-    utf32(RAPIDJSON_NEW(UTF32<>)),
-    utf32be(RAPIDJSON_NEW(UTF32BE<>)),
-    utf32le(RAPIDJSON_NEW(UTF32LE<>)),
-    ascii(RAPIDJSON_NEW(ASCII<>)),
-    autoutf(RAPIDJSON_NEW(AutoUTF<unsigned>)),
-    transcoder(RAPIDJSON_NEW(TranscoderUtf8ToUtf8)),
-
-    // allocators.h
-    crtallocator(RAPIDJSON_NEW(CrtAllocator)),
-    memorypoolallocator(RAPIDJSON_NEW(MemoryPoolAllocator<>)),
-
-    // stream.h
-    stringstream(RAPIDJSON_NEW(StringStream)(NULL)),
-    insitustringstream(RAPIDJSON_NEW(InsituStringStream)(NULL)),
-
-    // stringbuffer.h
-    stringbuffer(RAPIDJSON_NEW(StringBuffer)),
-
-    // // filereadstream.h
-    // filereadstream(RAPIDJSON_NEW(FileReadStream)(stdout, buffer, sizeof(buffer))),
-
-    // // filewritestream.h
-    // filewritestream(RAPIDJSON_NEW(FileWriteStream)(stdout, buffer, sizeof(buffer))),
-
-    // memorybuffer.h
-    memorybuffer(RAPIDJSON_NEW(MemoryBuffer)),
-
-    // memorystream.h
-    memorystream(RAPIDJSON_NEW(MemoryStream)(NULL, 0)),
-
-    // reader.h
-    basereaderhandler(RAPIDJSON_NEW(BaseReaderHandlerUtf8Void)),
-    reader(RAPIDJSON_NEW(Reader)),
-
-    // writer.h
-    writer(RAPIDJSON_NEW(Writer<StringBuffer>)),
-
-    // prettywriter.h
-    prettywriter(RAPIDJSON_NEW(PrettyWriter<StringBuffer>)),
-
-    // document.h
-    value(RAPIDJSON_NEW(Value)),
-    document(RAPIDJSON_NEW(Document)),
-
-    // pointer.h
-    pointer(RAPIDJSON_NEW(Pointer)),
-
-    // schema.h
-    schemadocument(RAPIDJSON_NEW(SchemaDocument)(*document)),
-    schemavalidator(RAPIDJSON_NEW(SchemaValidator)(*schemadocument))
-{
-
-}
-
-Foo::~Foo() {
-    // encodings.h
-    RAPIDJSON_DELETE(utf8);
-    RAPIDJSON_DELETE(utf16);
-    RAPIDJSON_DELETE(utf16be);
-    RAPIDJSON_DELETE(utf16le);
-    RAPIDJSON_DELETE(utf32);
-    RAPIDJSON_DELETE(utf32be);
-    RAPIDJSON_DELETE(utf32le);
-    RAPIDJSON_DELETE(ascii);
-    RAPIDJSON_DELETE(autoutf);
-    RAPIDJSON_DELETE(transcoder);
-
-    // allocators.h
-    RAPIDJSON_DELETE(crtallocator);
-    RAPIDJSON_DELETE(memorypoolallocator);
-
-    // stream.h
-    RAPIDJSON_DELETE(stringstream);
-    RAPIDJSON_DELETE(insitustringstream);
-
-    // stringbuffer.h
-    RAPIDJSON_DELETE(stringbuffer);
-
-    // // filereadstream.h
-    // RAPIDJSON_DELETE(filereadstream);
-
-    // // filewritestream.h
-    // RAPIDJSON_DELETE(filewritestream);
-
-    // memorybuffer.h
-    RAPIDJSON_DELETE(memorybuffer);
-
-    // memorystream.h
-    RAPIDJSON_DELETE(memorystream);
-
-    // reader.h
-    RAPIDJSON_DELETE(basereaderhandler);
-    RAPIDJSON_DELETE(reader);
-
-    // writer.h
-    RAPIDJSON_DELETE(writer);
-
-    // prettywriter.h
-    RAPIDJSON_DELETE(prettywriter);
-
-    // document.h
-    RAPIDJSON_DELETE(value);
-    RAPIDJSON_DELETE(document);
-
-    // pointer.h
-    RAPIDJSON_DELETE(pointer);
-
-    // schema.h
-    RAPIDJSON_DELETE(schemadocument);
-    RAPIDJSON_DELETE(schemavalidator);
-}
-
-TEST(Fwd, Fwd) {
-    Foo f;
-}
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
diff --git a/src/sioclient/lib/rapidjson/test/unittest/istreamwrappertest.cpp b/src/sioclient/lib/rapidjson/test/unittest/istreamwrappertest.cpp
deleted file mode 100644
index 94480cd7..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/istreamwrappertest.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-
-#include "rapidjson/istreamwrapper.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/document.h"
-#include <sstream>
-#include <fstream>
-
-#if defined(_MSC_VER) && !defined(__clang__)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4702) // unreachable code
-#endif
-
-using namespace rapidjson;
-using namespace std;
-
-template <typename StringStreamType>
-static void TestStringStream() {
-    typedef typename StringStreamType::char_type Ch;
-
-    {
-        StringStreamType iss;
-        BasicIStreamWrapper<StringStreamType> is(iss);
-        EXPECT_EQ(0, is.Tell());
-        if (sizeof(Ch) == 1) {
-            EXPECT_EQ(0, is.Peek4());
-            EXPECT_EQ(0, is.Tell());
-        }
-        EXPECT_EQ(0, is.Peek());
-        EXPECT_EQ(0, is.Take());
-        EXPECT_EQ(0, is.Tell());
-    }
-
-    {
-        Ch s[] = { 'A', 'B', 'C', '\0' };
-        StringStreamType iss(s);
-        BasicIStreamWrapper<StringStreamType> is(iss);
-        EXPECT_EQ(0, is.Tell());
-        if (sizeof(Ch) == 1) {
-            EXPECT_EQ(0, is.Peek4()); // less than 4 bytes
-        }
-        for (int i = 0; i < 3; i++) {
-            EXPECT_EQ(static_cast<size_t>(i), is.Tell());
-            EXPECT_EQ('A' + i, is.Peek());
-            EXPECT_EQ('A' + i, is.Peek());
-            EXPECT_EQ('A' + i, is.Take());
-        }
-        EXPECT_EQ(3, is.Tell());
-        EXPECT_EQ(0, is.Peek());
-        EXPECT_EQ(0, is.Take());
-    }
-
-    {
-        Ch s[] = { 'A', 'B', 'C', 'D', 'E', '\0' };
-        StringStreamType iss(s);
-        BasicIStreamWrapper<StringStreamType> is(iss);
-        if (sizeof(Ch) == 1) {
-            const Ch* c = is.Peek4();
-            for (int i = 0; i < 4; i++)
-                EXPECT_EQ('A' + i, c[i]);
-            EXPECT_EQ(0, is.Tell());
-        }
-        for (int i = 0; i < 5; i++) {
-            EXPECT_EQ(static_cast<size_t>(i), is.Tell());
-            EXPECT_EQ('A' + i, is.Peek());
-            EXPECT_EQ('A' + i, is.Peek());
-            EXPECT_EQ('A' + i, is.Take());
-        }
-        EXPECT_EQ(5, is.Tell());
-        EXPECT_EQ(0, is.Peek());
-        EXPECT_EQ(0, is.Take());
-    }
-}
-
-TEST(IStreamWrapper, istringstream) {
-    TestStringStream<istringstream>();
-}
-
-TEST(IStreamWrapper, stringstream) {
-    TestStringStream<stringstream>();
-}
-
-TEST(IStreamWrapper, wistringstream) {
-    TestStringStream<wistringstream>();
-}
-
-TEST(IStreamWrapper, wstringstream) {
-    TestStringStream<wstringstream>();
-}
-
-template <typename FileStreamType>
-static bool Open(FileStreamType& fs, const char* filename) {
-    const char *paths[] = {
-        "encodings",
-        "bin/encodings",
-        "../bin/encodings",
-        "../../bin/encodings",
-        "../../../bin/encodings"
-    };
-    char buffer[1024];
-    for (size_t i = 0; i < sizeof(paths) / sizeof(paths[0]); i++) {
-        sprintf(buffer, "%s/%s", paths[i], filename);
-        fs.open(buffer, ios_base::in | ios_base::binary);
-        if (fs.is_open())
-            return true;
-    }
-    return false;
-}
-
-TEST(IStreamWrapper, ifstream) {
-    ifstream ifs;
-    ASSERT_TRUE(Open(ifs, "utf8bom.json"));
-    IStreamWrapper isw(ifs);
-    EncodedInputStream<UTF8<>, IStreamWrapper> eis(isw);
-    Document d;
-    EXPECT_TRUE(!d.ParseStream(eis).HasParseError());
-    EXPECT_TRUE(d.IsObject());
-    EXPECT_EQ(5, d.MemberCount());
-}
-
-TEST(IStreamWrapper, fstream) {
-    fstream fs;
-    ASSERT_TRUE(Open(fs, "utf8bom.json"));
-    IStreamWrapper isw(fs);
-    EncodedInputStream<UTF8<>, IStreamWrapper> eis(isw);
-    Document d;
-    EXPECT_TRUE(!d.ParseStream(eis).HasParseError());
-    EXPECT_TRUE(d.IsObject());
-    EXPECT_EQ(5, d.MemberCount());
-}
-
-// wifstream/wfstream only works on C++11 with codecvt_utf16
-// But many C++11 library still not have it.
-#if 0
-#include <codecvt>
-
-TEST(IStreamWrapper, wifstream) {
-    wifstream ifs;
-    ASSERT_TRUE(Open(ifs, "utf16bebom.json"));
-    ifs.imbue(std::locale(ifs.getloc(),
-       new std::codecvt_utf16<wchar_t, 0x10ffff, std::consume_header>));
-    WIStreamWrapper isw(ifs);
-    GenericDocument<UTF16<> > d;
-    d.ParseStream<kParseDefaultFlags, UTF16<>, WIStreamWrapper>(isw);
-    EXPECT_TRUE(!d.HasParseError());
-    EXPECT_TRUE(d.IsObject());
-    EXPECT_EQ(5, d.MemberCount());
-}
-
-TEST(IStreamWrapper, wfstream) {
-    wfstream fs;
-    ASSERT_TRUE(Open(fs, "utf16bebom.json"));
-    fs.imbue(std::locale(fs.getloc(),
-       new std::codecvt_utf16<wchar_t, 0x10ffff, std::consume_header>));
-    WIStreamWrapper isw(fs);
-    GenericDocument<UTF16<> > d;
-    d.ParseStream<kParseDefaultFlags, UTF16<>, WIStreamWrapper>(isw);
-    EXPECT_TRUE(!d.HasParseError());
-    EXPECT_TRUE(d.IsObject());
-    EXPECT_EQ(5, d.MemberCount());
-}
-
-#endif
-
-#if defined(_MSC_VER) && !defined(__clang__)
-RAPIDJSON_DIAG_POP
-#endif
diff --git a/src/sioclient/lib/rapidjson/test/unittest/itoatest.cpp b/src/sioclient/lib/rapidjson/test/unittest/itoatest.cpp
deleted file mode 100644
index f41edeb7..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/itoatest.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/internal/itoa.h"
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(type-limits)
-#endif
-
-using namespace rapidjson::internal;
-
-template <typename T>
-struct Traits {
-};
-
-template <>
-struct Traits<uint32_t> {
-    enum { kBufferSize = 11 };
-    enum { kMaxDigit = 10 };
-    static uint32_t Negate(uint32_t x) { return x; }
-};
-
-template <>
-struct Traits<int32_t> {
-    enum { kBufferSize = 12 };
-    enum { kMaxDigit = 10 };
-    static int32_t Negate(int32_t x) { return -x; }
-};
-
-template <>
-struct Traits<uint64_t> {
-    enum { kBufferSize = 21 };
-    enum { kMaxDigit = 20 };
-    static uint64_t Negate(uint64_t x) { return x; }
-};
-
-template <>
-struct Traits<int64_t> {
-    enum { kBufferSize = 22 };
-    enum { kMaxDigit = 20 };
-    static int64_t Negate(int64_t x) { return -x; }
-};
-
-template <typename T>
-static void VerifyValue(T value, void(*f)(T, char*), char* (*g)(T, char*)) {
-    char buffer1[Traits<T>::kBufferSize];
-    char buffer2[Traits<T>::kBufferSize];
-
-    f(value, buffer1);
-    *g(value, buffer2) = '\0';
-    
-
-    EXPECT_STREQ(buffer1, buffer2);
-}
-
-template <typename T>
-static void Verify(void(*f)(T, char*), char* (*g)(T, char*)) {
-    // Boundary cases
-    VerifyValue<T>(0, f, g);
-    VerifyValue<T>((std::numeric_limits<T>::min)(), f, g);
-    VerifyValue<T>((std::numeric_limits<T>::max)(), f, g);
-
-    // 2^n - 1, 2^n, 10^n - 1, 10^n until overflow
-    for (int power = 2; power <= 10; power += 8) {
-        T i = 1, last;
-        do {
-            VerifyValue<T>(i - 1, f, g);
-            VerifyValue<T>(i, f, g);
-            if (std::numeric_limits<T>::min() < 0) {
-                VerifyValue<T>(Traits<T>::Negate(i), f, g);
-                VerifyValue<T>(Traits<T>::Negate(i + 1), f, g);
-            }
-            last = i;
-            if (i > static_cast<T>(std::numeric_limits<T>::max() / static_cast<T>(power)))
-                break;
-            i *= static_cast<T>(power);
-        } while (last < i);
-    }
-}
-
-static void u32toa_naive(uint32_t value, char* buffer) {
-    char temp[10];
-    char *p = temp;
-    do {
-        *p++ = static_cast<char>(char(value % 10) + '0');
-        value /= 10;
-    } while (value > 0);
-
-    do {
-        *buffer++ = *--p;
-    } while (p != temp);
-
-    *buffer = '\0';
-}
-
-static void i32toa_naive(int32_t value, char* buffer) {
-    uint32_t u = static_cast<uint32_t>(value);
-    if (value < 0) {
-        *buffer++ = '-';
-        u = ~u + 1;
-    }
-    u32toa_naive(u, buffer);
-}
-
-static void u64toa_naive(uint64_t value, char* buffer) {
-    char temp[20];
-    char *p = temp;
-    do {
-        *p++ = static_cast<char>(char(value % 10) + '0');
-        value /= 10;
-    } while (value > 0);
-
-    do {
-        *buffer++ = *--p;
-    } while (p != temp);
-
-    *buffer = '\0';
-}
-
-static void i64toa_naive(int64_t value, char* buffer) {
-    uint64_t u = static_cast<uint64_t>(value);
-    if (value < 0) {
-        *buffer++ = '-';
-        u = ~u + 1;
-    }
-    u64toa_naive(u, buffer);
-}
-
-TEST(itoa, u32toa) {
-    Verify(u32toa_naive, u32toa);
-}
-
-TEST(itoa, i32toa) {
-    Verify(i32toa_naive, i32toa);
-}
-
-TEST(itoa, u64toa) {
-    Verify(u64toa_naive, u64toa);
-}
-
-TEST(itoa, i64toa) {
-    Verify(i64toa_naive, i64toa);
-}
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
diff --git a/src/sioclient/lib/rapidjson/test/unittest/jsoncheckertest.cpp b/src/sioclient/lib/rapidjson/test/unittest/jsoncheckertest.cpp
deleted file mode 100644
index 47c2b567..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/jsoncheckertest.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-
-#include "rapidjson/document.h"
-
-using namespace rapidjson;
-
-static char* ReadFile(const char* filename, size_t& length) {
-    const char *paths[] = {
-        "jsonchecker",
-        "bin/jsonchecker",
-        "../bin/jsonchecker",
-        "../../bin/jsonchecker",
-        "../../../bin/jsonchecker"
-    };
-    char buffer[1024];
-    FILE *fp = 0;
-    for (size_t i = 0; i < sizeof(paths) / sizeof(paths[0]); i++) {
-        sprintf(buffer, "%s/%s", paths[i], filename);
-        fp = fopen(buffer, "rb");
-        if (fp)
-            break;
-    }
-
-    if (!fp)
-        return 0;
-
-    fseek(fp, 0, SEEK_END);
-    length = static_cast<size_t>(ftell(fp));
-    fseek(fp, 0, SEEK_SET);
-    char* json = static_cast<char*>(malloc(length + 1));
-    size_t readLength = fread(json, 1, length, fp);
-    json[readLength] = '\0';
-    fclose(fp);
-    return json;
-}
-
-struct NoOpHandler {
-    bool Null() { return true; }
-    bool Bool(bool) { return true; }
-    bool Int(int) { return true; }
-    bool Uint(unsigned) { return true; }
-    bool Int64(int64_t) { return true; }
-    bool Uint64(uint64_t) { return true; }
-    bool Double(double) { return true; }
-    bool RawNumber(const char*, SizeType, bool) { return true; }
-    bool String(const char*, SizeType, bool) { return true; }
-    bool StartObject() { return true; }
-    bool Key(const char*, SizeType, bool) { return true; }
-    bool EndObject(SizeType) { return true; }
-    bool StartArray() { return true; }
-    bool EndArray(SizeType) { return true; }
-};
-
-
-TEST(JsonChecker, Reader) {
-    char filename[256];
-
-    // jsonchecker/failXX.json
-    for (int i = 1; i <= 33; i++) {
-        if (i == 1) // fail1.json is valid in rapidjson, which has no limitation on type of root element (RFC 7159).
-            continue;
-        if (i == 18)    // fail18.json is valid in rapidjson, which has no limitation on depth of nesting.
-            continue;
-
-        sprintf(filename, "fail%d.json", i);
-        size_t length;
-        char* json = ReadFile(filename, length);
-        if (!json) {
-            printf("jsonchecker file %s not found", filename);
-            ADD_FAILURE();
-            continue;
-        }
-
-        // Test stack-based parsing.
-        GenericDocument<UTF8<>, CrtAllocator> document; // Use Crt allocator to check exception-safety (no memory leak)
-        document.Parse(json);
-        EXPECT_TRUE(document.HasParseError()) << filename;
-
-        // Test iterative parsing.
-        document.Parse<kParseIterativeFlag>(json);
-        EXPECT_TRUE(document.HasParseError()) << filename;
-
-        // Test iterative pull-parsing.
-        Reader reader;
-        StringStream ss(json);
-        NoOpHandler h;
-        reader.IterativeParseInit();
-        while (!reader.IterativeParseComplete()) {
-            if (!reader.IterativeParseNext<kParseDefaultFlags>(ss, h))
-                break;
-        }
-        EXPECT_TRUE(reader.HasParseError()) << filename;
-        
-        free(json);
-    }
-
-    // passX.json
-    for (int i = 1; i <= 3; i++) {
-        sprintf(filename, "pass%d.json", i);
-        size_t length;
-        char* json = ReadFile(filename, length);
-        if (!json) {
-            printf("jsonchecker file %s not found", filename);
-            continue;
-        }
-
-        // Test stack-based parsing.
-        GenericDocument<UTF8<>, CrtAllocator> document; // Use Crt allocator to check exception-safety (no memory leak)
-        document.Parse(json);
-        EXPECT_FALSE(document.HasParseError()) << filename;
-
-        // Test iterative parsing.
-        document.Parse<kParseIterativeFlag>(json);
-        EXPECT_FALSE(document.HasParseError()) << filename;
-        
-        // Test iterative pull-parsing.
-        Reader reader;
-        StringStream ss(json);
-        NoOpHandler h;
-        reader.IterativeParseInit();
-        while (!reader.IterativeParseComplete()) {
-            if (!reader.IterativeParseNext<kParseDefaultFlags>(ss, h))
-                break;
-        }
-        EXPECT_FALSE(reader.HasParseError()) << filename;
-
-        free(json);
-    }
-}
diff --git a/src/sioclient/lib/rapidjson/test/unittest/namespacetest.cpp b/src/sioclient/lib/rapidjson/test/unittest/namespacetest.cpp
deleted file mode 100644
index 1814724a..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/namespacetest.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-
-// test another instantiation of RapidJSON in a different namespace 
-
-#define RAPIDJSON_NAMESPACE my::rapid::json
-#define RAPIDJSON_NAMESPACE_BEGIN namespace my { namespace rapid { namespace json {
-#define RAPIDJSON_NAMESPACE_END } } }
-
-// include lots of RapidJSON files
-
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/stringbuffer.h"
-
-static const char json[] = "{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3,4]}";
-
-TEST(NamespaceTest,Using) {
-    using namespace RAPIDJSON_NAMESPACE;
-    typedef GenericDocument<UTF8<>, CrtAllocator> DocumentType;
-    DocumentType doc;
-
-    doc.Parse(json);
-    EXPECT_TRUE(!doc.HasParseError());
-}
-
-TEST(NamespaceTest,Direct) {
-    typedef RAPIDJSON_NAMESPACE::Document Document;
-    typedef RAPIDJSON_NAMESPACE::Reader Reader;
-    typedef RAPIDJSON_NAMESPACE::StringStream StringStream;
-    typedef RAPIDJSON_NAMESPACE::StringBuffer StringBuffer;
-    typedef RAPIDJSON_NAMESPACE::Writer<StringBuffer> WriterType;
-
-    StringStream s(json);
-    StringBuffer buffer;
-    WriterType writer(buffer);
-    buffer.ShrinkToFit();
-    Reader reader;
-    reader.Parse(s, writer);
-
-    EXPECT_STREQ(json, buffer.GetString());
-    EXPECT_EQ(sizeof(json)-1, buffer.GetSize());
-    EXPECT_TRUE(writer.IsComplete());
-
-    Document doc;
-    doc.Parse(buffer.GetString());
-    EXPECT_TRUE(!doc.HasParseError());
-
-    buffer.Clear();
-    writer.Reset(buffer);
-    doc.Accept(writer);
-    EXPECT_STREQ(json, buffer.GetString());
-    EXPECT_TRUE(writer.IsComplete());
-}
diff --git a/src/sioclient/lib/rapidjson/test/unittest/ostreamwrappertest.cpp b/src/sioclient/lib/rapidjson/test/unittest/ostreamwrappertest.cpp
deleted file mode 100644
index 50f8da63..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/ostreamwrappertest.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-
-#include "rapidjson/ostreamwrapper.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/document.h"
-#include <sstream>
-#include <fstream>
-
-using namespace rapidjson;
-using namespace std;
-
-template <typename StringStreamType>
-static void TestStringStream() {
-    typedef typename StringStreamType::char_type Ch;
-
-    Ch s[] = { 'A', 'B', 'C', '\0' };
-    StringStreamType oss(s);
-    BasicOStreamWrapper<StringStreamType> os(oss);
-    for (size_t i = 0; i < 3; i++)
-        os.Put(s[i]);
-    os.Flush();
-    for (size_t i = 0; i < 3; i++)
-        EXPECT_EQ(s[i], oss.str()[i]);
-}
-
-TEST(OStreamWrapper, ostringstream) {
-    TestStringStream<ostringstream>();
-}
-
-TEST(OStreamWrapper, stringstream) {
-    TestStringStream<stringstream>();
-}
-
-TEST(OStreamWrapper, wostringstream) {
-    TestStringStream<wostringstream>();
-}
-
-TEST(OStreamWrapper, wstringstream) {
-    TestStringStream<wstringstream>();
-}
-
-TEST(OStreamWrapper, cout) {
-    OStreamWrapper os(cout);
-    const char* s = "Hello World!\n";
-    while (*s)
-        os.Put(*s++);
-    os.Flush();
-}
-
-template <typename FileStreamType>
-static void TestFileStream() {
-    char filename[L_tmpnam];
-    FILE* fp = TempFile(filename);
-    fclose(fp);
-
-    const char* s = "Hello World!\n";
-    {
-        FileStreamType ofs(filename, ios::out | ios::binary);
-        BasicOStreamWrapper<FileStreamType> osw(ofs);
-        for (const char* p = s; *p; p++)
-            osw.Put(*p);
-        osw.Flush();
-    }
-
-    fp = fopen(filename, "r");
-	ASSERT_TRUE( fp != NULL );
-    for (const char* p = s; *p; p++)
-        EXPECT_EQ(*p, static_cast<char>(fgetc(fp)));
-    fclose(fp);
-}
-
-TEST(OStreamWrapper, ofstream) {
-    TestFileStream<ofstream>();
-}
-
-TEST(OStreamWrapper, fstream) {
-    TestFileStream<fstream>();
-}
diff --git a/src/sioclient/lib/rapidjson/test/unittest/pointertest.cpp b/src/sioclient/lib/rapidjson/test/unittest/pointertest.cpp
deleted file mode 100644
index 855d822c..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/pointertest.cpp
+++ /dev/null
@@ -1,1529 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/pointer.h"
-#include "rapidjson/stringbuffer.h"
-#include <sstream>
-
-using namespace rapidjson;
-
-static const char kJson[] = "{\n"
-"    \"foo\":[\"bar\", \"baz\"],\n"
-"    \"\" : 0,\n"
-"    \"a/b\" : 1,\n"
-"    \"c%d\" : 2,\n"
-"    \"e^f\" : 3,\n"
-"    \"g|h\" : 4,\n"
-"    \"i\\\\j\" : 5,\n"
-"    \"k\\\"l\" : 6,\n"
-"    \" \" : 7,\n"
-"    \"m~n\" : 8\n"
-"}";
-
-TEST(Pointer, DefaultConstructor) {
-    Pointer p;
-    EXPECT_TRUE(p.IsValid());
-    EXPECT_EQ(0u, p.GetTokenCount());
-}
-
-TEST(Pointer, Parse) {
-    {
-        Pointer p("");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(0u, p.GetTokenCount());
-    }
-
-    {
-        Pointer p("/");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(0u, p.GetTokens()[0].length);
-        EXPECT_STREQ("", p.GetTokens()[0].name);
-        EXPECT_EQ(kPointerInvalidIndex, p.GetTokens()[0].index);
-    }
-
-    {
-        Pointer p("/foo");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(3u, p.GetTokens()[0].length);
-        EXPECT_STREQ("foo", p.GetTokens()[0].name);
-        EXPECT_EQ(kPointerInvalidIndex, p.GetTokens()[0].index);
-    }
-
-    #if RAPIDJSON_HAS_STDSTRING
-    {
-        Pointer p(std::string("/foo"));
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(3u, p.GetTokens()[0].length);
-        EXPECT_STREQ("foo", p.GetTokens()[0].name);
-        EXPECT_EQ(kPointerInvalidIndex, p.GetTokens()[0].index);
-    }
-    #endif
-
-    {
-        Pointer p("/foo/0");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(2u, p.GetTokenCount());
-        EXPECT_EQ(3u, p.GetTokens()[0].length);
-        EXPECT_STREQ("foo", p.GetTokens()[0].name);
-        EXPECT_EQ(kPointerInvalidIndex, p.GetTokens()[0].index);
-        EXPECT_EQ(1u, p.GetTokens()[1].length);
-        EXPECT_STREQ("0", p.GetTokens()[1].name);
-        EXPECT_EQ(0u, p.GetTokens()[1].index);
-    }
-
-    {
-        // Unescape ~1
-        Pointer p("/a~1b");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(3u, p.GetTokens()[0].length);
-        EXPECT_STREQ("a/b", p.GetTokens()[0].name);
-    }
-
-    {
-        // Unescape ~0
-        Pointer p("/m~0n");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(3u, p.GetTokens()[0].length);
-        EXPECT_STREQ("m~n", p.GetTokens()[0].name);
-    }
-
-    {
-        // empty name
-        Pointer p("/");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(0u, p.GetTokens()[0].length);
-        EXPECT_STREQ("", p.GetTokens()[0].name);
-    }
-
-    {
-        // empty and non-empty name
-        Pointer p("//a");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(2u, p.GetTokenCount());
-        EXPECT_EQ(0u, p.GetTokens()[0].length);
-        EXPECT_STREQ("", p.GetTokens()[0].name);
-        EXPECT_EQ(1u, p.GetTokens()[1].length);
-        EXPECT_STREQ("a", p.GetTokens()[1].name);
-    }
-
-    {
-        // Null characters
-        Pointer p("/\0\0", 3);
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(2u, p.GetTokens()[0].length);
-        EXPECT_EQ('\0', p.GetTokens()[0].name[0]);
-        EXPECT_EQ('\0', p.GetTokens()[0].name[1]);
-        EXPECT_EQ('\0', p.GetTokens()[0].name[2]);
-    }
-
-    {
-        // Valid index
-        Pointer p("/123");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_STREQ("123", p.GetTokens()[0].name);
-        EXPECT_EQ(123u, p.GetTokens()[0].index);
-    }
-
-    {
-        // Invalid index (with leading zero)
-        Pointer p("/01");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_STREQ("01", p.GetTokens()[0].name);
-        EXPECT_EQ(kPointerInvalidIndex, p.GetTokens()[0].index);
-    }
-
-    if (sizeof(SizeType) == 4) {
-        // Invalid index (overflow)
-        Pointer p("/4294967296");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_STREQ("4294967296", p.GetTokens()[0].name);
-        EXPECT_EQ(kPointerInvalidIndex, p.GetTokens()[0].index);
-    }
-
-    {
-        // kPointerParseErrorTokenMustBeginWithSolidus
-        Pointer p(" ");
-        EXPECT_FALSE(p.IsValid());
-        EXPECT_EQ(kPointerParseErrorTokenMustBeginWithSolidus, p.GetParseErrorCode());
-        EXPECT_EQ(0u, p.GetParseErrorOffset());
-    }
-
-    {
-        // kPointerParseErrorInvalidEscape
-        Pointer p("/~");
-        EXPECT_FALSE(p.IsValid());
-        EXPECT_EQ(kPointerParseErrorInvalidEscape, p.GetParseErrorCode());
-        EXPECT_EQ(2u, p.GetParseErrorOffset());
-    }
-
-    {
-        // kPointerParseErrorInvalidEscape
-        Pointer p("/~2");
-        EXPECT_FALSE(p.IsValid());
-        EXPECT_EQ(kPointerParseErrorInvalidEscape, p.GetParseErrorCode());
-        EXPECT_EQ(2u, p.GetParseErrorOffset());
-    }
-}
-
-TEST(Pointer, Parse_URIFragment) {
-    {
-        Pointer p("#");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(0u, p.GetTokenCount());
-    }
-
-    {
-        Pointer p("#/foo");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(3u, p.GetTokens()[0].length);
-        EXPECT_STREQ("foo", p.GetTokens()[0].name);
-    }
-
-    {
-        Pointer p("#/foo/0");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(2u, p.GetTokenCount());
-        EXPECT_EQ(3u, p.GetTokens()[0].length);
-        EXPECT_STREQ("foo", p.GetTokens()[0].name);
-        EXPECT_EQ(1u, p.GetTokens()[1].length);
-        EXPECT_STREQ("0", p.GetTokens()[1].name);
-        EXPECT_EQ(0u, p.GetTokens()[1].index);
-    }
-
-    {
-        // Unescape ~1
-        Pointer p("#/a~1b");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(3u, p.GetTokens()[0].length);
-        EXPECT_STREQ("a/b", p.GetTokens()[0].name);
-    }
-
-    {
-        // Unescape ~0
-        Pointer p("#/m~0n");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(3u, p.GetTokens()[0].length);
-        EXPECT_STREQ("m~n", p.GetTokens()[0].name);
-    }
-
-    {
-        // empty name
-        Pointer p("#/");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(0u, p.GetTokens()[0].length);
-        EXPECT_STREQ("", p.GetTokens()[0].name);
-    }
-
-    {
-        // empty and non-empty name
-        Pointer p("#//a");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(2u, p.GetTokenCount());
-        EXPECT_EQ(0u, p.GetTokens()[0].length);
-        EXPECT_STREQ("", p.GetTokens()[0].name);
-        EXPECT_EQ(1u, p.GetTokens()[1].length);
-        EXPECT_STREQ("a", p.GetTokens()[1].name);
-    }
-
-    {
-        // Null characters
-        Pointer p("#/%00%00");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(2u, p.GetTokens()[0].length);
-        EXPECT_EQ('\0', p.GetTokens()[0].name[0]);
-        EXPECT_EQ('\0', p.GetTokens()[0].name[1]);
-        EXPECT_EQ('\0', p.GetTokens()[0].name[2]);
-    }
-
-    {
-        // Percentage Escapes
-        EXPECT_STREQ("c%d", Pointer("#/c%25d").GetTokens()[0].name);
-        EXPECT_STREQ("e^f", Pointer("#/e%5Ef").GetTokens()[0].name);
-        EXPECT_STREQ("g|h", Pointer("#/g%7Ch").GetTokens()[0].name);
-        EXPECT_STREQ("i\\j", Pointer("#/i%5Cj").GetTokens()[0].name);
-        EXPECT_STREQ("k\"l", Pointer("#/k%22l").GetTokens()[0].name);
-        EXPECT_STREQ(" ", Pointer("#/%20").GetTokens()[0].name);
-    }
-
-    {
-        // Valid index
-        Pointer p("#/123");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_STREQ("123", p.GetTokens()[0].name);
-        EXPECT_EQ(123u, p.GetTokens()[0].index);
-    }
-
-    {
-        // Invalid index (with leading zero)
-        Pointer p("#/01");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_STREQ("01", p.GetTokens()[0].name);
-        EXPECT_EQ(kPointerInvalidIndex, p.GetTokens()[0].index);
-    }
-
-    if (sizeof(SizeType) == 4) {
-        // Invalid index (overflow)
-        Pointer p("#/4294967296");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_STREQ("4294967296", p.GetTokens()[0].name);
-        EXPECT_EQ(kPointerInvalidIndex, p.GetTokens()[0].index);
-    }
-
-    {
-        // Decode UTF-8 perecent encoding to UTF-8
-        Pointer p("#/%C2%A2");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_STREQ("\xC2\xA2", p.GetTokens()[0].name);
-    }
-
-    {
-        // Decode UTF-8 perecent encoding to UTF-16
-        GenericPointer<GenericValue<UTF16<> > > p(L"#/%C2%A2");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(static_cast<UTF16<>::Ch>(0x00A2), p.GetTokens()[0].name[0]);
-        EXPECT_EQ(1u, p.GetTokens()[0].length);
-    }
-
-    {
-        // Decode UTF-8 perecent encoding to UTF-16
-        GenericPointer<GenericValue<UTF16<> > > p(L"#/%E2%82%AC");
-        EXPECT_TRUE(p.IsValid());
-        EXPECT_EQ(1u, p.GetTokenCount());
-        EXPECT_EQ(static_cast<UTF16<>::Ch>(0x20AC), p.GetTokens()[0].name[0]);
-        EXPECT_EQ(1u, p.GetTokens()[0].length);
-    }
-
-    {
-        // kPointerParseErrorTokenMustBeginWithSolidus
-        Pointer p("# ");
-        EXPECT_FALSE(p.IsValid());
-        EXPECT_EQ(kPointerParseErrorTokenMustBeginWithSolidus, p.GetParseErrorCode());
-        EXPECT_EQ(1u, p.GetParseErrorOffset());
-    }
-
-    {
-        // kPointerParseErrorInvalidEscape
-        Pointer p("#/~");
-        EXPECT_FALSE(p.IsValid());
-        EXPECT_EQ(kPointerParseErrorInvalidEscape, p.GetParseErrorCode());
-        EXPECT_EQ(3u, p.GetParseErrorOffset());
-    }
-
-    {
-        // kPointerParseErrorInvalidEscape
-        Pointer p("#/~2");
-        EXPECT_FALSE(p.IsValid());
-        EXPECT_EQ(kPointerParseErrorInvalidEscape, p.GetParseErrorCode());
-        EXPECT_EQ(3u, p.GetParseErrorOffset());
-    }
-
-    {
-        // kPointerParseErrorInvalidPercentEncoding
-        Pointer p("#/%");
-        EXPECT_FALSE(p.IsValid());
-        EXPECT_EQ(kPointerParseErrorInvalidPercentEncoding, p.GetParseErrorCode());
-        EXPECT_EQ(2u, p.GetParseErrorOffset());
-    }
-
-    {
-        // kPointerParseErrorInvalidPercentEncoding (invalid hex)
-        Pointer p("#/%g0");
-        EXPECT_FALSE(p.IsValid());
-        EXPECT_EQ(kPointerParseErrorInvalidPercentEncoding, p.GetParseErrorCode());
-        EXPECT_EQ(2u, p.GetParseErrorOffset());
-    }
-
-    {
-        // kPointerParseErrorInvalidPercentEncoding (invalid hex)
-        Pointer p("#/%0g");
-        EXPECT_FALSE(p.IsValid());
-        EXPECT_EQ(kPointerParseErrorInvalidPercentEncoding, p.GetParseErrorCode());
-        EXPECT_EQ(2u, p.GetParseErrorOffset());
-    }
-
-    {
-        // kPointerParseErrorInvalidPercentEncoding (incomplete UTF-8 sequence)
-        Pointer p("#/%C2");
-        EXPECT_FALSE(p.IsValid());
-        EXPECT_EQ(kPointerParseErrorInvalidPercentEncoding, p.GetParseErrorCode());
-        EXPECT_EQ(2u, p.GetParseErrorOffset());
-    }
-
-    {
-        // kPointerParseErrorCharacterMustPercentEncode
-        Pointer p("#/ ");
-        EXPECT_FALSE(p.IsValid());
-        EXPECT_EQ(kPointerParseErrorCharacterMustPercentEncode, p.GetParseErrorCode());
-        EXPECT_EQ(2u, p.GetParseErrorOffset());
-    }
-
-    {
-        // kPointerParseErrorCharacterMustPercentEncode
-        Pointer p("#/\n");
-        EXPECT_FALSE(p.IsValid());
-        EXPECT_EQ(kPointerParseErrorCharacterMustPercentEncode, p.GetParseErrorCode());
-        EXPECT_EQ(2u, p.GetParseErrorOffset());
-    }
-}
-
-TEST(Pointer, Stringify) {
-    // Test by roundtrip
-    const char* sources[] = {
-        "",
-        "/foo",
-        "/foo/0",
-        "/",
-        "/a~1b",
-        "/c%d",
-        "/e^f",
-        "/g|h",
-        "/i\\j",
-        "/k\"l",
-        "/ ",
-        "/m~0n",
-        "/\xC2\xA2",
-        "/\xE2\x82\xAC",
-        "/\xF0\x9D\x84\x9E"
-    };
-
-    for (size_t i = 0; i < sizeof(sources) / sizeof(sources[0]); i++) {
-        Pointer p(sources[i]);
-        StringBuffer s;
-        EXPECT_TRUE(p.Stringify(s));
-        EXPECT_STREQ(sources[i], s.GetString());
-
-        // Stringify to URI fragment
-        StringBuffer s2;
-        EXPECT_TRUE(p.StringifyUriFragment(s2));
-        Pointer p2(s2.GetString(), s2.GetSize());
-        EXPECT_TRUE(p2.IsValid());
-        EXPECT_TRUE(p == p2);
-    }
-
-    {
-        // Strigify to URI fragment with an invalid UTF-8 sequence
-        Pointer p("/\xC2");
-        StringBuffer s;
-        EXPECT_FALSE(p.StringifyUriFragment(s));
-    }
-}
-
-// Construct a Pointer with static tokens, no dynamic allocation involved.
-#define NAME(s) { s, static_cast<SizeType>(sizeof(s) / sizeof(s[0]) - 1), kPointerInvalidIndex }
-#define INDEX(i) { #i, static_cast<SizeType>(sizeof(#i) - 1), i }
-
-static const Pointer::Token kTokens[] = { NAME("foo"), INDEX(0) }; // equivalent to "/foo/0"
-
-#undef NAME
-#undef INDEX
-
-TEST(Pointer, ConstructorWithToken) {
-    Pointer p(kTokens, sizeof(kTokens) / sizeof(kTokens[0]));
-    EXPECT_TRUE(p.IsValid());
-    EXPECT_EQ(2u, p.GetTokenCount());
-    EXPECT_EQ(3u, p.GetTokens()[0].length);
-    EXPECT_STREQ("foo", p.GetTokens()[0].name);
-    EXPECT_EQ(1u, p.GetTokens()[1].length);
-    EXPECT_STREQ("0", p.GetTokens()[1].name);
-    EXPECT_EQ(0u, p.GetTokens()[1].index);
-}
-
-TEST(Pointer, CopyConstructor) {
-    {
-        CrtAllocator allocator;
-        Pointer p("/foo/0", &allocator);
-        Pointer q(p);
-        EXPECT_TRUE(q.IsValid());
-        EXPECT_EQ(2u, q.GetTokenCount());
-        EXPECT_EQ(3u, q.GetTokens()[0].length);
-        EXPECT_STREQ("foo", q.GetTokens()[0].name);
-        EXPECT_EQ(1u, q.GetTokens()[1].length);
-        EXPECT_STREQ("0", q.GetTokens()[1].name);
-        EXPECT_EQ(0u, q.GetTokens()[1].index);
-        EXPECT_EQ(&p.GetAllocator(), &q.GetAllocator());
-    }
-
-    // Static tokens
-    {
-        Pointer p(kTokens, sizeof(kTokens) / sizeof(kTokens[0]));
-        Pointer q(p);
-        EXPECT_TRUE(q.IsValid());
-        EXPECT_EQ(2u, q.GetTokenCount());
-        EXPECT_EQ(3u, q.GetTokens()[0].length);
-        EXPECT_STREQ("foo", q.GetTokens()[0].name);
-        EXPECT_EQ(1u, q.GetTokens()[1].length);
-        EXPECT_STREQ("0", q.GetTokens()[1].name);
-        EXPECT_EQ(0u, q.GetTokens()[1].index);
-    }
-}
-
-TEST(Pointer, Assignment) {
-    {
-        CrtAllocator allocator;
-        Pointer p("/foo/0", &allocator);
-        Pointer q;
-        q = p;
-        EXPECT_TRUE(q.IsValid());
-        EXPECT_EQ(2u, q.GetTokenCount());
-        EXPECT_EQ(3u, q.GetTokens()[0].length);
-        EXPECT_STREQ("foo", q.GetTokens()[0].name);
-        EXPECT_EQ(1u, q.GetTokens()[1].length);
-        EXPECT_STREQ("0", q.GetTokens()[1].name);
-        EXPECT_EQ(0u, q.GetTokens()[1].index);
-        EXPECT_NE(&p.GetAllocator(), &q.GetAllocator());
-        q = q;
-        EXPECT_TRUE(q.IsValid());
-        EXPECT_EQ(2u, q.GetTokenCount());
-        EXPECT_EQ(3u, q.GetTokens()[0].length);
-        EXPECT_STREQ("foo", q.GetTokens()[0].name);
-        EXPECT_EQ(1u, q.GetTokens()[1].length);
-        EXPECT_STREQ("0", q.GetTokens()[1].name);
-        EXPECT_EQ(0u, q.GetTokens()[1].index);
-        EXPECT_NE(&p.GetAllocator(), &q.GetAllocator());
-    }
-
-    // Static tokens
-    {
-        Pointer p(kTokens, sizeof(kTokens) / sizeof(kTokens[0]));
-        Pointer q;
-        q = p;
-        EXPECT_TRUE(q.IsValid());
-        EXPECT_EQ(2u, q.GetTokenCount());
-        EXPECT_EQ(3u, q.GetTokens()[0].length);
-        EXPECT_STREQ("foo", q.GetTokens()[0].name);
-        EXPECT_EQ(1u, q.GetTokens()[1].length);
-        EXPECT_STREQ("0", q.GetTokens()[1].name);
-        EXPECT_EQ(0u, q.GetTokens()[1].index);
-    }
-}
-
-TEST(Pointer, Append) {
-    {
-        Pointer p;
-        Pointer q = p.Append("foo");
-        EXPECT_TRUE(Pointer("/foo") == q);
-        q = q.Append(1234);
-        EXPECT_TRUE(Pointer("/foo/1234") == q);
-        q = q.Append("");
-        EXPECT_TRUE(Pointer("/foo/1234/") == q);
-    }
-
-    {
-        Pointer p;
-        Pointer q = p.Append(Value("foo").Move());
-        EXPECT_TRUE(Pointer("/foo") == q);
-        q = q.Append(Value(1234).Move());
-        EXPECT_TRUE(Pointer("/foo/1234") == q);
-        q = q.Append(Value(kStringType).Move());
-        EXPECT_TRUE(Pointer("/foo/1234/") == q);
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    {
-        Pointer p;
-        Pointer q = p.Append(std::string("foo"));
-        EXPECT_TRUE(Pointer("/foo") == q);
-    }
-#endif
-}
-
-TEST(Pointer, Equality) {
-    EXPECT_TRUE(Pointer("/foo/0") == Pointer("/foo/0"));
-    EXPECT_FALSE(Pointer("/foo/0") == Pointer("/foo/1"));
-    EXPECT_FALSE(Pointer("/foo/0") == Pointer("/foo/0/1"));
-    EXPECT_FALSE(Pointer("/foo/0") == Pointer("a"));
-    EXPECT_FALSE(Pointer("a") == Pointer("a")); // Invalid always not equal
-}
-
-TEST(Pointer, Inequality) {
-    EXPECT_FALSE(Pointer("/foo/0") != Pointer("/foo/0"));
-    EXPECT_TRUE(Pointer("/foo/0") != Pointer("/foo/1"));
-    EXPECT_TRUE(Pointer("/foo/0") != Pointer("/foo/0/1"));
-    EXPECT_TRUE(Pointer("/foo/0") != Pointer("a"));
-    EXPECT_TRUE(Pointer("a") != Pointer("a")); // Invalid always not equal
-}
-
-TEST(Pointer, Create) {
-    Document d;
-    {
-        Value* v = &Pointer("").Create(d, d.GetAllocator());
-        EXPECT_EQ(&d, v);
-    }
-    {
-        Value* v = &Pointer("/foo").Create(d, d.GetAllocator());
-        EXPECT_EQ(&d["foo"], v);
-    }
-    {
-        Value* v = &Pointer("/foo/0").Create(d, d.GetAllocator());
-        EXPECT_EQ(&d["foo"][0], v);
-    }
-    {
-        Value* v = &Pointer("/foo/-").Create(d, d.GetAllocator());
-        EXPECT_EQ(&d["foo"][1], v);
-    }
-
-    {
-        Value* v = &Pointer("/foo/-/-").Create(d, d.GetAllocator());
-        // "foo/-" is a newly created null value x.
-        // "foo/-/-" finds that x is not an array, it converts x to empty object
-        // and treats - as "-" member name
-        EXPECT_EQ(&d["foo"][2]["-"], v);
-    }
-
-    {
-        // Document with no allocator
-        Value* v = &Pointer("/foo/-").Create(d);
-        EXPECT_EQ(&d["foo"][3], v);
-    }
-
-    {
-        // Value (not document) must give allocator
-        Value* v = &Pointer("/-").Create(d["foo"], d.GetAllocator());
-        EXPECT_EQ(&d["foo"][4], v);
-    }
-}
-
-TEST(Pointer, Get) {
-    Document d;
-    d.Parse(kJson);
-
-    EXPECT_EQ(&d, Pointer("").Get(d));
-    EXPECT_EQ(&d["foo"], Pointer("/foo").Get(d));
-    EXPECT_EQ(&d["foo"][0], Pointer("/foo/0").Get(d));
-    EXPECT_EQ(&d[""], Pointer("/").Get(d));
-    EXPECT_EQ(&d["a/b"], Pointer("/a~1b").Get(d));
-    EXPECT_EQ(&d["c%d"], Pointer("/c%d").Get(d));
-    EXPECT_EQ(&d["e^f"], Pointer("/e^f").Get(d));
-    EXPECT_EQ(&d["g|h"], Pointer("/g|h").Get(d));
-    EXPECT_EQ(&d["i\\j"], Pointer("/i\\j").Get(d));
-    EXPECT_EQ(&d["k\"l"], Pointer("/k\"l").Get(d));
-    EXPECT_EQ(&d[" "], Pointer("/ ").Get(d));
-    EXPECT_EQ(&d["m~n"], Pointer("/m~0n").Get(d));
-    EXPECT_TRUE(Pointer("/abc").Get(d) == 0);
-    size_t unresolvedTokenIndex;
-    EXPECT_TRUE(Pointer("/foo/2").Get(d, &unresolvedTokenIndex) == 0); // Out of boundary
-    EXPECT_EQ(1, unresolvedTokenIndex);
-    EXPECT_TRUE(Pointer("/foo/a").Get(d, &unresolvedTokenIndex) == 0); // "/foo" is an array, cannot query by "a"
-    EXPECT_EQ(1, unresolvedTokenIndex);
-    EXPECT_TRUE(Pointer("/foo/0/0").Get(d, &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
-    EXPECT_EQ(2, unresolvedTokenIndex);
-    EXPECT_TRUE(Pointer("/foo/0/a").Get(d, &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
-    EXPECT_EQ(2, unresolvedTokenIndex);
-}
-
-TEST(Pointer, GetWithDefault) {
-    Document d;
-    d.Parse(kJson);
-
-    // Value version
-    Document::AllocatorType& a = d.GetAllocator();
-    const Value v("qux");
-    EXPECT_TRUE(Value("bar") == Pointer("/foo/0").GetWithDefault(d, v, a));
-    EXPECT_TRUE(Value("baz") == Pointer("/foo/1").GetWithDefault(d, v, a));
-    EXPECT_TRUE(Value("qux") == Pointer("/foo/2").GetWithDefault(d, v, a));
-    EXPECT_TRUE(Value("last") == Pointer("/foo/-").GetWithDefault(d, Value("last").Move(), a));
-    EXPECT_STREQ("last", d["foo"][3].GetString());
-
-    EXPECT_TRUE(Pointer("/foo/null").GetWithDefault(d, Value().Move(), a).IsNull());
-    EXPECT_TRUE(Pointer("/foo/null").GetWithDefault(d, "x", a).IsNull());
-
-    // Generic version
-    EXPECT_EQ(-1, Pointer("/foo/int").GetWithDefault(d, -1, a).GetInt());
-    EXPECT_EQ(-1, Pointer("/foo/int").GetWithDefault(d, -2, a).GetInt());
-    EXPECT_EQ(0x87654321, Pointer("/foo/uint").GetWithDefault(d, 0x87654321, a).GetUint());
-    EXPECT_EQ(0x87654321, Pointer("/foo/uint").GetWithDefault(d, 0x12345678, a).GetUint());
-
-    const int64_t i64 = static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0));
-    EXPECT_EQ(i64, Pointer("/foo/int64").GetWithDefault(d, i64, a).GetInt64());
-    EXPECT_EQ(i64, Pointer("/foo/int64").GetWithDefault(d, i64 + 1, a).GetInt64());
-
-    const uint64_t u64 = RAPIDJSON_UINT64_C2(0xFFFFFFFFF, 0xFFFFFFFFF);
-    EXPECT_EQ(u64, Pointer("/foo/uint64").GetWithDefault(d, u64, a).GetUint64());
-    EXPECT_EQ(u64, Pointer("/foo/uint64").GetWithDefault(d, u64 - 1, a).GetUint64());
-
-    EXPECT_TRUE(Pointer("/foo/true").GetWithDefault(d, true, a).IsTrue());
-    EXPECT_TRUE(Pointer("/foo/true").GetWithDefault(d, false, a).IsTrue());
-
-    EXPECT_TRUE(Pointer("/foo/false").GetWithDefault(d, false, a).IsFalse());
-    EXPECT_TRUE(Pointer("/foo/false").GetWithDefault(d, true, a).IsFalse());
-
-    // StringRef version
-    EXPECT_STREQ("Hello", Pointer("/foo/hello").GetWithDefault(d, "Hello", a).GetString());
-
-    // Copy string version
-    {
-        char buffer[256];
-        strcpy(buffer, "World");
-        EXPECT_STREQ("World", Pointer("/foo/world").GetWithDefault(d, buffer, a).GetString());
-        memset(buffer, 0, sizeof(buffer));
-    }
-    EXPECT_STREQ("World", GetValueByPointer(d, "/foo/world")->GetString());
-
-#if RAPIDJSON_HAS_STDSTRING
-    EXPECT_STREQ("C++", Pointer("/foo/C++").GetWithDefault(d, std::string("C++"), a).GetString());
-#endif
-}
-
-TEST(Pointer, GetWithDefault_NoAllocator) {
-    Document d;
-    d.Parse(kJson);
-
-    // Value version
-    const Value v("qux");
-    EXPECT_TRUE(Value("bar") == Pointer("/foo/0").GetWithDefault(d, v));
-    EXPECT_TRUE(Value("baz") == Pointer("/foo/1").GetWithDefault(d, v));
-    EXPECT_TRUE(Value("qux") == Pointer("/foo/2").GetWithDefault(d, v));
-    EXPECT_TRUE(Value("last") == Pointer("/foo/-").GetWithDefault(d, Value("last").Move()));
-    EXPECT_STREQ("last", d["foo"][3].GetString());
-
-    EXPECT_TRUE(Pointer("/foo/null").GetWithDefault(d, Value().Move()).IsNull());
-    EXPECT_TRUE(Pointer("/foo/null").GetWithDefault(d, "x").IsNull());
-
-    // Generic version
-    EXPECT_EQ(-1, Pointer("/foo/int").GetWithDefault(d, -1).GetInt());
-    EXPECT_EQ(-1, Pointer("/foo/int").GetWithDefault(d, -2).GetInt());
-    EXPECT_EQ(0x87654321, Pointer("/foo/uint").GetWithDefault(d, 0x87654321).GetUint());
-    EXPECT_EQ(0x87654321, Pointer("/foo/uint").GetWithDefault(d, 0x12345678).GetUint());
-
-    const int64_t i64 = static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0));
-    EXPECT_EQ(i64, Pointer("/foo/int64").GetWithDefault(d, i64).GetInt64());
-    EXPECT_EQ(i64, Pointer("/foo/int64").GetWithDefault(d, i64 + 1).GetInt64());
-
-    const uint64_t u64 = RAPIDJSON_UINT64_C2(0xFFFFFFFFF, 0xFFFFFFFFF);
-    EXPECT_EQ(u64, Pointer("/foo/uint64").GetWithDefault(d, u64).GetUint64());
-    EXPECT_EQ(u64, Pointer("/foo/uint64").GetWithDefault(d, u64 - 1).GetUint64());
-
-    EXPECT_TRUE(Pointer("/foo/true").GetWithDefault(d, true).IsTrue());
-    EXPECT_TRUE(Pointer("/foo/true").GetWithDefault(d, false).IsTrue());
-
-    EXPECT_TRUE(Pointer("/foo/false").GetWithDefault(d, false).IsFalse());
-    EXPECT_TRUE(Pointer("/foo/false").GetWithDefault(d, true).IsFalse());
-
-    // StringRef version
-    EXPECT_STREQ("Hello", Pointer("/foo/hello").GetWithDefault(d, "Hello").GetString());
-
-    // Copy string version
-    {
-        char buffer[256];
-        strcpy(buffer, "World");
-        EXPECT_STREQ("World", Pointer("/foo/world").GetWithDefault(d, buffer).GetString());
-        memset(buffer, 0, sizeof(buffer));
-    }
-    EXPECT_STREQ("World", GetValueByPointer(d, "/foo/world")->GetString());
-
-#if RAPIDJSON_HAS_STDSTRING
-    EXPECT_STREQ("C++", Pointer("/foo/C++").GetWithDefault(d, std::string("C++")).GetString());
-#endif
-}
-
-TEST(Pointer, Set) {
-    Document d;
-    d.Parse(kJson);
-    Document::AllocatorType& a = d.GetAllocator();
-    
-    // Value version
-    Pointer("/foo/0").Set(d, Value(123).Move(), a);
-    EXPECT_EQ(123, d["foo"][0].GetInt());
-
-    Pointer("/foo/-").Set(d, Value(456).Move(), a);
-    EXPECT_EQ(456, d["foo"][2].GetInt());
-
-    Pointer("/foo/null").Set(d, Value().Move(), a);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/null")->IsNull());
-
-    // Const Value version
-    const Value foo(d["foo"], a);
-    Pointer("/clone").Set(d, foo, a);
-    EXPECT_EQ(foo, *GetValueByPointer(d, "/clone"));
-
-    // Generic version
-    Pointer("/foo/int").Set(d, -1, a);
-    EXPECT_EQ(-1, GetValueByPointer(d, "/foo/int")->GetInt());
-
-    Pointer("/foo/uint").Set(d, 0x87654321, a);
-    EXPECT_EQ(0x87654321, GetValueByPointer(d, "/foo/uint")->GetUint());
-
-    const int64_t i64 = static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0));
-    Pointer("/foo/int64").Set(d, i64, a);
-    EXPECT_EQ(i64, GetValueByPointer(d, "/foo/int64")->GetInt64());
-
-    const uint64_t u64 = RAPIDJSON_UINT64_C2(0xFFFFFFFFF, 0xFFFFFFFFF);
-    Pointer("/foo/uint64").Set(d, u64, a);
-    EXPECT_EQ(u64, GetValueByPointer(d, "/foo/uint64")->GetUint64());
-
-    Pointer("/foo/true").Set(d, true, a);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/true")->IsTrue());
-
-    Pointer("/foo/false").Set(d, false, a);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/false")->IsFalse());
-
-    // StringRef version
-    Pointer("/foo/hello").Set(d, "Hello", a);
-    EXPECT_STREQ("Hello", GetValueByPointer(d, "/foo/hello")->GetString());
-
-    // Copy string version
-    {
-        char buffer[256];
-        strcpy(buffer, "World");
-        Pointer("/foo/world").Set(d, buffer, a);
-        memset(buffer, 0, sizeof(buffer));
-    }
-    EXPECT_STREQ("World", GetValueByPointer(d, "/foo/world")->GetString());
-
-#if RAPIDJSON_HAS_STDSTRING
-    Pointer("/foo/c++").Set(d, std::string("C++"), a);
-    EXPECT_STREQ("C++", GetValueByPointer(d, "/foo/c++")->GetString());
-#endif
-}
-
-TEST(Pointer, Set_NoAllocator) {
-    Document d;
-    d.Parse(kJson);
-    
-    // Value version
-    Pointer("/foo/0").Set(d, Value(123).Move());
-    EXPECT_EQ(123, d["foo"][0].GetInt());
-
-    Pointer("/foo/-").Set(d, Value(456).Move());
-    EXPECT_EQ(456, d["foo"][2].GetInt());
-
-    Pointer("/foo/null").Set(d, Value().Move());
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/null")->IsNull());
-
-    // Const Value version
-    const Value foo(d["foo"], d.GetAllocator());
-    Pointer("/clone").Set(d, foo);
-    EXPECT_EQ(foo, *GetValueByPointer(d, "/clone"));
-
-    // Generic version
-    Pointer("/foo/int").Set(d, -1);
-    EXPECT_EQ(-1, GetValueByPointer(d, "/foo/int")->GetInt());
-
-    Pointer("/foo/uint").Set(d, 0x87654321);
-    EXPECT_EQ(0x87654321, GetValueByPointer(d, "/foo/uint")->GetUint());
-
-    const int64_t i64 = static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0));
-    Pointer("/foo/int64").Set(d, i64);
-    EXPECT_EQ(i64, GetValueByPointer(d, "/foo/int64")->GetInt64());
-
-    const uint64_t u64 = RAPIDJSON_UINT64_C2(0xFFFFFFFFF, 0xFFFFFFFFF);
-    Pointer("/foo/uint64").Set(d, u64);
-    EXPECT_EQ(u64, GetValueByPointer(d, "/foo/uint64")->GetUint64());
-
-    Pointer("/foo/true").Set(d, true);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/true")->IsTrue());
-
-    Pointer("/foo/false").Set(d, false);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/false")->IsFalse());
-
-    // StringRef version
-    Pointer("/foo/hello").Set(d, "Hello");
-    EXPECT_STREQ("Hello", GetValueByPointer(d, "/foo/hello")->GetString());
-
-    // Copy string version
-    {
-        char buffer[256];
-        strcpy(buffer, "World");
-        Pointer("/foo/world").Set(d, buffer);
-        memset(buffer, 0, sizeof(buffer));
-    }
-    EXPECT_STREQ("World", GetValueByPointer(d, "/foo/world")->GetString());
-
-#if RAPIDJSON_HAS_STDSTRING
-    Pointer("/foo/c++").Set(d, std::string("C++"));
-    EXPECT_STREQ("C++", GetValueByPointer(d, "/foo/c++")->GetString());
-#endif
-}
-
-TEST(Pointer, Swap) {
-    Document d;
-    d.Parse(kJson);
-    Document::AllocatorType& a = d.GetAllocator();
-    Pointer("/foo/0").Swap(d, *Pointer("/foo/1").Get(d), a);
-    EXPECT_STREQ("baz", d["foo"][0].GetString());
-    EXPECT_STREQ("bar", d["foo"][1].GetString());
-}
-
-TEST(Pointer, Swap_NoAllocator) {
-    Document d;
-    d.Parse(kJson);
-    Pointer("/foo/0").Swap(d, *Pointer("/foo/1").Get(d));
-    EXPECT_STREQ("baz", d["foo"][0].GetString());
-    EXPECT_STREQ("bar", d["foo"][1].GetString());
-}
-
-TEST(Pointer, Erase) {
-    Document d;
-    d.Parse(kJson);
-
-    EXPECT_FALSE(Pointer("").Erase(d));
-    EXPECT_FALSE(Pointer("/nonexist").Erase(d));
-    EXPECT_FALSE(Pointer("/nonexist/nonexist").Erase(d));
-    EXPECT_FALSE(Pointer("/foo/nonexist").Erase(d));
-    EXPECT_FALSE(Pointer("/foo/nonexist/nonexist").Erase(d));
-    EXPECT_FALSE(Pointer("/foo/0/nonexist").Erase(d));
-    EXPECT_FALSE(Pointer("/foo/0/nonexist/nonexist").Erase(d));
-    EXPECT_FALSE(Pointer("/foo/2/nonexist").Erase(d));
-    EXPECT_TRUE(Pointer("/foo/0").Erase(d));
-    EXPECT_EQ(1u, d["foo"].Size());
-    EXPECT_STREQ("baz", d["foo"][0].GetString());
-    EXPECT_TRUE(Pointer("/foo/0").Erase(d));
-    EXPECT_TRUE(d["foo"].Empty());
-    EXPECT_TRUE(Pointer("/foo").Erase(d));
-    EXPECT_TRUE(Pointer("/foo").Get(d) == 0);
-
-    Pointer("/a/0/b/0").Create(d);
-
-    EXPECT_TRUE(Pointer("/a/0/b/0").Get(d) != 0);
-    EXPECT_TRUE(Pointer("/a/0/b/0").Erase(d));
-    EXPECT_TRUE(Pointer("/a/0/b/0").Get(d) == 0);
-
-    EXPECT_TRUE(Pointer("/a/0/b").Get(d) != 0);
-    EXPECT_TRUE(Pointer("/a/0/b").Erase(d));
-    EXPECT_TRUE(Pointer("/a/0/b").Get(d) == 0);
-
-    EXPECT_TRUE(Pointer("/a/0").Get(d) != 0);
-    EXPECT_TRUE(Pointer("/a/0").Erase(d));
-    EXPECT_TRUE(Pointer("/a/0").Get(d) == 0);
-
-    EXPECT_TRUE(Pointer("/a").Get(d) != 0);
-    EXPECT_TRUE(Pointer("/a").Erase(d));
-    EXPECT_TRUE(Pointer("/a").Get(d) == 0);
-}
-
-TEST(Pointer, CreateValueByPointer) {
-    Document d;
-    Document::AllocatorType& a = d.GetAllocator();
-
-    {
-        Value& v = CreateValueByPointer(d, Pointer("/foo/0"), a);
-        EXPECT_EQ(&d["foo"][0], &v);
-    }
-    {
-        Value& v = CreateValueByPointer(d, "/foo/1", a);
-        EXPECT_EQ(&d["foo"][1], &v);
-    }
-}
-
-TEST(Pointer, CreateValueByPointer_NoAllocator) {
-    Document d;
-
-    {
-        Value& v = CreateValueByPointer(d, Pointer("/foo/0"));
-        EXPECT_EQ(&d["foo"][0], &v);
-    }
-    {
-        Value& v = CreateValueByPointer(d, "/foo/1");
-        EXPECT_EQ(&d["foo"][1], &v);
-    }
-}
-
-TEST(Pointer, GetValueByPointer) {
-    Document d;
-    d.Parse(kJson);
-
-    EXPECT_EQ(&d["foo"][0], GetValueByPointer(d, Pointer("/foo/0")));
-    EXPECT_EQ(&d["foo"][0], GetValueByPointer(d, "/foo/0"));
-
-    size_t unresolvedTokenIndex;
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/2", &unresolvedTokenIndex) == 0); // Out of boundary
-    EXPECT_EQ(1, unresolvedTokenIndex);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/a", &unresolvedTokenIndex) == 0); // "/foo" is an array, cannot query by "a"
-    EXPECT_EQ(1, unresolvedTokenIndex);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/0/0", &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
-    EXPECT_EQ(2, unresolvedTokenIndex);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/0/a", &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
-    EXPECT_EQ(2, unresolvedTokenIndex);
-
-    // const version
-    const Value& v = d;
-    EXPECT_EQ(&d["foo"][0], GetValueByPointer(v, Pointer("/foo/0")));
-    EXPECT_EQ(&d["foo"][0], GetValueByPointer(v, "/foo/0"));
-
-    EXPECT_TRUE(GetValueByPointer(v, "/foo/2", &unresolvedTokenIndex) == 0); // Out of boundary
-    EXPECT_EQ(1, unresolvedTokenIndex);
-    EXPECT_TRUE(GetValueByPointer(v, "/foo/a", &unresolvedTokenIndex) == 0); // "/foo" is an array, cannot query by "a"
-    EXPECT_EQ(1, unresolvedTokenIndex);
-    EXPECT_TRUE(GetValueByPointer(v, "/foo/0/0", &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
-    EXPECT_EQ(2, unresolvedTokenIndex);
-    EXPECT_TRUE(GetValueByPointer(v, "/foo/0/a", &unresolvedTokenIndex) == 0); // "/foo/0" is an string, cannot further query
-    EXPECT_EQ(2, unresolvedTokenIndex);
-
-}
-
-TEST(Pointer, GetValueByPointerWithDefault_Pointer) {
-    Document d;
-    d.Parse(kJson);
-
-    Document::AllocatorType& a = d.GetAllocator();
-    const Value v("qux");
-    EXPECT_TRUE(Value("bar") == GetValueByPointerWithDefault(d, Pointer("/foo/0"), v, a));
-    EXPECT_TRUE(Value("bar") == GetValueByPointerWithDefault(d, Pointer("/foo/0"), v, a));
-    EXPECT_TRUE(Value("baz") == GetValueByPointerWithDefault(d, Pointer("/foo/1"), v, a));
-    EXPECT_TRUE(Value("qux") == GetValueByPointerWithDefault(d, Pointer("/foo/2"), v, a));
-    EXPECT_TRUE(Value("last") == GetValueByPointerWithDefault(d, Pointer("/foo/-"), Value("last").Move(), a));
-    EXPECT_STREQ("last", d["foo"][3].GetString());
-
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, Pointer("/foo/null"), Value().Move(), a).IsNull());
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, Pointer("/foo/null"), "x", a).IsNull());
-
-    // Generic version
-    EXPECT_EQ(-1, GetValueByPointerWithDefault(d, Pointer("/foo/int"), -1, a).GetInt());
-    EXPECT_EQ(-1, GetValueByPointerWithDefault(d, Pointer("/foo/int"), -2, a).GetInt());
-    EXPECT_EQ(0x87654321, GetValueByPointerWithDefault(d, Pointer("/foo/uint"), 0x87654321, a).GetUint());
-    EXPECT_EQ(0x87654321, GetValueByPointerWithDefault(d, Pointer("/foo/uint"), 0x12345678, a).GetUint());
-
-    const int64_t i64 = static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0));
-    EXPECT_EQ(i64, GetValueByPointerWithDefault(d, Pointer("/foo/int64"), i64, a).GetInt64());
-    EXPECT_EQ(i64, GetValueByPointerWithDefault(d, Pointer("/foo/int64"), i64 + 1, a).GetInt64());
-
-    const uint64_t u64 = RAPIDJSON_UINT64_C2(0xFFFFFFFFF, 0xFFFFFFFFF);
-    EXPECT_EQ(u64, GetValueByPointerWithDefault(d, Pointer("/foo/uint64"), u64, a).GetUint64());
-    EXPECT_EQ(u64, GetValueByPointerWithDefault(d, Pointer("/foo/uint64"), u64 - 1, a).GetUint64());
-
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, Pointer("/foo/true"), true, a).IsTrue());
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, Pointer("/foo/true"), false, a).IsTrue());
-
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, Pointer("/foo/false"), false, a).IsFalse());
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, Pointer("/foo/false"), true, a).IsFalse());
-
-    // StringRef version
-    EXPECT_STREQ("Hello", GetValueByPointerWithDefault(d, Pointer("/foo/hello"), "Hello", a).GetString());
-
-    // Copy string version
-    {
-        char buffer[256];
-        strcpy(buffer, "World");
-        EXPECT_STREQ("World", GetValueByPointerWithDefault(d, Pointer("/foo/world"), buffer, a).GetString());
-        memset(buffer, 0, sizeof(buffer));
-    }
-    EXPECT_STREQ("World", GetValueByPointer(d, Pointer("/foo/world"))->GetString());
-
-#if RAPIDJSON_HAS_STDSTRING
-    EXPECT_STREQ("C++", GetValueByPointerWithDefault(d, Pointer("/foo/C++"), std::string("C++"), a).GetString());
-#endif
-}
-
-TEST(Pointer, GetValueByPointerWithDefault_String) {
-    Document d;
-    d.Parse(kJson);
-
-    Document::AllocatorType& a = d.GetAllocator();
-    const Value v("qux");
-    EXPECT_TRUE(Value("bar") == GetValueByPointerWithDefault(d, "/foo/0", v, a));
-    EXPECT_TRUE(Value("bar") == GetValueByPointerWithDefault(d, "/foo/0", v, a));
-    EXPECT_TRUE(Value("baz") == GetValueByPointerWithDefault(d, "/foo/1", v, a));
-    EXPECT_TRUE(Value("qux") == GetValueByPointerWithDefault(d, "/foo/2", v, a));
-    EXPECT_TRUE(Value("last") == GetValueByPointerWithDefault(d, "/foo/-", Value("last").Move(), a));
-    EXPECT_STREQ("last", d["foo"][3].GetString());
-
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, "/foo/null", Value().Move(), a).IsNull());
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, "/foo/null", "x", a).IsNull());
-
-    // Generic version
-    EXPECT_EQ(-1, GetValueByPointerWithDefault(d, "/foo/int", -1, a).GetInt());
-    EXPECT_EQ(-1, GetValueByPointerWithDefault(d, "/foo/int", -2, a).GetInt());
-    EXPECT_EQ(0x87654321, GetValueByPointerWithDefault(d, "/foo/uint", 0x87654321, a).GetUint());
-    EXPECT_EQ(0x87654321, GetValueByPointerWithDefault(d, "/foo/uint", 0x12345678, a).GetUint());
-
-    const int64_t i64 = static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0));
-    EXPECT_EQ(i64, GetValueByPointerWithDefault(d, "/foo/int64", i64, a).GetInt64());
-    EXPECT_EQ(i64, GetValueByPointerWithDefault(d, "/foo/int64", i64 + 1, a).GetInt64());
-
-    const uint64_t u64 = RAPIDJSON_UINT64_C2(0xFFFFFFFFF, 0xFFFFFFFFF);
-    EXPECT_EQ(u64, GetValueByPointerWithDefault(d, "/foo/uint64", u64, a).GetUint64());
-    EXPECT_EQ(u64, GetValueByPointerWithDefault(d, "/foo/uint64", u64 - 1, a).GetUint64());
-
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, "/foo/true", true, a).IsTrue());
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, "/foo/true", false, a).IsTrue());
-
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, "/foo/false", false, a).IsFalse());
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, "/foo/false", true, a).IsFalse());
-
-    // StringRef version
-    EXPECT_STREQ("Hello", GetValueByPointerWithDefault(d, "/foo/hello", "Hello", a).GetString());
-
-    // Copy string version
-    {
-        char buffer[256];
-        strcpy(buffer, "World");
-        EXPECT_STREQ("World", GetValueByPointerWithDefault(d, "/foo/world", buffer, a).GetString());
-        memset(buffer, 0, sizeof(buffer));
-    }
-    EXPECT_STREQ("World", GetValueByPointer(d, "/foo/world")->GetString());
-
-#if RAPIDJSON_HAS_STDSTRING
-    EXPECT_STREQ("C++", GetValueByPointerWithDefault(d, "/foo/C++", std::string("C++"), a).GetString());
-#endif
-}
-
-TEST(Pointer, GetValueByPointerWithDefault_Pointer_NoAllocator) {
-    Document d;
-    d.Parse(kJson);
-
-    const Value v("qux");
-    EXPECT_TRUE(Value("bar") == GetValueByPointerWithDefault(d, Pointer("/foo/0"), v));
-    EXPECT_TRUE(Value("bar") == GetValueByPointerWithDefault(d, Pointer("/foo/0"), v));
-    EXPECT_TRUE(Value("baz") == GetValueByPointerWithDefault(d, Pointer("/foo/1"), v));
-    EXPECT_TRUE(Value("qux") == GetValueByPointerWithDefault(d, Pointer("/foo/2"), v));
-    EXPECT_TRUE(Value("last") == GetValueByPointerWithDefault(d, Pointer("/foo/-"), Value("last").Move()));
-    EXPECT_STREQ("last", d["foo"][3].GetString());
-
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, Pointer("/foo/null"), Value().Move()).IsNull());
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, Pointer("/foo/null"), "x").IsNull());
-
-    // Generic version
-    EXPECT_EQ(-1, GetValueByPointerWithDefault(d, Pointer("/foo/int"), -1).GetInt());
-    EXPECT_EQ(-1, GetValueByPointerWithDefault(d, Pointer("/foo/int"), -2).GetInt());
-    EXPECT_EQ(0x87654321, GetValueByPointerWithDefault(d, Pointer("/foo/uint"), 0x87654321).GetUint());
-    EXPECT_EQ(0x87654321, GetValueByPointerWithDefault(d, Pointer("/foo/uint"), 0x12345678).GetUint());
-
-    const int64_t i64 = static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0));
-    EXPECT_EQ(i64, GetValueByPointerWithDefault(d, Pointer("/foo/int64"), i64).GetInt64());
-    EXPECT_EQ(i64, GetValueByPointerWithDefault(d, Pointer("/foo/int64"), i64 + 1).GetInt64());
-
-    const uint64_t u64 = RAPIDJSON_UINT64_C2(0xFFFFFFFFF, 0xFFFFFFFFF);
-    EXPECT_EQ(u64, GetValueByPointerWithDefault(d, Pointer("/foo/uint64"), u64).GetUint64());
-    EXPECT_EQ(u64, GetValueByPointerWithDefault(d, Pointer("/foo/uint64"), u64 - 1).GetUint64());
-
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, Pointer("/foo/true"), true).IsTrue());
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, Pointer("/foo/true"), false).IsTrue());
-
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, Pointer("/foo/false"), false).IsFalse());
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, Pointer("/foo/false"), true).IsFalse());
-
-    // StringRef version
-    EXPECT_STREQ("Hello", GetValueByPointerWithDefault(d, Pointer("/foo/hello"), "Hello").GetString());
-
-    // Copy string version
-    {
-        char buffer[256];
-        strcpy(buffer, "World");
-        EXPECT_STREQ("World", GetValueByPointerWithDefault(d, Pointer("/foo/world"), buffer).GetString());
-        memset(buffer, 0, sizeof(buffer));
-    }
-    EXPECT_STREQ("World", GetValueByPointer(d, Pointer("/foo/world"))->GetString());
-
-#if RAPIDJSON_HAS_STDSTRING
-    EXPECT_STREQ("C++", GetValueByPointerWithDefault(d, Pointer("/foo/C++"), std::string("C++")).GetString());
-#endif
-}
-
-TEST(Pointer, GetValueByPointerWithDefault_String_NoAllocator) {
-    Document d;
-    d.Parse(kJson);
-
-    const Value v("qux");
-    EXPECT_TRUE(Value("bar") == GetValueByPointerWithDefault(d, "/foo/0", v));
-    EXPECT_TRUE(Value("bar") == GetValueByPointerWithDefault(d, "/foo/0", v));
-    EXPECT_TRUE(Value("baz") == GetValueByPointerWithDefault(d, "/foo/1", v));
-    EXPECT_TRUE(Value("qux") == GetValueByPointerWithDefault(d, "/foo/2", v));
-    EXPECT_TRUE(Value("last") == GetValueByPointerWithDefault(d, "/foo/-", Value("last").Move()));
-    EXPECT_STREQ("last", d["foo"][3].GetString());
-
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, "/foo/null", Value().Move()).IsNull());
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, "/foo/null", "x").IsNull());
-
-    // Generic version
-    EXPECT_EQ(-1, GetValueByPointerWithDefault(d, "/foo/int", -1).GetInt());
-    EXPECT_EQ(-1, GetValueByPointerWithDefault(d, "/foo/int", -2).GetInt());
-    EXPECT_EQ(0x87654321, GetValueByPointerWithDefault(d, "/foo/uint", 0x87654321).GetUint());
-    EXPECT_EQ(0x87654321, GetValueByPointerWithDefault(d, "/foo/uint", 0x12345678).GetUint());
-
-    const int64_t i64 = static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0));
-    EXPECT_EQ(i64, GetValueByPointerWithDefault(d, "/foo/int64", i64).GetInt64());
-    EXPECT_EQ(i64, GetValueByPointerWithDefault(d, "/foo/int64", i64 + 1).GetInt64());
-
-    const uint64_t u64 = RAPIDJSON_UINT64_C2(0xFFFFFFFFF, 0xFFFFFFFFF);
-    EXPECT_EQ(u64, GetValueByPointerWithDefault(d, "/foo/uint64", u64).GetUint64());
-    EXPECT_EQ(u64, GetValueByPointerWithDefault(d, "/foo/uint64", u64 - 1).GetUint64());
-
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, "/foo/true", true).IsTrue());
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, "/foo/true", false).IsTrue());
-
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, "/foo/false", false).IsFalse());
-    EXPECT_TRUE(GetValueByPointerWithDefault(d, "/foo/false", true).IsFalse());
-
-    // StringRef version
-    EXPECT_STREQ("Hello", GetValueByPointerWithDefault(d, "/foo/hello", "Hello").GetString());
-
-    // Copy string version
-    {
-        char buffer[256];
-        strcpy(buffer, "World");
-        EXPECT_STREQ("World", GetValueByPointerWithDefault(d, "/foo/world", buffer).GetString());
-        memset(buffer, 0, sizeof(buffer));
-    }
-    EXPECT_STREQ("World", GetValueByPointer(d, "/foo/world")->GetString());
-
-#if RAPIDJSON_HAS_STDSTRING
-    EXPECT_STREQ("C++", GetValueByPointerWithDefault(d, Pointer("/foo/C++"), std::string("C++")).GetString());
-#endif
-}
-
-TEST(Pointer, SetValueByPointer_Pointer) {
-    Document d;
-    d.Parse(kJson);
-    Document::AllocatorType& a = d.GetAllocator();
-
-    // Value version
-    SetValueByPointer(d, Pointer("/foo/0"), Value(123).Move(), a);
-    EXPECT_EQ(123, d["foo"][0].GetInt());
-
-    SetValueByPointer(d, Pointer("/foo/null"), Value().Move(), a);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/null")->IsNull());
-
-    // Const Value version
-    const Value foo(d["foo"], d.GetAllocator());
-    SetValueByPointer(d, Pointer("/clone"), foo, a);
-    EXPECT_EQ(foo, *GetValueByPointer(d, "/clone"));
-
-    // Generic version
-    SetValueByPointer(d, Pointer("/foo/int"), -1, a);
-    EXPECT_EQ(-1, GetValueByPointer(d, "/foo/int")->GetInt());
-
-    SetValueByPointer(d, Pointer("/foo/uint"), 0x87654321, a);
-    EXPECT_EQ(0x87654321, GetValueByPointer(d, "/foo/uint")->GetUint());
-
-    const int64_t i64 = static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0));
-    SetValueByPointer(d, Pointer("/foo/int64"), i64, a);
-    EXPECT_EQ(i64, GetValueByPointer(d, "/foo/int64")->GetInt64());
-
-    const uint64_t u64 = RAPIDJSON_UINT64_C2(0xFFFFFFFFF, 0xFFFFFFFFF);
-    SetValueByPointer(d, Pointer("/foo/uint64"), u64, a);
-    EXPECT_EQ(u64, GetValueByPointer(d, "/foo/uint64")->GetUint64());
-
-    SetValueByPointer(d, Pointer("/foo/true"), true, a);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/true")->IsTrue());
-
-    SetValueByPointer(d, Pointer("/foo/false"), false, a);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/false")->IsFalse());
-
-    // StringRef version
-    SetValueByPointer(d, Pointer("/foo/hello"), "Hello", a);
-    EXPECT_STREQ("Hello", GetValueByPointer(d, "/foo/hello")->GetString());
-
-    // Copy string version
-    {
-        char buffer[256];
-        strcpy(buffer, "World");
-        SetValueByPointer(d, Pointer("/foo/world"), buffer, a);
-        memset(buffer, 0, sizeof(buffer));
-    }
-    EXPECT_STREQ("World", GetValueByPointer(d, "/foo/world")->GetString());
-
-#if RAPIDJSON_HAS_STDSTRING
-    SetValueByPointer(d, Pointer("/foo/c++"), std::string("C++"), a);
-    EXPECT_STREQ("C++", GetValueByPointer(d, "/foo/c++")->GetString());
-#endif
-}
-
-TEST(Pointer, SetValueByPointer_String) {
-    Document d;
-    d.Parse(kJson);
-    Document::AllocatorType& a = d.GetAllocator();
-
-    // Value version
-    SetValueByPointer(d, "/foo/0", Value(123).Move(), a);
-    EXPECT_EQ(123, d["foo"][0].GetInt());
-
-    SetValueByPointer(d, "/foo/null", Value().Move(), a);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/null")->IsNull());
-
-    // Const Value version
-    const Value foo(d["foo"], d.GetAllocator());
-    SetValueByPointer(d, "/clone", foo, a);
-    EXPECT_EQ(foo, *GetValueByPointer(d, "/clone"));
-
-    // Generic version
-    SetValueByPointer(d, "/foo/int", -1, a);
-    EXPECT_EQ(-1, GetValueByPointer(d, "/foo/int")->GetInt());
-
-    SetValueByPointer(d, "/foo/uint", 0x87654321, a);
-    EXPECT_EQ(0x87654321, GetValueByPointer(d, "/foo/uint")->GetUint());
-
-    const int64_t i64 = static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0));
-    SetValueByPointer(d, "/foo/int64", i64, a);
-    EXPECT_EQ(i64, GetValueByPointer(d, "/foo/int64")->GetInt64());
-
-    const uint64_t u64 = RAPIDJSON_UINT64_C2(0xFFFFFFFFF, 0xFFFFFFFFF);
-    SetValueByPointer(d, "/foo/uint64", u64, a);
-    EXPECT_EQ(u64, GetValueByPointer(d, "/foo/uint64")->GetUint64());
-
-    SetValueByPointer(d, "/foo/true", true, a);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/true")->IsTrue());
-
-    SetValueByPointer(d, "/foo/false", false, a);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/false")->IsFalse());
-
-    // StringRef version
-    SetValueByPointer(d, "/foo/hello", "Hello", a);
-    EXPECT_STREQ("Hello", GetValueByPointer(d, "/foo/hello")->GetString());
-
-    // Copy string version
-    {
-        char buffer[256];
-        strcpy(buffer, "World");
-        SetValueByPointer(d, "/foo/world", buffer, a);
-        memset(buffer, 0, sizeof(buffer));
-    }
-    EXPECT_STREQ("World", GetValueByPointer(d, "/foo/world")->GetString());
-
-#if RAPIDJSON_HAS_STDSTRING
-    SetValueByPointer(d, "/foo/c++", std::string("C++"), a);
-    EXPECT_STREQ("C++", GetValueByPointer(d, "/foo/c++")->GetString());
-#endif
-}
-
-TEST(Pointer, SetValueByPointer_Pointer_NoAllocator) {
-    Document d;
-    d.Parse(kJson);
-
-    // Value version
-    SetValueByPointer(d, Pointer("/foo/0"), Value(123).Move());
-    EXPECT_EQ(123, d["foo"][0].GetInt());
-
-    SetValueByPointer(d, Pointer("/foo/null"), Value().Move());
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/null")->IsNull());
-
-    // Const Value version
-    const Value foo(d["foo"], d.GetAllocator());
-    SetValueByPointer(d, Pointer("/clone"), foo);
-    EXPECT_EQ(foo, *GetValueByPointer(d, "/clone"));
-
-    // Generic version
-    SetValueByPointer(d, Pointer("/foo/int"), -1);
-    EXPECT_EQ(-1, GetValueByPointer(d, "/foo/int")->GetInt());
-
-    SetValueByPointer(d, Pointer("/foo/uint"), 0x87654321);
-    EXPECT_EQ(0x87654321, GetValueByPointer(d, "/foo/uint")->GetUint());
-
-    const int64_t i64 = static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0));
-    SetValueByPointer(d, Pointer("/foo/int64"), i64);
-    EXPECT_EQ(i64, GetValueByPointer(d, "/foo/int64")->GetInt64());
-
-    const uint64_t u64 = RAPIDJSON_UINT64_C2(0xFFFFFFFFF, 0xFFFFFFFFF);
-    SetValueByPointer(d, Pointer("/foo/uint64"), u64);
-    EXPECT_EQ(u64, GetValueByPointer(d, "/foo/uint64")->GetUint64());
-
-    SetValueByPointer(d, Pointer("/foo/true"), true);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/true")->IsTrue());
-
-    SetValueByPointer(d, Pointer("/foo/false"), false);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/false")->IsFalse());
-
-    // StringRef version
-    SetValueByPointer(d, Pointer("/foo/hello"), "Hello");
-    EXPECT_STREQ("Hello", GetValueByPointer(d, "/foo/hello")->GetString());
-
-    // Copy string version
-    {
-        char buffer[256];
-        strcpy(buffer, "World");
-        SetValueByPointer(d, Pointer("/foo/world"), buffer);
-        memset(buffer, 0, sizeof(buffer));
-    }
-    EXPECT_STREQ("World", GetValueByPointer(d, "/foo/world")->GetString());
-
-#if RAPIDJSON_HAS_STDSTRING
-    SetValueByPointer(d, Pointer("/foo/c++"), std::string("C++"));
-    EXPECT_STREQ("C++", GetValueByPointer(d, "/foo/c++")->GetString());
-#endif
-}
-
-TEST(Pointer, SetValueByPointer_String_NoAllocator) {
-    Document d;
-    d.Parse(kJson);
-
-    // Value version
-    SetValueByPointer(d, "/foo/0", Value(123).Move());
-    EXPECT_EQ(123, d["foo"][0].GetInt());
-
-    SetValueByPointer(d, "/foo/null", Value().Move());
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/null")->IsNull());
-
-    // Const Value version
-    const Value foo(d["foo"], d.GetAllocator());
-    SetValueByPointer(d, "/clone", foo);
-    EXPECT_EQ(foo, *GetValueByPointer(d, "/clone"));
-
-    // Generic version
-    SetValueByPointer(d, "/foo/int", -1);
-    EXPECT_EQ(-1, GetValueByPointer(d, "/foo/int")->GetInt());
-
-    SetValueByPointer(d, "/foo/uint", 0x87654321);
-    EXPECT_EQ(0x87654321, GetValueByPointer(d, "/foo/uint")->GetUint());
-
-    const int64_t i64 = static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0));
-    SetValueByPointer(d, "/foo/int64", i64);
-    EXPECT_EQ(i64, GetValueByPointer(d, "/foo/int64")->GetInt64());
-
-    const uint64_t u64 = RAPIDJSON_UINT64_C2(0xFFFFFFFFF, 0xFFFFFFFFF);
-    SetValueByPointer(d, "/foo/uint64", u64);
-    EXPECT_EQ(u64, GetValueByPointer(d, "/foo/uint64")->GetUint64());
-
-    SetValueByPointer(d, "/foo/true", true);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/true")->IsTrue());
-
-    SetValueByPointer(d, "/foo/false", false);
-    EXPECT_TRUE(GetValueByPointer(d, "/foo/false")->IsFalse());
-
-    // StringRef version
-    SetValueByPointer(d, "/foo/hello", "Hello");
-    EXPECT_STREQ("Hello", GetValueByPointer(d, "/foo/hello")->GetString());
-
-    // Copy string version
-    {
-        char buffer[256];
-        strcpy(buffer, "World");
-        SetValueByPointer(d, "/foo/world", buffer);
-        memset(buffer, 0, sizeof(buffer));
-    }
-    EXPECT_STREQ("World", GetValueByPointer(d, "/foo/world")->GetString());
-
-#if RAPIDJSON_HAS_STDSTRING
-    SetValueByPointer(d, "/foo/c++", std::string("C++"));
-    EXPECT_STREQ("C++", GetValueByPointer(d, "/foo/c++")->GetString());
-#endif
-}
-
-TEST(Pointer, SwapValueByPointer) {
-    Document d;
-    d.Parse(kJson);
-    Document::AllocatorType& a = d.GetAllocator();
-    SwapValueByPointer(d, Pointer("/foo/0"), *GetValueByPointer(d, "/foo/1"), a);
-    EXPECT_STREQ("baz", d["foo"][0].GetString());
-    EXPECT_STREQ("bar", d["foo"][1].GetString());
-
-    SwapValueByPointer(d, "/foo/0", *GetValueByPointer(d, "/foo/1"), a);
-    EXPECT_STREQ("bar", d["foo"][0].GetString());
-    EXPECT_STREQ("baz", d["foo"][1].GetString());
-}
-
-TEST(Pointer, SwapValueByPointer_NoAllocator) {
-    Document d;
-    d.Parse(kJson);
-    SwapValueByPointer(d, Pointer("/foo/0"), *GetValueByPointer(d, "/foo/1"));
-    EXPECT_STREQ("baz", d["foo"][0].GetString());
-    EXPECT_STREQ("bar", d["foo"][1].GetString());
-
-    SwapValueByPointer(d, "/foo/0", *GetValueByPointer(d, "/foo/1"));
-    EXPECT_STREQ("bar", d["foo"][0].GetString());
-    EXPECT_STREQ("baz", d["foo"][1].GetString());
-}
-
-TEST(Pointer, EraseValueByPointer_Pointer) {
-    Document d;
-    d.Parse(kJson);
-
-    EXPECT_FALSE(EraseValueByPointer(d, Pointer("")));
-    EXPECT_FALSE(Pointer("/foo/nonexist").Erase(d));
-    EXPECT_TRUE(EraseValueByPointer(d, Pointer("/foo/0")));
-    EXPECT_EQ(1u, d["foo"].Size());
-    EXPECT_STREQ("baz", d["foo"][0].GetString());
-    EXPECT_TRUE(EraseValueByPointer(d, Pointer("/foo/0")));
-    EXPECT_TRUE(d["foo"].Empty());
-    EXPECT_TRUE(EraseValueByPointer(d, Pointer("/foo")));
-    EXPECT_TRUE(Pointer("/foo").Get(d) == 0);
-}
-
-TEST(Pointer, EraseValueByPointer_String) {
-    Document d;
-    d.Parse(kJson);
-
-    EXPECT_FALSE(EraseValueByPointer(d, ""));
-    EXPECT_FALSE(Pointer("/foo/nonexist").Erase(d));
-    EXPECT_TRUE(EraseValueByPointer(d, "/foo/0"));
-    EXPECT_EQ(1u, d["foo"].Size());
-    EXPECT_STREQ("baz", d["foo"][0].GetString());
-    EXPECT_TRUE(EraseValueByPointer(d, "/foo/0"));
-    EXPECT_TRUE(d["foo"].Empty());
-    EXPECT_TRUE(EraseValueByPointer(d, "/foo"));
-    EXPECT_TRUE(Pointer("/foo").Get(d) == 0);
-}
-
-TEST(Pointer, Ambiguity) {
-    {
-        Document d;
-        d.Parse("{\"0\" : [123]}");
-        EXPECT_EQ(123, Pointer("/0/0").Get(d)->GetInt());
-        Pointer("/0/a").Set(d, 456);    // Change array [123] to object {456}
-        EXPECT_EQ(456, Pointer("/0/a").Get(d)->GetInt());
-    }
-
-    {
-        Document d;
-        EXPECT_FALSE(d.Parse("[{\"0\": 123}]").HasParseError());
-        EXPECT_EQ(123, Pointer("/0/0").Get(d)->GetInt());
-        Pointer("/0/1").Set(d, 456); // 1 is treated as "1" to index object
-        EXPECT_EQ(123, Pointer("/0/0").Get(d)->GetInt());
-        EXPECT_EQ(456, Pointer("/0/1").Get(d)->GetInt());
-    }
-}
-
-// https://github.com/Tencent/rapidjson/issues/483
-namespace myjson {
-
-class MyAllocator
-{
-public:
-    static const bool kNeedFree = true;
-    void * Malloc(size_t _size) { return malloc(_size); }
-    void * Realloc(void *_org_p, size_t _org_size, size_t _new_size) { (void)_org_size; return realloc(_org_p, _new_size); }
-    static void Free(void *_p) { return free(_p); }
-};
-
-typedef rapidjson::GenericDocument<
-            rapidjson::UTF8<>,
-            rapidjson::MemoryPoolAllocator< MyAllocator >,
-            MyAllocator
-        > Document;
-
-typedef rapidjson::GenericPointer<
-            ::myjson::Document::ValueType,
-            MyAllocator
-        > Pointer;
-
-typedef ::myjson::Document::ValueType Value;
-
-}
-
-TEST(Pointer, Issue483) {
-    std::string mystr, path;
-    myjson::Document document;
-    myjson::Value value(rapidjson::kStringType);
-    value.SetString(mystr.c_str(), static_cast<SizeType>(mystr.length()), document.GetAllocator());
-    myjson::Pointer(path.c_str()).Set(document, value, document.GetAllocator());
-}
diff --git a/src/sioclient/lib/rapidjson/test/unittest/prettywritertest.cpp b/src/sioclient/lib/rapidjson/test/unittest/prettywritertest.cpp
deleted file mode 100644
index 43617a2f..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/prettywritertest.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/reader.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/filewritestream.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-using namespace rapidjson;
-
-static const char kJson[] = "{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3,-1],\"u64\":1234567890123456789,\"i64\":-1234567890123456789}";
-static const char kPrettyJson[] =
-"{\n"
-"    \"hello\": \"world\",\n"
-"    \"t\": true,\n"
-"    \"f\": false,\n"
-"    \"n\": null,\n"
-"    \"i\": 123,\n"
-"    \"pi\": 3.1416,\n"
-"    \"a\": [\n"
-"        1,\n"
-"        2,\n"
-"        3,\n"
-"        -1\n"
-"    ],\n"
-"    \"u64\": 1234567890123456789,\n"
-"    \"i64\": -1234567890123456789\n"
-"}";
-
-static const char kPrettyJson_FormatOptions_SLA[] =
-"{\n"
-"    \"hello\": \"world\",\n"
-"    \"t\": true,\n"
-"    \"f\": false,\n"
-"    \"n\": null,\n"
-"    \"i\": 123,\n"
-"    \"pi\": 3.1416,\n"
-"    \"a\": [1, 2, 3, -1],\n"
-"    \"u64\": 1234567890123456789,\n"
-"    \"i64\": -1234567890123456789\n"
-"}";
-
-TEST(PrettyWriter, Basic) {
-    StringBuffer buffer;
-    PrettyWriter<StringBuffer> writer(buffer);
-    Reader reader;
-    StringStream s(kJson);
-    reader.Parse(s, writer);
-    EXPECT_STREQ(kPrettyJson, buffer.GetString());
-}
-
-TEST(PrettyWriter, FormatOptions) {
-    StringBuffer buffer;
-    PrettyWriter<StringBuffer> writer(buffer);
-    writer.SetFormatOptions(kFormatSingleLineArray);
-    Reader reader;
-    StringStream s(kJson);
-    reader.Parse(s, writer);
-    EXPECT_STREQ(kPrettyJson_FormatOptions_SLA, buffer.GetString());
-}
-
-TEST(PrettyWriter, SetIndent) {
-    StringBuffer buffer;
-    PrettyWriter<StringBuffer> writer(buffer);
-    writer.SetIndent('\t', 1);
-    Reader reader;
-    StringStream s(kJson);
-    reader.Parse(s, writer);
-    EXPECT_STREQ(
-        "{\n"
-        "\t\"hello\": \"world\",\n"
-        "\t\"t\": true,\n"
-        "\t\"f\": false,\n"
-        "\t\"n\": null,\n"
-        "\t\"i\": 123,\n"
-        "\t\"pi\": 3.1416,\n"
-        "\t\"a\": [\n"
-        "\t\t1,\n"
-        "\t\t2,\n"
-        "\t\t3,\n"
-        "\t\t-1\n"
-        "\t],\n"
-        "\t\"u64\": 1234567890123456789,\n"
-        "\t\"i64\": -1234567890123456789\n"
-        "}",
-        buffer.GetString());
-}
-
-TEST(PrettyWriter, String) {
-    StringBuffer buffer;
-    PrettyWriter<StringBuffer> writer(buffer);
-    EXPECT_TRUE(writer.StartArray());
-    EXPECT_TRUE(writer.String("Hello\n"));
-    EXPECT_TRUE(writer.EndArray());
-    EXPECT_STREQ("[\n    \"Hello\\n\"\n]", buffer.GetString());
-}
-
-#if RAPIDJSON_HAS_STDSTRING
-TEST(PrettyWriter, String_STDSTRING) {
-    StringBuffer buffer;
-    PrettyWriter<StringBuffer> writer(buffer);
-    EXPECT_TRUE(writer.StartArray());
-    EXPECT_TRUE(writer.String(std::string("Hello\n")));
-    EXPECT_TRUE(writer.EndArray());
-    EXPECT_STREQ("[\n    \"Hello\\n\"\n]", buffer.GetString());
-}
-#endif
-
-#include <sstream>
-
-class OStreamWrapper {
-public:
-    typedef char Ch;
-
-    OStreamWrapper(std::ostream& os) : os_(os) {}
-
-    Ch Peek() const { assert(false); return '\0'; }
-    Ch Take() { assert(false); return '\0'; }
-    size_t Tell() const { return 0; }
-
-    Ch* PutBegin() { assert(false); return 0; }
-    void Put(Ch c) { os_.put(c); }
-    void Flush() { os_.flush(); }
-    size_t PutEnd(Ch*) { assert(false); return 0; }
-
-private:
-    OStreamWrapper(const OStreamWrapper&);
-    OStreamWrapper& operator=(const OStreamWrapper&);
-
-    std::ostream& os_;
-};
-
-// For covering PutN() generic version
-TEST(PrettyWriter, OStreamWrapper) {
-    StringStream s(kJson);
-    
-    std::stringstream ss;
-    OStreamWrapper os(ss);
-    
-    PrettyWriter<OStreamWrapper> writer(os);
-
-    Reader reader;
-    reader.Parse(s, writer);
-    
-    std::string actual = ss.str();
-    EXPECT_STREQ(kPrettyJson, actual.c_str());
-}
-
-// For covering FileWriteStream::PutN()
-TEST(PrettyWriter, FileWriteStream) {
-    char filename[L_tmpnam];
-    FILE* fp = TempFile(filename);
-    ASSERT_TRUE(fp!=NULL);
-    char buffer[16];
-    FileWriteStream os(fp, buffer, sizeof(buffer));
-    PrettyWriter<FileWriteStream> writer(os);
-    Reader reader;
-    StringStream s(kJson);
-    reader.Parse(s, writer);
-    fclose(fp);
-
-    fp = fopen(filename, "rb");
-    fseek(fp, 0, SEEK_END);
-    size_t size = static_cast<size_t>(ftell(fp));
-    fseek(fp, 0, SEEK_SET);
-    char* json = static_cast<char*>(malloc(size + 1));
-    size_t readLength = fread(json, 1, size, fp);
-    json[readLength] = '\0';
-    fclose(fp);
-    remove(filename);
-    EXPECT_STREQ(kPrettyJson, json);
-    free(json);
-}
-
-TEST(PrettyWriter, RawValue) {
-    StringBuffer buffer;
-    PrettyWriter<StringBuffer> writer(buffer);
-    writer.StartObject();
-    writer.Key("a");
-    writer.Int(1);
-    writer.Key("raw");
-    const char json[] = "[\"Hello\\nWorld\", 123.456]";
-    writer.RawValue(json, strlen(json), kArrayType);
-    writer.EndObject();
-    EXPECT_TRUE(writer.IsComplete());
-    EXPECT_STREQ(
-        "{\n"
-        "    \"a\": 1,\n"
-        "    \"raw\": [\"Hello\\nWorld\", 123.456]\n" // no indentation within raw value
-        "}",
-        buffer.GetString());
-}
-
-TEST(PrettyWriter, InvalidEventSequence) {
-    // {]
-    {
-        StringBuffer buffer;
-        PrettyWriter<StringBuffer> writer(buffer);
-        writer.StartObject();
-        EXPECT_THROW(writer.EndArray(), AssertException);
-        EXPECT_FALSE(writer.IsComplete());
-    }
-    
-    // [}
-    {
-        StringBuffer buffer;
-        PrettyWriter<StringBuffer> writer(buffer);
-        writer.StartArray();
-        EXPECT_THROW(writer.EndObject(), AssertException);
-        EXPECT_FALSE(writer.IsComplete());
-    }
-    
-    // { 1:
-    {
-        StringBuffer buffer;
-        PrettyWriter<StringBuffer> writer(buffer);
-        writer.StartObject();
-        EXPECT_THROW(writer.Int(1), AssertException);
-        EXPECT_FALSE(writer.IsComplete());
-    }
-    
-    // { 'a' }
-    {
-        StringBuffer buffer;
-        PrettyWriter<StringBuffer> writer(buffer);
-        writer.StartObject();
-        writer.Key("a");
-        EXPECT_THROW(writer.EndObject(), AssertException);
-        EXPECT_FALSE(writer.IsComplete());
-    }
-    
-    // { 'a':'b','c' }
-    {
-        StringBuffer buffer;
-        PrettyWriter<StringBuffer> writer(buffer);
-        writer.StartObject();
-        writer.Key("a");
-        writer.String("b");
-        writer.Key("c");
-        EXPECT_THROW(writer.EndObject(), AssertException);
-        EXPECT_FALSE(writer.IsComplete());
-    }
-}
-
-TEST(PrettyWriter, NaN) {
-    double nan = std::numeric_limits<double>::quiet_NaN();
-
-    EXPECT_TRUE(internal::Double(nan).IsNan());
-    StringBuffer buffer;
-    {
-        PrettyWriter<StringBuffer> writer(buffer);
-        EXPECT_FALSE(writer.Double(nan));
-    }
-    {
-        PrettyWriter<StringBuffer, UTF8<>, UTF8<>, CrtAllocator, kWriteNanAndInfFlag> writer(buffer);
-        EXPECT_TRUE(writer.Double(nan));
-        EXPECT_STREQ("NaN", buffer.GetString());
-    }
-    GenericStringBuffer<UTF16<> > buffer2;
-    PrettyWriter<GenericStringBuffer<UTF16<> > > writer2(buffer2);
-    EXPECT_FALSE(writer2.Double(nan));
-}
-
-TEST(PrettyWriter, Inf) {
-    double inf = std::numeric_limits<double>::infinity();
-
-    EXPECT_TRUE(internal::Double(inf).IsInf());
-    StringBuffer buffer;
-    {
-        PrettyWriter<StringBuffer> writer(buffer);
-        EXPECT_FALSE(writer.Double(inf));
-    }
-    {
-        PrettyWriter<StringBuffer> writer(buffer);
-        EXPECT_FALSE(writer.Double(-inf));
-    }
-    {
-        PrettyWriter<StringBuffer, UTF8<>, UTF8<>, CrtAllocator, kWriteNanAndInfFlag> writer(buffer);
-        EXPECT_TRUE(writer.Double(inf));
-    }
-    {
-        PrettyWriter<StringBuffer, UTF8<>, UTF8<>, CrtAllocator, kWriteNanAndInfFlag> writer(buffer);
-        EXPECT_TRUE(writer.Double(-inf));
-    }
-    EXPECT_STREQ("Infinity-Infinity", buffer.GetString());
-}
-
-TEST(PrettyWriter, Issue_889) {
-    char buf[100] = "Hello";
-    
-    StringBuffer buffer;
-    PrettyWriter<StringBuffer> writer(buffer);
-    writer.StartArray();
-    writer.String(buf);
-    writer.EndArray();
-    
-    EXPECT_STREQ("[\n    \"Hello\"\n]", buffer.GetString());
-    EXPECT_TRUE(writer.IsComplete()); \
-}
-
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-static PrettyWriter<StringBuffer> WriterGen(StringBuffer &target) {
-    PrettyWriter<StringBuffer> writer(target);
-    writer.StartObject();
-    writer.Key("a");
-    writer.Int(1);
-    return writer;
-}
-
-TEST(PrettyWriter, MoveCtor) {
-    StringBuffer buffer;
-    PrettyWriter<StringBuffer> writer(WriterGen(buffer));
-    writer.EndObject();
-    EXPECT_TRUE(writer.IsComplete());
-    EXPECT_STREQ(
-        "{\n"
-        "    \"a\": 1\n"
-        "}",
-        buffer.GetString());
-}
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
diff --git a/src/sioclient/lib/rapidjson/test/unittest/readertest.cpp b/src/sioclient/lib/rapidjson/test/unittest/readertest.cpp
deleted file mode 100644
index 71ef6dbc..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/readertest.cpp
+++ /dev/null
@@ -1,2190 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-
-#include "rapidjson/reader.h"
-#include "rapidjson/internal/dtoa.h"
-#include "rapidjson/internal/itoa.h"
-#include "rapidjson/memorystream.h"
-
-#include <limits>
-
-using namespace rapidjson;
-
-RAPIDJSON_DIAG_PUSH
-#ifdef __GNUC__
-RAPIDJSON_DIAG_OFF(effc++)
-RAPIDJSON_DIAG_OFF(float-equal)
-RAPIDJSON_DIAG_OFF(missing-noreturn)
-#if __GNUC__ >= 7
-RAPIDJSON_DIAG_OFF(dangling-else)
-#endif
-#endif // __GNUC__
-
-#ifdef __clang__
-RAPIDJSON_DIAG_OFF(variadic-macros)
-RAPIDJSON_DIAG_OFF(c++98-compat-pedantic)
-#endif
-
-template<bool expect>
-struct ParseBoolHandler : BaseReaderHandler<UTF8<>, ParseBoolHandler<expect> > {
-    ParseBoolHandler() : step_(0) {}
-    bool Default() { ADD_FAILURE(); return false; }
-    // gcc 4.8.x generates warning in EXPECT_EQ(bool, bool) on this gtest version.
-    // Workaround with EXPECT_TRUE().
-    bool Bool(bool b) { /*EXPECT_EQ(expect, b); */EXPECT_TRUE(expect == b);  ++step_; return true; }
-
-    unsigned step_;
-};
-
-TEST(Reader, ParseTrue) {
-    StringStream s("true");
-    ParseBoolHandler<true> h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(1u, h.step_);
-}
-
-TEST(Reader, ParseFalse) {
-    StringStream s("false");
-    ParseBoolHandler<false> h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(1u, h.step_);
-}
-
-struct ParseIntHandler : BaseReaderHandler<UTF8<>, ParseIntHandler> {
-    ParseIntHandler() : step_(0), actual_() {}
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Int(int i) { actual_ = i; step_++; return true; }
-
-    unsigned step_;
-    int actual_;
-};
-
-struct ParseUintHandler : BaseReaderHandler<UTF8<>, ParseUintHandler> {
-    ParseUintHandler() : step_(0), actual_() {}
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Uint(unsigned i) { actual_ = i; step_++; return true; }
-
-    unsigned step_;
-    unsigned actual_;
-};
-
-struct ParseInt64Handler : BaseReaderHandler<UTF8<>, ParseInt64Handler> {
-    ParseInt64Handler() : step_(0), actual_() {}
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Int64(int64_t i) { actual_ = i; step_++; return true; }
-
-    unsigned step_;
-    int64_t actual_;
-};
-
-struct ParseUint64Handler : BaseReaderHandler<UTF8<>, ParseUint64Handler> {
-    ParseUint64Handler() : step_(0), actual_() {}
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Uint64(uint64_t i) { actual_ = i; step_++; return true; }
-
-    unsigned step_;
-    uint64_t actual_;
-};
-
-struct ParseDoubleHandler : BaseReaderHandler<UTF8<>, ParseDoubleHandler> {
-    ParseDoubleHandler() : step_(0), actual_() {}
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Double(double d) { actual_ = d; step_++; return true; }
-
-    unsigned step_;
-    double actual_;
-};
-
-TEST(Reader, ParseNumber_Integer) {
-#define TEST_INTEGER(Handler, str, x) \
-    { \
-        StringStream s(str); \
-        Handler h; \
-        Reader reader; \
-        reader.Parse(s, h); \
-        EXPECT_EQ(1u, h.step_); \
-        EXPECT_EQ(x, h.actual_); \
-    }
-
-    TEST_INTEGER(ParseUintHandler, "0", 0u);
-    TEST_INTEGER(ParseUintHandler, "123", 123u);
-    TEST_INTEGER(ParseUintHandler, "2147483648", 2147483648u);       // 2^31 - 1 (cannot be stored in int)
-    TEST_INTEGER(ParseUintHandler, "4294967295", 4294967295u);
-
-    TEST_INTEGER(ParseIntHandler, "-123", -123);
-    TEST_INTEGER(ParseIntHandler, "-2147483648", static_cast<int32_t>(0x80000000));     // -2^31 (min of int)
-
-    TEST_INTEGER(ParseUint64Handler, "4294967296", RAPIDJSON_UINT64_C2(1, 0));   // 2^32 (max of unsigned + 1, force to use uint64_t)
-    TEST_INTEGER(ParseUint64Handler, "18446744073709551615", RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFFF));   // 2^64 - 1 (max of uint64_t)
-
-    TEST_INTEGER(ParseInt64Handler, "-2147483649", static_cast<int64_t>(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x7FFFFFFF)));   // -2^31 -1 (min of int - 1, force to use int64_t)
-    TEST_INTEGER(ParseInt64Handler, "-9223372036854775808", static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 0x00000000)));       // -2^63 (min of int64_t)
-
-    // Random test for uint32_t/int32_t
-    {
-        union {
-            uint32_t u;
-            int32_t i;
-        }u;
-        Random r;
-
-        for (unsigned i = 0; i < 100000; i++) {
-            u.u = r();
-
-            char buffer[32];
-            *internal::u32toa(u.u, buffer) = '\0';
-            TEST_INTEGER(ParseUintHandler, buffer, u.u);
-
-            if (u.i < 0) {
-                *internal::i32toa(u.i, buffer) = '\0';
-                TEST_INTEGER(ParseIntHandler, buffer, u.i);
-            }
-        }
-    }
-
-    // Random test for uint64_t/int64_t
-    {
-        union {
-            uint64_t u;
-            int64_t i;
-        }u;
-        Random r;
-
-        for (unsigned i = 0; i < 100000; i++) {
-            u.u = uint64_t(r()) << 32;
-            u.u |= r();
-
-            char buffer[32];
-            if (u.u > uint64_t(4294967295u)) {
-                *internal::u64toa(u.u, buffer) = '\0';
-                TEST_INTEGER(ParseUint64Handler, buffer, u.u);
-            }
-
-            if (u.i < -int64_t(2147483648u)) {
-                *internal::i64toa(u.i, buffer) = '\0';
-                TEST_INTEGER(ParseInt64Handler, buffer, u.i);
-            }
-        }
-    }
-#undef TEST_INTEGER
-}
-
-template<bool fullPrecision>
-static void TestParseDouble() {
-#define TEST_DOUBLE(fullPrecision, str, x) \
-    { \
-        StringStream s(str); \
-        ParseDoubleHandler h; \
-        Reader reader; \
-        ASSERT_EQ(kParseErrorNone, reader.Parse<fullPrecision ? kParseFullPrecisionFlag : 0>(s, h).Code()); \
-        EXPECT_EQ(1u, h.step_); \
-        internal::Double e(x), a(h.actual_); \
-        if (fullPrecision) { \
-            EXPECT_EQ(e.Uint64Value(), a.Uint64Value()); \
-            if (e.Uint64Value() != a.Uint64Value()) \
-                printf("  String: %s\n  Actual: %.17g\nExpected: %.17g\n", str, h.actual_, x); \
-        } \
-        else { \
-            EXPECT_EQ(e.Sign(), a.Sign()); /* for 0.0 != -0.0 */ \
-            EXPECT_DOUBLE_EQ(x, h.actual_); \
-        } \
-    }
-
-    TEST_DOUBLE(fullPrecision, "0.0", 0.0);
-    TEST_DOUBLE(fullPrecision, "-0.0", -0.0); // For checking issue #289
-    TEST_DOUBLE(fullPrecision, "0e100", 0.0); // For checking issue #1249
-    TEST_DOUBLE(fullPrecision, "1.0", 1.0);
-    TEST_DOUBLE(fullPrecision, "-1.0", -1.0);
-    TEST_DOUBLE(fullPrecision, "1.5", 1.5);
-    TEST_DOUBLE(fullPrecision, "-1.5", -1.5);
-    TEST_DOUBLE(fullPrecision, "3.1416", 3.1416);
-    TEST_DOUBLE(fullPrecision, "1E10", 1E10);
-    TEST_DOUBLE(fullPrecision, "1e10", 1e10);
-    TEST_DOUBLE(fullPrecision, "1E+10", 1E+10);
-    TEST_DOUBLE(fullPrecision, "1E-10", 1E-10);
-    TEST_DOUBLE(fullPrecision, "-1E10", -1E10);
-    TEST_DOUBLE(fullPrecision, "-1e10", -1e10);
-    TEST_DOUBLE(fullPrecision, "-1E+10", -1E+10);
-    TEST_DOUBLE(fullPrecision, "-1E-10", -1E-10);
-    TEST_DOUBLE(fullPrecision, "1.234E+10", 1.234E+10);
-    TEST_DOUBLE(fullPrecision, "1.234E-10", 1.234E-10);
-    TEST_DOUBLE(fullPrecision, "1.79769e+308", 1.79769e+308);
-    TEST_DOUBLE(fullPrecision, "2.22507e-308", 2.22507e-308);
-    TEST_DOUBLE(fullPrecision, "-1.79769e+308", -1.79769e+308);
-    TEST_DOUBLE(fullPrecision, "-2.22507e-308", -2.22507e-308);
-    TEST_DOUBLE(fullPrecision, "4.9406564584124654e-324", 4.9406564584124654e-324); // minimum denormal
-    TEST_DOUBLE(fullPrecision, "2.2250738585072009e-308", 2.2250738585072009e-308); // Max subnormal double
-    TEST_DOUBLE(fullPrecision, "2.2250738585072014e-308", 2.2250738585072014e-308); // Min normal positive double
-    TEST_DOUBLE(fullPrecision, "1.7976931348623157e+308", 1.7976931348623157e+308); // Max double
-    TEST_DOUBLE(fullPrecision, "1e-10000", 0.0);                                    // must underflow
-    TEST_DOUBLE(fullPrecision, "18446744073709551616", 18446744073709551616.0);     // 2^64 (max of uint64_t + 1, force to use double)
-    TEST_DOUBLE(fullPrecision, "-9223372036854775809", -9223372036854775809.0);     // -2^63 - 1(min of int64_t + 1, force to use double)
-    TEST_DOUBLE(fullPrecision, "0.9868011474609375", 0.9868011474609375);           // https://github.com/Tencent/rapidjson/issues/120
-    TEST_DOUBLE(fullPrecision, "123e34", 123e34);                                   // Fast Path Cases In Disguise
-    TEST_DOUBLE(fullPrecision, "45913141877270640000.0", 45913141877270640000.0);
-    TEST_DOUBLE(fullPrecision, "2.2250738585072011e-308", 2.2250738585072011e-308); // http://www.exploringbinary.com/php-hangs-on-numeric-value-2-2250738585072011e-308/
-    TEST_DOUBLE(fullPrecision, "1e-00011111111111", 0.0);                           // Issue #313
-    TEST_DOUBLE(fullPrecision, "-1e-00011111111111", -0.0);
-    TEST_DOUBLE(fullPrecision, "1e-214748363", 0.0);                                  // Maximum supported negative exponent
-    TEST_DOUBLE(fullPrecision, "1e-214748364", 0.0);
-    TEST_DOUBLE(fullPrecision, "1e-21474836311", 0.0);
-    TEST_DOUBLE(fullPrecision, "1.00000000001e-2147483638", 0.0);
-    TEST_DOUBLE(fullPrecision, "0.017976931348623157e+310", 1.7976931348623157e+308); // Max double in another form
-    TEST_DOUBLE(fullPrecision, "128.74836467836484838364836483643636483648e-336", 0.0); // Issue #1251
-
-    // Since
-    // abs((2^-1022 - 2^-1074) - 2.2250738585072012e-308) = 3.109754131239141401123495768877590405345064751974375599... x 10^-324
-    // abs((2^-1022) - 2.2250738585072012e-308) = 1.830902327173324040642192159804623318305533274168872044... x 10 ^ -324
-    // So 2.2250738585072012e-308 should round to 2^-1022 = 2.2250738585072014e-308
-    TEST_DOUBLE(fullPrecision, "2.2250738585072012e-308", 2.2250738585072014e-308); // http://www.exploringbinary.com/java-hangs-when-converting-2-2250738585072012e-308/
-
-    // More closer to normal/subnormal boundary
-    // boundary = 2^-1022 - 2^-1075 = 2.225073858507201136057409796709131975934819546351645648... x 10^-308
-    TEST_DOUBLE(fullPrecision, "2.22507385850720113605740979670913197593481954635164564e-308", 2.2250738585072009e-308);
-    TEST_DOUBLE(fullPrecision, "2.22507385850720113605740979670913197593481954635164565e-308", 2.2250738585072014e-308);
-
-    // 1.0 is in (1.0 - 2^-54, 1.0 + 2^-53)
-    // 1.0 - 2^-54 = 0.999999999999999944488848768742172978818416595458984375
-    TEST_DOUBLE(fullPrecision, "0.999999999999999944488848768742172978818416595458984375", 1.0); // round to even
-    TEST_DOUBLE(fullPrecision, "0.999999999999999944488848768742172978818416595458984374", 0.99999999999999989); // previous double
-    TEST_DOUBLE(fullPrecision, "0.999999999999999944488848768742172978818416595458984376", 1.0); // next double
-    // 1.0 + 2^-53 = 1.00000000000000011102230246251565404236316680908203125
-    TEST_DOUBLE(fullPrecision, "1.00000000000000011102230246251565404236316680908203125", 1.0); // round to even
-    TEST_DOUBLE(fullPrecision, "1.00000000000000011102230246251565404236316680908203124", 1.0); // previous double
-    TEST_DOUBLE(fullPrecision, "1.00000000000000011102230246251565404236316680908203126", 1.00000000000000022); // next double
-
-    // Numbers from https://github.com/floitsch/double-conversion/blob/master/test/cctest/test-strtod.cc
-
-    TEST_DOUBLE(fullPrecision, "72057594037927928.0", 72057594037927928.0);
-    TEST_DOUBLE(fullPrecision, "72057594037927936.0", 72057594037927936.0);
-    TEST_DOUBLE(fullPrecision, "72057594037927932.0", 72057594037927936.0);
-    TEST_DOUBLE(fullPrecision, "7205759403792793199999e-5", 72057594037927928.0);
-    TEST_DOUBLE(fullPrecision, "7205759403792793200001e-5", 72057594037927936.0);
-
-    TEST_DOUBLE(fullPrecision, "9223372036854774784.0", 9223372036854774784.0);
-    TEST_DOUBLE(fullPrecision, "9223372036854775808.0", 9223372036854775808.0);
-    TEST_DOUBLE(fullPrecision, "9223372036854775296.0", 9223372036854775808.0);
-    TEST_DOUBLE(fullPrecision, "922337203685477529599999e-5", 9223372036854774784.0);
-    TEST_DOUBLE(fullPrecision, "922337203685477529600001e-5", 9223372036854775808.0);
-
-    TEST_DOUBLE(fullPrecision, "10141204801825834086073718800384", 10141204801825834086073718800384.0);
-    TEST_DOUBLE(fullPrecision, "10141204801825835211973625643008", 10141204801825835211973625643008.0);
-    TEST_DOUBLE(fullPrecision, "10141204801825834649023672221696", 10141204801825835211973625643008.0);
-    TEST_DOUBLE(fullPrecision, "1014120480182583464902367222169599999e-5", 10141204801825834086073718800384.0);
-    TEST_DOUBLE(fullPrecision, "1014120480182583464902367222169600001e-5", 10141204801825835211973625643008.0);
-
-    TEST_DOUBLE(fullPrecision, "5708990770823838890407843763683279797179383808", 5708990770823838890407843763683279797179383808.0);
-    TEST_DOUBLE(fullPrecision, "5708990770823839524233143877797980545530986496", 5708990770823839524233143877797980545530986496.0);
-    TEST_DOUBLE(fullPrecision, "5708990770823839207320493820740630171355185152", 5708990770823839524233143877797980545530986496.0);
-    TEST_DOUBLE(fullPrecision, "5708990770823839207320493820740630171355185151999e-3", 5708990770823838890407843763683279797179383808.0);
-    TEST_DOUBLE(fullPrecision, "5708990770823839207320493820740630171355185152001e-3", 5708990770823839524233143877797980545530986496.0);
-
-    {
-        char n1e308[310];   // '1' followed by 308 '0'
-        n1e308[0] = '1';
-        for (int i = 1; i < 309; i++)
-            n1e308[i] = '0';
-        n1e308[309] = '\0';
-        TEST_DOUBLE(fullPrecision, n1e308, 1E308);
-    }
-
-    // Cover trimming
-    TEST_DOUBLE(fullPrecision,
-"2.22507385850720113605740979670913197593481954635164564802342610972482222202107694551652952390813508"
-"7914149158913039621106870086438694594645527657207407820621743379988141063267329253552286881372149012"
-"9811224514518898490572223072852551331557550159143974763979834118019993239625482890171070818506906306"
-"6665599493827577257201576306269066333264756530000924588831643303777979186961204949739037782970490505"
-"1080609940730262937128958950003583799967207254304360284078895771796150945516748243471030702609144621"
-"5722898802581825451803257070188608721131280795122334262883686223215037756666225039825343359745688844"
-"2390026549819838548794829220689472168983109969836584681402285424333066033985088644580400103493397042"
-"7567186443383770486037861622771738545623065874679014086723327636718751234567890123456789012345678901"
-"e-308",
-    2.2250738585072014e-308);
-
-    {
-        static const unsigned count = 100; // Tested with 1000000 locally
-        Random r;
-        Reader reader; // Reusing reader to prevent heap allocation
-
-        // Exhaustively test different exponents with random significant
-        for (uint64_t exp = 0; exp < 2047; exp++) {
-            ;
-            for (unsigned i = 0; i < count; i++) {
-                // Need to call r() in two statements for cross-platform coherent sequence.
-                uint64_t u = (exp << 52) | uint64_t(r() & 0x000FFFFF) << 32;
-                u |= uint64_t(r());
-                internal::Double d = internal::Double(u);
-
-                char buffer[32];
-                *internal::dtoa(d.Value(), buffer) = '\0';
-
-                StringStream s(buffer);
-                ParseDoubleHandler h;
-                ASSERT_EQ(kParseErrorNone, reader.Parse<fullPrecision ? kParseFullPrecisionFlag : 0>(s, h).Code());
-                EXPECT_EQ(1u, h.step_);
-                internal::Double a(h.actual_);
-                if (fullPrecision) {
-                    EXPECT_EQ(d.Uint64Value(), a.Uint64Value());
-                    if (d.Uint64Value() != a.Uint64Value())
-                        printf("  String: %s\n  Actual: %.17g\nExpected: %.17g\n", buffer, h.actual_, d.Value());
-                }
-                else {
-                    EXPECT_EQ(d.Sign(), a.Sign()); // for 0.0 != -0.0
-                    EXPECT_DOUBLE_EQ(d.Value(), h.actual_);
-                }
-            }
-        }
-    }
-
-    // Issue #340
-    TEST_DOUBLE(fullPrecision, "7.450580596923828e-9", 7.450580596923828e-9);
-    {
-        internal::Double d(1.0);
-        for (int i = 0; i < 324; i++) {
-            char buffer[32];
-            *internal::dtoa(d.Value(), buffer) = '\0';
-
-            StringStream s(buffer);
-            ParseDoubleHandler h;
-            Reader reader;
-            ASSERT_EQ(kParseErrorNone, reader.Parse<fullPrecision ? kParseFullPrecisionFlag : 0>(s, h).Code());
-            EXPECT_EQ(1u, h.step_);
-            internal::Double a(h.actual_);
-            if (fullPrecision) {
-                EXPECT_EQ(d.Uint64Value(), a.Uint64Value());
-                if (d.Uint64Value() != a.Uint64Value())
-                    printf("  String: %s\n  Actual: %.17g\nExpected: %.17g\n", buffer, h.actual_, d.Value());
-            }
-            else {
-                EXPECT_EQ(d.Sign(), a.Sign()); // for 0.0 != -0.0
-                EXPECT_DOUBLE_EQ(d.Value(), h.actual_);
-            }
-
-
-            d = d.Value() * 0.5;
-        }
-    }
-
-    // Issue 1249
-    TEST_DOUBLE(fullPrecision, "0e100", 0.0);
-
-    // Issue 1251
-    TEST_DOUBLE(fullPrecision, "128.74836467836484838364836483643636483648e-336", 0.0);
-
-    // Issue 1256
-    TEST_DOUBLE(fullPrecision,
-        "6223372036854775296.1701512723685473547372536854755293372036854685477"
-        "529752233737201701512337200972013723685473123372036872036854236854737"
-        "247372368372367752975258547752975254729752547372368737201701512354737"
-        "83723677529752585477247372368372368547354737253685475529752",
-        6223372036854775808.0);
-
-#if 0
-    // Test (length + exponent) overflow
-    TEST_DOUBLE(fullPrecision, "0e+2147483647", 0.0);
-    TEST_DOUBLE(fullPrecision, "0e-2147483648", 0.0);
-    TEST_DOUBLE(fullPrecision, "1e-2147483648", 0.0);
-    TEST_DOUBLE(fullPrecision, "0e+9223372036854775807", 0.0);
-    TEST_DOUBLE(fullPrecision, "0e-9223372036854775808", 0.0);
-#endif
-
-    if (fullPrecision)
-    {
-        TEST_DOUBLE(fullPrecision, "1e-325", 0.0);
-        TEST_DOUBLE(fullPrecision, "1e-324", 0.0);
-        TEST_DOUBLE(fullPrecision, "2e-324", 0.0);
-        TEST_DOUBLE(fullPrecision, "2.4703282292062327e-324", 0.0);
-        TEST_DOUBLE(fullPrecision, "2.4703282292062328e-324", 5e-324);
-        TEST_DOUBLE(fullPrecision, "2.48e-324",5e-324);
-        TEST_DOUBLE(fullPrecision, "2.5e-324", 5e-324);
-
-        // Slightly above max-normal
-        TEST_DOUBLE(fullPrecision, "1.7976931348623158e+308", 1.7976931348623158e+308);
-
-        TEST_DOUBLE(fullPrecision,
-            "17976931348623157081452742373170435679807056752584499659891747680315726"
-            "07800285387605895586327668781715404589535143824642343213268894641827684"
-            "67546703537516986049910576551282076245490090389328944075868508455133942"
-            "30458323690322294816580855933212334827479782620414472316873817718091929"
-            "9881250404026184124858368",
-            std::numeric_limits<double>::max());
-
-        TEST_DOUBLE(fullPrecision,
-            "243546080556034731077856379609316893158278902575447060151047"
-            "212703405344938119816206067372775299130836050315842578309818"
-            "316450894337978612745889730079163798234256495613858256849283"
-            "467066859489192118352020514036083287319232435355752493038825"
-            "828481044358810649108367633313557305310641892225870327827273"
-            "41408256.000000",
-            2.4354608055603473e+307);
-        // 9007199254740991 * 2^971 (max normal)
-        TEST_DOUBLE(fullPrecision,
-            "1.797693134862315708145274237317043567980705675258449965989174768031572607800285"
-            "38760589558632766878171540458953514382464234321326889464182768467546703537516986"
-            "04991057655128207624549009038932894407586850845513394230458323690322294816580855"
-            "9332123348274797826204144723168738177180919299881250404026184124858368e+308",
-            1.797693134862315708e+308 //        0x1.fffffffffffffp1023
-            );
-#if 0
-        // TODO:
-        // Should work at least in full-precision mode...
-        TEST_DOUBLE(fullPrecision,
-            "0.00000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000024703282292062327208828439643411068618252"
-            "9901307162382212792841250337753635104375932649918180817996189"
-            "8982823477228588654633283551779698981993873980053909390631503"
-            "5659515570226392290858392449105184435931802849936536152500319"
-            "3704576782492193656236698636584807570015857692699037063119282"
-            "7955855133292783433840935197801553124659726357957462276646527"
-            "2827220056374006485499977096599470454020828166226237857393450"
-            "7363390079677619305775067401763246736009689513405355374585166"
-            "6113422376667860416215968046191446729184030053005753084904876"
-            "5391711386591646239524912623653881879636239373280423891018672"
-            "3484976682350898633885879256283027559956575244555072551893136"
-            "9083625477918694866799496832404970582102851318545139621383772"
-            "2826145437693412532098591327667236328125",
-            0.0);
-#endif
-        // 9007199254740991 * 2^-1074 = (2^53 - 1) * 2^-1074
-        TEST_DOUBLE(fullPrecision,
-            "4.450147717014402272114819593418263951869639092703291296046852219449644444042153"
-            "89103305904781627017582829831782607924221374017287738918929105531441481564124348"
-            "67599762821265346585071045737627442980259622449029037796981144446145705102663115"
-            "10031828794952795966823603998647925096578034214163701381261333311989876551545144"
-            "03152612538132666529513060001849177663286607555958373922409899478075565940981010"
-            "21612198814605258742579179000071675999344145086087205681577915435923018910334964"
-            "86942061405218289243144579760516365090360651414037721744226256159024466852576737"
-            "24464300755133324500796506867194913776884780053099639677097589658441378944337966"
-            "21993967316936280457084866613206797017728916080020698679408551343728867675409720"
-            "757232455434770912461317493580281734466552734375e-308",
-            4.450147717014402272e-308 //        0x1.fffffffffffffp-1022
-            );
-        // 9007199254740990 * 2^-1074
-        TEST_DOUBLE(fullPrecision,
-            "4.450147717014401778049173752171719775300846224481918930987049605124880018456471"
-            "39035755177760751831052846195619008686241717547743167145836439860405887584484471"
-            "19639655002484083577939142623582164522087943959208000909794783876158397872163051"
-            "22622675229968408654350206725478309956546318828765627255022767720818849892988457"
-            "26333908582101604036318532842699932130356061901518261174396928478121372742040102"
-            "17446565569357687263889031732270082446958029584739170416643195242132750803227473"
-            "16608838720742955671061336566907126801014814608027120593609275183716632624844904"
-            "31985250929886016737037234388448352929102742708402644340627409931664203093081360"
-            "70794835812045179006047003875039546061891526346421705014598610179523165038319441"
-            "51446491086954182492263498716056346893310546875e-308",
-            4.450147717014401778e-308 //        0x1.ffffffffffffep-1022
-            );
-        // half way between the two numbers above.
-        // round to nearest even.
-        TEST_DOUBLE(fullPrecision,
-            "4.450147717014402025081996672794991863585242658592605113516950912287262231249312"
-            "64069530541271189424317838013700808305231545782515453032382772695923684574304409"
-            "93619708911874715081505094180604803751173783204118519353387964161152051487413083"
-            "16327252012460602310586905362063117526562176521464664318142050516404363222266800"
-            "64743260560117135282915796422274554896821334728738317548403413978098469341510556"
-            "19529382191981473003234105366170879223151087335413188049110555339027884856781219"
-            "01775450062980622457102958163711745945687733011032421168917765671370549738710820"
-            "78224775842509670618916870627821633352993761380751142008862499795052791018709663"
-            "46394401564490729731565935244123171539810221213221201847003580761626016356864581"
-            "1358486831521563686919762403704226016998291015625e-308",
-            4.450147717014401778e-308 //        0x1.ffffffffffffep-1022
-            );
-        TEST_DOUBLE(fullPrecision,
-            "4.450147717014402025081996672794991863585242658592605113516950912287262231249312"
-            "64069530541271189424317838013700808305231545782515453032382772695923684574304409"
-            "93619708911874715081505094180604803751173783204118519353387964161152051487413083"
-            "16327252012460602310586905362063117526562176521464664318142050516404363222266800"
-            "64743260560117135282915796422274554896821334728738317548403413978098469341510556"
-            "19529382191981473003234105366170879223151087335413188049110555339027884856781219"
-            "01775450062980622457102958163711745945687733011032421168917765671370549738710820"
-            "78224775842509670618916870627821633352993761380751142008862499795052791018709663"
-            "46394401564490729731565935244123171539810221213221201847003580761626016356864581"
-            "13584868315215636869197624037042260169982910156250000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000e-308",
-            4.450147717014401778e-308 //        0x1.ffffffffffffep-1022
-            );
-#if 0
-        // ... round up
-        // TODO:
-        // Should work at least in full-precision mode...
-        TEST_DOUBLE(fullPrecision,
-            "4.450147717014402025081996672794991863585242658592605113516950912287262231249312"
-            "64069530541271189424317838013700808305231545782515453032382772695923684574304409"
-            "93619708911874715081505094180604803751173783204118519353387964161152051487413083"
-            "16327252012460602310586905362063117526562176521464664318142050516404363222266800"
-            "64743260560117135282915796422274554896821334728738317548403413978098469341510556"
-            "19529382191981473003234105366170879223151087335413188049110555339027884856781219"
-            "01775450062980622457102958163711745945687733011032421168917765671370549738710820"
-            "78224775842509670618916870627821633352993761380751142008862499795052791018709663"
-            "46394401564490729731565935244123171539810221213221201847003580761626016356864581"
-            "13584868315215636869197624037042260169982910156250000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000001e-308",
-            4.450147717014402272e-308 //        0x1.fffffffffffffp-1022
-            );
-#endif
-        // ... round down
-        TEST_DOUBLE(fullPrecision,
-            "4.450147717014402025081996672794991863585242658592605113516950912287262231249312"
-            "64069530541271189424317838013700808305231545782515453032382772695923684574304409"
-            "93619708911874715081505094180604803751173783204118519353387964161152051487413083"
-            "16327252012460602310586905362063117526562176521464664318142050516404363222266800"
-            "64743260560117135282915796422274554896821334728738317548403413978098469341510556"
-            "19529382191981473003234105366170879223151087335413188049110555339027884856781219"
-            "01775450062980622457102958163711745945687733011032421168917765671370549738710820"
-            "78224775842509670618916870627821633352993761380751142008862499795052791018709663"
-            "46394401564490729731565935244123171539810221213221201847003580761626016356864581"
-            "13584868315215636869197624037042260169982910156249999999999999999999999999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999e-308",
-            4.450147717014401778e-308 //        0x1.ffffffffffffep-1022
-            );
-        // Slightly below half way between max-normal and infinity.
-        // Should round down.
-        TEST_DOUBLE(fullPrecision,
-            "1.797693134862315807937289714053034150799341327100378269361737789804449682927647"
-            "50946649017977587207096330286416692887910946555547851940402630657488671505820681"
-            "90890200070838367627385484581771153176447573027006985557136695962284291481986083"
-            "49364752927190741684443655107043427115596995080930428801779041744977919999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999"
-            "99999999999999999999999999999999999999999999999999999999999999999999999999999999e+308",
-            1.797693134862315708e+308 //        0x1.fffffffffffffp1023
-            );
-    }
-
-#undef TEST_DOUBLE
-}
-
-TEST(Reader, ParseNumber_NormalPrecisionDouble) {
-    TestParseDouble<false>();
-}
-
-TEST(Reader, ParseNumber_FullPrecisionDouble) {
-    TestParseDouble<true>();
-}
-
-TEST(Reader, ParseNumber_NormalPrecisionError) {
-    static unsigned count = 1000000;
-    Random r;
-
-    double ulpSum = 0.0;
-    double ulpMax = 0.0;
-    for (unsigned i = 0; i < count; i++) {
-        internal::Double e, a;
-        do {
-            // Need to call r() in two statements for cross-platform coherent sequence.
-            uint64_t u = uint64_t(r()) << 32;
-            u |= uint64_t(r());
-            e = u;
-        } while (e.IsNan() || e.IsInf() || !e.IsNormal());
-
-        char buffer[32];
-        *internal::dtoa(e.Value(), buffer) = '\0';
-
-        StringStream s(buffer);
-        ParseDoubleHandler h;
-        Reader reader;
-        ASSERT_EQ(kParseErrorNone, reader.Parse(s, h).Code());
-        EXPECT_EQ(1u, h.step_);
-
-        a = h.actual_;
-        uint64_t bias1 = e.ToBias();
-        uint64_t bias2 = a.ToBias();
-        double ulp = static_cast<double>(bias1 >= bias2 ? bias1 - bias2 : bias2 - bias1);
-        ulpMax = (std::max)(ulpMax, ulp);
-        ulpSum += ulp;
-    }
-    printf("ULP Average = %g, Max = %g \n", ulpSum / count, ulpMax);
-}
-
-template<bool fullPrecision>
-static void TestParseNumberError() {
-#define TEST_NUMBER_ERROR(errorCode, str, errorOffset, streamPos) \
-    { \
-        char buffer[2048]; \
-        ASSERT_LT(std::strlen(str), 2048u); \
-        sprintf(buffer, "%s", str); \
-        InsituStringStream s(buffer); \
-        BaseReaderHandler<> h; \
-        Reader reader; \
-        EXPECT_FALSE(reader.Parse<fullPrecision ? kParseFullPrecisionFlag : 0>(s, h)); \
-        EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
-        EXPECT_EQ(errorOffset, reader.GetErrorOffset());\
-        EXPECT_EQ(streamPos, s.Tell());\
-    }
-
-    // Number too big to be stored in double.
-    {
-        char n1e309[311];   // '1' followed by 309 '0'
-        n1e309[0] = '1';
-        for (int i = 1; i < 310; i++)
-            n1e309[i] = '0';
-        n1e309[310] = '\0';
-        TEST_NUMBER_ERROR(kParseErrorNumberTooBig, n1e309, 0, 310);
-    }
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "1e309", 0, 5);
-
-    // Miss fraction part in number.
-    TEST_NUMBER_ERROR(kParseErrorNumberMissFraction, "1.", 2, 2);
-    TEST_NUMBER_ERROR(kParseErrorNumberMissFraction, "1.a", 2, 2);
-
-    // Miss exponent in number.
-    TEST_NUMBER_ERROR(kParseErrorNumberMissExponent, "1e", 2, 2);
-    TEST_NUMBER_ERROR(kParseErrorNumberMissExponent, "1e_", 2, 2);
-
-    // Issue 849
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "1.8e308", 0, 7);
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "5e308", 0, 5);
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "1e309", 0, 5);
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "1.0e310", 0, 7);
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "1.00e310", 0, 8);
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "-1.8e308", 0, 8);
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "-1e309", 0, 6);
-
-    // Issue 1253
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "2e308", 0, 5);
-
-    // Issue 1259
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig,
-        "88474320368547737236837236775298547354737253685475547552933720368546854775297525"
-        "29337203685468547770151233720097201372368547312337203687203685423685123372036872"
-        "03685473724737236837236775297525854775297525472975254737236873720170151235473783"
-        "7236737247372368772473723683723456789012E66", 0, 283);
-
-#if 0
-    // Test (length + exponent) overflow
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "1e+2147483647", 0, 13);
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "1e+9223372036854775807", 0, 22);
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "1e+10000", 0, 8);
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig, "1e+50000", 0, 8);
-#endif
-
-    // 9007199254740992 * 2^971 ("infinity")
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig,
-        "1.797693134862315907729305190789024733617976978942306572734300811577326758055009"
-        "63132708477322407536021120113879871393357658789768814416622492847430639474124377"
-        "76789342486548527630221960124609411945308295208500576883815068234246288147391311"
-        "0540827237163350510684586298239947245938479716304835356329624224137216e+308", 0, 315);
-
-    // TODO:
-    // These tests (currently) fail in normal-precision mode
-    if (fullPrecision)
-    {
-        // Half way between max-normal and infinity
-        // Should round to infinity in nearest-even mode.
-        TEST_NUMBER_ERROR(kParseErrorNumberTooBig,
-            "1.797693134862315807937289714053034150799341327100378269361737789804449682927647"
-            "50946649017977587207096330286416692887910946555547851940402630657488671505820681"
-            "90890200070838367627385484581771153176447573027006985557136695962284291481986083"
-            "49364752927190741684443655107043427115596995080930428801779041744977920000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000e+308", 0, 1125);
-        // ...round up
-        TEST_NUMBER_ERROR(kParseErrorNumberTooBig,
-            "1.797693134862315807937289714053034150799341327100378269361737789804449682927647"
-            "50946649017977587207096330286416692887910946555547851940402630657488671505820681"
-            "90890200070838367627385484581771153176447573027006985557136695962284291481986083"
-            "49364752927190741684443655107043427115596995080930428801779041744977920000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000001e+308", 0, 1205);
-    }
-
-    TEST_NUMBER_ERROR(kParseErrorNumberTooBig,
-        "10000000000000000000000000000000000000000000000000000000000000000000000000000000"
-        "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-        "00000000000000000000000000000000000000000000000000000000000000000000000000000000"
-        "0000000000000000000000000000000000000000000000000000000000000000000001", 0, 310);
-
-#undef TEST_NUMBER_ERROR
-}
-
-TEST(Reader, ParseNumberError_NormalPrecisionDouble) {
-    TestParseNumberError<false>();
-}
-
-TEST(Reader, ParseNumberError_FullPrecisionDouble) {
-    TestParseNumberError<true>();
-}
-
-template <typename Encoding>
-struct ParseStringHandler : BaseReaderHandler<Encoding, ParseStringHandler<Encoding> > {
-    ParseStringHandler() : str_(0), length_(0), copy_() {}
-    ~ParseStringHandler() { EXPECT_TRUE(str_ != 0); if (copy_) free(const_cast<typename Encoding::Ch*>(str_)); }
-
-    ParseStringHandler(const ParseStringHandler&);
-    ParseStringHandler& operator=(const ParseStringHandler&);
-
-    bool Default() { ADD_FAILURE(); return false; }
-    bool String(const typename Encoding::Ch* str, size_t length, bool copy) {
-        EXPECT_EQ(0, str_);
-        if (copy) {
-            str_ = static_cast<typename Encoding::Ch*>(malloc((length + 1) * sizeof(typename Encoding::Ch)));
-            memcpy(const_cast<typename Encoding::Ch*>(str_), str, (length + 1) * sizeof(typename Encoding::Ch));
-        }
-        else
-            str_ = str;
-        length_ = length;
-        copy_ = copy;
-        return true;
-    }
-
-    const typename Encoding::Ch* str_;
-    size_t length_;
-    bool copy_;
-};
-
-TEST(Reader, ParseString) {
-#define TEST_STRING(Encoding, e, x) \
-    { \
-        Encoding::Ch* buffer = StrDup(x); \
-        GenericInsituStringStream<Encoding> is(buffer); \
-        ParseStringHandler<Encoding> h; \
-        GenericReader<Encoding, Encoding> reader; \
-        reader.Parse<kParseInsituFlag | kParseValidateEncodingFlag>(is, h); \
-        EXPECT_EQ(0, StrCmp<Encoding::Ch>(e, h.str_)); \
-        EXPECT_EQ(StrLen(e), h.length_); \
-        free(buffer); \
-        GenericStringStream<Encoding> s(x); \
-        ParseStringHandler<Encoding> h2; \
-        GenericReader<Encoding, Encoding> reader2; \
-        reader2.Parse(s, h2); \
-        EXPECT_EQ(0, StrCmp<Encoding::Ch>(e, h2.str_)); \
-        EXPECT_EQ(StrLen(e), h2.length_); \
-    }
-
-    // String constant L"\xXX" can only specify character code in bytes, which is not endianness-neutral.
-    // And old compiler does not support u"" and U"" string literal. So here specify string literal by array of Ch.
-    // In addition, GCC 4.8 generates -Wnarrowing warnings when character code >= 128 are assigned to signed integer types.
-    // Therefore, utype is added for declaring unsigned array, and then cast it to Encoding::Ch.
-#define ARRAY(...) { __VA_ARGS__ }
-#define TEST_STRINGARRAY(Encoding, utype, array, x) \
-    { \
-        static const utype ue[] = array; \
-        static const Encoding::Ch* e = reinterpret_cast<const Encoding::Ch *>(&ue[0]); \
-        TEST_STRING(Encoding, e, x); \
-    }
-
-#define TEST_STRINGARRAY2(Encoding, utype, earray, xarray) \
-    { \
-        static const utype ue[] = earray; \
-        static const utype xe[] = xarray; \
-        static const Encoding::Ch* e = reinterpret_cast<const Encoding::Ch *>(&ue[0]); \
-        static const Encoding::Ch* x = reinterpret_cast<const Encoding::Ch *>(&xe[0]); \
-        TEST_STRING(Encoding, e, x); \
-    }
-
-    TEST_STRING(UTF8<>, "", "\"\"");
-    TEST_STRING(UTF8<>, "Hello", "\"Hello\"");
-    TEST_STRING(UTF8<>, "Hello\nWorld", "\"Hello\\nWorld\"");
-    TEST_STRING(UTF8<>, "\"\\/\b\f\n\r\t", "\"\\\"\\\\/\\b\\f\\n\\r\\t\"");
-    TEST_STRING(UTF8<>, "\x24", "\"\\u0024\"");         // Dollar sign U+0024
-    TEST_STRING(UTF8<>, "\xC2\xA2", "\"\\u00A2\"");     // Cents sign U+00A2
-    TEST_STRING(UTF8<>, "\xE2\x82\xAC", "\"\\u20AC\""); // Euro sign U+20AC
-    TEST_STRING(UTF8<>, "\xF0\x9D\x84\x9E", "\"\\uD834\\uDD1E\"");  // G clef sign U+1D11E
-
-    // UTF16
-    TEST_STRING(UTF16<>, L"", L"\"\"");
-    TEST_STRING(UTF16<>, L"Hello", L"\"Hello\"");
-    TEST_STRING(UTF16<>, L"Hello\nWorld", L"\"Hello\\nWorld\"");
-    TEST_STRING(UTF16<>, L"\"\\/\b\f\n\r\t", L"\"\\\"\\\\/\\b\\f\\n\\r\\t\"");
-    TEST_STRINGARRAY(UTF16<>, wchar_t, ARRAY(0x0024, 0x0000), L"\"\\u0024\"");
-    TEST_STRINGARRAY(UTF16<>, wchar_t, ARRAY(0x00A2, 0x0000), L"\"\\u00A2\"");  // Cents sign U+00A2
-    TEST_STRINGARRAY(UTF16<>, wchar_t, ARRAY(0x20AC, 0x0000), L"\"\\u20AC\"");  // Euro sign U+20AC
-    TEST_STRINGARRAY(UTF16<>, wchar_t, ARRAY(0xD834, 0xDD1E, 0x0000), L"\"\\uD834\\uDD1E\"");   // G clef sign U+1D11E
-
-    // UTF32
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY('\0'), ARRAY('\"', '\"', '\0'));
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY('H', 'e', 'l', 'l', 'o', '\0'), ARRAY('\"', 'H', 'e', 'l', 'l', 'o', '\"', '\0'));
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY('H', 'e', 'l', 'l', 'o', '\n', 'W', 'o', 'r', 'l', 'd', '\0'), ARRAY('\"', 'H', 'e', 'l', 'l', 'o', '\\', 'n', 'W', 'o', 'r', 'l', 'd', '\"', '\0'));
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY('\"', '\\', '/', '\b', '\f', '\n', '\r', '\t', '\0'), ARRAY('\"', '\\', '\"', '\\', '\\', '/', '\\', 'b', '\\', 'f', '\\', 'n', '\\', 'r', '\\', 't', '\"', '\0'));
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY(0x00024, 0x0000), ARRAY('\"', '\\', 'u', '0', '0', '2', '4', '\"', '\0'));
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY(0x000A2, 0x0000), ARRAY('\"', '\\', 'u', '0', '0', 'A', '2', '\"', '\0'));   // Cents sign U+00A2
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY(0x020AC, 0x0000), ARRAY('\"', '\\', 'u', '2', '0', 'A', 'C', '\"', '\0'));   // Euro sign U+20AC
-    TEST_STRINGARRAY2(UTF32<>, unsigned, ARRAY(0x1D11E, 0x0000), ARRAY('\"', '\\', 'u', 'D', '8', '3', '4', '\\', 'u', 'D', 'D', '1', 'E', '\"', '\0'));    // G clef sign U+1D11E
-
-#undef TEST_STRINGARRAY
-#undef ARRAY
-#undef TEST_STRING
-
-    // Support of null character in string
-    {
-        StringStream s("\"Hello\\u0000World\"");
-        const char e[] = "Hello\0World";
-        ParseStringHandler<UTF8<> > h;
-        Reader reader;
-        reader.Parse(s, h);
-        EXPECT_EQ(0, memcmp(e, h.str_, h.length_ + 1));
-        EXPECT_EQ(11u, h.length_);
-    }
-}
-
-TEST(Reader, ParseString_Transcoding) {
-    const char* x = "\"Hello\"";
-    const wchar_t* e = L"Hello";
-    GenericStringStream<UTF8<> > is(x);
-    GenericReader<UTF8<>, UTF16<> > reader;
-    ParseStringHandler<UTF16<> > h;
-    reader.Parse(is, h);
-    EXPECT_EQ(0, StrCmp<UTF16<>::Ch>(e, h.str_));
-    EXPECT_EQ(StrLen(e), h.length_);
-}
-
-TEST(Reader, ParseString_TranscodingWithValidation) {
-    const char* x = "\"Hello\"";
-    const wchar_t* e = L"Hello";
-    GenericStringStream<UTF8<> > is(x);
-    GenericReader<UTF8<>, UTF16<> > reader;
-    ParseStringHandler<UTF16<> > h;
-    reader.Parse<kParseValidateEncodingFlag>(is, h);
-    EXPECT_EQ(0, StrCmp<UTF16<>::Ch>(e, h.str_));
-    EXPECT_EQ(StrLen(e), h.length_);
-}
-
-TEST(Reader, ParseString_NonDestructive) {
-    StringStream s("\"Hello\\nWorld\"");
-    ParseStringHandler<UTF8<> > h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(0, StrCmp("Hello\nWorld", h.str_));
-    EXPECT_EQ(11u, h.length_);
-}
-
-template <typename Encoding>
-ParseErrorCode TestString(const typename Encoding::Ch* str) {
-    GenericStringStream<Encoding> s(str);
-    BaseReaderHandler<Encoding> h;
-    GenericReader<Encoding, Encoding> reader;
-    reader.template Parse<kParseValidateEncodingFlag>(s, h);
-    return reader.GetParseErrorCode();
-}
-
-TEST(Reader, ParseString_Error) {
-#define TEST_STRING_ERROR(errorCode, str, errorOffset, streamPos)\
-{\
-    GenericStringStream<UTF8<> > s(str);\
-    BaseReaderHandler<UTF8<> > h;\
-    GenericReader<UTF8<> , UTF8<> > reader;\
-    reader.Parse<kParseValidateEncodingFlag>(s, h);\
-    EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
-    EXPECT_EQ(errorOffset, reader.GetErrorOffset());\
-    EXPECT_EQ(streamPos, s.Tell());\
-}
-
-#define ARRAY(...) { __VA_ARGS__ }
-#define TEST_STRINGENCODING_ERROR(Encoding, TargetEncoding, utype, array) \
-    { \
-        static const utype ue[] = array; \
-        static const Encoding::Ch* e = reinterpret_cast<const Encoding::Ch *>(&ue[0]); \
-        EXPECT_EQ(kParseErrorStringInvalidEncoding, TestString<Encoding>(e));\
-        /* decode error */\
-        GenericStringStream<Encoding> s(e);\
-        BaseReaderHandler<TargetEncoding> h;\
-        GenericReader<Encoding, TargetEncoding> reader;\
-        reader.Parse(s, h);\
-        EXPECT_EQ(kParseErrorStringInvalidEncoding, reader.GetParseErrorCode());\
-    }
-
-    // Invalid escape character in string.
-    TEST_STRING_ERROR(kParseErrorStringEscapeInvalid, "[\"\\a\"]", 2, 3);
-
-    // Incorrect hex digit after \\u escape in string.
-    TEST_STRING_ERROR(kParseErrorStringUnicodeEscapeInvalidHex, "[\"\\uABCG\"]", 2, 7);
-
-    // Quotation in \\u escape in string (Issue #288)
-    TEST_STRING_ERROR(kParseErrorStringUnicodeEscapeInvalidHex, "[\"\\uaaa\"]", 2, 7);
-    TEST_STRING_ERROR(kParseErrorStringUnicodeEscapeInvalidHex, "[\"\\uD800\\uFFF\"]", 2, 13);
-
-    // The surrogate pair in string is invalid.
-    TEST_STRING_ERROR(kParseErrorStringUnicodeSurrogateInvalid, "[\"\\uD800X\"]", 2, 8);
-    TEST_STRING_ERROR(kParseErrorStringUnicodeSurrogateInvalid, "[\"\\uD800\\uFFFF\"]", 2, 14);
-
-    // Missing a closing quotation mark in string.
-    TEST_STRING_ERROR(kParseErrorStringMissQuotationMark, "[\"Test]", 7, 7);
-
-    // http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
-
-    // 3  Malformed sequences
-
-    // 3.1 Unexpected continuation bytes
-    {
-         char e[] = { '[', '\"', 0, '\"', ']', '\0' };
-         for (unsigned char c = 0x80u; c <= 0xBFu; c++) {
-            e[2] = static_cast<char>(c);
-            ParseErrorCode error = TestString<UTF8<> >(e);
-            EXPECT_EQ(kParseErrorStringInvalidEncoding, error);
-            if (error != kParseErrorStringInvalidEncoding)
-                std::cout << static_cast<unsigned>(c) << std::endl;
-         }
-    }
-
-    // 3.2 Lonely start characters, 3.5 Impossible bytes
-    {
-        char e[] = { '[', '\"', 0, ' ', '\"', ']', '\0' };
-        for (unsigned c = 0xC0u; c <= 0xFFu; c++) {
-            e[2] = static_cast<char>(c);
-            int streamPos;
-            if (c <= 0xC1u)
-                streamPos = 3; // 0xC0 - 0xC1
-            else if (c <= 0xDFu)
-                streamPos = 4; // 0xC2 - 0xDF
-            else if (c <= 0xEFu)
-                streamPos = 5; // 0xE0 - 0xEF
-            else if (c <= 0xF4u)
-                streamPos = 6; // 0xF0 - 0xF4
-            else
-                streamPos = 3; // 0xF5 - 0xFF
-            TEST_STRING_ERROR(kParseErrorStringInvalidEncoding, e, 2, streamPos);
-        }
-    }
-
-    // 4  Overlong sequences
-
-    // 4.1  Examples of an overlong ASCII character
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xC0u, 0xAFu, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xE0u, 0x80u, 0xAFu, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xF0u, 0x80u, 0x80u, 0xAFu, '\"', ']', '\0'));
-
-    // 4.2  Maximum overlong sequences
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xC1u, 0xBFu, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xE0u, 0x9Fu, 0xBFu, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xF0u, 0x8Fu, 0xBFu, 0xBFu, '\"', ']', '\0'));
-
-    // 4.3  Overlong representation of the NUL character
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xC0u, 0x80u, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xE0u, 0x80u, 0x80u, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xF0u, 0x80u, 0x80u, 0x80u, '\"', ']', '\0'));
-
-    // 5  Illegal code positions
-
-    // 5.1 Single UTF-16 surrogates
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xA0u, 0x80u, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xADu, 0xBFu, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xAEu, 0x80u, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xAFu, 0xBFu, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xB0u, 0x80u, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xBEu, 0x80u, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF8<>, UTF16<>, unsigned char, ARRAY('[', '\"', 0xEDu, 0xBFu, 0xBFu, '\"', ']', '\0'));
-
-    // Malform UTF-16 sequences
-    TEST_STRINGENCODING_ERROR(UTF16<>, UTF8<>, wchar_t, ARRAY('[', '\"', 0xDC00, 0xDC00, '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(UTF16<>, UTF8<>, wchar_t, ARRAY('[', '\"', 0xD800, 0xD800, '\"', ']', '\0'));
-
-    // Malform UTF-32 sequence
-    TEST_STRINGENCODING_ERROR(UTF32<>, UTF8<>, unsigned, ARRAY('[', '\"', 0x110000, '\"', ']', '\0'));
-
-    // Malform ASCII sequence
-    TEST_STRINGENCODING_ERROR(ASCII<>, UTF8<>, char, ARRAY('[', '\"', char(0x80u), '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(ASCII<>, UTF8<>, char, ARRAY('[', '\"', char(0x01u), '\"', ']', '\0'));
-    TEST_STRINGENCODING_ERROR(ASCII<>, UTF8<>, char, ARRAY('[', '\"', char(0x1Cu), '\"', ']', '\0'));
-
-#undef ARRAY
-#undef TEST_STRINGARRAY_ERROR
-}
-
-template <unsigned count>
-struct ParseArrayHandler : BaseReaderHandler<UTF8<>, ParseArrayHandler<count> > {
-    ParseArrayHandler() : step_(0) {}
-
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Uint(unsigned i) { EXPECT_EQ(step_, i); step_++; return true; }
-    bool StartArray() { EXPECT_EQ(0u, step_); step_++; return true; }
-    bool EndArray(SizeType) { step_++; return true; }
-
-    unsigned step_;
-};
-
-TEST(Reader, ParseEmptyArray) {
-    char *json = StrDup("[ ] ");
-    InsituStringStream s(json);
-    ParseArrayHandler<0> h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(2u, h.step_);
-    free(json);
-}
-
-TEST(Reader, ParseArray) {
-    char *json = StrDup("[1, 2, 3, 4]");
-    InsituStringStream s(json);
-    ParseArrayHandler<4> h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(6u, h.step_);
-    free(json);
-}
-
-TEST(Reader, ParseArray_Error) {
-#define TEST_ARRAY_ERROR(errorCode, str, errorOffset) \
-    { \
-        int streamPos = errorOffset; \
-        char buffer[1001]; \
-        strncpy(buffer, str, 1000); \
-        InsituStringStream s(buffer); \
-        BaseReaderHandler<> h; \
-        GenericReader<UTF8<>, UTF8<>, CrtAllocator> reader; \
-        EXPECT_FALSE(reader.Parse(s, h)); \
-        EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
-        EXPECT_EQ(errorOffset, reader.GetErrorOffset());\
-        EXPECT_EQ(streamPos, s.Tell());\
-    }
-
-    // Missing a comma or ']' after an array element.
-    TEST_ARRAY_ERROR(kParseErrorArrayMissCommaOrSquareBracket, "[1", 2);
-    TEST_ARRAY_ERROR(kParseErrorArrayMissCommaOrSquareBracket, "[1}", 2);
-    TEST_ARRAY_ERROR(kParseErrorArrayMissCommaOrSquareBracket, "[1 2]", 3);
-
-    // Array cannot have a trailing comma (without kParseTrailingCommasFlag);
-    // a value must follow a comma
-    TEST_ARRAY_ERROR(kParseErrorValueInvalid, "[1,]", 3);
-
-#undef TEST_ARRAY_ERROR
-}
-
-struct ParseObjectHandler : BaseReaderHandler<UTF8<>, ParseObjectHandler> {
-    ParseObjectHandler() : step_(0) {}
-
-    bool Default() { ADD_FAILURE(); return false; }
-    bool Null() { EXPECT_EQ(8u, step_); step_++; return true; }
-    bool Bool(bool b) {
-        switch(step_) {
-            case 4: EXPECT_TRUE(b); step_++; return true;
-            case 6: EXPECT_FALSE(b); step_++; return true;
-            default: ADD_FAILURE(); return false;
-        }
-    }
-    bool Int(int i) {
-        switch(step_) {
-            case 10: EXPECT_EQ(123, i); step_++; return true;
-            case 15: EXPECT_EQ(1, i); step_++; return true;
-            case 16: EXPECT_EQ(2, i); step_++; return true;
-            case 17: EXPECT_EQ(3, i); step_++; return true;
-            default: ADD_FAILURE(); return false;
-        }
-    }
-    bool Uint(unsigned i) { return Int(static_cast<int>(i)); }
-    bool Double(double d) { EXPECT_EQ(12u, step_); EXPECT_DOUBLE_EQ(3.1416, d); step_++; return true; }
-    bool String(const char* str, size_t, bool) {
-        switch(step_) {
-            case 1: EXPECT_STREQ("hello", str); step_++; return true;
-            case 2: EXPECT_STREQ("world", str); step_++; return true;
-            case 3: EXPECT_STREQ("t", str); step_++; return true;
-            case 5: EXPECT_STREQ("f", str); step_++; return true;
-            case 7: EXPECT_STREQ("n", str); step_++; return true;
-            case 9: EXPECT_STREQ("i", str); step_++; return true;
-            case 11: EXPECT_STREQ("pi", str); step_++; return true;
-            case 13: EXPECT_STREQ("a", str); step_++; return true;
-            default: ADD_FAILURE(); return false;
-        }
-    }
-    bool StartObject() { EXPECT_EQ(0u, step_); step_++; return true; }
-    bool EndObject(SizeType memberCount) { EXPECT_EQ(19u, step_); EXPECT_EQ(7u, memberCount); step_++; return true; }
-    bool StartArray() { EXPECT_EQ(14u, step_); step_++; return true; }
-    bool EndArray(SizeType elementCount) { EXPECT_EQ(18u, step_); EXPECT_EQ(3u, elementCount); step_++; return true; }
-
-    unsigned step_;
-};
-
-TEST(Reader, ParseObject) {
-    const char* json = "{ \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3] } ";
-
-    // Insitu
-    {
-        char* json2 = StrDup(json);
-        InsituStringStream s(json2);
-        ParseObjectHandler h;
-        Reader reader;
-        reader.Parse<kParseInsituFlag>(s, h);
-        EXPECT_EQ(20u, h.step_);
-        free(json2);
-    }
-
-    // Normal
-    {
-        StringStream s(json);
-        ParseObjectHandler h;
-        Reader reader;
-        reader.Parse(s, h);
-        EXPECT_EQ(20u, h.step_);
-    }
-}
-
-struct ParseEmptyObjectHandler : BaseReaderHandler<UTF8<>, ParseEmptyObjectHandler> {
-    ParseEmptyObjectHandler() : step_(0) {}
-
-    bool Default() { ADD_FAILURE(); return false; }
-    bool StartObject() { EXPECT_EQ(0u, step_); step_++; return true; }
-    bool EndObject(SizeType) { EXPECT_EQ(1u, step_); step_++; return true; }
-
-    unsigned step_;
-};
-
-TEST(Reader, Parse_EmptyObject) {
-    StringStream s("{ } ");
-    ParseEmptyObjectHandler h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(2u, h.step_);
-}
-
-struct ParseMultipleRootHandler : BaseReaderHandler<UTF8<>, ParseMultipleRootHandler> {
-    ParseMultipleRootHandler() : step_(0) {}
-
-    bool Default() { ADD_FAILURE(); return false; }
-    bool StartObject() { EXPECT_EQ(0u, step_); step_++; return true; }
-    bool EndObject(SizeType) { EXPECT_EQ(1u, step_); step_++; return true; }
-    bool StartArray() { EXPECT_EQ(2u, step_); step_++; return true; }
-    bool EndArray(SizeType) { EXPECT_EQ(3u, step_); step_++; return true; }
-
-    unsigned step_;
-};
-
-template <unsigned parseFlags>
-void TestMultipleRoot() {
-    StringStream s("{}[] a");
-    ParseMultipleRootHandler h;
-    Reader reader;
-    EXPECT_TRUE(reader.Parse<parseFlags>(s, h));
-    EXPECT_EQ(2u, h.step_);
-    EXPECT_TRUE(reader.Parse<parseFlags>(s, h));
-    EXPECT_EQ(4u, h.step_);
-    EXPECT_EQ(' ', s.Take());
-    EXPECT_EQ('a', s.Take());
-}
-
-TEST(Reader, Parse_MultipleRoot) {
-    TestMultipleRoot<kParseStopWhenDoneFlag>();
-}
-
-TEST(Reader, ParseIterative_MultipleRoot) {
-    TestMultipleRoot<kParseIterativeFlag | kParseStopWhenDoneFlag>();
-}
-
-template <unsigned parseFlags>
-void TestInsituMultipleRoot() {
-    char* buffer = strdup("{}[] a");
-    InsituStringStream s(buffer);
-    ParseMultipleRootHandler h;
-    Reader reader;
-    EXPECT_TRUE(reader.Parse<kParseInsituFlag | parseFlags>(s, h));
-    EXPECT_EQ(2u, h.step_);
-    EXPECT_TRUE(reader.Parse<kParseInsituFlag | parseFlags>(s, h));
-    EXPECT_EQ(4u, h.step_);
-    EXPECT_EQ(' ', s.Take());
-    EXPECT_EQ('a', s.Take());
-    free(buffer);
-}
-
-TEST(Reader, ParseInsitu_MultipleRoot) {
-    TestInsituMultipleRoot<kParseStopWhenDoneFlag>();
-}
-
-TEST(Reader, ParseInsituIterative_MultipleRoot) {
-    TestInsituMultipleRoot<kParseIterativeFlag | kParseStopWhenDoneFlag>();
-}
-
-#define TEST_ERROR(errorCode, str, errorOffset) \
-    { \
-        int streamPos = errorOffset; \
-        char buffer[1001]; \
-        strncpy(buffer, str, 1000); \
-        InsituStringStream s(buffer); \
-        BaseReaderHandler<> h; \
-        Reader reader; \
-        EXPECT_FALSE(reader.Parse(s, h)); \
-        EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
-        EXPECT_EQ(errorOffset, reader.GetErrorOffset());\
-        EXPECT_EQ(streamPos, s.Tell());\
-    }
-
-TEST(Reader, ParseDocument_Error) {
-    // The document is empty.
-    TEST_ERROR(kParseErrorDocumentEmpty, "", 0);
-    TEST_ERROR(kParseErrorDocumentEmpty, " ", 1);
-    TEST_ERROR(kParseErrorDocumentEmpty, " \n", 2);
-
-    // The document root must not follow by other values.
-    TEST_ERROR(kParseErrorDocumentRootNotSingular, "[] 0", 3);
-    TEST_ERROR(kParseErrorDocumentRootNotSingular, "{} 0", 3);
-    TEST_ERROR(kParseErrorDocumentRootNotSingular, "null []", 5);
-    TEST_ERROR(kParseErrorDocumentRootNotSingular, "0 {}", 2);
-}
-
-TEST(Reader, ParseValue_Error) {
-    // Invalid value.
-    TEST_ERROR(kParseErrorValueInvalid, "nulL", 3);
-    TEST_ERROR(kParseErrorValueInvalid, "truE", 3);
-    TEST_ERROR(kParseErrorValueInvalid, "falsE", 4);
-    TEST_ERROR(kParseErrorValueInvalid, "a]", 0);
-    TEST_ERROR(kParseErrorValueInvalid, ".1", 0);
-}
-
-TEST(Reader, ParseObject_Error) {
-    // Missing a name for object member.
-    TEST_ERROR(kParseErrorObjectMissName, "{1}", 1);
-    TEST_ERROR(kParseErrorObjectMissName, "{:1}", 1);
-    TEST_ERROR(kParseErrorObjectMissName, "{null:1}", 1);
-    TEST_ERROR(kParseErrorObjectMissName, "{true:1}", 1);
-    TEST_ERROR(kParseErrorObjectMissName, "{false:1}", 1);
-    TEST_ERROR(kParseErrorObjectMissName, "{1:1}", 1);
-    TEST_ERROR(kParseErrorObjectMissName, "{[]:1}", 1);
-    TEST_ERROR(kParseErrorObjectMissName, "{{}:1}", 1);
-    TEST_ERROR(kParseErrorObjectMissName, "{xyz:1}", 1);
-
-    // Missing a colon after a name of object member.
-    TEST_ERROR(kParseErrorObjectMissColon, "{\"a\" 1}", 5);
-    TEST_ERROR(kParseErrorObjectMissColon, "{\"a\",1}", 4);
-
-    // Must be a comma or '}' after an object member
-    TEST_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, "{\"a\":1]", 6);
-
-    // Object cannot have a trailing comma (without kParseTrailingCommasFlag);
-    // an object member name must follow a comma
-    TEST_ERROR(kParseErrorObjectMissName, "{\"a\":1,}", 7);
-
-    // This tests that MemoryStream is checking the length in Peek().
-    {
-        MemoryStream ms("{\"a\"", 1);
-        BaseReaderHandler<> h;
-        Reader reader;
-        EXPECT_FALSE(reader.Parse<kParseStopWhenDoneFlag>(ms, h));
-        EXPECT_EQ(kParseErrorObjectMissName, reader.GetParseErrorCode());
-    }
-}
-
-#undef TEST_ERROR
-
-TEST(Reader, SkipWhitespace) {
-    StringStream ss(" A \t\tB\n \n\nC\r\r \rD \t\n\r E");
-    const char* expected = "ABCDE";
-    for (size_t i = 0; i < 5; i++) {
-        SkipWhitespace(ss);
-        EXPECT_EQ(expected[i], ss.Take());
-    }
-}
-
-// Test implementing a stream without copy stream optimization.
-// Clone from GenericStringStream except that copy constructor is disabled.
-template <typename Encoding>
-class CustomStringStream {
-public:
-    typedef typename Encoding::Ch Ch;
-
-    CustomStringStream(const Ch *src) : src_(src), head_(src) {}
-
-    Ch Peek() const { return *src_; }
-    Ch Take() { return *src_++; }
-    size_t Tell() const { return static_cast<size_t>(src_ - head_); }
-
-    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
-    void Put(Ch) { RAPIDJSON_ASSERT(false); }
-    void Flush() { RAPIDJSON_ASSERT(false); }
-    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    CustomStringStream(const CustomStringStream&);
-    CustomStringStream& operator=(const CustomStringStream&);
-
-    const Ch* src_;     //!< Current read position.
-    const Ch* head_;    //!< Original head of the string.
-};
-
-// If the following code is compiled, it should generate compilation error as predicted.
-// Because CustomStringStream<> is not copyable via making copy constructor private.
-#if 0
-namespace rapidjson {
-
-template <typename Encoding>
-struct StreamTraits<CustomStringStream<Encoding> > {
-    enum { copyOptimization = 1 };
-};
-
-} // namespace rapidjson
-#endif
-
-TEST(Reader, CustomStringStream) {
-    const char* json = "{ \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3] } ";
-    CustomStringStream<UTF8<char> > s(json);
-    ParseObjectHandler h;
-    Reader reader;
-    reader.Parse(s, h);
-    EXPECT_EQ(20u, h.step_);
-}
-
-#include <sstream>
-
-class IStreamWrapper {
-public:
-    typedef char Ch;
-
-    IStreamWrapper(std::istream& is) : is_(is) {}
-
-    Ch Peek() const {
-        int c = is_.peek();
-        return c == std::char_traits<char>::eof() ? '\0' : static_cast<Ch>(c);
-    }
-
-    Ch Take() {
-        int c = is_.get();
-        return c == std::char_traits<char>::eof() ? '\0' : static_cast<Ch>(c);
-    }
-
-    size_t Tell() const { return static_cast<size_t>(is_.tellg()); }
-
-    Ch* PutBegin() { assert(false); return 0; }
-    void Put(Ch) { assert(false); }
-    void Flush() { assert(false); }
-    size_t PutEnd(Ch*) { assert(false); return 0; }
-
-private:
-    IStreamWrapper(const IStreamWrapper&);
-    IStreamWrapper& operator=(const IStreamWrapper&);
-
-    std::istream& is_;
-};
-
-TEST(Reader, Parse_IStreamWrapper_StringStream) {
-    const char* json = "[1,2,3,4]";
-
-    std::stringstream ss(json);
-    IStreamWrapper is(ss);
-
-    Reader reader;
-    ParseArrayHandler<4> h;
-    reader.Parse(is, h);
-    EXPECT_FALSE(reader.HasParseError());
-}
-
-// Test iterative parsing.
-
-#define TESTERRORHANDLING(text, errorCode, offset)\
-{\
-    int streamPos = offset; \
-    StringStream json(text); \
-    BaseReaderHandler<> handler; \
-    Reader reader; \
-    reader.Parse<kParseIterativeFlag>(json, handler); \
-    EXPECT_TRUE(reader.HasParseError()); \
-    EXPECT_EQ(errorCode, reader.GetParseErrorCode()); \
-    EXPECT_EQ(offset, reader.GetErrorOffset()); \
-    EXPECT_EQ(streamPos, json.Tell()); \
-}
-
-TEST(Reader, IterativeParsing_ErrorHandling) {
-    TESTERRORHANDLING("{\"a\": a}", kParseErrorValueInvalid, 6u);
-
-    TESTERRORHANDLING("", kParseErrorDocumentEmpty, 0u);
-    TESTERRORHANDLING("{}{}", kParseErrorDocumentRootNotSingular, 2u);
-
-    TESTERRORHANDLING("{1}", kParseErrorObjectMissName, 1u);
-    TESTERRORHANDLING("{\"a\", 1}", kParseErrorObjectMissColon, 4u);
-    TESTERRORHANDLING("{\"a\"}", kParseErrorObjectMissColon, 4u);
-    TESTERRORHANDLING("{\"a\": 1", kParseErrorObjectMissCommaOrCurlyBracket, 7u);
-    TESTERRORHANDLING("[1 2 3]", kParseErrorArrayMissCommaOrSquareBracket, 3u);
-    TESTERRORHANDLING("{\"a: 1", kParseErrorStringMissQuotationMark, 6u);
-    TESTERRORHANDLING("{\"a\":}", kParseErrorValueInvalid, 5u);
-    TESTERRORHANDLING("{\"a\":]", kParseErrorValueInvalid, 5u);
-    TESTERRORHANDLING("[1,2,}", kParseErrorValueInvalid, 5u);
-    TESTERRORHANDLING("[}]", kParseErrorValueInvalid, 1u);
-    TESTERRORHANDLING("[,]", kParseErrorValueInvalid, 1u);
-    TESTERRORHANDLING("[1,,]", kParseErrorValueInvalid, 3u);
-
-    // Trailing commas are not allowed without kParseTrailingCommasFlag
-    TESTERRORHANDLING("{\"a\": 1,}", kParseErrorObjectMissName, 8u);
-    TESTERRORHANDLING("[1,2,3,]", kParseErrorValueInvalid, 7u);
-
-    // Any JSON value can be a valid root element in RFC7159.
-    TESTERRORHANDLING("\"ab", kParseErrorStringMissQuotationMark, 3u);
-    TESTERRORHANDLING("truE", kParseErrorValueInvalid, 3u);
-    TESTERRORHANDLING("False", kParseErrorValueInvalid, 0u);
-    TESTERRORHANDLING("true, false", kParseErrorDocumentRootNotSingular, 4u);
-    TESTERRORHANDLING("false, false", kParseErrorDocumentRootNotSingular, 5u);
-    TESTERRORHANDLING("nulL", kParseErrorValueInvalid, 3u);
-    TESTERRORHANDLING("null , null", kParseErrorDocumentRootNotSingular, 5u);
-    TESTERRORHANDLING("1a", kParseErrorDocumentRootNotSingular, 1u);
-}
-
-template<typename Encoding = UTF8<> >
-struct IterativeParsingReaderHandler {
-    typedef typename Encoding::Ch Ch;
-
-    const static uint32_t LOG_NULL        = 0x10000000;
-    const static uint32_t LOG_BOOL        = 0x20000000;
-    const static uint32_t LOG_INT         = 0x30000000;
-    const static uint32_t LOG_UINT        = 0x40000000;
-    const static uint32_t LOG_INT64       = 0x50000000;
-    const static uint32_t LOG_UINT64      = 0x60000000;
-    const static uint32_t LOG_DOUBLE      = 0x70000000;
-    const static uint32_t LOG_STRING      = 0x80000000;
-    const static uint32_t LOG_STARTOBJECT = 0x90000000;
-    const static uint32_t LOG_KEY         = 0xA0000000;
-    const static uint32_t LOG_ENDOBJECT   = 0xB0000000;
-    const static uint32_t LOG_STARTARRAY  = 0xC0000000;
-    const static uint32_t LOG_ENDARRAY    = 0xD0000000;
-
-    const static size_t LogCapacity = 256;
-    uint32_t Logs[LogCapacity];
-    size_t LogCount;
-
-    IterativeParsingReaderHandler() : LogCount(0) {
-    }
-
-    bool Null() { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_NULL; return true; }
-
-    bool Bool(bool) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_BOOL; return true; }
-
-    bool Int(int) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_INT; return true; }
-
-    bool Uint(unsigned) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_INT; return true; }
-
-    bool Int64(int64_t) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_INT64; return true; }
-
-    bool Uint64(uint64_t) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_UINT64; return true; }
-
-    bool Double(double) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_DOUBLE; return true; }
-
-    bool RawNumber(const Ch*, SizeType, bool) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_STRING; return true; }
-
-    bool String(const Ch*, SizeType, bool) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_STRING; return true; }
-
-    bool StartObject() { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_STARTOBJECT; return true; }
-
-    bool Key (const Ch*, SizeType, bool) { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_KEY; return true; }
-
-    bool EndObject(SizeType c) {
-        RAPIDJSON_ASSERT(LogCount < LogCapacity);
-        RAPIDJSON_ASSERT((static_cast<uint32_t>(c) & 0xF0000000) == 0);
-        Logs[LogCount++] = LOG_ENDOBJECT | static_cast<uint32_t>(c);
-        return true;
-    }
-
-    bool StartArray() { RAPIDJSON_ASSERT(LogCount < LogCapacity); Logs[LogCount++] = LOG_STARTARRAY; return true; }
-
-    bool EndArray(SizeType c) {
-        RAPIDJSON_ASSERT(LogCount < LogCapacity);
-        RAPIDJSON_ASSERT((static_cast<uint32_t>(c) & 0xF0000000) == 0);
-        Logs[LogCount++] = LOG_ENDARRAY | static_cast<uint32_t>(c);
-        return true;
-    }
-};
-
-TEST(Reader, IterativeParsing_General) {
-    {
-        StringStream is("[1, {\"k\": [1, 2]}, null, false, true, \"string\", 1.2]");
-        Reader reader;
-        IterativeParsingReaderHandler<> handler;
-
-        ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
-
-        EXPECT_FALSE(r.IsError());
-        EXPECT_FALSE(reader.HasParseError());
-
-        uint32_t e[] = {
-            handler.LOG_STARTARRAY,
-            handler.LOG_INT,
-            handler.LOG_STARTOBJECT,
-            handler.LOG_KEY,
-            handler.LOG_STARTARRAY,
-            handler.LOG_INT,
-            handler.LOG_INT,
-            handler.LOG_ENDARRAY | 2,
-            handler.LOG_ENDOBJECT | 1,
-            handler.LOG_NULL,
-            handler.LOG_BOOL,
-            handler.LOG_BOOL,
-            handler.LOG_STRING,
-            handler.LOG_DOUBLE,
-            handler.LOG_ENDARRAY | 7
-        };
-
-        EXPECT_EQ(sizeof(e) / sizeof(int), handler.LogCount);
-
-        for (size_t i = 0; i < handler.LogCount; ++i) {
-            EXPECT_EQ(e[i], handler.Logs[i]) << "i = " << i;
-        }
-    }
-}
-
-TEST(Reader, IterativeParsing_Count) {
-    {
-        StringStream is("[{}, {\"k\": 1}, [1], []]");
-        Reader reader;
-        IterativeParsingReaderHandler<> handler;
-
-        ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
-
-        EXPECT_FALSE(r.IsError());
-        EXPECT_FALSE(reader.HasParseError());
-
-        uint32_t e[] = {
-            handler.LOG_STARTARRAY,
-            handler.LOG_STARTOBJECT,
-            handler.LOG_ENDOBJECT | 0,
-            handler.LOG_STARTOBJECT,
-            handler.LOG_KEY,
-            handler.LOG_INT,
-            handler.LOG_ENDOBJECT | 1,
-            handler.LOG_STARTARRAY,
-            handler.LOG_INT,
-            handler.LOG_ENDARRAY | 1,
-            handler.LOG_STARTARRAY,
-            handler.LOG_ENDARRAY | 0,
-            handler.LOG_ENDARRAY | 4
-        };
-
-        EXPECT_EQ(sizeof(e) / sizeof(int), handler.LogCount);
-
-        for (size_t i = 0; i < handler.LogCount; ++i) {
-            EXPECT_EQ(e[i], handler.Logs[i]) << "i = " << i;
-        }
-    }
-}
-
-TEST(Reader, IterativePullParsing_General) {
-    {
-        IterativeParsingReaderHandler<> handler;
-        uint32_t e[] = {
-            handler.LOG_STARTARRAY,
-            handler.LOG_INT,
-            handler.LOG_STARTOBJECT,
-            handler.LOG_KEY,
-            handler.LOG_STARTARRAY,
-            handler.LOG_INT,
-            handler.LOG_INT,
-            handler.LOG_ENDARRAY | 2,
-            handler.LOG_ENDOBJECT | 1,
-            handler.LOG_NULL,
-            handler.LOG_BOOL,
-            handler.LOG_BOOL,
-            handler.LOG_STRING,
-            handler.LOG_DOUBLE,
-            handler.LOG_ENDARRAY | 7
-        };
-
-        StringStream is("[1, {\"k\": [1, 2]}, null, false, true, \"string\", 1.2]");
-        Reader reader;
-
-        reader.IterativeParseInit();
-        while (!reader.IterativeParseComplete()) {
-            size_t oldLogCount = handler.LogCount;
-            EXPECT_TRUE(oldLogCount < sizeof(e) / sizeof(int)) << "overrun";
-
-            EXPECT_TRUE(reader.IterativeParseNext<kParseDefaultFlags>(is, handler)) << "parse fail";
-            EXPECT_EQ(handler.LogCount, oldLogCount + 1) << "handler should be invoked exactly once each time";
-            EXPECT_EQ(e[oldLogCount], handler.Logs[oldLogCount]) << "wrong event returned";
-        }
-
-        EXPECT_FALSE(reader.HasParseError());
-        EXPECT_EQ(sizeof(e) / sizeof(int), handler.LogCount) << "handler invoked wrong number of times";
-
-        // The handler should not be invoked when the JSON has been fully read, but it should not fail
-        size_t oldLogCount = handler.LogCount;
-        EXPECT_TRUE(reader.IterativeParseNext<kParseDefaultFlags>(is, handler)) << "parse-next past complete is allowed";
-        EXPECT_EQ(handler.LogCount, oldLogCount) << "parse-next past complete should not invoke handler";
-        EXPECT_FALSE(reader.HasParseError()) << "parse-next past complete should not generate parse error";
-    }
-}
-
-// Test iterative parsing on kParseErrorTermination.
-struct HandlerTerminateAtStartObject : public IterativeParsingReaderHandler<> {
-    bool StartObject() { return false; }
-};
-
-struct HandlerTerminateAtStartArray : public IterativeParsingReaderHandler<> {
-    bool StartArray() { return false; }
-};
-
-struct HandlerTerminateAtEndObject : public IterativeParsingReaderHandler<> {
-    bool EndObject(SizeType) { return false; }
-};
-
-struct HandlerTerminateAtEndArray : public IterativeParsingReaderHandler<> {
-    bool EndArray(SizeType) { return false; }
-};
-
-TEST(Reader, IterativeParsing_ShortCircuit) {
-    {
-        HandlerTerminateAtStartObject handler;
-        Reader reader;
-        StringStream is("[1, {}]");
-
-        ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
-
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorTermination, r.Code());
-        EXPECT_EQ(4u, r.Offset());
-    }
-
-    {
-        HandlerTerminateAtStartArray handler;
-        Reader reader;
-        StringStream is("{\"a\": []}");
-
-        ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
-
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorTermination, r.Code());
-        EXPECT_EQ(6u, r.Offset());
-    }
-
-    {
-        HandlerTerminateAtEndObject handler;
-        Reader reader;
-        StringStream is("[1, {}]");
-
-        ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
-
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorTermination, r.Code());
-        EXPECT_EQ(5u, r.Offset());
-    }
-
-    {
-        HandlerTerminateAtEndArray handler;
-        Reader reader;
-        StringStream is("{\"a\": []}");
-
-        ParseResult r = reader.Parse<kParseIterativeFlag>(is, handler);
-
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorTermination, r.Code());
-        EXPECT_EQ(7u, r.Offset());
-    }
-}
-
-// For covering BaseReaderHandler default functions
-TEST(Reader, BaseReaderHandler_Default) {
-    BaseReaderHandler<> h;
-    Reader reader;
-    StringStream is("[null, true, -1, 1, -1234567890123456789, 1234567890123456789, 3.14, \"s\", { \"a\" : 1 }]");
-    EXPECT_TRUE(reader.Parse(is, h));
-}
-
-template <int e>
-struct TerminateHandler {
-    bool Null() { return e != 0; }
-    bool Bool(bool) { return e != 1; }
-    bool Int(int) { return e != 2; }
-    bool Uint(unsigned) { return e != 3; }
-    bool Int64(int64_t) { return e != 4; }
-    bool Uint64(uint64_t) { return e != 5;  }
-    bool Double(double) { return e != 6; }
-    bool RawNumber(const char*, SizeType, bool) { return e != 7; }
-    bool String(const char*, SizeType, bool) { return e != 8; }
-    bool StartObject() { return e != 9; }
-    bool Key(const char*, SizeType, bool)  { return e != 10; }
-    bool EndObject(SizeType) { return e != 11; }
-    bool StartArray() { return e != 12; }
-    bool EndArray(SizeType) { return e != 13; }
-};
-
-#define TEST_TERMINATION(e, json)\
-{\
-    Reader reader;\
-    TerminateHandler<e> h;\
-    StringStream is(json);\
-    EXPECT_FALSE(reader.Parse(is, h));\
-    EXPECT_EQ(kParseErrorTermination, reader.GetParseErrorCode());\
-}
-
-TEST(Reader, ParseTerminationByHandler) {
-    TEST_TERMINATION(0, "[null");
-    TEST_TERMINATION(1, "[true");
-    TEST_TERMINATION(1, "[false");
-    TEST_TERMINATION(2, "[-1");
-    TEST_TERMINATION(3, "[1");
-    TEST_TERMINATION(4, "[-1234567890123456789");
-    TEST_TERMINATION(5, "[1234567890123456789");
-    TEST_TERMINATION(6, "[0.5]");
-    // RawNumber() is never called
-    TEST_TERMINATION(8, "[\"a\"");
-    TEST_TERMINATION(9, "[{");
-    TEST_TERMINATION(10, "[{\"a\"");
-    TEST_TERMINATION(11, "[{}");
-    TEST_TERMINATION(11, "[{\"a\":1}"); // non-empty object
-    TEST_TERMINATION(12, "{\"a\":[");
-    TEST_TERMINATION(13, "{\"a\":[]");
-    TEST_TERMINATION(13, "{\"a\":[1]"); // non-empty array
-}
-
-TEST(Reader, ParseComments) {
-    const char* json =
-    "// Here is a one-line comment.\n"
-    "{// And here's another one\n"
-    "   /*And here's an in-line one.*/\"hello\" : \"world\","
-    "   \"t\" :/* And one with '*' symbol*/true ,"
-    "/* A multiline comment\n"
-    "   goes here*/"
-    "   \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3]"
-    "}/*And the last one to be sure */";
-
-    StringStream s(json);
-    ParseObjectHandler h;
-    Reader reader;
-    EXPECT_TRUE(reader.Parse<kParseCommentsFlag>(s, h));
-    EXPECT_EQ(20u, h.step_);
-}
-
-TEST(Reader, ParseEmptyInlineComment) {
-    const char* json = "{/**/\"hello\" : \"world\", \"t\" : true, \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3] }";
-
-    StringStream s(json);
-    ParseObjectHandler h;
-    Reader reader;
-    EXPECT_TRUE(reader.Parse<kParseCommentsFlag>(s, h));
-    EXPECT_EQ(20u, h.step_);
-}
-
-TEST(Reader, ParseEmptyOnelineComment) {
-    const char* json = "{//\n\"hello\" : \"world\", \"t\" : true, \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3] }";
-
-    StringStream s(json);
-    ParseObjectHandler h;
-    Reader reader;
-    EXPECT_TRUE(reader.Parse<kParseCommentsFlag>(s, h));
-    EXPECT_EQ(20u, h.step_);
-}
-
-TEST(Reader, ParseMultipleCommentsInARow) {
-    const char* json =
-    "{/* first comment *//* second */\n"
-    "/* third */ /*fourth*/// last one\n"
-    "\"hello\" : \"world\", \"t\" : true, \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3] }";
-
-    StringStream s(json);
-    ParseObjectHandler h;
-    Reader reader;
-    EXPECT_TRUE(reader.Parse<kParseCommentsFlag>(s, h));
-    EXPECT_EQ(20u, h.step_);
-}
-
-TEST(Reader, InlineCommentsAreDisabledByDefault) {
-    {
-        const char* json = "{/* Inline comment. */\"hello\" : \"world\", \"t\" : true, \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3] }";
-
-        StringStream s(json);
-        ParseObjectHandler h;
-        Reader reader;
-        EXPECT_FALSE(reader.Parse<kParseDefaultFlags>(s, h));
-    }
-
-    {
-        const char* json =
-        "{\"hello\" : /* Multiline comment starts here\n"
-        " continues here\n"
-        " and ends here */\"world\", \"t\" :true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3] }";
-
-        StringStream s(json);
-        ParseObjectHandler h;
-        Reader reader;
-        EXPECT_FALSE(reader.Parse<kParseDefaultFlags>(s, h));
-    }
-}
-
-TEST(Reader, OnelineCommentsAreDisabledByDefault) {
-    const char* json = "{// One-line comment\n\"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3] }";
-
-    StringStream s(json);
-    ParseObjectHandler h;
-    Reader reader;
-    EXPECT_FALSE(reader.Parse<kParseDefaultFlags>(s, h));
-}
-
-TEST(Reader, EofAfterOneLineComment) {
-    const char* json = "{\"hello\" : \"world\" // EOF is here -->\0 \n}";
-
-    StringStream s(json);
-    ParseObjectHandler h;
-    Reader reader;
-    EXPECT_FALSE(reader.Parse<kParseCommentsFlag>(s, h));
-    EXPECT_EQ(kParseErrorObjectMissCommaOrCurlyBracket, reader.GetParseErrorCode());
-}
-
-TEST(Reader, IncompleteMultilineComment) {
-    const char* json = "{\"hello\" : \"world\" /* EOF is here -->\0 */}";
-
-    StringStream s(json);
-    ParseObjectHandler h;
-    Reader reader;
-    EXPECT_FALSE(reader.Parse<kParseCommentsFlag>(s, h));
-    EXPECT_EQ(kParseErrorUnspecificSyntaxError, reader.GetParseErrorCode());
-}
-
-TEST(Reader, IncompleteMultilineComment2) {
-    const char* json = "{\"hello\" : \"world\" /* *\0 */}";
-
-    StringStream s(json);
-    ParseObjectHandler h;
-    Reader reader;
-    EXPECT_FALSE(reader.Parse<kParseCommentsFlag>(s, h));
-    EXPECT_EQ(kParseErrorUnspecificSyntaxError, reader.GetParseErrorCode());
-}
-
-TEST(Reader, UnrecognizedComment) {
-    const char* json = "{\"hello\" : \"world\" /! }";
-
-    StringStream s(json);
-    ParseObjectHandler h;
-    Reader reader;
-    EXPECT_FALSE(reader.Parse<kParseCommentsFlag>(s, h));
-    EXPECT_EQ(kParseErrorUnspecificSyntaxError, reader.GetParseErrorCode());
-}
-
-struct NumbersAsStringsHandler {
-    bool Null() { return true; }
-    bool Bool(bool) { return true; }
-    bool Int(int) { return true; }
-    bool Uint(unsigned) { return true; }
-    bool Int64(int64_t) { return true; }
-    bool Uint64(uint64_t) { return true;  }
-    bool Double(double) { return true; }
-    // 'str' is not null-terminated
-    bool RawNumber(const char* str, SizeType length, bool) {
-        EXPECT_TRUE(str != 0);
-        EXPECT_TRUE(expected_len_ == length);
-        EXPECT_TRUE(strncmp(str, expected_, length) == 0);
-        return true;
-    }
-    bool String(const char*, SizeType, bool) { return true; }
-    bool StartObject() { return true; }
-    bool Key(const char*, SizeType, bool) { return true; }
-    bool EndObject(SizeType) { return true; }
-    bool StartArray() { return true; }
-    bool EndArray(SizeType) { return true; }
-
-    NumbersAsStringsHandler(const char* expected)
-        : expected_(expected)
-        , expected_len_(strlen(expected)) {}
-
-    const char* expected_;
-    size_t expected_len_;
-};
-
-TEST(Reader, NumbersAsStrings) {
-    {
-        const char* json = "{ \"pi\": 3.1416 } ";
-        StringStream s(json);
-        NumbersAsStringsHandler h("3.1416");
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseNumbersAsStringsFlag>(s, h));
-    }
-    {
-        char* json = StrDup("{ \"pi\": 3.1416 } ");
-        InsituStringStream s(json);
-        NumbersAsStringsHandler h("3.1416");
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseInsituFlag|kParseNumbersAsStringsFlag>(s, h));
-        free(json);
-    }
-    {
-        const char* json = "{ \"gigabyte\": 1.0e9 } ";
-        StringStream s(json);
-        NumbersAsStringsHandler h("1.0e9");
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseNumbersAsStringsFlag>(s, h));
-    }
-    {
-        char* json = StrDup("{ \"gigabyte\": 1.0e9 } ");
-        InsituStringStream s(json);
-        NumbersAsStringsHandler h("1.0e9");
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseInsituFlag|kParseNumbersAsStringsFlag>(s, h));
-        free(json);
-    }
-    {
-        const char* json = "{ \"pi\": 314.159e-2 } ";
-        StringStream s(json);
-        NumbersAsStringsHandler h("314.159e-2");
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseNumbersAsStringsFlag>(s, h));
-    }
-    {
-        char* json = StrDup("{ \"gigabyte\": 314.159e-2 } ");
-        InsituStringStream s(json);
-        NumbersAsStringsHandler h("314.159e-2");
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseInsituFlag|kParseNumbersAsStringsFlag>(s, h));
-        free(json);
-    }
-    {
-        const char* json = "{ \"negative\": -1.54321 } ";
-        StringStream s(json);
-        NumbersAsStringsHandler h("-1.54321");
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseNumbersAsStringsFlag>(s, h));
-    }
-    {
-        char* json = StrDup("{ \"negative\": -1.54321 } ");
-        InsituStringStream s(json);
-        NumbersAsStringsHandler h("-1.54321");
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseInsituFlag|kParseNumbersAsStringsFlag>(s, h));
-        free(json);
-    }
-    {
-        const char* json = "{ \"pi\": 314.159e-2 } ";
-        std::stringstream ss(json);
-        IStreamWrapper s(ss);
-        NumbersAsStringsHandler h("314.159e-2");
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<kParseNumbersAsStringsFlag>(s, h));
-    }
-}
-
-template <unsigned extraFlags>
-void TestTrailingCommas() {
-    {
-        StringStream s("[1,2,3,]");
-        ParseArrayHandler<3> h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<extraFlags|kParseTrailingCommasFlag>(s, h));
-        EXPECT_EQ(5u, h.step_);
-    }
-    {
-        const char* json = "{ \"hello\" : \"world\", \"t\" : true , \"f\" : false,"
-                "\"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3],}";
-        StringStream s(json);
-        ParseObjectHandler h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<extraFlags|kParseTrailingCommasFlag>(s, h));
-        EXPECT_EQ(20u, h.step_);
-    }
-    {
-        // whitespace around trailing commas
-        const char* json = "{ \"hello\" : \"world\", \"t\" : true , \"f\" : false,"
-                "\"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3\n,\n]\n,\n} ";
-        StringStream s(json);
-        ParseObjectHandler h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<extraFlags|kParseTrailingCommasFlag>(s, h));
-        EXPECT_EQ(20u, h.step_);
-    }
-    {
-        // comments around trailing commas
-        const char* json = "{ \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null,"
-                "\"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3/*test*/,/*test*/]/*test*/,/*test*/}";
-        StringStream s(json);
-        ParseObjectHandler h;
-        Reader reader;
-        EXPECT_TRUE(reader.Parse<extraFlags|kParseTrailingCommasFlag|kParseCommentsFlag>(s, h));
-        EXPECT_EQ(20u, h.step_);
-    }
-}
-
-TEST(Reader, TrailingCommas) {
-    TestTrailingCommas<kParseNoFlags>();
-}
-
-TEST(Reader, TrailingCommasIterative) {
-    TestTrailingCommas<kParseIterativeFlag>();
-}
-
-template <unsigned extraFlags>
-void TestMultipleTrailingCommaErrors() {
-    // only a single trailing comma is allowed.
-    {
-        StringStream s("[1,2,3,,]");
-        ParseArrayHandler<3> h;
-        Reader reader;
-        ParseResult r = reader.Parse<extraFlags|kParseTrailingCommasFlag>(s, h);
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorValueInvalid, r.Code());
-        EXPECT_EQ(7u, r.Offset());
-    }
-    {
-        const char* json = "{ \"hello\" : \"world\", \"t\" : true , \"f\" : false,"
-                "\"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3,],,}";
-        StringStream s(json);
-        ParseObjectHandler h;
-        Reader reader;
-        ParseResult r = reader.Parse<extraFlags|kParseTrailingCommasFlag>(s, h);
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorObjectMissName, r.Code());
-        EXPECT_EQ(95u, r.Offset());
-    }
-}
-
-TEST(Reader, MultipleTrailingCommaErrors) {
-    TestMultipleTrailingCommaErrors<kParseNoFlags>();
-}
-
-TEST(Reader, MultipleTrailingCommaErrorsIterative) {
-    TestMultipleTrailingCommaErrors<kParseIterativeFlag>();
-}
-
-template <unsigned extraFlags>
-void TestEmptyExceptForCommaErrors() {
-    // not allowed even with trailing commas enabled; the
-    // trailing comma must follow a value.
-    {
-        StringStream s("[,]");
-        ParseArrayHandler<3> h;
-        Reader reader;
-        ParseResult r = reader.Parse<extraFlags|kParseTrailingCommasFlag>(s, h);
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorValueInvalid, r.Code());
-        EXPECT_EQ(1u, r.Offset());
-    }
-    {
-        StringStream s("{,}");
-        ParseObjectHandler h;
-        Reader reader;
-        ParseResult r = reader.Parse<extraFlags|kParseTrailingCommasFlag>(s, h);
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorObjectMissName, r.Code());
-        EXPECT_EQ(1u, r.Offset());
-    }
-}
-
-TEST(Reader, EmptyExceptForCommaErrors) {
-    TestEmptyExceptForCommaErrors<kParseNoFlags>();
-}
-
-TEST(Reader, EmptyExceptForCommaErrorsIterative) {
-    TestEmptyExceptForCommaErrors<kParseIterativeFlag>();
-}
-
-template <unsigned extraFlags>
-void TestTrailingCommaHandlerTermination() {
-    {
-        HandlerTerminateAtEndArray h;
-        Reader reader;
-        StringStream s("[1,2,3,]");
-        ParseResult r = reader.Parse<extraFlags|kParseTrailingCommasFlag>(s, h);
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorTermination, r.Code());
-        EXPECT_EQ(7u, r.Offset());
-    }
-    {
-        HandlerTerminateAtEndObject h;
-        Reader reader;
-        StringStream s("{\"t\": true, \"f\": false,}");
-        ParseResult r = reader.Parse<extraFlags|kParseTrailingCommasFlag>(s, h);
-        EXPECT_TRUE(reader.HasParseError());
-        EXPECT_EQ(kParseErrorTermination, r.Code());
-        EXPECT_EQ(23u, r.Offset());
-    }
-}
-
-TEST(Reader, TrailingCommaHandlerTermination) {
-    TestTrailingCommaHandlerTermination<kParseNoFlags>();
-}
-
-TEST(Reader, TrailingCommaHandlerTerminationIterative) {
-    TestTrailingCommaHandlerTermination<kParseIterativeFlag>();
-}
-
-TEST(Reader, ParseNanAndInfinity) {
-#define TEST_NAN_INF(str, x) \
-    { \
-        { \
-            StringStream s(str); \
-            ParseDoubleHandler h; \
-            Reader reader; \
-            ASSERT_EQ(kParseErrorNone, reader.Parse<kParseNanAndInfFlag>(s, h).Code()); \
-            EXPECT_EQ(1u, h.step_); \
-            internal::Double e(x), a(h.actual_); \
-            EXPECT_EQ(e.IsNan(), a.IsNan()); \
-            EXPECT_EQ(e.IsInf(), a.IsInf()); \
-            if (!e.IsNan()) \
-                EXPECT_EQ(e.Sign(), a.Sign()); \
-        } \
-        { \
-            const char* json = "{ \"naninfdouble\": " str " } "; \
-            StringStream s(json); \
-            NumbersAsStringsHandler h(str); \
-            Reader reader; \
-            EXPECT_TRUE(reader.Parse<kParseNumbersAsStringsFlag|kParseNanAndInfFlag>(s, h)); \
-        } \
-        { \
-            char* json = StrDup("{ \"naninfdouble\": " str " } "); \
-            InsituStringStream s(json); \
-            NumbersAsStringsHandler h(str); \
-            Reader reader; \
-            EXPECT_TRUE(reader.Parse<kParseInsituFlag|kParseNumbersAsStringsFlag|kParseNanAndInfFlag>(s, h)); \
-            free(json); \
-        } \
-    }
-#define TEST_NAN_INF_ERROR(errorCode, str, errorOffset) \
-    { \
-        int streamPos = errorOffset; \
-        char buffer[1001]; \
-        strncpy(buffer, str, 1000); \
-        InsituStringStream s(buffer); \
-        BaseReaderHandler<> h; \
-        Reader reader; \
-        EXPECT_FALSE(reader.Parse<kParseNanAndInfFlag>(s, h)); \
-        EXPECT_EQ(errorCode, reader.GetParseErrorCode());\
-        EXPECT_EQ(errorOffset, reader.GetErrorOffset());\
-        EXPECT_EQ(streamPos, s.Tell());\
-    }
-
-    double nan = std::numeric_limits<double>::quiet_NaN();
-    double inf = std::numeric_limits<double>::infinity();
-
-    TEST_NAN_INF("NaN", nan);
-    TEST_NAN_INF("-NaN", nan);
-    TEST_NAN_INF("Inf", inf);
-    TEST_NAN_INF("Infinity", inf);
-    TEST_NAN_INF("-Inf", -inf);
-    TEST_NAN_INF("-Infinity", -inf);
-    TEST_NAN_INF_ERROR(kParseErrorValueInvalid, "NInf", 1);
-    TEST_NAN_INF_ERROR(kParseErrorValueInvalid, "NaInf", 2);
-    TEST_NAN_INF_ERROR(kParseErrorValueInvalid, "INan", 1);
-    TEST_NAN_INF_ERROR(kParseErrorValueInvalid, "InNan", 2);
-    TEST_NAN_INF_ERROR(kParseErrorValueInvalid, "nan", 1);
-    TEST_NAN_INF_ERROR(kParseErrorValueInvalid, "-nan", 1);
-    TEST_NAN_INF_ERROR(kParseErrorValueInvalid, "NAN", 1);
-    TEST_NAN_INF_ERROR(kParseErrorValueInvalid, "-Infinty", 6);
-
-#undef TEST_NAN_INF_ERROR
-#undef TEST_NAN_INF
-}
-
-RAPIDJSON_DIAG_POP
diff --git a/src/sioclient/lib/rapidjson/test/unittest/regextest.cpp b/src/sioclient/lib/rapidjson/test/unittest/regextest.cpp
deleted file mode 100644
index cdd36301..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/regextest.cpp
+++ /dev/null
@@ -1,638 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/internal/regex.h"
-
-using namespace rapidjson::internal;
-
-TEST(Regex, Single) {
-    Regex re("a");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("a"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("b"));
-}
-
-TEST(Regex, Concatenation) {
-    Regex re("abc");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("abc"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("a"));
-    EXPECT_FALSE(rs.Match("b"));
-    EXPECT_FALSE(rs.Match("ab"));
-    EXPECT_FALSE(rs.Match("abcd"));
-}
-
-TEST(Regex, Alternation1) {
-    Regex re("abab|abbb");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("abab"));
-    EXPECT_TRUE(rs.Match("abbb"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("ab"));
-    EXPECT_FALSE(rs.Match("ababa"));
-    EXPECT_FALSE(rs.Match("abb"));
-    EXPECT_FALSE(rs.Match("abbbb"));
-}
-
-TEST(Regex, Alternation2) {
-    Regex re("a|b|c");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("a"));
-    EXPECT_TRUE(rs.Match("b"));
-    EXPECT_TRUE(rs.Match("c"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("aa"));
-    EXPECT_FALSE(rs.Match("ab"));
-}
-
-TEST(Regex, Parenthesis1) {
-    Regex re("(ab)c");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("abc"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("a"));
-    EXPECT_FALSE(rs.Match("b"));
-    EXPECT_FALSE(rs.Match("ab"));
-    EXPECT_FALSE(rs.Match("abcd"));
-}
-
-TEST(Regex, Parenthesis2) {
-    Regex re("a(bc)");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("abc"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("a"));
-    EXPECT_FALSE(rs.Match("b"));
-    EXPECT_FALSE(rs.Match("ab"));
-    EXPECT_FALSE(rs.Match("abcd"));
-}
-
-TEST(Regex, Parenthesis3) {
-    Regex re("(a|b)(c|d)");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("ac"));
-    EXPECT_TRUE(rs.Match("ad"));
-    EXPECT_TRUE(rs.Match("bc"));
-    EXPECT_TRUE(rs.Match("bd"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("ab"));
-    EXPECT_FALSE(rs.Match("cd"));
-}
-
-TEST(Regex, ZeroOrOne1) {
-    Regex re("a?");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match(""));
-    EXPECT_TRUE(rs.Match("a"));
-    EXPECT_FALSE(rs.Match("aa"));
-}
-
-TEST(Regex, ZeroOrOne2) {
-    Regex re("a?b");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("b"));
-    EXPECT_TRUE(rs.Match("ab"));
-    EXPECT_FALSE(rs.Match("a"));
-    EXPECT_FALSE(rs.Match("aa"));
-    EXPECT_FALSE(rs.Match("bb"));
-    EXPECT_FALSE(rs.Match("ba"));
-}
-
-TEST(Regex, ZeroOrOne3) {
-    Regex re("ab?");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("a"));
-    EXPECT_TRUE(rs.Match("ab"));
-    EXPECT_FALSE(rs.Match("b"));
-    EXPECT_FALSE(rs.Match("aa"));
-    EXPECT_FALSE(rs.Match("bb"));
-    EXPECT_FALSE(rs.Match("ba"));
-}
-
-TEST(Regex, ZeroOrOne4) {
-    Regex re("a?b?");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match(""));
-    EXPECT_TRUE(rs.Match("a"));
-    EXPECT_TRUE(rs.Match("b"));
-    EXPECT_TRUE(rs.Match("ab"));
-    EXPECT_FALSE(rs.Match("aa"));
-    EXPECT_FALSE(rs.Match("bb"));
-    EXPECT_FALSE(rs.Match("ba"));
-    EXPECT_FALSE(rs.Match("abc"));
-}
-
-TEST(Regex, ZeroOrOne5) {
-    Regex re("a(ab)?b");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("ab"));
-    EXPECT_TRUE(rs.Match("aabb"));
-    EXPECT_FALSE(rs.Match("aab"));
-    EXPECT_FALSE(rs.Match("abb"));
-}
-
-TEST(Regex, ZeroOrMore1) {
-    Regex re("a*");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match(""));
-    EXPECT_TRUE(rs.Match("a"));
-    EXPECT_TRUE(rs.Match("aa"));
-    EXPECT_FALSE(rs.Match("b"));
-    EXPECT_FALSE(rs.Match("ab"));
-}
-
-TEST(Regex, ZeroOrMore2) {
-    Regex re("a*b");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("b"));
-    EXPECT_TRUE(rs.Match("ab"));
-    EXPECT_TRUE(rs.Match("aab"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("bb"));
-}
-
-TEST(Regex, ZeroOrMore3) {
-    Regex re("a*b*");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match(""));
-    EXPECT_TRUE(rs.Match("a"));
-    EXPECT_TRUE(rs.Match("aa"));
-    EXPECT_TRUE(rs.Match("b"));
-    EXPECT_TRUE(rs.Match("bb"));
-    EXPECT_TRUE(rs.Match("ab"));
-    EXPECT_TRUE(rs.Match("aabb"));
-    EXPECT_FALSE(rs.Match("ba"));
-}
-
-TEST(Regex, ZeroOrMore4) {
-    Regex re("a(ab)*b");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("ab"));
-    EXPECT_TRUE(rs.Match("aabb"));
-    EXPECT_TRUE(rs.Match("aababb"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("aa"));
-}
-
-TEST(Regex, OneOrMore1) {
-    Regex re("a+");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("a"));
-    EXPECT_TRUE(rs.Match("aa"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("b"));
-    EXPECT_FALSE(rs.Match("ab"));
-}
-
-TEST(Regex, OneOrMore2) {
-    Regex re("a+b");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("ab"));
-    EXPECT_TRUE(rs.Match("aab"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("b"));
-}
-
-TEST(Regex, OneOrMore3) {
-    Regex re("a+b+");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("ab"));
-    EXPECT_TRUE(rs.Match("aab"));
-    EXPECT_TRUE(rs.Match("abb"));
-    EXPECT_TRUE(rs.Match("aabb"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("b"));
-    EXPECT_FALSE(rs.Match("ba"));
-}
-
-TEST(Regex, OneOrMore4) {
-    Regex re("a(ab)+b");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("aabb"));
-    EXPECT_TRUE(rs.Match("aababb"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("ab"));
-}
-
-TEST(Regex, QuantifierExact1) {
-    Regex re("ab{3}c");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("abbbc"));
-    EXPECT_FALSE(rs.Match("ac"));
-    EXPECT_FALSE(rs.Match("abc"));
-    EXPECT_FALSE(rs.Match("abbc"));
-    EXPECT_FALSE(rs.Match("abbbbc"));
-}
-
-TEST(Regex, QuantifierExact2) {
-    Regex re("a(bc){3}d");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("abcbcbcd"));
-    EXPECT_FALSE(rs.Match("ad"));
-    EXPECT_FALSE(rs.Match("abcd"));
-    EXPECT_FALSE(rs.Match("abcbcd"));
-    EXPECT_FALSE(rs.Match("abcbcbcbcd"));
-}
-
-TEST(Regex, QuantifierExact3) {
-    Regex re("a(b|c){3}d");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("abbbd"));
-    EXPECT_TRUE(rs.Match("acccd"));
-    EXPECT_TRUE(rs.Match("abcbd"));
-    EXPECT_FALSE(rs.Match("ad"));
-    EXPECT_FALSE(rs.Match("abbd"));
-    EXPECT_FALSE(rs.Match("accccd"));
-    EXPECT_FALSE(rs.Match("abbbbd"));
-}
-
-TEST(Regex, QuantifierMin1) {
-    Regex re("ab{3,}c");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("abbbc"));
-    EXPECT_TRUE(rs.Match("abbbbc"));
-    EXPECT_TRUE(rs.Match("abbbbbc"));
-    EXPECT_FALSE(rs.Match("ac"));
-    EXPECT_FALSE(rs.Match("abc"));
-    EXPECT_FALSE(rs.Match("abbc"));
-}
-
-TEST(Regex, QuantifierMin2) {
-    Regex re("a(bc){3,}d");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("abcbcbcd"));
-    EXPECT_TRUE(rs.Match("abcbcbcbcd"));
-    EXPECT_FALSE(rs.Match("ad"));
-    EXPECT_FALSE(rs.Match("abcd"));
-    EXPECT_FALSE(rs.Match("abcbcd"));
-}
-
-TEST(Regex, QuantifierMin3) {
-    Regex re("a(b|c){3,}d");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("abbbd"));
-    EXPECT_TRUE(rs.Match("acccd"));
-    EXPECT_TRUE(rs.Match("abcbd"));
-    EXPECT_TRUE(rs.Match("accccd"));
-    EXPECT_TRUE(rs.Match("abbbbd"));
-    EXPECT_FALSE(rs.Match("ad"));
-    EXPECT_FALSE(rs.Match("abbd"));
-}
-
-TEST(Regex, QuantifierMinMax1) {
-    Regex re("ab{3,5}c");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("abbbc"));
-    EXPECT_TRUE(rs.Match("abbbbc"));
-    EXPECT_TRUE(rs.Match("abbbbbc"));
-    EXPECT_FALSE(rs.Match("ac"));
-    EXPECT_FALSE(rs.Match("abc"));
-    EXPECT_FALSE(rs.Match("abbc"));
-    EXPECT_FALSE(rs.Match("abbbbbbc"));
-}
-
-TEST(Regex, QuantifierMinMax2) {
-    Regex re("a(bc){3,5}d");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("abcbcbcd"));
-    EXPECT_TRUE(rs.Match("abcbcbcbcd"));
-    EXPECT_TRUE(rs.Match("abcbcbcbcbcd"));
-    EXPECT_FALSE(rs.Match("ad"));
-    EXPECT_FALSE(rs.Match("abcd"));
-    EXPECT_FALSE(rs.Match("abcbcd"));
-    EXPECT_FALSE(rs.Match("abcbcbcbcbcbcd"));
-}
-
-TEST(Regex, QuantifierMinMax3) {
-    Regex re("a(b|c){3,5}d");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("abbbd"));
-    EXPECT_TRUE(rs.Match("acccd"));
-    EXPECT_TRUE(rs.Match("abcbd"));
-    EXPECT_TRUE(rs.Match("accccd"));
-    EXPECT_TRUE(rs.Match("abbbbd"));
-    EXPECT_TRUE(rs.Match("acccccd"));
-    EXPECT_TRUE(rs.Match("abbbbbd"));
-    EXPECT_FALSE(rs.Match("ad"));
-    EXPECT_FALSE(rs.Match("abbd"));
-    EXPECT_FALSE(rs.Match("accccccd"));
-    EXPECT_FALSE(rs.Match("abbbbbbd"));
-}
-
-// Issue538
-TEST(Regex, QuantifierMinMax4) {
-    Regex re("a(b|c){0,3}d");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("ad"));
-    EXPECT_TRUE(rs.Match("abd"));
-    EXPECT_TRUE(rs.Match("acd"));
-    EXPECT_TRUE(rs.Match("abbd"));
-    EXPECT_TRUE(rs.Match("accd"));
-    EXPECT_TRUE(rs.Match("abcd"));
-    EXPECT_TRUE(rs.Match("abbbd"));
-    EXPECT_TRUE(rs.Match("acccd"));
-    EXPECT_FALSE(rs.Match("abbbbd"));
-    EXPECT_FALSE(rs.Match("add"));
-    EXPECT_FALSE(rs.Match("accccd"));
-    EXPECT_FALSE(rs.Match("abcbcd"));
-}
-
-// Issue538
-TEST(Regex, QuantifierMinMax5) {
-    Regex re("a(b|c){0,}d");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("ad"));
-    EXPECT_TRUE(rs.Match("abd"));
-    EXPECT_TRUE(rs.Match("acd"));
-    EXPECT_TRUE(rs.Match("abbd"));
-    EXPECT_TRUE(rs.Match("accd"));
-    EXPECT_TRUE(rs.Match("abcd"));
-    EXPECT_TRUE(rs.Match("abbbd"));
-    EXPECT_TRUE(rs.Match("acccd"));
-    EXPECT_TRUE(rs.Match("abbbbd"));
-    EXPECT_TRUE(rs.Match("accccd"));
-    EXPECT_TRUE(rs.Match("abcbcd"));
-    EXPECT_FALSE(rs.Match("add"));
-    EXPECT_FALSE(rs.Match("aad"));
-}
-
-#define EURO "\xE2\x82\xAC" // "\xE2\x82\xAC" is UTF-8 rsquence of Euro sign U+20AC
-
-TEST(Regex, Unicode) {
-    Regex re("a" EURO "+b"); 
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("a" EURO "b"));
-    EXPECT_TRUE(rs.Match("a" EURO EURO "b"));
-    EXPECT_FALSE(rs.Match("a?b"));
-    EXPECT_FALSE(rs.Match("a" EURO "\xAC" "b")); // unaware of UTF-8 will match
-}
-
-TEST(Regex, AnyCharacter) {
-    Regex re(".");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("a"));
-    EXPECT_TRUE(rs.Match("b"));
-    EXPECT_TRUE(rs.Match(EURO));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("aa"));
-}
-
-TEST(Regex, CharacterRange1) {
-    Regex re("[abc]");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("a"));
-    EXPECT_TRUE(rs.Match("b"));
-    EXPECT_TRUE(rs.Match("c"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("`"));
-    EXPECT_FALSE(rs.Match("d"));
-    EXPECT_FALSE(rs.Match("aa"));
-}
-
-TEST(Regex, CharacterRange2) {
-    Regex re("[^abc]");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("`"));
-    EXPECT_TRUE(rs.Match("d"));
-    EXPECT_FALSE(rs.Match("a"));
-    EXPECT_FALSE(rs.Match("b"));
-    EXPECT_FALSE(rs.Match("c"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("aa"));
-}
-
-TEST(Regex, CharacterRange3) {
-    Regex re("[a-c]");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("a"));
-    EXPECT_TRUE(rs.Match("b"));
-    EXPECT_TRUE(rs.Match("c"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("`"));
-    EXPECT_FALSE(rs.Match("d"));
-    EXPECT_FALSE(rs.Match("aa"));
-}
-
-TEST(Regex, CharacterRange4) {
-    Regex re("[^a-c]");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("`"));
-    EXPECT_TRUE(rs.Match("d"));
-    EXPECT_FALSE(rs.Match("a"));
-    EXPECT_FALSE(rs.Match("b"));
-    EXPECT_FALSE(rs.Match("c"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("aa"));
-}
-
-TEST(Regex, CharacterRange5) {
-    Regex re("[-]");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("-"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("a"));
-}
-
-TEST(Regex, CharacterRange6) {
-    Regex re("[a-]");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("a"));
-    EXPECT_TRUE(rs.Match("-"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("`"));
-    EXPECT_FALSE(rs.Match("b"));
-}
-
-TEST(Regex, CharacterRange7) {
-    Regex re("[-a]");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("a"));
-    EXPECT_TRUE(rs.Match("-"));
-    EXPECT_FALSE(rs.Match(""));
-    EXPECT_FALSE(rs.Match("`"));
-    EXPECT_FALSE(rs.Match("b"));
-}
-
-TEST(Regex, CharacterRange8) {
-    Regex re("[a-zA-Z0-9]*");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("Milo"));
-    EXPECT_TRUE(rs.Match("MT19937"));
-    EXPECT_TRUE(rs.Match("43"));
-    EXPECT_FALSE(rs.Match("a_b"));
-    EXPECT_FALSE(rs.Match("!"));
-}
-
-TEST(Regex, Search) {
-    Regex re("abc");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Search("abc"));
-    EXPECT_TRUE(rs.Search("_abc"));
-    EXPECT_TRUE(rs.Search("abc_"));
-    EXPECT_TRUE(rs.Search("_abc_"));
-    EXPECT_TRUE(rs.Search("__abc__"));
-    EXPECT_TRUE(rs.Search("abcabc"));
-    EXPECT_FALSE(rs.Search("a"));
-    EXPECT_FALSE(rs.Search("ab"));
-    EXPECT_FALSE(rs.Search("bc"));
-    EXPECT_FALSE(rs.Search("cba"));
-}
-
-TEST(Regex, Search_BeginAnchor) {
-    Regex re("^abc");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Search("abc"));
-    EXPECT_TRUE(rs.Search("abc_"));
-    EXPECT_TRUE(rs.Search("abcabc"));
-    EXPECT_FALSE(rs.Search("_abc"));
-    EXPECT_FALSE(rs.Search("_abc_"));
-    EXPECT_FALSE(rs.Search("a"));
-    EXPECT_FALSE(rs.Search("ab"));
-    EXPECT_FALSE(rs.Search("bc"));
-    EXPECT_FALSE(rs.Search("cba"));
-}
-
-TEST(Regex, Search_EndAnchor) {
-    Regex re("abc$");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Search("abc"));
-    EXPECT_TRUE(rs.Search("_abc"));
-    EXPECT_TRUE(rs.Search("abcabc"));
-    EXPECT_FALSE(rs.Search("abc_"));
-    EXPECT_FALSE(rs.Search("_abc_"));
-    EXPECT_FALSE(rs.Search("a"));
-    EXPECT_FALSE(rs.Search("ab"));
-    EXPECT_FALSE(rs.Search("bc"));
-    EXPECT_FALSE(rs.Search("cba"));
-}
-
-TEST(Regex, Search_BothAnchor) {
-    Regex re("^abc$");
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Search("abc"));
-    EXPECT_FALSE(rs.Search(""));
-    EXPECT_FALSE(rs.Search("a"));
-    EXPECT_FALSE(rs.Search("b"));
-    EXPECT_FALSE(rs.Search("ab"));
-    EXPECT_FALSE(rs.Search("abcd"));
-}
-
-TEST(Regex, Escape) {
-    const char* s = "\\^\\$\\|\\(\\)\\?\\*\\+\\.\\[\\]\\{\\}\\\\\\f\\n\\r\\t\\v[\\b][\\[][\\]]";
-    Regex re(s);
-    ASSERT_TRUE(re.IsValid());
-    RegexSearch rs(re);
-    EXPECT_TRUE(rs.Match("^$|()?*+.[]{}\\\x0C\n\r\t\x0B\b[]"));
-    EXPECT_FALSE(rs.Match(s)); // Not escaping
-}
-
-TEST(Regex, Invalid) {
-#define TEST_INVALID(s) \
-    {\
-        Regex re(s);\
-        EXPECT_FALSE(re.IsValid());\
-    }
-
-    TEST_INVALID("");
-    TEST_INVALID("a|");
-    TEST_INVALID("()");
-    TEST_INVALID(")");
-    TEST_INVALID("(a))");
-    TEST_INVALID("(a|)");
-    TEST_INVALID("(a||b)");
-    TEST_INVALID("(|b)");
-    TEST_INVALID("?");
-    TEST_INVALID("*");
-    TEST_INVALID("+");
-    TEST_INVALID("{");
-    TEST_INVALID("{}");
-    TEST_INVALID("a{a}");
-    TEST_INVALID("a{0}");
-    TEST_INVALID("a{-1}");
-    TEST_INVALID("a{}");
-    // TEST_INVALID("a{0,}");   // Support now
-    TEST_INVALID("a{,0}");
-    TEST_INVALID("a{1,0}");
-    TEST_INVALID("a{-1,0}");
-    TEST_INVALID("a{-1,1}");
-    TEST_INVALID("a{4294967296}"); // overflow of unsigned
-    TEST_INVALID("a{1a}");
-    TEST_INVALID("[");
-    TEST_INVALID("[]");
-    TEST_INVALID("[^]");
-    TEST_INVALID("[\\a]");
-    TEST_INVALID("\\a");
-
-#undef TEST_INVALID
-}
-
-TEST(Regex, Issue538) {
-    Regex re("^[0-9]+(\\\\.[0-9]+){0,2}");
-    EXPECT_TRUE(re.IsValid());
-}
-
-TEST(Regex, Issue583) {
-    Regex re("[0-9]{99999}");
-    ASSERT_TRUE(re.IsValid());
-}
-
-#undef EURO
diff --git a/src/sioclient/lib/rapidjson/test/unittest/schematest.cpp b/src/sioclient/lib/rapidjson/test/unittest/schematest.cpp
deleted file mode 100644
index 0c61a8a9..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/schematest.cpp
+++ /dev/null
@@ -1,2072 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/schema.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/writer.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(variadic-macros)
-#elif defined(_MSC_VER)
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(4822) // local class member function does not have a body
-#endif
-
-using namespace rapidjson;
-
-#define TEST_HASHER(json1, json2, expected) \
-{\
-    Document d1, d2;\
-    d1.Parse(json1);\
-    ASSERT_FALSE(d1.HasParseError());\
-    d2.Parse(json2);\
-    ASSERT_FALSE(d2.HasParseError());\
-    internal::Hasher<Value, CrtAllocator> h1, h2;\
-    d1.Accept(h1);\
-    d2.Accept(h2);\
-    ASSERT_TRUE(h1.IsValid());\
-    ASSERT_TRUE(h2.IsValid());\
-    /*printf("%s: 0x%016llx\n%s: 0x%016llx\n\n", json1, h1.GetHashCode(), json2, h2.GetHashCode());*/\
-    EXPECT_TRUE(expected == (h1.GetHashCode() == h2.GetHashCode()));\
-}
-
-TEST(SchemaValidator, Hasher) {
-    TEST_HASHER("null", "null", true);
-
-    TEST_HASHER("true", "true", true);
-    TEST_HASHER("false", "false", true);
-    TEST_HASHER("true", "false", false);
-    TEST_HASHER("false", "true", false);
-    TEST_HASHER("true", "null", false);
-    TEST_HASHER("false", "null", false);
-
-    TEST_HASHER("1", "1", true);
-    TEST_HASHER("2147483648", "2147483648", true); // 2^31 can only be fit in unsigned
-    TEST_HASHER("-2147483649", "-2147483649", true); // -2^31 - 1 can only be fit in int64_t
-    TEST_HASHER("2147483648", "2147483648", true); // 2^31 can only be fit in unsigned
-    TEST_HASHER("4294967296", "4294967296", true); // 2^32 can only be fit in int64_t
-    TEST_HASHER("9223372036854775808", "9223372036854775808", true); // 2^63 can only be fit in uint64_t
-    TEST_HASHER("1.5", "1.5", true);
-    TEST_HASHER("1", "1.0", true);
-    TEST_HASHER("1", "-1", false);
-    TEST_HASHER("0.0", "-0.0", false);
-    TEST_HASHER("1", "true", false);
-    TEST_HASHER("0", "false", false);
-    TEST_HASHER("0", "null", false);
-
-    TEST_HASHER("\"\"", "\"\"", true);
-    TEST_HASHER("\"\"", "\"\\u0000\"", false);
-    TEST_HASHER("\"Hello\"", "\"Hello\"", true);
-    TEST_HASHER("\"Hello\"", "\"World\"", false);
-    TEST_HASHER("\"Hello\"", "null", false);
-    TEST_HASHER("\"Hello\\u0000\"", "\"Hello\"", false);
-    TEST_HASHER("\"\"", "null", false);
-    TEST_HASHER("\"\"", "true", false);
-    TEST_HASHER("\"\"", "false", false);
-
-    TEST_HASHER("[]", "[ ]", true);
-    TEST_HASHER("[1, true, false]", "[1, true, false]", true);
-    TEST_HASHER("[1, true, false]", "[1, true]", false);
-    TEST_HASHER("[1, 2]", "[2, 1]", false);
-    TEST_HASHER("[[1], 2]", "[[1, 2]]", false);
-    TEST_HASHER("[1, 2]", "[1, [2]]", false);
-    TEST_HASHER("[]", "null", false);
-    TEST_HASHER("[]", "true", false);
-    TEST_HASHER("[]", "false", false);
-    TEST_HASHER("[]", "0", false);
-    TEST_HASHER("[]", "0.0", false);
-    TEST_HASHER("[]", "\"\"", false);
-
-    TEST_HASHER("{}", "{ }", true);
-    TEST_HASHER("{\"a\":1}", "{\"a\":1}", true);
-    TEST_HASHER("{\"a\":1}", "{\"b\":1}", false);
-    TEST_HASHER("{\"a\":1}", "{\"a\":2}", false);
-    TEST_HASHER("{\"a\":1, \"b\":2}", "{\"b\":2, \"a\":1}", true); // Member order insensitive
-    TEST_HASHER("{}", "null", false);
-    TEST_HASHER("{}", "false", false);
-    TEST_HASHER("{}", "true", false);
-    TEST_HASHER("{}", "0", false);
-    TEST_HASHER("{}", "0.0", false);
-    TEST_HASHER("{}", "\"\"", false);
-}
-
-// Test cases following http://spacetelescope.github.io/understanding-json-schema
-
-#define VALIDATE(schema, json, expected) \
-{\
-    SchemaValidator validator(schema);\
-    Document d;\
-    /*printf("\n%s\n", json);*/\
-    d.Parse(json);\
-    EXPECT_FALSE(d.HasParseError());\
-    EXPECT_TRUE(expected == d.Accept(validator));\
-    EXPECT_TRUE(expected == validator.IsValid());\
-    if ((expected) && !validator.IsValid()) {\
-        StringBuffer sb;\
-        validator.GetInvalidSchemaPointer().StringifyUriFragment(sb);\
-        printf("Invalid schema: %s\n", sb.GetString());\
-        printf("Invalid keyword: %s\n", validator.GetInvalidSchemaKeyword());\
-        sb.Clear();\
-        validator.GetInvalidDocumentPointer().StringifyUriFragment(sb);\
-        printf("Invalid document: %s\n", sb.GetString());\
-        sb.Clear();\
-        Writer<StringBuffer> w(sb);\
-        validator.GetError().Accept(w);\
-        printf("Validation error: %s\n", sb.GetString());\
-    }\
-}
-
-#define INVALIDATE(schema, json, invalidSchemaPointer, invalidSchemaKeyword, invalidDocumentPointer, error) \
-{\
-    INVALIDATE_(schema, json, invalidSchemaPointer, invalidSchemaKeyword, invalidDocumentPointer, error, SchemaValidator, Pointer) \
-}
-
-#define INVALIDATE_(schema, json, invalidSchemaPointer, invalidSchemaKeyword, invalidDocumentPointer, error, \
-    SchemaValidatorType, PointerType) \
-{\
-    SchemaValidatorType validator(schema);\
-    Document d;\
-    /*printf("\n%s\n", json);*/\
-    d.Parse(json);\
-    EXPECT_FALSE(d.HasParseError());\
-    EXPECT_FALSE(d.Accept(validator));\
-    EXPECT_FALSE(validator.IsValid());\
-    if (validator.GetInvalidSchemaPointer() != PointerType(invalidSchemaPointer)) {\
-        StringBuffer sb;\
-        validator.GetInvalidSchemaPointer().Stringify(sb);\
-        printf("GetInvalidSchemaPointer() Expected: %s Actual: %s\n", invalidSchemaPointer, sb.GetString());\
-        ADD_FAILURE();\
-    }\
-    ASSERT_TRUE(validator.GetInvalidSchemaKeyword() != 0);\
-    if (strcmp(validator.GetInvalidSchemaKeyword(), invalidSchemaKeyword) != 0) {\
-        printf("GetInvalidSchemaKeyword() Expected: %s Actual %s\n", invalidSchemaKeyword, validator.GetInvalidSchemaKeyword());\
-        ADD_FAILURE();\
-    }\
-    if (validator.GetInvalidDocumentPointer() != PointerType(invalidDocumentPointer)) {\
-        StringBuffer sb;\
-        validator.GetInvalidDocumentPointer().Stringify(sb);\
-        printf("GetInvalidDocumentPointer() Expected: %s Actual: %s\n", invalidDocumentPointer, sb.GetString());\
-        ADD_FAILURE();\
-    }\
-    Document e;\
-    e.Parse(error);\
-    if (validator.GetError() != e) {\
-        StringBuffer sb;\
-        Writer<StringBuffer> w(sb);\
-        validator.GetError().Accept(w);\
-        printf("GetError() Expected: %s Actual: %s\n", error, sb.GetString());\
-        ADD_FAILURE();\
-    }\
-}
-
-TEST(SchemaValidator, Typeless) {
-    Document sd;
-    sd.Parse("{}");
-    SchemaDocument s(sd);
-    
-    VALIDATE(s, "42", true);
-    VALIDATE(s, "\"I'm a string\"", true);
-    VALIDATE(s, "{ \"an\": [ \"arbitrarily\", \"nested\" ], \"data\": \"structure\" }", true);
-}
-
-TEST(SchemaValidator, MultiType) {
-    Document sd;
-    sd.Parse("{ \"type\": [\"number\", \"string\"] }");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "42", true);
-    VALIDATE(s, "\"Life, the universe, and everything\"", true);
-    INVALIDATE(s, "[\"Life\", \"the universe\", \"and everything\"]", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"string\", \"number\"], \"actual\": \"array\""
-        "}}");
-}
-
-TEST(SchemaValidator, Enum_Typed) {
-    Document sd;
-    sd.Parse("{ \"type\": \"string\", \"enum\" : [\"red\", \"amber\", \"green\"] }");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "\"red\"", true);
-    INVALIDATE(s, "\"blue\"", "", "enum", "",
-        "{ \"enum\": { \"instanceRef\": \"#\", \"schemaRef\": \"#\" }}");
-}
-
-TEST(SchemaValidator, Enum_Typless) {
-    Document sd;
-    sd.Parse("{  \"enum\": [\"red\", \"amber\", \"green\", null, 42] }");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "\"red\"", true);
-    VALIDATE(s, "null", true);
-    VALIDATE(s, "42", true);
-    INVALIDATE(s, "0", "", "enum", "",
-        "{ \"enum\": { \"instanceRef\": \"#\", \"schemaRef\": \"#\" }}");
-}
-
-TEST(SchemaValidator, Enum_InvalidType) {
-    Document sd;
-    sd.Parse("{ \"type\": \"string\", \"enum\": [\"red\", \"amber\", \"green\", null] }");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "\"red\"", true);
-    INVALIDATE(s, "null", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"string\"], \"actual\": \"null\""
-        "}}");
-}
-
-TEST(SchemaValidator, AllOf) {
-    {
-        Document sd;
-        sd.Parse("{\"allOf\": [{ \"type\": \"string\" }, { \"type\": \"string\", \"maxLength\": 5 }]}");
-        SchemaDocument s(sd);
-
-        VALIDATE(s, "\"ok\"", true);
-        INVALIDATE(s, "\"too long\"", "", "allOf", "",
-            "{ \"maxLength\": { "
-            "    \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/1\", "
-            "    \"expected\": 5, \"actual\": \"too long\""
-            "}}");
-    }
-    {
-        Document sd;
-        sd.Parse("{\"allOf\": [{ \"type\": \"string\" }, { \"type\": \"number\" } ] }");
-        SchemaDocument s(sd);
-
-        VALIDATE(s, "\"No way\"", false);
-        INVALIDATE(s, "-1", "", "allOf", "",
-            "{ \"type\": { \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/0\","
-            "    \"expected\": [\"string\"], \"actual\": \"integer\""
-            "}}");
-    }
-}
-
-TEST(SchemaValidator, AnyOf) {
-    Document sd;
-    sd.Parse("{\"anyOf\": [{ \"type\": \"string\" }, { \"type\": \"number\" } ] }");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "\"Yes\"", true);
-    VALIDATE(s, "42", true);
-    INVALIDATE(s, "{ \"Not a\": \"string or number\" }", "", "anyOf", "",
-        "{ \"anyOf\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\", "
-        "    \"errors\": ["
-        "      { \"type\": {"
-        "          \"instanceRef\": \"#\", \"schemaRef\": \"#/anyOf/0\","
-        "          \"expected\": [\"string\"], \"actual\": \"object\""
-        "      }},"
-        "      { \"type\": {"
-        "          \"instanceRef\": \"#\", \"schemaRef\": \"#/anyOf/1\","
-        "          \"expected\": [\"number\"], \"actual\": \"object\""
-        "      }}"
-        "    ]"
-        "}}");
-}
-
-TEST(SchemaValidator, OneOf) {
-    Document sd;
-    sd.Parse("{\"oneOf\": [{ \"type\": \"number\", \"multipleOf\": 5 }, { \"type\": \"number\", \"multipleOf\": 3 } ] }");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "10", true);
-    VALIDATE(s, "9", true);
-    INVALIDATE(s, "2", "", "oneOf", "",
-        "{ \"oneOf\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"errors\": ["
-        "      { \"multipleOf\": {"
-        "          \"instanceRef\": \"#\", \"schemaRef\": \"#/oneOf/0\","
-        "          \"expected\": 5, \"actual\": 2"
-        "      }},"
-        "      { \"multipleOf\": {"
-        "          \"instanceRef\": \"#\", \"schemaRef\": \"#/oneOf/1\","
-        "          \"expected\": 3, \"actual\": 2"
-        "      }}"
-        "    ]"
-        "}}");
-    INVALIDATE(s, "15", "", "oneOf", "",
-        "{ \"oneOf\": { \"instanceRef\": \"#\", \"schemaRef\": \"#\", \"errors\": [{}, {}]}}");
-}
-
-TEST(SchemaValidator, Not) {
-    Document sd;
-    sd.Parse("{\"not\":{ \"type\": \"string\"}}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "42", true);
-    VALIDATE(s, "{ \"key\": \"value\" }", true);
-    INVALIDATE(s, "\"I am a string\"", "", "not", "",
-        "{ \"not\": { \"instanceRef\": \"#\", \"schemaRef\": \"#\" }}");
-}
-
-TEST(SchemaValidator, Ref) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "  \"$schema\": \"http://json-schema.org/draft-04/schema#\","
-        ""
-        "  \"definitions\": {"
-        "    \"address\": {"
-        "      \"type\": \"object\","
-        "      \"properties\": {"
-        "        \"street_address\": { \"type\": \"string\" },"
-        "        \"city\":           { \"type\": \"string\" },"
-        "        \"state\":          { \"type\": \"string\" }"
-        "      },"
-        "      \"required\": [\"street_address\", \"city\", \"state\"]"
-        "    }"
-        "  },"
-        "  \"type\": \"object\","
-        "  \"properties\": {"
-        "    \"billing_address\": { \"$ref\": \"#/definitions/address\" },"
-        "    \"shipping_address\": { \"$ref\": \"#/definitions/address\" }"
-        "  }"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{\"shipping_address\": {\"street_address\": \"1600 Pennsylvania Avenue NW\", \"city\": \"Washington\", \"state\": \"DC\"}, \"billing_address\": {\"street_address\": \"1st Street SE\", \"city\": \"Washington\", \"state\": \"DC\"} }", true);
-}
-
-TEST(SchemaValidator, Ref_AllOf) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "  \"$schema\": \"http://json-schema.org/draft-04/schema#\","
-        ""
-        "  \"definitions\": {"
-        "    \"address\": {"
-        "      \"type\": \"object\","
-        "      \"properties\": {"
-        "        \"street_address\": { \"type\": \"string\" },"
-        "        \"city\":           { \"type\": \"string\" },"
-        "        \"state\":          { \"type\": \"string\" }"
-        "      },"
-        "      \"required\": [\"street_address\", \"city\", \"state\"]"
-        "    }"
-        "  },"
-        "  \"type\": \"object\","
-        "  \"properties\": {"
-        "    \"billing_address\": { \"$ref\": \"#/definitions/address\" },"
-        "    \"shipping_address\": {"
-        "      \"allOf\": ["
-        "        { \"$ref\": \"#/definitions/address\" },"
-        "        { \"properties\":"
-        "          { \"type\": { \"enum\": [ \"residential\", \"business\" ] } },"
-        "          \"required\": [\"type\"]"
-        "        }"
-        "      ]"
-        "    }"
-        "  }"
-        "}");
-    SchemaDocument s(sd);
-
-    INVALIDATE(s, "{\"shipping_address\": {\"street_address\": \"1600 Pennsylvania Avenue NW\", \"city\": \"Washington\", \"state\": \"DC\"} }", "/properties/shipping_address", "allOf", "/shipping_address",
-        "{ \"required\": {"
-        "    \"instanceRef\": \"#/shipping_address\","
-        "    \"schemaRef\": \"#/properties/shipping_address/allOf/1\","
-        "    \"missing\": [\"type\"]"
-        "}}");
-    VALIDATE(s, "{\"shipping_address\": {\"street_address\": \"1600 Pennsylvania Avenue NW\", \"city\": \"Washington\", \"state\": \"DC\", \"type\": \"business\"} }", true);
-}
-
-TEST(SchemaValidator, String) {
-    Document sd;
-    sd.Parse("{\"type\":\"string\"}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "\"I'm a string\"", true);
-    INVALIDATE(s, "42", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"string\"], \"actual\": \"integer\""
-        "}}");
-    INVALIDATE(s, "2147483648", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"string\"], \"actual\": \"integer\""
-        "}}"); // 2^31 can only be fit in unsigned
-    INVALIDATE(s, "-2147483649", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"string\"], \"actual\": \"integer\""
-        "}}"); // -2^31 - 1 can only be fit in int64_t
-    INVALIDATE(s, "4294967296", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"string\"], \"actual\": \"integer\""
-        "}}"); // 2^32 can only be fit in int64_t
-    INVALIDATE(s, "3.1415926", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"string\"], \"actual\": \"number\""
-        "}}");
-}
-
-TEST(SchemaValidator, String_LengthRange) {
-    Document sd;
-    sd.Parse("{\"type\":\"string\",\"minLength\":2,\"maxLength\":3}");
-    SchemaDocument s(sd);
-
-    INVALIDATE(s, "\"A\"", "", "minLength", "",
-        "{ \"minLength\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 2, \"actual\": \"A\""
-        "}}");
-    VALIDATE(s, "\"AB\"", true);
-    VALIDATE(s, "\"ABC\"", true);
-    INVALIDATE(s, "\"ABCD\"", "", "maxLength", "",
-        "{ \"maxLength\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 3, \"actual\": \"ABCD\""
-        "}}");
-}
-
-#if RAPIDJSON_SCHEMA_HAS_REGEX
-TEST(SchemaValidator, String_Pattern) {
-    Document sd;
-    sd.Parse("{\"type\":\"string\",\"pattern\":\"^(\\\\([0-9]{3}\\\\))?[0-9]{3}-[0-9]{4}$\"}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "\"555-1212\"", true);
-    VALIDATE(s, "\"(888)555-1212\"", true);
-    INVALIDATE(s, "\"(888)555-1212 ext. 532\"", "", "pattern", "",
-        "{ \"pattern\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"actual\": \"(888)555-1212 ext. 532\""
-        "}}");
-    INVALIDATE(s, "\"(800)FLOWERS\"", "", "pattern", "",
-        "{ \"pattern\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"actual\": \"(800)FLOWERS\""
-        "}}");
-}
-
-TEST(SchemaValidator, String_Pattern_Invalid) {
-    Document sd;
-    sd.Parse("{\"type\":\"string\",\"pattern\":\"a{0}\"}"); // TODO: report regex is invalid somehow
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "\"\"", true);
-    VALIDATE(s, "\"a\"", true);
-    VALIDATE(s, "\"aa\"", true);
-}
-#endif
-
-TEST(SchemaValidator, Integer) {
-    Document sd;
-    sd.Parse("{\"type\":\"integer\"}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "42", true);
-    VALIDATE(s, "-1", true);
-    VALIDATE(s, "2147483648", true); // 2^31 can only be fit in unsigned
-    VALIDATE(s, "-2147483649", true); // -2^31 - 1 can only be fit in int64_t
-    VALIDATE(s, "2147483648", true); // 2^31 can only be fit in unsigned
-    VALIDATE(s, "4294967296", true); // 2^32 can only be fit in int64_t
-    INVALIDATE(s, "3.1415926", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"integer\"], \"actual\": \"number\""
-        "}}");
-    INVALIDATE(s, "\"42\"", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"integer\"], \"actual\": \"string\""
-        "}}");
-}
-
-TEST(SchemaValidator, Integer_Range) {
-    Document sd;
-    sd.Parse("{\"type\":\"integer\",\"minimum\":0,\"maximum\":100,\"exclusiveMaximum\":true}");
-    SchemaDocument s(sd);
-
-    INVALIDATE(s, "-1", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 0, \"actual\": -1"
-        "}}");
-    VALIDATE(s, "0", true);
-    VALIDATE(s, "10", true);
-    VALIDATE(s, "99", true);
-    INVALIDATE(s, "100", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100, \"exclusiveMaximum\": true, \"actual\": 100"
-        "}}");
-    INVALIDATE(s, "101", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100, \"exclusiveMaximum\": true, \"actual\": 101"
-        "}}");
-}
-
-TEST(SchemaValidator, Integer_Range64Boundary) {
-    Document sd;
-    sd.Parse("{\"type\":\"integer\",\"minimum\":-9223372036854775807,\"maximum\":9223372036854775806}");
-    SchemaDocument s(sd);
-
-    INVALIDATE(s, "-9223372036854775808", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": -9223372036854775807, \"actual\": -9223372036854775808"
-        "}}");
-    VALIDATE(s, "-9223372036854775807", true);
-    VALIDATE(s, "-2147483648", true); // int min
-    VALIDATE(s, "0", true);
-    VALIDATE(s, "2147483647", true);  // int max
-    VALIDATE(s, "2147483648", true);  // unsigned first
-    VALIDATE(s, "4294967295", true);  // unsigned max
-    VALIDATE(s, "9223372036854775806", true);
-    INVALIDATE(s, "9223372036854775807", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775806, \"actual\": 9223372036854775807"
-        "}}");
-    INVALIDATE(s, "18446744073709551615", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775806, \"actual\": 18446744073709551615"
-        "}}");   // uint64_t max
-}
-
-TEST(SchemaValidator, Integer_RangeU64Boundary) {
-    Document sd;
-    sd.Parse("{\"type\":\"integer\",\"minimum\":9223372036854775808,\"maximum\":18446744073709551614}");
-    SchemaDocument s(sd);
-
-    INVALIDATE(s, "-9223372036854775808", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775808, \"actual\": -9223372036854775808"
-        "}}");
-    INVALIDATE(s, "9223372036854775807", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775808, \"actual\": 9223372036854775807"
-        "}}");
-    INVALIDATE(s, "-2147483648", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775808, \"actual\": -2147483648"
-        "}}"); // int min
-    INVALIDATE(s, "0", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775808, \"actual\": 0"
-        "}}");
-    INVALIDATE(s, "2147483647", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775808, \"actual\": 2147483647"
-        "}}");  // int max
-    INVALIDATE(s, "2147483648", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775808, \"actual\": 2147483648"
-        "}}");  // unsigned first
-    INVALIDATE(s, "4294967295", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775808, \"actual\": 4294967295"
-        "}}");  // unsigned max
-    VALIDATE(s, "9223372036854775808", true);
-    VALIDATE(s, "18446744073709551614", true);
-    INVALIDATE(s, "18446744073709551615", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 18446744073709551614, \"actual\": 18446744073709551615"
-        "}}");
-}
-
-TEST(SchemaValidator, Integer_Range64BoundaryExclusive) {
-    Document sd;
-    sd.Parse("{\"type\":\"integer\",\"minimum\":-9223372036854775808,\"maximum\":18446744073709551615,\"exclusiveMinimum\":true,\"exclusiveMaximum\":true}");
-    SchemaDocument s(sd);
-
-    INVALIDATE(s, "-9223372036854775808", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": -9223372036854775808, \"exclusiveMinimum\": true, "
-        "    \"actual\": -9223372036854775808"
-        "}}");
-    VALIDATE(s, "-9223372036854775807", true);
-    VALIDATE(s, "18446744073709551614", true);
-    INVALIDATE(s, "18446744073709551615", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 18446744073709551615, \"exclusiveMaximum\": true, "
-        "    \"actual\": 18446744073709551615"
-        "}}");
-}
-
-TEST(SchemaValidator, Integer_MultipleOf) {
-    Document sd;
-    sd.Parse("{\"type\":\"integer\",\"multipleOf\":10}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "0", true);
-    VALIDATE(s, "10", true);
-    VALIDATE(s, "-10", true);
-    VALIDATE(s, "20", true);
-    INVALIDATE(s, "23", "", "multipleOf", "",
-        "{ \"multipleOf\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 10, \"actual\": 23"
-        "}}");
-    INVALIDATE(s, "-23", "", "multipleOf", "",
-        "{ \"multipleOf\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 10, \"actual\": -23"
-        "}}");
-}
-
-TEST(SchemaValidator, Integer_MultipleOf64Boundary) {
-    Document sd;
-    sd.Parse("{\"type\":\"integer\",\"multipleOf\":18446744073709551615}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "0", true);
-    VALIDATE(s, "18446744073709551615", true);
-    INVALIDATE(s, "18446744073709551614", "", "multipleOf", "",
-        "{ \"multipleOf\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 18446744073709551615, \"actual\": 18446744073709551614"
-        "}}");
-}
-
-TEST(SchemaValidator, Number_Range) {
-    Document sd;
-    sd.Parse("{\"type\":\"number\",\"minimum\":0,\"maximum\":100,\"exclusiveMaximum\":true}");
-    SchemaDocument s(sd);
-
-    INVALIDATE(s, "-1", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 0, \"actual\": -1"
-        "}}");
-    VALIDATE(s, "0", true);
-    VALIDATE(s, "0.1", true);
-    VALIDATE(s, "10", true);
-    VALIDATE(s, "99", true);
-    VALIDATE(s, "99.9", true);
-    INVALIDATE(s, "100", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100, \"exclusiveMaximum\": true, \"actual\": 100"
-        "}}");
-    INVALIDATE(s, "100.0", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100, \"exclusiveMaximum\": true, \"actual\": 100.0"
-        "}}");
-    INVALIDATE(s, "101.5", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100, \"exclusiveMaximum\": true, \"actual\": 101.5"
-        "}}");
-}
-
-TEST(SchemaValidator, Number_RangeInt) {
-    Document sd;
-    sd.Parse("{\"type\":\"number\",\"minimum\":-100,\"maximum\":-1,\"exclusiveMaximum\":true}");
-    SchemaDocument s(sd);
-
-    INVALIDATE(s, "-101", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": -100, \"actual\": -101"
-        "}}");
-    INVALIDATE(s, "-100.1", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": -100, \"actual\": -100.1"
-        "}}");
-    VALIDATE(s, "-100", true);
-    VALIDATE(s, "-2", true);
-    INVALIDATE(s, "-1", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": -1"
-        "}}");
-    INVALIDATE(s, "-0.9", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": -0.9"
-        "}}");
-    INVALIDATE(s, "0", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 0"
-        "}}");
-    INVALIDATE(s, "2147483647", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 2147483647"
-        "}}");  // int max
-    INVALIDATE(s, "2147483648", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 2147483648"
-        "}}");  // unsigned first
-    INVALIDATE(s, "4294967295", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 4294967295"
-        "}}");  // unsigned max
-    INVALIDATE(s, "9223372036854775808", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 9223372036854775808"
-        "}}");
-    INVALIDATE(s, "18446744073709551614", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 18446744073709551614"
-        "}}");
-    INVALIDATE(s, "18446744073709551615", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 18446744073709551615"
-        "}}");
-}
-
-TEST(SchemaValidator, Number_RangeDouble) {
-    Document sd;
-    sd.Parse("{\"type\":\"number\",\"minimum\":0.1,\"maximum\":100.1,\"exclusiveMaximum\":true}");
-    SchemaDocument s(sd);
-
-    INVALIDATE(s, "-9223372036854775808", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 0.1, \"actual\": -9223372036854775808"
-        "}}");
-    INVALIDATE(s, "-2147483648", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 0.1, \"actual\": -2147483648"
-        "}}"); // int min
-    INVALIDATE(s, "-1", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 0.1, \"actual\": -1"
-        "}}");
-    VALIDATE(s, "0.1", true);
-    VALIDATE(s, "10", true);
-    VALIDATE(s, "99", true);
-    VALIDATE(s, "100", true);
-    INVALIDATE(s, "101", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 101"
-        "}}");
-    INVALIDATE(s, "101.5", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 101.5"
-        "}}");
-    INVALIDATE(s, "18446744073709551614", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 18446744073709551614"
-        "}}");
-    INVALIDATE(s, "18446744073709551615", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 18446744073709551615"
-        "}}");
-    INVALIDATE(s, "2147483647", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 2147483647"
-        "}}");  // int max
-    INVALIDATE(s, "2147483648", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 2147483648"
-        "}}");  // unsigned first
-    INVALIDATE(s, "4294967295", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 4294967295"
-        "}}");  // unsigned max
-    INVALIDATE(s, "9223372036854775808", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 9223372036854775808"
-        "}}");
-    INVALIDATE(s, "18446744073709551614", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 18446744073709551614"
-        "}}");
-    INVALIDATE(s, "18446744073709551615", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 18446744073709551615"
-        "}}");
-}
-
-TEST(SchemaValidator, Number_RangeDoubleU64Boundary) {
-    Document sd;
-    sd.Parse("{\"type\":\"number\",\"minimum\":9223372036854775808.0,\"maximum\":18446744073709550000.0}");
-    SchemaDocument s(sd);
-
-    INVALIDATE(s, "-9223372036854775808", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775808.0, \"actual\": -9223372036854775808"
-        "}}");
-    INVALIDATE(s, "-2147483648", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775808.0, \"actual\": -2147483648"
-        "}}"); // int min
-    INVALIDATE(s, "0", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775808.0, \"actual\": 0"
-        "}}");
-    INVALIDATE(s, "2147483647", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775808.0, \"actual\": 2147483647"
-        "}}");  // int max
-    INVALIDATE(s, "2147483648", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775808.0, \"actual\": 2147483648"
-        "}}");  // unsigned first
-    INVALIDATE(s, "4294967295", "", "minimum", "",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 9223372036854775808.0, \"actual\": 4294967295"
-        "}}");  // unsigned max
-    VALIDATE(s, "9223372036854775808", true);
-    VALIDATE(s, "18446744073709540000", true);
-    INVALIDATE(s, "18446744073709551615", "", "maximum", "",
-        "{ \"maximum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 18446744073709550000.0, \"actual\": 18446744073709551615"
-        "}}");
-}
-
-TEST(SchemaValidator, Number_MultipleOf) {
-    Document sd;
-    sd.Parse("{\"type\":\"number\",\"multipleOf\":10.0}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "0", true);
-    VALIDATE(s, "10", true);
-    VALIDATE(s, "-10", true);
-    VALIDATE(s, "20", true);
-    INVALIDATE(s, "23", "", "multipleOf", "",
-        "{ \"multipleOf\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 10.0, \"actual\": 23"
-        "}}");
-    INVALIDATE(s, "-2147483648", "", "multipleOf", "",
-        "{ \"multipleOf\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 10.0, \"actual\": -2147483648"
-        "}}");  // int min
-    VALIDATE(s, "-2147483640", true);
-    INVALIDATE(s, "2147483647", "", "multipleOf", "",
-        "{ \"multipleOf\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 10.0, \"actual\": 2147483647"
-        "}}");  // int max
-    INVALIDATE(s, "2147483648", "", "multipleOf", "",
-        "{ \"multipleOf\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 10.0, \"actual\": 2147483648"
-        "}}");  // unsigned first
-    VALIDATE(s, "2147483650", true);
-    INVALIDATE(s, "4294967295", "", "multipleOf", "",
-        "{ \"multipleOf\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 10.0, \"actual\": 4294967295"
-        "}}");  // unsigned max
-    VALIDATE(s, "4294967300", true);
-}
-
-TEST(SchemaValidator, Number_MultipleOfOne) {
-    Document sd;
-    sd.Parse("{\"type\":\"number\",\"multipleOf\":1}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "42", true);
-    VALIDATE(s, "42.0", true);
-    INVALIDATE(s, "3.1415926", "", "multipleOf", "",
-        "{ \"multipleOf\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 1, \"actual\": 3.1415926"
-        "}}");
-}
-
-TEST(SchemaValidator, Object) {
-    Document sd;
-    sd.Parse("{\"type\":\"object\"}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{\"key\":\"value\",\"another_key\":\"another_value\"}", true);
-    VALIDATE(s, "{\"Sun\":1.9891e30,\"Jupiter\":1.8986e27,\"Saturn\":5.6846e26,\"Neptune\":10.243e25,\"Uranus\":8.6810e25,\"Earth\":5.9736e24,\"Venus\":4.8685e24,\"Mars\":6.4185e23,\"Mercury\":3.3022e23,\"Moon\":7.349e22,\"Pluto\":1.25e22}", true);    
-    INVALIDATE(s, "[\"An\", \"array\", \"not\", \"an\", \"object\"]", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"object\"], \"actual\": \"array\""
-        "}}");
-    INVALIDATE(s, "\"Not an object\"", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"object\"], \"actual\": \"string\""
-        "}}");
-}
-
-TEST(SchemaValidator, Object_Properties) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "    \"type\": \"object\","
-        "    \"properties\" : {"
-        "        \"number\": { \"type\": \"number\" },"
-        "        \"street_name\" : { \"type\": \"string\" },"
-        "        \"street_type\" : { \"type\": \"string\", \"enum\" : [\"Street\", \"Avenue\", \"Boulevard\"] }"
-        "    }"
-        "}");
-
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{ \"number\": 1600, \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\" }", true);
-    INVALIDATE(s, "{ \"number\": \"1600\", \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\" }", "/properties/number", "type", "/number",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/number\", \"schemaRef\": \"#/properties/number\","
-        "    \"expected\": [\"number\"], \"actual\": \"string\""
-        "}}");
-    INVALIDATE(s, "{ \"number\": \"One\", \"street_name\": \"Microsoft\", \"street_type\": \"Way\" }",
-        "/properties/number", "type", "/number",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/number\", \"schemaRef\": \"#/properties/number\","
-        "    \"expected\": [\"number\"], \"actual\": \"string\""
-        "}}"); // fail fast
-    VALIDATE(s, "{ \"number\": 1600, \"street_name\": \"Pennsylvania\" }", true);
-    VALIDATE(s, "{}", true);
-    VALIDATE(s, "{ \"number\": 1600, \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\", \"direction\": \"NW\" }", true);
-}
-
-TEST(SchemaValidator, Object_AdditionalPropertiesBoolean) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "    \"type\": \"object\","
-        "        \"properties\" : {"
-        "        \"number\": { \"type\": \"number\" },"
-        "            \"street_name\" : { \"type\": \"string\" },"
-        "            \"street_type\" : { \"type\": \"string\","
-        "            \"enum\" : [\"Street\", \"Avenue\", \"Boulevard\"]"
-        "        }"
-        "    },"
-        "    \"additionalProperties\": false"
-        "}");
-
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{ \"number\": 1600, \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\" }", true);
-    INVALIDATE(s, "{ \"number\": 1600, \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\", \"direction\": \"NW\" }", "", "additionalProperties", "/direction",
-        "{ \"additionalProperties\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"disallowed\": \"direction\""
-        "}}");
-}
-
-TEST(SchemaValidator, Object_AdditionalPropertiesObject) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "    \"type\": \"object\","
-        "    \"properties\" : {"
-        "        \"number\": { \"type\": \"number\" },"
-        "        \"street_name\" : { \"type\": \"string\" },"
-        "        \"street_type\" : { \"type\": \"string\","
-        "            \"enum\" : [\"Street\", \"Avenue\", \"Boulevard\"]"
-        "        }"
-        "    },"
-        "    \"additionalProperties\": { \"type\": \"string\" }"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{ \"number\": 1600, \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\" }", true);
-    VALIDATE(s, "{ \"number\": 1600, \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\", \"direction\": \"NW\" }", true);
-    INVALIDATE(s, "{ \"number\": 1600, \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\", \"office_number\": 201 }", "/additionalProperties", "type", "/office_number",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/office_number\", \"schemaRef\": \"#/additionalProperties\","
-        "    \"expected\": [\"string\"], \"actual\": \"integer\""
-        "}}");
-}
-
-TEST(SchemaValidator, Object_Required) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "    \"type\": \"object\","
-        "    \"properties\" : {"
-        "        \"name\":      { \"type\": \"string\" },"
-        "        \"email\" : { \"type\": \"string\" },"
-        "        \"address\" : { \"type\": \"string\" },"
-        "        \"telephone\" : { \"type\": \"string\" }"
-        "    },"
-        "    \"required\":[\"name\", \"email\"]"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{ \"name\": \"William Shakespeare\", \"email\" : \"bill@stratford-upon-avon.co.uk\" }", true);
-    VALIDATE(s, "{ \"name\": \"William Shakespeare\", \"email\" : \"bill@stratford-upon-avon.co.uk\", \"address\" : \"Henley Street, Stratford-upon-Avon, Warwickshire, England\", \"authorship\" : \"in question\"}", true);
-    INVALIDATE(s, "{ \"name\": \"William Shakespeare\", \"address\" : \"Henley Street, Stratford-upon-Avon, Warwickshire, England\" }", "", "required", "",
-        "{ \"required\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"missing\": [\"email\"]"
-        "}}");
-    INVALIDATE(s, "{}", "", "required", "",
-        "{ \"required\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"missing\": [\"name\", \"email\"]"
-        "}}");
-}
-
-TEST(SchemaValidator, Object_Required_PassWithDefault) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "    \"type\": \"object\","
-        "    \"properties\" : {"
-        "        \"name\":      { \"type\": \"string\", \"default\": \"William Shakespeare\" },"
-        "        \"email\" : { \"type\": \"string\", \"default\": \"\" },"
-        "        \"address\" : { \"type\": \"string\" },"
-        "        \"telephone\" : { \"type\": \"string\" }"
-        "    },"
-        "    \"required\":[\"name\", \"email\"]"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{ \"email\" : \"bill@stratford-upon-avon.co.uk\", \"address\" : \"Henley Street, Stratford-upon-Avon, Warwickshire, England\", \"authorship\" : \"in question\"}", true);
-    INVALIDATE(s, "{ \"name\": \"William Shakespeare\", \"address\" : \"Henley Street, Stratford-upon-Avon, Warwickshire, England\" }", "", "required", "",
-        "{ \"required\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"missing\": [\"email\"]"
-        "}}");
-    INVALIDATE(s, "{}", "", "required", "",
-        "{ \"required\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"missing\": [\"email\"]"
-        "}}");
-}
-
-TEST(SchemaValidator, Object_PropertiesRange) {
-    Document sd;
-    sd.Parse("{\"type\":\"object\", \"minProperties\":2, \"maxProperties\":3}");
-    SchemaDocument s(sd);
-
-    INVALIDATE(s, "{}", "", "minProperties", "",
-        "{ \"minProperties\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 2, \"actual\": 0"
-        "}}");
-    INVALIDATE(s, "{\"a\":0}", "", "minProperties", "",
-        "{ \"minProperties\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 2, \"actual\": 1"
-        "}}");
-    VALIDATE(s, "{\"a\":0,\"b\":1}", true);
-    VALIDATE(s, "{\"a\":0,\"b\":1,\"c\":2}", true);
-    INVALIDATE(s, "{\"a\":0,\"b\":1,\"c\":2,\"d\":3}", "", "maxProperties", "",
-        "{ \"maxProperties\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\", "
-        "    \"expected\": 3, \"actual\": 4"
-        "}}");
-}
-
-TEST(SchemaValidator, Object_PropertyDependencies) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "  \"type\": \"object\","
-        "  \"properties\": {"
-        "    \"name\": { \"type\": \"string\" },"
-        "    \"credit_card\": { \"type\": \"number\" },"
-        "    \"cvv_code\": { \"type\": \"number\" },"
-        "    \"billing_address\": { \"type\": \"string\" }"
-        "  },"
-        "  \"required\": [\"name\"],"
-        "  \"dependencies\": {"
-        "    \"credit_card\": [\"cvv_code\", \"billing_address\"]"
-        "  }"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{ \"name\": \"John Doe\", \"credit_card\": 5555555555555555, \"cvv_code\": 777, "
-        "\"billing_address\": \"555 Debtor's Lane\" }", true);
-    INVALIDATE(s, "{ \"name\": \"John Doe\", \"credit_card\": 5555555555555555 }", "", "dependencies", "",
-        "{ \"dependencies\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"errors\": {\"credit_card\": [\"cvv_code\", \"billing_address\"]}"
-        "}}");
-    VALIDATE(s, "{ \"name\": \"John Doe\"}", true);
-    VALIDATE(s, "{ \"name\": \"John Doe\", \"cvv_code\": 777, \"billing_address\": \"555 Debtor's Lane\" }", true);
-}
-
-TEST(SchemaValidator, Object_SchemaDependencies) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "    \"type\": \"object\","
-        "    \"properties\" : {"
-        "        \"name\": { \"type\": \"string\" },"
-        "        \"credit_card\" : { \"type\": \"number\" }"
-        "    },"
-        "    \"required\" : [\"name\"],"
-        "    \"dependencies\" : {"
-        "        \"credit_card\": {"
-        "            \"properties\": {"
-        "                \"billing_address\": { \"type\": \"string\" }"
-        "            },"
-        "            \"required\" : [\"billing_address\"]"
-        "        }"
-        "    }"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{\"name\": \"John Doe\", \"credit_card\" : 5555555555555555,\"billing_address\" : \"555 Debtor's Lane\"}", true);
-    INVALIDATE(s, "{\"name\": \"John Doe\", \"credit_card\" : 5555555555555555 }", "", "dependencies", "",
-        "{ \"dependencies\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"errors\": {"
-        "      \"credit_card\": {"
-        "        \"required\": {"
-        "          \"instanceRef\": \"#\", \"schemaRef\": \"#/dependencies/credit_card\","
-        "          \"missing\": [\"billing_address\"]"
-        "    } } }"
-        "}}");
-    VALIDATE(s, "{\"name\": \"John Doe\", \"billing_address\" : \"555 Debtor's Lane\"}", true);
-}
-
-#if RAPIDJSON_SCHEMA_HAS_REGEX
-TEST(SchemaValidator, Object_PatternProperties) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "  \"type\": \"object\","
-        "  \"patternProperties\": {"
-        "    \"^S_\": { \"type\": \"string\" },"
-        "    \"^I_\": { \"type\": \"integer\" }"
-        "  }"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{ \"S_25\": \"This is a string\" }", true);
-    VALIDATE(s, "{ \"I_0\": 42 }", true);
-    INVALIDATE(s, "{ \"S_0\": 42 }", "", "patternProperties", "/S_0",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/S_0\", \"schemaRef\": \"#/patternProperties/%5ES_\","
-        "    \"expected\": [\"string\"], \"actual\": \"integer\""
-        "}}");
-    INVALIDATE(s, "{ \"I_42\": \"This is a string\" }", "", "patternProperties", "/I_42",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/I_42\", \"schemaRef\": \"#/patternProperties/%5EI_\","
-        "    \"expected\": [\"integer\"], \"actual\": \"string\""
-        "}}");
-    VALIDATE(s, "{ \"keyword\": \"value\" }", true);
-}
-
-TEST(SchemaValidator, Object_PattternProperties_ErrorConflict) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "  \"type\": \"object\","
-        "  \"patternProperties\": {"
-        "    \"^I_\": { \"multipleOf\": 5 },"
-        "    \"30$\": { \"multipleOf\": 6 }"
-        "  }"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{ \"I_30\": 30 }", true);
-    INVALIDATE(s, "{ \"I_30\": 7 }", "", "patternProperties", "/I_30",
-        "{ \"multipleOf\": ["
-        "    {"
-        "      \"instanceRef\": \"#/I_30\", \"schemaRef\": \"#/patternProperties/%5EI_\","
-        "      \"expected\": 5, \"actual\": 7"
-        "    }, {"
-        "      \"instanceRef\": \"#/I_30\", \"schemaRef\": \"#/patternProperties/30%24\","
-        "      \"expected\": 6, \"actual\": 7"
-        "    }"
-        "]}");
-}
-
-TEST(SchemaValidator, Object_Properties_PatternProperties) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "  \"type\": \"object\","
-        "  \"properties\": {"
-        "    \"I_42\": { \"type\": \"integer\", \"minimum\": 73 }"
-        "  },"
-        "  \"patternProperties\": {"
-        "    \"^I_\": { \"type\": \"integer\", \"multipleOf\": 6 }"
-        "  }"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{ \"I_6\": 6 }", true);
-    VALIDATE(s, "{ \"I_42\": 78 }", true);
-    INVALIDATE(s, "{ \"I_42\": 42 }", "", "patternProperties", "/I_42",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#/I_42\", \"schemaRef\": \"#/properties/I_42\","
-        "    \"expected\": 73, \"actual\": 42"
-        "}}");
-    INVALIDATE(s, "{ \"I_42\": 7 }", "", "patternProperties", "/I_42",
-        "{ \"minimum\": {"
-        "    \"instanceRef\": \"#/I_42\", \"schemaRef\": \"#/properties/I_42\","
-        "    \"expected\": 73, \"actual\": 7"
-        "  },"
-        "  \"multipleOf\": {"
-        "    \"instanceRef\": \"#/I_42\", \"schemaRef\": \"#/patternProperties/%5EI_\","
-        "    \"expected\": 6, \"actual\": 7"
-        "  }"
-        "}");
-}
-
-TEST(SchemaValidator, Object_PatternProperties_AdditionalProperties) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "  \"type\": \"object\","
-        "  \"properties\": {"
-        "    \"builtin\": { \"type\": \"number\" }"
-        "  },"
-        "  \"patternProperties\": {"
-        "    \"^S_\": { \"type\": \"string\" },"
-        "    \"^I_\": { \"type\": \"integer\" }"
-        "  },"
-        "  \"additionalProperties\": { \"type\": \"string\" }"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{ \"builtin\": 42 }", true);
-    VALIDATE(s, "{ \"keyword\": \"value\" }", true);
-    INVALIDATE(s, "{ \"keyword\": 42 }", "/additionalProperties", "type", "/keyword",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/keyword\", \"schemaRef\": \"#/additionalProperties\","
-        "    \"expected\": [\"string\"], \"actual\": \"integer\""
-        "}}");
-}
-#endif
-
-TEST(SchemaValidator, Array) {
-    Document sd;
-    sd.Parse("{\"type\":\"array\"}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "[1, 2, 3, 4, 5]", true);
-    VALIDATE(s, "[3, \"different\", { \"types\" : \"of values\" }]", true);
-    INVALIDATE(s, "{\"Not\": \"an array\"}", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"array\"], \"actual\": \"object\""
-        "}}");
-}
-
-TEST(SchemaValidator, Array_ItemsList) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "    \"type\": \"array\","
-        "    \"items\" : {"
-        "        \"type\": \"number\""
-        "    }"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "[1, 2, 3, 4, 5]", true);
-    INVALIDATE(s, "[1, 2, \"3\", 4, 5]", "/items", "type", "/2",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/2\", \"schemaRef\": \"#/items\","
-        "    \"expected\": [\"number\"], \"actual\": \"string\""
-        "}}");
-    VALIDATE(s, "[]", true);
-}
-
-TEST(SchemaValidator, Array_ItemsTuple) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "  \"type\": \"array\","
-        "  \"items\": ["
-        "    {"
-        "      \"type\": \"number\""
-        "    },"
-        "    {"
-        "      \"type\": \"string\""
-        "    },"
-        "    {"
-        "      \"type\": \"string\","
-        "      \"enum\": [\"Street\", \"Avenue\", \"Boulevard\"]"
-        "    },"
-        "    {"
-        "      \"type\": \"string\","
-        "      \"enum\": [\"NW\", \"NE\", \"SW\", \"SE\"]"
-        "    }"
-        "  ]"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "[1600, \"Pennsylvania\", \"Avenue\", \"NW\"]", true);
-    INVALIDATE(s, "[24, \"Sussex\", \"Drive\"]", "/items/2", "enum", "/2",
-        "{ \"enum\": { \"instanceRef\": \"#/2\", \"schemaRef\": \"#/items/2\" }}");
-    INVALIDATE(s, "[\"Palais de l'Elysee\"]", "/items/0", "type", "/0",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/0\", \"schemaRef\": \"#/items/0\","
-        "    \"expected\": [\"number\"], \"actual\": \"string\""
-        "}}");
-    INVALIDATE(s, "[\"Twenty-four\", \"Sussex\", \"Drive\"]", "/items/0", "type", "/0",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/0\", \"schemaRef\": \"#/items/0\","
-        "    \"expected\": [\"number\"], \"actual\": \"string\""
-        "}}"); // fail fast
-    VALIDATE(s, "[10, \"Downing\", \"Street\"]", true);
-    VALIDATE(s, "[1600, \"Pennsylvania\", \"Avenue\", \"NW\", \"Washington\"]", true);
-}
-
-TEST(SchemaValidator, Array_AdditionalItmes) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "  \"type\": \"array\","
-        "  \"items\": ["
-        "    {"
-        "      \"type\": \"number\""
-        "    },"
-        "    {"
-        "      \"type\": \"string\""
-        "    },"
-        "    {"
-        "      \"type\": \"string\","
-        "      \"enum\": [\"Street\", \"Avenue\", \"Boulevard\"]"
-        "    },"
-        "    {"
-        "      \"type\": \"string\","
-        "      \"enum\": [\"NW\", \"NE\", \"SW\", \"SE\"]"
-        "    }"
-        "  ],"
-        "  \"additionalItems\": false"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "[1600, \"Pennsylvania\", \"Avenue\", \"NW\"]", true);
-    VALIDATE(s, "[1600, \"Pennsylvania\", \"Avenue\"]", true);
-    INVALIDATE(s, "[1600, \"Pennsylvania\", \"Avenue\", \"NW\", \"Washington\"]", "", "items", "/4",
-        "{ \"additionalItems\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"disallowed\": 4"
-        "}}");
-}
-
-TEST(SchemaValidator, Array_ItemsRange) {
-    Document sd;
-    sd.Parse("{\"type\": \"array\",\"minItems\": 2,\"maxItems\" : 3}");
-    SchemaDocument s(sd);
-
-    INVALIDATE(s, "[]", "", "minItems", "",
-        "{ \"minItems\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 2, \"actual\": 0"
-        "}}");
-    INVALIDATE(s, "[1]", "", "minItems", "",
-        "{ \"minItems\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 2, \"actual\": 1"
-        "}}");
-    VALIDATE(s, "[1, 2]", true);
-    VALIDATE(s, "[1, 2, 3]", true);
-    INVALIDATE(s, "[1, 2, 3, 4]", "", "maxItems", "",
-        "{ \"maxItems\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 3, \"actual\": 4"
-        "}}");
-}
-
-TEST(SchemaValidator, Array_UniqueItems) {
-    Document sd;
-    sd.Parse("{\"type\": \"array\", \"uniqueItems\": true}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "[1, 2, 3, 4, 5]", true);
-    INVALIDATE(s, "[1, 2, 3, 3, 4]", "", "uniqueItems", "/3",
-        "{ \"uniqueItems\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"duplicates\": [2, 3]"
-        "}}");
-    INVALIDATE(s, "[1, 2, 3, 3, 3]", "", "uniqueItems", "/3",
-        "{ \"uniqueItems\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"duplicates\": [2, 3]"
-        "}}"); // fail fast
-    VALIDATE(s, "[]", true);
-}
-
-TEST(SchemaValidator, Boolean) {
-    Document sd;
-    sd.Parse("{\"type\":\"boolean\"}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "true", true);
-    VALIDATE(s, "false", true);
-    INVALIDATE(s, "\"true\"", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"boolean\"], \"actual\": \"string\""
-        "}}");
-    INVALIDATE(s, "0", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"boolean\"], \"actual\": \"integer\""
-        "}}");
-}
-
-TEST(SchemaValidator, Null) {
-    Document sd;
-    sd.Parse("{\"type\":\"null\"}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "null", true);
-    INVALIDATE(s, "false", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"null\"], \"actual\": \"boolean\""
-        "}}");
-    INVALIDATE(s, "0", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"null\"], \"actual\": \"integer\""
-        "}}");
-    INVALIDATE(s, "\"\"", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"null\"], \"actual\": \"string\""
-        "}}");
-}
-
-// Additional tests
-
-TEST(SchemaValidator, ObjectInArray) {
-    Document sd;
-    sd.Parse("{\"type\":\"array\", \"items\": { \"type\":\"string\" }}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "[\"a\"]", true);
-    INVALIDATE(s, "[1]", "/items", "type", "/0",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/0\", \"schemaRef\": \"#/items\","
-        "    \"expected\": [\"string\"], \"actual\": \"integer\""
-        "}}");
-    INVALIDATE(s, "[{}]", "/items", "type", "/0",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/0\", \"schemaRef\": \"#/items\","
-        "    \"expected\": [\"string\"], \"actual\": \"object\""
-        "}}");
-}
-
-TEST(SchemaValidator, MultiTypeInObject) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "    \"type\":\"object\","
-        "    \"properties\": {"
-        "        \"tel\" : {"
-        "            \"type\":[\"integer\", \"string\"]"
-        "        }"
-        "    }"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{ \"tel\": 999 }", true);
-    VALIDATE(s, "{ \"tel\": \"123-456\" }", true);
-    INVALIDATE(s, "{ \"tel\": true }", "/properties/tel", "type", "/tel",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/tel\", \"schemaRef\": \"#/properties/tel\","
-        "    \"expected\": [\"string\", \"integer\"], \"actual\": \"boolean\""
-        "}}");
-}
-
-TEST(SchemaValidator, MultiTypeWithObject) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "    \"type\": [\"object\",\"string\"],"
-        "    \"properties\": {"
-        "        \"tel\" : {"
-        "            \"type\": \"integer\""
-        "        }"
-        "    }"
-        "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "\"Hello\"", true);
-    VALIDATE(s, "{ \"tel\": 999 }", true);
-    INVALIDATE(s, "{ \"tel\": \"fail\" }", "/properties/tel", "type", "/tel",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/tel\", \"schemaRef\": \"#/properties/tel\","
-        "    \"expected\": [\"integer\"], \"actual\": \"string\""
-        "}}");
-}
-
-TEST(SchemaValidator, AllOf_Nested) {
-    Document sd;
-    sd.Parse(
-    "{"
-    "    \"allOf\": ["
-    "        { \"type\": \"string\", \"minLength\": 2 },"
-    "        { \"type\": \"string\", \"maxLength\": 5 },"
-    "        { \"allOf\": [ { \"enum\" : [\"ok\", \"okay\", \"OK\", \"o\"] }, { \"enum\" : [\"ok\", \"OK\", \"o\"]} ] }"
-    "    ]"
-    "}");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "\"ok\"", true);
-    VALIDATE(s, "\"OK\"", true);
-    INVALIDATE(s, "\"okay\"", "", "allOf", "",
-        "{ \"enum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/1\""
-        "}}");
-    INVALIDATE(s, "\"o\"", "", "allOf", "",
-        "{ \"minLength\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/0\","
-        "    \"expected\": 2, \"actual\": \"o\""
-        "}}");
-    INVALIDATE(s, "\"n\"", "", "allOf", "",
-        "{ \"minLength\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/0\","
-        "    \"expected\": 2, \"actual\": \"n\""
-        "  },"
-        "  \"enum\": ["
-        "    {\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/0\"},"
-        "    {\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/1\"}"
-        "  ]"
-        "}")
-    INVALIDATE(s, "\"too long\"", "", "allOf", "",
-        "{ \"maxLength\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/1\","
-        "    \"expected\": 5, \"actual\": \"too long\""
-        "  },"
-        "  \"enum\": ["
-        "    {\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/0\"},"
-        "    {\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/1\"}"
-        "  ]"
-        "}");
-    INVALIDATE(s, "123", "", "allOf", "",
-        "{ \"type\": ["
-        "    { \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/0\","
-        "      \"expected\": [\"string\"], \"actual\": \"integer\""
-        "    },"
-        "    { \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/1\","
-        "      \"expected\": [\"string\"], \"actual\": \"integer\""
-        "    }"
-        "  ],"
-        "  \"enum\": ["
-        "    {\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/0\"},"
-        "    {\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/1\"}"
-        "  ]"
-        "}");
-}
-
-TEST(SchemaValidator, EscapedPointer) {
-    Document sd;
-    sd.Parse(
-        "{"
-        "  \"type\": \"object\","
-        "  \"properties\": {"
-        "    \"~/\": { \"type\": \"number\" }"
-        "  }"
-        "}");
-    SchemaDocument s(sd);
-    INVALIDATE(s, "{\"~/\":true}", "/properties/~0~1", "type", "/~0~1",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#/~0~1\", \"schemaRef\": \"#/properties/~0~1\","
-        "    \"expected\": [\"number\"], \"actual\": \"boolean\""
-        "}}");
-}
-
-template <typename Allocator>
-static char* ReadFile(const char* filename, Allocator& allocator) {
-    const char *paths[] = {
-        "",
-        "bin/",
-        "../bin/",
-        "../../bin/",
-        "../../../bin/"
-    };
-    char buffer[1024];
-    FILE *fp = 0;
-    for (size_t i = 0; i < sizeof(paths) / sizeof(paths[0]); i++) {
-        sprintf(buffer, "%s%s", paths[i], filename);
-        fp = fopen(buffer, "rb");
-        if (fp)
-            break;
-    }
-
-    if (!fp)
-        return 0;
-
-    fseek(fp, 0, SEEK_END);
-    size_t length = static_cast<size_t>(ftell(fp));
-    fseek(fp, 0, SEEK_SET);
-    char* json = reinterpret_cast<char*>(allocator.Malloc(length + 1));
-    size_t readLength = fread(json, 1, length, fp);
-    json[readLength] = '\0';
-    fclose(fp);
-    return json;
-}
-
-TEST(SchemaValidator, ValidateMetaSchema) {
-    CrtAllocator allocator;
-    char* json = ReadFile("draft-04/schema", allocator);
-    Document d;
-    d.Parse(json);
-    ASSERT_FALSE(d.HasParseError());
-    SchemaDocument sd(d);
-    SchemaValidator validator(sd);
-    if (!d.Accept(validator)) {
-        StringBuffer sb;
-        validator.GetInvalidSchemaPointer().StringifyUriFragment(sb);
-        printf("Invalid schema: %s\n", sb.GetString());
-        printf("Invalid keyword: %s\n", validator.GetInvalidSchemaKeyword());
-        sb.Clear();
-        validator.GetInvalidDocumentPointer().StringifyUriFragment(sb);
-        printf("Invalid document: %s\n", sb.GetString());
-        sb.Clear();
-        Writer<StringBuffer> w(sb);
-        validator.GetError().Accept(w);
-        printf("Validation error: %s\n", sb.GetString());
-        ADD_FAILURE();
-    }
-    CrtAllocator::Free(json);
-}
-
-TEST(SchemaValidator, ValidateMetaSchema_UTF16) {
-    typedef GenericDocument<UTF16<> > D;
-    typedef GenericSchemaDocument<D::ValueType> SD;
-    typedef GenericSchemaValidator<SD> SV;
-
-    CrtAllocator allocator;
-    char* json = ReadFile("draft-04/schema", allocator);
-
-    D d;
-    StringStream ss(json);
-    d.ParseStream<0, UTF8<> >(ss);
-    ASSERT_FALSE(d.HasParseError());
-    SD sd(d);
-    SV validator(sd);
-    if (!d.Accept(validator)) {
-        GenericStringBuffer<UTF16<> > sb;
-        validator.GetInvalidSchemaPointer().StringifyUriFragment(sb);
-        wprintf(L"Invalid schema: %ls\n", sb.GetString());
-        wprintf(L"Invalid keyword: %ls\n", validator.GetInvalidSchemaKeyword());
-        sb.Clear();
-        validator.GetInvalidDocumentPointer().StringifyUriFragment(sb);
-        wprintf(L"Invalid document: %ls\n", sb.GetString());
-        sb.Clear();
-        Writer<GenericStringBuffer<UTF16<> >, UTF16<> > w(sb);
-        validator.GetError().Accept(w);
-        printf("Validation error: %ls\n", sb.GetString());
-        ADD_FAILURE();
-    }
-    CrtAllocator::Free(json);
-}
-
-template <typename SchemaDocumentType = SchemaDocument>
-class RemoteSchemaDocumentProvider : public IGenericRemoteSchemaDocumentProvider<SchemaDocumentType> {
-public:
-    RemoteSchemaDocumentProvider() : 
-        documentAllocator_(documentBuffer_, sizeof(documentBuffer_)), 
-        schemaAllocator_(schemaBuffer_, sizeof(schemaBuffer_)) 
-    {
-        const char* filenames[kCount] = {
-            "jsonschema/remotes/integer.json",
-            "jsonschema/remotes/subSchemas.json",
-            "jsonschema/remotes/folder/folderInteger.json",
-            "draft-04/schema"
-        };
-        const char* uris[kCount] = {
-            "http://localhost:1234/integer.json",
-            "http://localhost:1234/subSchemas.json",
-            "http://localhost:1234/folder/folderInteger.json",
-            "http://json-schema.org/draft-04/schema"
-        };
-
-        for (size_t i = 0; i < kCount; i++) {
-            sd_[i] = 0;
-
-            char jsonBuffer[8192];
-            MemoryPoolAllocator<> jsonAllocator(jsonBuffer, sizeof(jsonBuffer));
-            char* json = ReadFile(filenames[i], jsonAllocator);
-            if (!json) {
-                printf("json remote file %s not found", filenames[i]);
-                ADD_FAILURE();
-            }
-            else {
-                char stackBuffer[4096];
-                MemoryPoolAllocator<> stackAllocator(stackBuffer, sizeof(stackBuffer));
-                DocumentType d(&documentAllocator_, 1024, &stackAllocator);
-                d.Parse(json);
-                sd_[i] = new SchemaDocumentType(d, uris[i], static_cast<SizeType>(strlen(uris[i])), 0, &schemaAllocator_);
-                MemoryPoolAllocator<>::Free(json);
-            }
-        };
-    }
-
-    ~RemoteSchemaDocumentProvider() {
-        for (size_t i = 0; i < kCount; i++)
-            delete sd_[i];
-    }
-
-    virtual const SchemaDocumentType* GetRemoteDocument(const char* uri, SizeType length) {
-        for (size_t i = 0; i < kCount; i++)
-            if (typename SchemaDocumentType::URIType(uri, length) == sd_[i]->GetURI())
-                return sd_[i];
-        return 0;
-    }
-
-private:
-    typedef GenericDocument<typename SchemaDocumentType::EncodingType, MemoryPoolAllocator<>, MemoryPoolAllocator<> > DocumentType;
-
-    RemoteSchemaDocumentProvider(const RemoteSchemaDocumentProvider&);
-    RemoteSchemaDocumentProvider& operator=(const RemoteSchemaDocumentProvider&);
-
-    static const size_t kCount = 4;
-    SchemaDocumentType* sd_[kCount];
-    typename DocumentType::AllocatorType documentAllocator_;
-    typename SchemaDocumentType::AllocatorType schemaAllocator_;
-    char documentBuffer_[16384];
-    char schemaBuffer_[128 * 1024];
-};
-
-TEST(SchemaValidator, TestSuite) {
-    const char* filenames[] = {
-        "additionalItems.json",
-        "additionalProperties.json",
-        "allOf.json",
-        "anyOf.json",
-        "default.json",
-        "definitions.json",
-        "dependencies.json",
-        "enum.json",
-        "items.json",
-        "maximum.json",
-        "maxItems.json",
-        "maxLength.json",
-        "maxProperties.json",
-        "minimum.json",
-        "minItems.json",
-        "minLength.json",
-        "minProperties.json",
-        "multipleOf.json",
-        "not.json",
-        "oneOf.json",
-        "pattern.json",
-        "patternProperties.json",
-        "properties.json",
-        "ref.json",
-        "refRemote.json",
-        "required.json",
-        "type.json",
-        "uniqueItems.json"
-    };
-
-    const char* onlyRunDescription = 0;
-    //const char* onlyRunDescription = "a string is a string";
-
-    unsigned testCount = 0;
-    unsigned passCount = 0;
-
-    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
-    RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
-
-    char jsonBuffer[65536];
-    char documentBuffer[65536];
-    char documentStackBuffer[65536];
-    char schemaBuffer[65536];
-    char validatorBuffer[65536];
-    MemoryPoolAllocator<> jsonAllocator(jsonBuffer, sizeof(jsonBuffer));
-    MemoryPoolAllocator<> documentAllocator(documentBuffer, sizeof(documentBuffer));
-    MemoryPoolAllocator<> documentStackAllocator(documentStackBuffer, sizeof(documentStackBuffer));
-    MemoryPoolAllocator<> schemaAllocator(schemaBuffer, sizeof(schemaBuffer));
-    MemoryPoolAllocator<> validatorAllocator(validatorBuffer, sizeof(validatorBuffer));
-
-    for (size_t i = 0; i < sizeof(filenames) / sizeof(filenames[0]); i++) {
-        char filename[FILENAME_MAX];
-        sprintf(filename, "jsonschema/tests/draft4/%s", filenames[i]);
-        char* json = ReadFile(filename, jsonAllocator);
-        if (!json) {
-            printf("json test suite file %s not found", filename);
-            ADD_FAILURE();
-        }
-        else {
-            GenericDocument<UTF8<>, MemoryPoolAllocator<>, MemoryPoolAllocator<> > d(&documentAllocator, 1024, &documentStackAllocator);
-            d.Parse(json);
-            if (d.HasParseError()) {
-                printf("json test suite file %s has parse error", filename);
-                ADD_FAILURE();
-            }
-            else {
-                for (Value::ConstValueIterator schemaItr = d.Begin(); schemaItr != d.End(); ++schemaItr) {
-                    {
-                        SchemaDocumentType schema((*schemaItr)["schema"], filenames[i], static_cast<SizeType>(strlen(filenames[i])), &provider, &schemaAllocator);
-                        GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > validator(schema, &validatorAllocator);
-                        const char* description1 = (*schemaItr)["description"].GetString();
-                        const Value& tests = (*schemaItr)["tests"];
-                        for (Value::ConstValueIterator testItr = tests.Begin(); testItr != tests.End(); ++testItr) {
-                            const char* description2 = (*testItr)["description"].GetString();
-                            if (!onlyRunDescription || strcmp(description2, onlyRunDescription) == 0) {
-                                const Value& data = (*testItr)["data"];
-                                bool expected = (*testItr)["valid"].GetBool();
-                                testCount++;
-                                validator.Reset();
-                                bool actual = data.Accept(validator);
-                                if (expected != actual)
-                                    printf("Fail: %30s \"%s\" \"%s\"\n", filename, description1, description2);
-                                else
-                                    passCount++;
-                            }
-                        }
-                        //printf("%zu %zu %zu\n", documentAllocator.Size(), schemaAllocator.Size(), validatorAllocator.Size());
-                    }
-                    schemaAllocator.Clear();
-                    validatorAllocator.Clear();
-                }
-            }
-        }
-        documentAllocator.Clear();
-        MemoryPoolAllocator<>::Free(json);
-        jsonAllocator.Clear();
-    }
-    printf("%d / %d passed (%2d%%)\n", passCount, testCount, passCount * 100 / testCount);
-    // if (passCount != testCount)
-    //     ADD_FAILURE();
-}
-
-TEST(SchemaValidatingReader, Simple) {
-    Document sd;
-    sd.Parse("{ \"type\": \"string\", \"enum\" : [\"red\", \"amber\", \"green\"] }");
-    SchemaDocument s(sd);
-
-    Document d;
-    StringStream ss("\"red\"");
-    SchemaValidatingReader<kParseDefaultFlags, StringStream, UTF8<> > reader(ss, s);
-    d.Populate(reader);
-    EXPECT_TRUE(reader.GetParseResult());
-    EXPECT_TRUE(reader.IsValid());
-    EXPECT_TRUE(d.IsString());
-    EXPECT_STREQ("red", d.GetString());
-}
-
-TEST(SchemaValidatingReader, Invalid) {
-    Document sd;
-    sd.Parse("{\"type\":\"string\",\"minLength\":2,\"maxLength\":3}");
-    SchemaDocument s(sd);
-
-    Document d;
-    StringStream ss("\"ABCD\"");
-    SchemaValidatingReader<kParseDefaultFlags, StringStream, UTF8<> > reader(ss, s);
-    d.Populate(reader);
-    EXPECT_FALSE(reader.GetParseResult());
-    EXPECT_FALSE(reader.IsValid());
-    EXPECT_EQ(kParseErrorTermination, reader.GetParseResult().Code());
-    EXPECT_STREQ("maxLength", reader.GetInvalidSchemaKeyword());
-    EXPECT_TRUE(reader.GetInvalidSchemaPointer() == SchemaDocument::PointerType(""));
-    EXPECT_TRUE(reader.GetInvalidDocumentPointer() == SchemaDocument::PointerType(""));
-    EXPECT_TRUE(d.IsNull());
-    Document e;
-    e.Parse(
-        "{ \"maxLength\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 3, \"actual\": \"ABCD\""
-        "}}");
-    if (e != reader.GetError()) {
-        ADD_FAILURE();
-    }
-}
-
-TEST(SchemaValidatingWriter, Simple) {
-    Document sd;
-    sd.Parse("{\"type\":\"string\",\"minLength\":2,\"maxLength\":3}");
-    SchemaDocument s(sd);
-
-    Document d;
-    StringBuffer sb;
-    Writer<StringBuffer> writer(sb);
-    GenericSchemaValidator<SchemaDocument, Writer<StringBuffer> > validator(s, writer);
-
-    d.Parse("\"red\"");
-    EXPECT_TRUE(d.Accept(validator));
-    EXPECT_TRUE(validator.IsValid());
-    EXPECT_STREQ("\"red\"", sb.GetString());
-
-    sb.Clear();
-    validator.Reset();
-    d.Parse("\"ABCD\"");
-    EXPECT_FALSE(d.Accept(validator));
-    EXPECT_FALSE(validator.IsValid());
-    EXPECT_TRUE(validator.GetInvalidSchemaPointer() == SchemaDocument::PointerType(""));
-    EXPECT_TRUE(validator.GetInvalidDocumentPointer() == SchemaDocument::PointerType(""));
-    Document e;
-    e.Parse(
-        "{ \"maxLength\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": 3, \"actual\": \"ABCD\""
-        "}}");
-    EXPECT_EQ(e, validator.GetError());
-}
-
-TEST(Schema, Issue848) {
-    rapidjson::Document d;
-    rapidjson::SchemaDocument s(d);
-    rapidjson::GenericSchemaValidator<rapidjson::SchemaDocument, rapidjson::Document> v(s);
-}
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-static SchemaDocument ReturnSchemaDocument() {
-    Document sd;
-    sd.Parse("{ \"type\": [\"number\", \"string\"] }");
-    SchemaDocument s(sd);
-    return s;
-}
-
-TEST(Schema, Issue552) {
-    SchemaDocument s = ReturnSchemaDocument();
-    VALIDATE(s, "42", true);
-    VALIDATE(s, "\"Life, the universe, and everything\"", true);
-    INVALIDATE(s, "[\"Life\", \"the universe\", \"and everything\"]", "", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"expected\": [\"string\", \"number\"], \"actual\": \"array\""
-        "}}");
-}
-
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-TEST(SchemaValidator, Issue608) {
-    Document sd;
-    sd.Parse("{\"required\": [\"a\", \"b\"] }");
-    SchemaDocument s(sd);
-
-    VALIDATE(s, "{\"a\" : null, \"b\": null}", true);
-    INVALIDATE(s, "{\"a\" : null, \"a\" : null}", "", "required", "",
-        "{ \"required\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"missing\": [\"b\"]"
-        "}}");
-}
-
-// Fail to resolve $ref in allOf causes crash in SchemaValidator::StartObject()
-TEST(SchemaValidator, Issue728_AllOfRef) {
-    Document sd;
-    sd.Parse("{\"allOf\": [{\"$ref\": \"#/abc\"}]}");
-    SchemaDocument s(sd);
-    VALIDATE(s, "{\"key1\": \"abc\", \"key2\": \"def\"}", true);
-}
-
-TEST(SchemaValidator, Issue825) {
-    Document sd;
-    sd.Parse("{\"type\": \"object\", \"additionalProperties\": false, \"patternProperties\": {\"^i\": { \"type\": \"string\" } } }");
-    SchemaDocument s(sd);
-    VALIDATE(s, "{ \"item\": \"hello\" }", true);
-}
-
-TEST(SchemaValidator, Issue1017_allOfHandler) {
-    Document sd;
-    sd.Parse("{\"allOf\": [{\"type\": \"object\",\"properties\": {\"cyanArray2\": {\"type\": \"array\",\"items\": { \"type\": \"string\" }}}},{\"type\": \"object\",\"properties\": {\"blackArray\": {\"type\": \"array\",\"items\": { \"type\": \"string\" }}},\"required\": [ \"blackArray\" ]}]}");
-    SchemaDocument s(sd);
-    StringBuffer sb;
-    Writer<StringBuffer> writer(sb);
-    GenericSchemaValidator<SchemaDocument, Writer<StringBuffer> > validator(s, writer);
-    EXPECT_TRUE(validator.StartObject());
-    EXPECT_TRUE(validator.Key("cyanArray2", 10, false));
-    EXPECT_TRUE(validator.StartArray());    
-    EXPECT_TRUE(validator.EndArray(0));    
-    EXPECT_TRUE(validator.Key("blackArray", 10, false));
-    EXPECT_TRUE(validator.StartArray());    
-    EXPECT_TRUE(validator.EndArray(0));    
-    EXPECT_TRUE(validator.EndObject(0));
-    EXPECT_TRUE(validator.IsValid());
-    EXPECT_STREQ("{\"cyanArray2\":[],\"blackArray\":[]}", sb.GetString());
-}
-
-TEST(SchemaValidator, Ref_remote) {
-    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
-    RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
-    Document sd;
-    sd.Parse("{\"$ref\": \"http://localhost:1234/subSchemas.json#/integer\"}");
-    SchemaDocumentType s(sd, 0, 0, &provider);
-    typedef GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > SchemaValidatorType;
-    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
-    INVALIDATE_(s, "null", "/integer", "type", "",
-        "{ \"type\": {"
-        "    \"instanceRef\": \"#\","
-        "    \"schemaRef\": \"http://localhost:1234/subSchemas.json#/integer\","
-        "    \"expected\": [\"integer\"], \"actual\": \"null\""
-        "}}",
-        SchemaValidatorType, PointerType);
-}
-
-TEST(SchemaValidator, Ref_remote_issue1210) {
-    class SchemaDocumentProvider : public IRemoteSchemaDocumentProvider {
-        SchemaDocument** collection;
-
-        SchemaDocumentProvider(const SchemaDocumentProvider&);
-        SchemaDocumentProvider& operator=(const SchemaDocumentProvider&);
-
-        public:
-          SchemaDocumentProvider(SchemaDocument** collection) : collection(collection) { }
-          virtual const SchemaDocument* GetRemoteDocument(const char* uri, SizeType length) {
-            int i = 0;
-            while (collection[i] && SchemaDocument::URIType(uri, length) != collection[i]->GetURI()) ++i;
-            return collection[i];
-          }
-    };
-    SchemaDocument* collection[] = { 0, 0, 0 };
-    SchemaDocumentProvider provider(collection);
-
-    Document x, y, z;
-    x.Parse("{\"properties\":{\"country\":{\"$ref\":\"y.json#/definitions/country_remote\"}},\"type\":\"object\"}");
-    y.Parse("{\"definitions\":{\"country_remote\":{\"$ref\":\"z.json#/definitions/country_list\"}}}");
-    z.Parse("{\"definitions\":{\"country_list\":{\"enum\":[\"US\"]}}}");
-
-    SchemaDocument sz(z, "z.json", 6, &provider);
-    collection[0] = &sz;
-    SchemaDocument sy(y, "y.json", 6, &provider);
-    collection[1] = &sy;
-    SchemaDocument sx(x, "x.json", 6, &provider);
-
-    VALIDATE(sx, "{\"country\":\"UK\"}", false);
-    VALIDATE(sx, "{\"country\":\"US\"}", true);
-}
-
-#if defined(_MSC_VER) || defined(__clang__)
-RAPIDJSON_DIAG_POP
-#endif
diff --git a/src/sioclient/lib/rapidjson/test/unittest/simdtest.cpp b/src/sioclient/lib/rapidjson/test/unittest/simdtest.cpp
deleted file mode 100644
index 7b58cd05..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/simdtest.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-// Since Travis CI installs old Valgrind 3.7.0, which fails with some SSE4.2
-// The unit tests prefix with SIMD should be skipped by Valgrind test
-
-// __SSE2__ and __SSE4_2__ are recognized by gcc, clang, and the Intel compiler.
-// We use -march=native with gmake to enable -msse2 and -msse4.2, if supported.
-#if defined(__SSE4_2__)
-#  define RAPIDJSON_SSE42
-#elif defined(__SSE2__)
-#  define RAPIDJSON_SSE2
-#elif defined(__ARM_NEON)
-#  define RAPIDJSON_NEON
-#endif
-
-#define RAPIDJSON_NAMESPACE rapidjson_simd
-
-#include "unittest.h"
-
-#include "rapidjson/reader.h"
-#include "rapidjson/writer.h"
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-using namespace rapidjson_simd;
-
-#ifdef RAPIDJSON_SSE2
-#define SIMD_SUFFIX(name) name##_SSE2
-#elif defined(RAPIDJSON_SSE42)
-#define SIMD_SUFFIX(name) name##_SSE42
-#elif defined(RAPIDJSON_NEON)
-#define SIMD_SUFFIX(name) name##_NEON
-#else
-#define SIMD_SUFFIX(name) name
-#endif
-
-template <typename StreamType>
-void TestSkipWhitespace() {
-    for (size_t step = 1; step < 32; step++) {
-        char buffer[1025];
-        for (size_t i = 0; i < 1024; i++)
-            buffer[i] = " \t\r\n"[i % 4];
-        for (size_t i = 0; i < 1024; i += step)
-            buffer[i] = 'X';
-        buffer[1024] = '\0';
-
-        StreamType s(buffer);
-        size_t i = 0;
-        for (;;) {
-            SkipWhitespace(s);
-            if (s.Peek() == '\0')
-                break;
-            EXPECT_EQ(i, s.Tell());
-            EXPECT_EQ('X', s.Take());
-            i += step;
-        }
-    }
-}
-
-TEST(SIMD, SIMD_SUFFIX(SkipWhitespace)) {
-    TestSkipWhitespace<StringStream>();
-    TestSkipWhitespace<InsituStringStream>();
-}
-
-TEST(SIMD, SIMD_SUFFIX(SkipWhitespace_EncodedMemoryStream)) {
-    for (size_t step = 1; step < 32; step++) {
-        char buffer[1024];
-        for (size_t i = 0; i < 1024; i++)
-            buffer[i] = " \t\r\n"[i % 4];
-        for (size_t i = 0; i < 1024; i += step)
-            buffer[i] = 'X';
-
-        MemoryStream ms(buffer, 1024);
-        EncodedInputStream<UTF8<>, MemoryStream> s(ms);
-        size_t i = 0;
-        for (;;) {
-            SkipWhitespace(s);
-            if (s.Peek() == '\0')
-                break;
-            //EXPECT_EQ(i, s.Tell());
-            EXPECT_EQ('X', s.Take());
-            i += step;
-        }
-    }
-}
-
-struct ScanCopyUnescapedStringHandler : BaseReaderHandler<UTF8<>, ScanCopyUnescapedStringHandler> {
-    bool String(const char* str, size_t length, bool) {
-        memcpy(buffer, str, length + 1);
-        return true;
-    }
-    char buffer[1024 + 5 + 32];
-};
-
-template <unsigned parseFlags, typename StreamType>
-void TestScanCopyUnescapedString() {
-    char buffer[1024 + 5 + 32];
-    char backup[1024 + 5 + 32];
-
-    // Test "ABCDABCD...\\"
-    for (size_t offset = 0; offset < 32; offset++) {
-        for (size_t step = 0; step < 1024; step++) {
-            char* json = buffer + offset;
-            char *p = json;
-            *p++ = '\"';
-            for (size_t i = 0; i < step; i++)
-                *p++ = "ABCD"[i % 4];
-            *p++ = '\\';
-            *p++ = '\\';
-            *p++ = '\"';
-            *p++ = '\0';
-            strcpy(backup, json); // insitu parsing will overwrite buffer, so need to backup first
-
-            StreamType s(json);
-            Reader reader;
-            ScanCopyUnescapedStringHandler h;
-            reader.Parse<parseFlags>(s, h);
-            EXPECT_TRUE(memcmp(h.buffer, backup + 1, step) == 0);
-            EXPECT_EQ('\\', h.buffer[step]);    // escaped
-            EXPECT_EQ('\0', h.buffer[step + 1]);
-        }
-    }
-
-    // Test "\\ABCDABCD..."
-    for (size_t offset = 0; offset < 32; offset++) {
-        for (size_t step = 0; step < 1024; step++) {
-            char* json = buffer + offset;
-            char *p = json;
-            *p++ = '\"';
-            *p++ = '\\';
-            *p++ = '\\';
-            for (size_t i = 0; i < step; i++)
-                *p++ = "ABCD"[i % 4];
-            *p++ = '\"';
-            *p++ = '\0';
-            strcpy(backup, json); // insitu parsing will overwrite buffer, so need to backup first
-
-            StreamType s(json);
-            Reader reader;
-            ScanCopyUnescapedStringHandler h;
-            reader.Parse<parseFlags>(s, h);
-            EXPECT_TRUE(memcmp(h.buffer + 1, backup + 3, step) == 0);
-            EXPECT_EQ('\\', h.buffer[0]);    // escaped
-            EXPECT_EQ('\0', h.buffer[step + 1]);
-        }
-    }
-}
-
-TEST(SIMD, SIMD_SUFFIX(ScanCopyUnescapedString)) {
-    TestScanCopyUnescapedString<kParseDefaultFlags, StringStream>();
-    TestScanCopyUnescapedString<kParseInsituFlag, InsituStringStream>();
-}
-
-TEST(SIMD, SIMD_SUFFIX(ScanWriteUnescapedString)) {
-    char buffer[2048 + 1 + 32];
-    for (size_t offset = 0; offset < 32; offset++) {
-        for (size_t step = 0; step < 1024; step++) {
-            char* s = buffer + offset;
-            char* p = s;
-            for (size_t i = 0; i < step; i++)
-                *p++ = "ABCD"[i % 4];
-            char escape = "\0\n\\\""[step % 4];
-            *p++ = escape;
-            for (size_t i = 0; i < step; i++)
-                *p++ = "ABCD"[i % 4];
-
-            StringBuffer sb;
-            Writer<StringBuffer> writer(sb);
-            writer.String(s, SizeType(step * 2 + 1));
-            const char* q = sb.GetString();
-            EXPECT_EQ('\"', *q++);
-            for (size_t i = 0; i < step; i++)
-                EXPECT_EQ("ABCD"[i % 4], *q++);
-            if (escape == '\0') {
-                EXPECT_EQ('\\', *q++);
-                EXPECT_EQ('u', *q++);
-                EXPECT_EQ('0', *q++);
-                EXPECT_EQ('0', *q++);
-                EXPECT_EQ('0', *q++);
-                EXPECT_EQ('0', *q++);
-            }
-            else if (escape == '\n') {
-                EXPECT_EQ('\\', *q++);
-                EXPECT_EQ('n', *q++);
-            }
-            else if (escape == '\\') {
-                EXPECT_EQ('\\', *q++);
-                EXPECT_EQ('\\', *q++);
-            }
-            else if (escape == '\"') {
-                EXPECT_EQ('\\', *q++);
-                EXPECT_EQ('\"', *q++);
-            }
-            for (size_t i = 0; i < step; i++)
-                EXPECT_EQ("ABCD"[i % 4], *q++);
-            EXPECT_EQ('\"', *q++);
-            EXPECT_EQ('\0', *q++);
-        }
-    }
-}
-
-#ifdef __GNUC__
-RAPIDJSON_DIAG_POP
-#endif
diff --git a/src/sioclient/lib/rapidjson/test/unittest/strfunctest.cpp b/src/sioclient/lib/rapidjson/test/unittest/strfunctest.cpp
deleted file mode 100644
index cc1bb22f..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/strfunctest.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/internal/strfunc.h"
-
-using namespace rapidjson;
-using namespace rapidjson::internal;
-
-TEST(StrFunc, CountStringCodePoint) {
-    SizeType count;
-    EXPECT_TRUE(CountStringCodePoint<UTF8<> >("", 0, &count));
-    EXPECT_EQ(0u, count);
-    EXPECT_TRUE(CountStringCodePoint<UTF8<> >("Hello", 5, &count));
-    EXPECT_EQ(5u, count);
-    EXPECT_TRUE(CountStringCodePoint<UTF8<> >("\xC2\xA2\xE2\x82\xAC\xF0\x9D\x84\x9E", 9, &count)); // cents euro G-clef
-    EXPECT_EQ(3u, count);
-    EXPECT_FALSE(CountStringCodePoint<UTF8<> >("\xC2\xA2\xE2\x82\xAC\xF0\x9D\x84\x9E\x80", 10, &count));
-}
diff --git a/src/sioclient/lib/rapidjson/test/unittest/stringbuffertest.cpp b/src/sioclient/lib/rapidjson/test/unittest/stringbuffertest.cpp
deleted file mode 100644
index 8a36102f..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/stringbuffertest.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/writer.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-using namespace rapidjson;
-
-TEST(StringBuffer, InitialSize) {
-    StringBuffer buffer;
-    EXPECT_EQ(0u, buffer.GetSize());
-    EXPECT_EQ(0u, buffer.GetLength());
-    EXPECT_STREQ("", buffer.GetString());
-}
-
-TEST(StringBuffer, Put) {
-    StringBuffer buffer;
-    buffer.Put('A');
-
-    EXPECT_EQ(1u, buffer.GetSize());
-    EXPECT_EQ(1u, buffer.GetLength());
-    EXPECT_STREQ("A", buffer.GetString());
-}
-
-TEST(StringBuffer, PutN_Issue672) {
-    GenericStringBuffer<UTF8<>, MemoryPoolAllocator<> > buffer;
-    EXPECT_EQ(0, buffer.GetSize());
-    EXPECT_EQ(0, buffer.GetLength());
-    rapidjson::PutN(buffer, ' ', 1);
-    EXPECT_EQ(1, buffer.GetSize());
-    EXPECT_EQ(1, buffer.GetLength());
-}
-
-TEST(StringBuffer, Clear) {
-    StringBuffer buffer;
-    buffer.Put('A');
-    buffer.Put('B');
-    buffer.Put('C');
-    buffer.Clear();
-
-    EXPECT_EQ(0u, buffer.GetSize());
-    EXPECT_EQ(0u, buffer.GetLength());
-    EXPECT_STREQ("", buffer.GetString());
-}
-
-TEST(StringBuffer, Push) {
-    StringBuffer buffer;
-    buffer.Push(5);
-
-    EXPECT_EQ(5u, buffer.GetSize());
-    EXPECT_EQ(5u, buffer.GetLength());
-
-    // Causes sudden expansion to make the stack's capacity equal to size
-    buffer.Push(65536u);
-    EXPECT_EQ(5u + 65536u, buffer.GetSize());
-}
-
-TEST(StringBuffer, Pop) {
-    StringBuffer buffer;
-    buffer.Put('A');
-    buffer.Put('B');
-    buffer.Put('C');
-    buffer.Put('D');
-    buffer.Put('E');
-    buffer.Pop(3);
-
-    EXPECT_EQ(2u, buffer.GetSize());
-    EXPECT_EQ(2u, buffer.GetLength());
-    EXPECT_STREQ("AB", buffer.GetString());
-}
-
-TEST(StringBuffer, GetLength_Issue744) {
-    GenericStringBuffer<UTF16<wchar_t> > buffer;
-    buffer.Put('A');
-    buffer.Put('B');
-    buffer.Put('C');
-    EXPECT_EQ(3u * sizeof(wchar_t), buffer.GetSize());
-    EXPECT_EQ(3u, buffer.GetLength());
-}
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-#if 0 // Many old compiler does not support these. Turn it off temporaily.
-
-#include <type_traits>
-
-TEST(StringBuffer, Traits) {
-    static_assert( std::is_constructible<StringBuffer>::value, "");
-    static_assert( std::is_default_constructible<StringBuffer>::value, "");
-#ifndef _MSC_VER
-    static_assert(!std::is_copy_constructible<StringBuffer>::value, "");
-#endif
-    static_assert( std::is_move_constructible<StringBuffer>::value, "");
-
-    static_assert(!std::is_nothrow_constructible<StringBuffer>::value, "");
-    static_assert(!std::is_nothrow_default_constructible<StringBuffer>::value, "");
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1800
-    static_assert(!std::is_nothrow_copy_constructible<StringBuffer>::value, "");
-    static_assert(!std::is_nothrow_move_constructible<StringBuffer>::value, "");
-#endif
-
-    static_assert( std::is_assignable<StringBuffer,StringBuffer>::value, "");
-#ifndef _MSC_VER
-    static_assert(!std::is_copy_assignable<StringBuffer>::value, "");
-#endif
-    static_assert( std::is_move_assignable<StringBuffer>::value, "");
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1800
-    static_assert(!std::is_nothrow_assignable<StringBuffer, StringBuffer>::value, "");
-#endif
-
-    static_assert(!std::is_nothrow_copy_assignable<StringBuffer>::value, "");
-    static_assert(!std::is_nothrow_move_assignable<StringBuffer>::value, "");
-
-    static_assert( std::is_destructible<StringBuffer>::value, "");
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_destructible<StringBuffer>::value, "");
-#endif
-}
-
-#endif
-
-TEST(StringBuffer, MoveConstructor) {
-    StringBuffer x;
-    x.Put('A');
-    x.Put('B');
-    x.Put('C');
-    x.Put('D');
-
-    EXPECT_EQ(4u, x.GetSize());
-    EXPECT_EQ(4u, x.GetLength());
-    EXPECT_STREQ("ABCD", x.GetString());
-
-    // StringBuffer y(x); // does not compile (!is_copy_constructible)
-    StringBuffer y(std::move(x));
-    EXPECT_EQ(0u, x.GetSize());
-    EXPECT_EQ(0u, x.GetLength());
-    EXPECT_EQ(4u, y.GetSize());
-    EXPECT_EQ(4u, y.GetLength());
-    EXPECT_STREQ("ABCD", y.GetString());
-
-    // StringBuffer z = y; // does not compile (!is_copy_assignable)
-    StringBuffer z = std::move(y);
-    EXPECT_EQ(0u, y.GetSize());
-    EXPECT_EQ(0u, y.GetLength());
-    EXPECT_EQ(4u, z.GetSize());
-    EXPECT_EQ(4u, z.GetLength());
-    EXPECT_STREQ("ABCD", z.GetString());
-}
-
-TEST(StringBuffer, MoveAssignment) {
-    StringBuffer x;
-    x.Put('A');
-    x.Put('B');
-    x.Put('C');
-    x.Put('D');
-
-    EXPECT_EQ(4u, x.GetSize());
-    EXPECT_EQ(4u, x.GetLength());
-    EXPECT_STREQ("ABCD", x.GetString());
-
-    StringBuffer y;
-    // y = x; // does not compile (!is_copy_assignable)
-    y = std::move(x);
-    EXPECT_EQ(0u, x.GetSize());
-    EXPECT_EQ(4u, y.GetLength());
-    EXPECT_STREQ("ABCD", y.GetString());
-}
-
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
diff --git a/src/sioclient/lib/rapidjson/test/unittest/strtodtest.cpp b/src/sioclient/lib/rapidjson/test/unittest/strtodtest.cpp
deleted file mode 100644
index 807f8872..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/strtodtest.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-
-#include "rapidjson/internal/strtod.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(unreachable-code)
-#endif
-
-#define BIGINTEGER_LITERAL(s) BigInteger(s, sizeof(s) - 1)
-
-using namespace rapidjson::internal;
-
-TEST(Strtod, CheckApproximationCase) {
-    static const int kSignificandSize = 52;
-    static const int kExponentBias = 0x3FF;
-    static const uint64_t kExponentMask = RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
-    static const uint64_t kSignificandMask = RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
-    static const uint64_t kHiddenBit = RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
-
-    // http://www.exploringbinary.com/using-integers-to-check-a-floating-point-approximation/
-    // Let b = 0x1.465a72e467d88p-149
-    //       = 5741268244528520 x 2^-201
-    union {
-        double d;
-        uint64_t u;
-    }u;
-    u.u = 0x465a72e467d88 | ((static_cast<uint64_t>(-149 + kExponentBias)) << kSignificandSize);
-    const double b = u.d;
-    const uint64_t bInt = (u.u & kSignificandMask) | kHiddenBit;
-    const int bExp = static_cast<int>(((u.u & kExponentMask) >> kSignificandSize) - kExponentBias - kSignificandSize);
-    EXPECT_DOUBLE_EQ(1.7864e-45, b);
-    EXPECT_EQ(RAPIDJSON_UINT64_C2(0x001465a7, 0x2e467d88), bInt);
-    EXPECT_EQ(-201, bExp);
-
-    // Let d = 17864 x 10-49
-    const char dInt[] = "17864";
-    const int dExp = -49;
-
-    // Let h = 2^(bExp-1)
-    const int hExp = bExp - 1;
-    EXPECT_EQ(-202, hExp);
-
-    int dS_Exp2 = 0;
-    int dS_Exp5 = 0;
-    int bS_Exp2 = 0;
-    int bS_Exp5 = 0;
-    int hS_Exp2 = 0;
-    int hS_Exp5 = 0;
-
-    // Adjust for decimal exponent
-    if (dExp >= 0) {
-        dS_Exp2 += dExp;
-        dS_Exp5 += dExp;
-    }
-    else {
-        bS_Exp2 -= dExp;
-        bS_Exp5 -= dExp;
-        hS_Exp2 -= dExp;
-        hS_Exp5 -= dExp;
-    }
-
-    // Adjust for binary exponent
-    if (bExp >= 0)
-        bS_Exp2 += bExp;
-    else {
-        dS_Exp2 -= bExp;
-        hS_Exp2 -= bExp;
-    }
-
-    // Adjust for half ulp exponent
-    if (hExp >= 0)
-        hS_Exp2 += hExp;
-    else {
-        dS_Exp2 -= hExp;
-        bS_Exp2 -= hExp;
-    }
-
-    // Remove common power of two factor from all three scaled values
-    int common_Exp2 = (std::min)(dS_Exp2, (std::min)(bS_Exp2, hS_Exp2));
-    dS_Exp2 -= common_Exp2;
-    bS_Exp2 -= common_Exp2;
-    hS_Exp2 -= common_Exp2;
-
-    EXPECT_EQ(153, dS_Exp2);
-    EXPECT_EQ(0, dS_Exp5);
-    EXPECT_EQ(1, bS_Exp2);
-    EXPECT_EQ(49, bS_Exp5);
-    EXPECT_EQ(0, hS_Exp2);
-    EXPECT_EQ(49, hS_Exp5);
-
-    BigInteger dS = BIGINTEGER_LITERAL(dInt);
-    dS.MultiplyPow5(static_cast<unsigned>(dS_Exp5)) <<= static_cast<size_t>(dS_Exp2);
-
-    BigInteger bS(bInt);
-    bS.MultiplyPow5(static_cast<unsigned>(bS_Exp5)) <<= static_cast<size_t>(bS_Exp2);
-
-    BigInteger hS(1);
-    hS.MultiplyPow5(static_cast<unsigned>(hS_Exp5)) <<= static_cast<size_t>(hS_Exp2);
-
-    EXPECT_TRUE(BIGINTEGER_LITERAL("203970822259994138521801764465966248930731085529088") == dS);
-    EXPECT_TRUE(BIGINTEGER_LITERAL("203970822259994122305215569213032722473144531250000") == bS);
-    EXPECT_TRUE(BIGINTEGER_LITERAL("17763568394002504646778106689453125") == hS);
-
-    EXPECT_EQ(1, dS.Compare(bS));
-    
-    BigInteger delta(0);
-    EXPECT_FALSE(dS.Difference(bS, &delta));
-    EXPECT_TRUE(BIGINTEGER_LITERAL("16216586195252933526457586554279088") == delta);
-    EXPECT_TRUE(bS.Difference(dS, &delta));
-    EXPECT_TRUE(BIGINTEGER_LITERAL("16216586195252933526457586554279088") == delta);
-
-    EXPECT_EQ(-1, delta.Compare(hS));
-}
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
diff --git a/src/sioclient/lib/rapidjson/test/unittest/unittest.cpp b/src/sioclient/lib/rapidjson/test/unittest/unittest.cpp
deleted file mode 100644
index b754563e..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/unittest.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/rapidjson.h"
-
-#ifdef __clang__
-#pragma GCC diagnostic push
-#if __has_warning("-Wdeprecated")
-#pragma GCC diagnostic ignored "-Wdeprecated"
-#endif
-#endif
-
-AssertException::~AssertException() throw() {}
-
-#ifdef __clang__
-#pragma GCC diagnostic pop
-#endif
-
-int main(int argc, char **argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-
-    std::cout << "RapidJSON v" << RAPIDJSON_VERSION_STRING << std::endl;
-
-#ifdef _MSC_VER
-    _CrtMemState memoryState = { 0 };
-    (void)memoryState;
-    _CrtMemCheckpoint(&memoryState);
-    //_CrtSetBreakAlloc(X);
-    //void *testWhetherMemoryLeakDetectionWorks = malloc(1);
-#endif
-
-    int ret = RUN_ALL_TESTS();
-
-#ifdef _MSC_VER
-    // Current gtest constantly leak 2 blocks at exit
-    _CrtMemDumpAllObjectsSince(&memoryState);
-#endif
-    return ret;
-}
diff --git a/src/sioclient/lib/rapidjson/test/unittest/unittest.h b/src/sioclient/lib/rapidjson/test/unittest/unittest.h
deleted file mode 100644
index 84c1b734..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/unittest.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef UNITTEST_H_
-#define UNITTEST_H_
-
-// gtest indirectly included inttypes.h, without __STDC_CONSTANT_MACROS.
-#ifndef __STDC_CONSTANT_MACROS
-#ifdef __clang__
-#pragma GCC diagnostic push
-#if __has_warning("-Wreserved-id-macro")
-#pragma GCC diagnostic ignored "-Wreserved-id-macro"
-#endif
-#endif
-
-#  define __STDC_CONSTANT_MACROS 1 // required by C++ standard
-
-#ifdef __clang__
-#pragma GCC diagnostic pop
-#endif
-#endif
-
-#ifdef _MSC_VER
-#define _CRTDBG_MAP_ALLOC
-#include <crtdbg.h>
-#pragma warning(disable : 4996) // 'function': was declared deprecated
-#endif
-
-#if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
-#if defined(__clang__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-#pragma GCC diagnostic push
-#endif
-#pragma GCC diagnostic ignored "-Weffc++"
-#endif
-
-#include "gtest/gtest.h"
-#include <stdexcept>
-
-#if defined(__clang__) || defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-#pragma GCC diagnostic pop
-#endif
-
-#ifdef __clang__
-// All TEST() macro generated this warning, disable globally
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
-#endif
-
-template <typename Ch>
-inline unsigned StrLen(const Ch* s) {
-    const Ch* p = s;
-    while (*p) p++;
-    return unsigned(p - s);
-}
-
-template<typename Ch>
-inline int StrCmp(const Ch* s1, const Ch* s2) {
-    while(*s1 && (*s1 == *s2)) { s1++; s2++; }
-    return static_cast<unsigned>(*s1) < static_cast<unsigned>(*s2) ? -1 : static_cast<unsigned>(*s1) > static_cast<unsigned>(*s2);
-}
-
-template <typename Ch>
-inline Ch* StrDup(const Ch* str) {
-    size_t bufferSize = sizeof(Ch) * (StrLen(str) + 1);
-    Ch* buffer = static_cast<Ch*>(malloc(bufferSize));
-    memcpy(buffer, str, bufferSize);
-    return buffer;
-}
-
-inline FILE* TempFile(char *filename) {
-#if defined(__WIN32__) || defined(_MSC_VER)
-    filename = tmpnam(filename);
-
-    // For Visual Studio, tmpnam() adds a backslash in front. Remove it.
-    if (filename[0] == '\\')
-        for (int i = 0; filename[i] != '\0'; i++)
-            filename[i] = filename[i + 1];
-        
-    return fopen(filename, "wb");
-#else
-    strcpy(filename, "/tmp/fileXXXXXX");
-    int fd = mkstemp(filename);
-    return fdopen(fd, "w");
-#endif
-}
-
-// Use exception for catching assert
-#ifdef _MSC_VER
-#pragma warning(disable : 4127)
-#endif
-
-#ifdef __clang__
-#pragma GCC diagnostic push
-#if __has_warning("-Wdeprecated")
-#pragma GCC diagnostic ignored "-Wdeprecated"
-#endif
-#endif
-
-class AssertException : public std::logic_error {
-public:
-    AssertException(const char* w) : std::logic_error(w) {}
-    AssertException(const AssertException& rhs) : std::logic_error(rhs) {}
-    virtual ~AssertException() throw();
-};
-
-#ifdef __clang__
-#pragma GCC diagnostic pop
-#endif
-
-// Not using noexcept for testing RAPIDJSON_ASSERT()
-#define RAPIDJSON_HAS_CXX11_NOEXCEPT 0
-
-#ifndef RAPIDJSON_ASSERT
-#define RAPIDJSON_ASSERT(x) (!(x) ? throw AssertException(RAPIDJSON_STRINGIFY(x)) : (void)0u)
-#endif
-
-class Random {
-public:
-    Random(unsigned seed = 0) : mSeed(seed) {}
-
-    unsigned operator()() {
-        mSeed = 214013 * mSeed + 2531011;
-        return mSeed;
-    }
-
-private:
-    unsigned mSeed;
-};
-
-#endif // UNITTEST_H_
diff --git a/src/sioclient/lib/rapidjson/test/unittest/valuetest.cpp b/src/sioclient/lib/rapidjson/test/unittest/valuetest.cpp
deleted file mode 100644
index 0eea92a1..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/valuetest.cpp
+++ /dev/null
@@ -1,1851 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-#include "rapidjson/document.h"
-#include <algorithm>
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-using namespace rapidjson;
-
-TEST(Value, Size) {
-    if (sizeof(SizeType) == 4) {
-#if RAPIDJSON_48BITPOINTER_OPTIMIZATION
-        EXPECT_EQ(16, sizeof(Value));
-#elif RAPIDJSON_64BIT
-        EXPECT_EQ(24, sizeof(Value));
-#else
-        EXPECT_EQ(16, sizeof(Value));
-#endif
-    }
-}
-
-TEST(Value, DefaultConstructor) {
-    Value x;
-    EXPECT_EQ(kNullType, x.GetType());
-    EXPECT_TRUE(x.IsNull());
-
-    //std::cout << "sizeof(Value): " << sizeof(x) << std::endl;
-}
-
-// Should not pass compilation
-//TEST(Value, copy_constructor) {
-//  Value x(1234);
-//  Value y = x;
-//}
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-#if 0 // Many old compiler does not support these. Turn it off temporaily.
-
-#include <type_traits>
-
-TEST(Value, Traits) {
-    typedef GenericValue<UTF8<>, CrtAllocator> Value;
-    static_assert(std::is_constructible<Value>::value, "");
-    static_assert(std::is_default_constructible<Value>::value, "");
-#ifndef _MSC_VER
-    static_assert(!std::is_copy_constructible<Value>::value, "");
-#endif
-    static_assert(std::is_move_constructible<Value>::value, "");
-
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_constructible<Value>::value, "");
-    static_assert(std::is_nothrow_default_constructible<Value>::value, "");
-    static_assert(!std::is_nothrow_copy_constructible<Value>::value, "");
-    static_assert(std::is_nothrow_move_constructible<Value>::value, "");
-#endif
-
-    static_assert(std::is_assignable<Value,Value>::value, "");
-#ifndef _MSC_VER
-    static_assert(!std::is_copy_assignable<Value>::value, "");
-#endif
-    static_assert(std::is_move_assignable<Value>::value, "");
-
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_assignable<Value, Value>::value, "");
-#endif
-    static_assert(!std::is_nothrow_copy_assignable<Value>::value, "");
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_move_assignable<Value>::value, "");
-#endif
-
-    static_assert(std::is_destructible<Value>::value, "");
-#ifndef _MSC_VER
-    static_assert(std::is_nothrow_destructible<Value>::value, "");
-#endif
-}
-
-#endif
-
-TEST(Value, MoveConstructor) {
-    typedef GenericValue<UTF8<>, CrtAllocator> V;
-    V::AllocatorType allocator;
-
-    V x((V(kArrayType)));
-    x.Reserve(4u, allocator);
-    x.PushBack(1, allocator).PushBack(2, allocator).PushBack(3, allocator).PushBack(4, allocator);
-    EXPECT_TRUE(x.IsArray());
-    EXPECT_EQ(4u, x.Size());
-
-    // Value y(x); // does not compile (!is_copy_constructible)
-    V y(std::move(x));
-    EXPECT_TRUE(x.IsNull());
-    EXPECT_TRUE(y.IsArray());
-    EXPECT_EQ(4u, y.Size());
-
-    // Value z = y; // does not compile (!is_copy_assignable)
-    V z = std::move(y);
-    EXPECT_TRUE(y.IsNull());
-    EXPECT_TRUE(z.IsArray());
-    EXPECT_EQ(4u, z.Size());
-}
-
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-TEST(Value, AssignmentOperator) {
-    Value x(1234);
-    Value y;
-    y = x;
-    EXPECT_TRUE(x.IsNull());    // move semantic
-    EXPECT_EQ(1234, y.GetInt());
-
-    y = 5678;
-    EXPECT_TRUE(y.IsInt());
-    EXPECT_EQ(5678, y.GetInt());
-
-    x = "Hello";
-    EXPECT_TRUE(x.IsString());
-    EXPECT_STREQ(x.GetString(),"Hello");
-
-    y = StringRef(x.GetString(),x.GetStringLength());
-    EXPECT_TRUE(y.IsString());
-    EXPECT_EQ(y.GetString(),x.GetString());
-    EXPECT_EQ(y.GetStringLength(),x.GetStringLength());
-
-    static char mstr[] = "mutable";
-    // y = mstr; // should not compile
-    y = StringRef(mstr);
-    EXPECT_TRUE(y.IsString());
-    EXPECT_EQ(y.GetString(),mstr);
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    // C++11 move assignment
-    x = Value("World");
-    EXPECT_TRUE(x.IsString());
-    EXPECT_STREQ("World", x.GetString());
-
-    x = std::move(y);
-    EXPECT_TRUE(y.IsNull());
-    EXPECT_TRUE(x.IsString());
-    EXPECT_EQ(x.GetString(), mstr);
-
-    y = std::move(Value().SetInt(1234));
-    EXPECT_TRUE(y.IsInt());
-    EXPECT_EQ(1234, y);
-#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
-}
-
-template <typename A, typename B> 
-void TestEqual(const A& a, const B& b) {
-    EXPECT_TRUE (a == b);
-    EXPECT_FALSE(a != b);
-    EXPECT_TRUE (b == a);
-    EXPECT_FALSE(b != a);
-}
-
-template <typename A, typename B> 
-void TestUnequal(const A& a, const B& b) {
-    EXPECT_FALSE(a == b);
-    EXPECT_TRUE (a != b);
-    EXPECT_FALSE(b == a);
-    EXPECT_TRUE (b != a);
-}
-
-TEST(Value, EqualtoOperator) {
-    Value::AllocatorType allocator;
-    Value x(kObjectType);
-    x.AddMember("hello", "world", allocator)
-        .AddMember("t", Value(true).Move(), allocator)
-        .AddMember("f", Value(false).Move(), allocator)
-        .AddMember("n", Value(kNullType).Move(), allocator)
-        .AddMember("i", 123, allocator)
-        .AddMember("pi", 3.14, allocator)
-        .AddMember("a", Value(kArrayType).Move().PushBack(1, allocator).PushBack(2, allocator).PushBack(3, allocator), allocator);
-
-    // Test templated operator==() and operator!=()
-    TestEqual(x["hello"], "world");
-    const char* cc = "world";
-    TestEqual(x["hello"], cc);
-    char* c = strdup("world");
-    TestEqual(x["hello"], c);
-    free(c);
-
-    TestEqual(x["t"], true);
-    TestEqual(x["f"], false);
-    TestEqual(x["i"], 123);
-    TestEqual(x["pi"], 3.14);
-
-    // Test operator==() (including different allocators)
-    CrtAllocator crtAllocator;
-    GenericValue<UTF8<>, CrtAllocator> y;
-    GenericDocument<UTF8<>, CrtAllocator> z(&crtAllocator);
-    y.CopyFrom(x, crtAllocator);
-    z.CopyFrom(y, z.GetAllocator());
-    TestEqual(x, y);
-    TestEqual(y, z);
-    TestEqual(z, x);
-
-    // Swapping member order should be fine.
-    EXPECT_TRUE(y.RemoveMember("t"));
-    TestUnequal(x, y);
-    TestUnequal(z, y);
-    EXPECT_TRUE(z.RemoveMember("t"));
-    TestUnequal(x, z);
-    TestEqual(y, z);
-    y.AddMember("t", false, crtAllocator);
-    z.AddMember("t", false, z.GetAllocator());
-    TestUnequal(x, y);
-    TestUnequal(z, x);
-    y["t"] = true;
-    z["t"] = true;
-    TestEqual(x, y);
-    TestEqual(y, z);
-    TestEqual(z, x);
-
-    // Swapping element order is not OK
-    x["a"][0].Swap(x["a"][1]);
-    TestUnequal(x, y);
-    x["a"][0].Swap(x["a"][1]);
-    TestEqual(x, y);
-
-    // Array of different size
-    x["a"].PushBack(4, allocator);
-    TestUnequal(x, y);
-    x["a"].PopBack();
-    TestEqual(x, y);
-
-    // Issue #129: compare Uint64
-    x.SetUint64(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFF0));
-    y.SetUint64(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFFF));
-    TestUnequal(x, y);
-}
-
-template <typename Value>
-void TestCopyFrom() {
-    typename Value::AllocatorType a;
-    Value v1(1234);
-    Value v2(v1, a); // deep copy constructor
-    EXPECT_TRUE(v1.GetType() == v2.GetType());
-    EXPECT_EQ(v1.GetInt(), v2.GetInt());
-
-    v1.SetString("foo");
-    v2.CopyFrom(v1, a);
-    EXPECT_TRUE(v1.GetType() == v2.GetType());
-    EXPECT_STREQ(v1.GetString(), v2.GetString());
-    EXPECT_EQ(v1.GetString(), v2.GetString()); // string NOT copied
-
-    v1.SetString("bar", a); // copy string
-    v2.CopyFrom(v1, a);
-    EXPECT_TRUE(v1.GetType() == v2.GetType());
-    EXPECT_STREQ(v1.GetString(), v2.GetString());
-    EXPECT_NE(v1.GetString(), v2.GetString()); // string copied
-
-
-    v1.SetArray().PushBack(1234, a);
-    v2.CopyFrom(v1, a);
-    EXPECT_TRUE(v2.IsArray());
-    EXPECT_EQ(v1.Size(), v2.Size());
-
-    v1.PushBack(Value().SetString("foo", a), a); // push string copy
-    EXPECT_TRUE(v1.Size() != v2.Size());
-    v2.CopyFrom(v1, a);
-    EXPECT_TRUE(v1.Size() == v2.Size());
-    EXPECT_STREQ(v1[1].GetString(), v2[1].GetString());
-    EXPECT_NE(v1[1].GetString(), v2[1].GetString()); // string got copied
-}
-
-TEST(Value, CopyFrom) {
-    TestCopyFrom<Value>();
-    TestCopyFrom<GenericValue<UTF8<>, CrtAllocator> >();
-}
-
-TEST(Value, Swap) {
-    Value v1(1234);
-    Value v2(kObjectType);
-
-    EXPECT_EQ(&v1, &v1.Swap(v2));
-    EXPECT_TRUE(v1.IsObject());
-    EXPECT_TRUE(v2.IsInt());
-    EXPECT_EQ(1234, v2.GetInt());
-
-    // testing std::swap compatibility
-    using std::swap;
-    swap(v1, v2);
-    EXPECT_TRUE(v1.IsInt());
-    EXPECT_TRUE(v2.IsObject());
-}
-
-TEST(Value, Null) {
-    // Default constructor
-    Value x;
-    EXPECT_EQ(kNullType, x.GetType());
-    EXPECT_TRUE(x.IsNull());
-
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsNumber());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    // Constructor with type
-    Value y(kNullType);
-    EXPECT_TRUE(y.IsNull());
-
-    // SetNull();
-    Value z(true);
-    z.SetNull();
-    EXPECT_TRUE(z.IsNull());
-}
-
-TEST(Value, True) {
-    // Constructor with bool
-    Value x(true);
-    EXPECT_EQ(kTrueType, x.GetType());
-    EXPECT_TRUE(x.GetBool());
-    EXPECT_TRUE(x.IsBool());
-    EXPECT_TRUE(x.IsTrue());
-
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsNumber());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    // Constructor with type
-    Value y(kTrueType);
-    EXPECT_TRUE(y.IsTrue());
-
-    // SetBool()
-    Value z;
-    z.SetBool(true);
-    EXPECT_TRUE(z.IsTrue());
-
-    // Templated functions
-    EXPECT_TRUE(z.Is<bool>());
-    EXPECT_TRUE(z.Get<bool>());
-    EXPECT_FALSE(z.Set<bool>(false).Get<bool>());
-    EXPECT_TRUE(z.Set(true).Get<bool>());
-}
-
-TEST(Value, False) {
-    // Constructor with bool
-    Value x(false);
-    EXPECT_EQ(kFalseType, x.GetType());
-    EXPECT_TRUE(x.IsBool());
-    EXPECT_TRUE(x.IsFalse());
-
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.GetBool());
-    //EXPECT_FALSE((bool)x);
-    EXPECT_FALSE(x.IsNumber());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    // Constructor with type
-    Value y(kFalseType);
-    EXPECT_TRUE(y.IsFalse());
-
-    // SetBool()
-    Value z;
-    z.SetBool(false);
-    EXPECT_TRUE(z.IsFalse());
-}
-
-TEST(Value, Int) {
-    // Constructor with int
-    Value x(1234);
-    EXPECT_EQ(kNumberType, x.GetType());
-    EXPECT_EQ(1234, x.GetInt());
-    EXPECT_EQ(1234u, x.GetUint());
-    EXPECT_EQ(1234, x.GetInt64());
-    EXPECT_EQ(1234u, x.GetUint64());
-    EXPECT_NEAR(1234.0, x.GetDouble(), 0.0);
-    //EXPECT_EQ(1234, (int)x);
-    //EXPECT_EQ(1234, (unsigned)x);
-    //EXPECT_EQ(1234, (int64_t)x);
-    //EXPECT_EQ(1234, (uint64_t)x);
-    //EXPECT_EQ(1234, (double)x);
-    EXPECT_TRUE(x.IsNumber());
-    EXPECT_TRUE(x.IsInt());
-    EXPECT_TRUE(x.IsUint());
-    EXPECT_TRUE(x.IsInt64());
-    EXPECT_TRUE(x.IsUint64());
-
-    EXPECT_FALSE(x.IsDouble());
-    EXPECT_FALSE(x.IsFloat());
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    Value nx(-1234);
-    EXPECT_EQ(-1234, nx.GetInt());
-    EXPECT_EQ(-1234, nx.GetInt64());
-    EXPECT_TRUE(nx.IsInt());
-    EXPECT_TRUE(nx.IsInt64());
-    EXPECT_FALSE(nx.IsUint());
-    EXPECT_FALSE(nx.IsUint64());
-
-    // Constructor with type
-    Value y(kNumberType);
-    EXPECT_TRUE(y.IsNumber());
-    EXPECT_TRUE(y.IsInt());
-    EXPECT_EQ(0, y.GetInt());
-
-    // SetInt()
-    Value z;
-    z.SetInt(1234);
-    EXPECT_EQ(1234, z.GetInt());
-
-    // operator=(int)
-    z = 5678;
-    EXPECT_EQ(5678, z.GetInt());
-
-    // Templated functions
-    EXPECT_TRUE(z.Is<int>());
-    EXPECT_EQ(5678, z.Get<int>());
-    EXPECT_EQ(5679, z.Set(5679).Get<int>());
-    EXPECT_EQ(5680, z.Set<int>(5680).Get<int>());
-
-#ifdef _MSC_VER
-    // long as int on MSC platforms
-    RAPIDJSON_STATIC_ASSERT(sizeof(long) == sizeof(int));
-    z.SetInt(2222);
-    EXPECT_TRUE(z.Is<long>());
-    EXPECT_EQ(2222l, z.Get<long>());
-    EXPECT_EQ(3333l, z.Set(3333l).Get<long>());
-    EXPECT_EQ(4444l, z.Set<long>(4444l).Get<long>());
-    EXPECT_TRUE(z.IsInt());
-#endif
-}
-
-TEST(Value, Uint) {
-    // Constructor with int
-    Value x(1234u);
-    EXPECT_EQ(kNumberType, x.GetType());
-    EXPECT_EQ(1234, x.GetInt());
-    EXPECT_EQ(1234u, x.GetUint());
-    EXPECT_EQ(1234, x.GetInt64());
-    EXPECT_EQ(1234u, x.GetUint64());
-    EXPECT_TRUE(x.IsNumber());
-    EXPECT_TRUE(x.IsInt());
-    EXPECT_TRUE(x.IsUint());
-    EXPECT_TRUE(x.IsInt64());
-    EXPECT_TRUE(x.IsUint64());
-    EXPECT_NEAR(1234.0, x.GetDouble(), 0.0);   // Number can always be cast as double but !IsDouble().
-
-    EXPECT_FALSE(x.IsDouble());
-    EXPECT_FALSE(x.IsFloat());
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    // SetUint()
-    Value z;
-    z.SetUint(1234);
-    EXPECT_EQ(1234u, z.GetUint());
-
-    // operator=(unsigned)
-    z = 5678u;
-    EXPECT_EQ(5678u, z.GetUint());
-
-    z = 2147483648u;    // 2^31, cannot cast as int
-    EXPECT_EQ(2147483648u, z.GetUint());
-    EXPECT_FALSE(z.IsInt());
-    EXPECT_TRUE(z.IsInt64());   // Issue 41: Incorrect parsing of unsigned int number types
-
-    // Templated functions
-    EXPECT_TRUE(z.Is<unsigned>());
-    EXPECT_EQ(2147483648u, z.Get<unsigned>());
-    EXPECT_EQ(2147483649u, z.Set(2147483649u).Get<unsigned>());
-    EXPECT_EQ(2147483650u, z.Set<unsigned>(2147483650u).Get<unsigned>());
-
-#ifdef _MSC_VER
-    // unsigned long as unsigned on MSC platforms
-    RAPIDJSON_STATIC_ASSERT(sizeof(unsigned long) == sizeof(unsigned));
-    z.SetUint(2222);
-    EXPECT_TRUE(z.Is<unsigned long>());
-    EXPECT_EQ(2222ul, z.Get<unsigned long>());
-    EXPECT_EQ(3333ul, z.Set(3333ul).Get<unsigned long>());
-    EXPECT_EQ(4444ul, z.Set<unsigned long>(4444ul).Get<unsigned long>());
-    EXPECT_TRUE(x.IsUint());
-#endif
-}
-
-TEST(Value, Int64) {
-    // Constructor with int
-    Value x(int64_t(1234));
-    EXPECT_EQ(kNumberType, x.GetType());
-    EXPECT_EQ(1234, x.GetInt());
-    EXPECT_EQ(1234u, x.GetUint());
-    EXPECT_EQ(1234, x.GetInt64());
-    EXPECT_EQ(1234u, x.GetUint64());
-    EXPECT_TRUE(x.IsNumber());
-    EXPECT_TRUE(x.IsInt());
-    EXPECT_TRUE(x.IsUint());
-    EXPECT_TRUE(x.IsInt64());
-    EXPECT_TRUE(x.IsUint64());
-
-    EXPECT_FALSE(x.IsDouble());
-    EXPECT_FALSE(x.IsFloat());
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    Value nx(int64_t(-1234));
-    EXPECT_EQ(-1234, nx.GetInt());
-    EXPECT_EQ(-1234, nx.GetInt64());
-    EXPECT_TRUE(nx.IsInt());
-    EXPECT_TRUE(nx.IsInt64());
-    EXPECT_FALSE(nx.IsUint());
-    EXPECT_FALSE(nx.IsUint64());
-
-    // SetInt64()
-    Value z;
-    z.SetInt64(1234);
-    EXPECT_EQ(1234, z.GetInt64());
-
-    z.SetInt64(2147483648u);   // 2^31, cannot cast as int
-    EXPECT_FALSE(z.IsInt());
-    EXPECT_TRUE(z.IsUint());
-    EXPECT_NEAR(2147483648.0, z.GetDouble(), 0.0);
-
-    z.SetInt64(int64_t(4294967295u) + 1);   // 2^32, cannot cast as uint
-    EXPECT_FALSE(z.IsInt());
-    EXPECT_FALSE(z.IsUint());
-    EXPECT_NEAR(4294967296.0, z.GetDouble(), 0.0);
-
-    z.SetInt64(-int64_t(2147483648u) - 1);   // -2^31-1, cannot cast as int
-    EXPECT_FALSE(z.IsInt());
-    EXPECT_NEAR(-2147483649.0, z.GetDouble(), 0.0);
-
-    int64_t i = static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x80000000, 00000000));
-    z.SetInt64(i);
-    EXPECT_DOUBLE_EQ(-9223372036854775808.0, z.GetDouble());
-
-    // Templated functions
-    EXPECT_TRUE(z.Is<int64_t>());
-    EXPECT_EQ(i, z.Get<int64_t>());
-#if 0 // signed integer underflow is undefined behaviour
-    EXPECT_EQ(i - 1, z.Set(i - 1).Get<int64_t>());
-    EXPECT_EQ(i - 2, z.Set<int64_t>(i - 2).Get<int64_t>());
-#endif
-}
-
-TEST(Value, Uint64) {
-    // Constructor with int
-    Value x(uint64_t(1234));
-    EXPECT_EQ(kNumberType, x.GetType());
-    EXPECT_EQ(1234, x.GetInt());
-    EXPECT_EQ(1234u, x.GetUint());
-    EXPECT_EQ(1234, x.GetInt64());
-    EXPECT_EQ(1234u, x.GetUint64());
-    EXPECT_TRUE(x.IsNumber());
-    EXPECT_TRUE(x.IsInt());
-    EXPECT_TRUE(x.IsUint());
-    EXPECT_TRUE(x.IsInt64());
-    EXPECT_TRUE(x.IsUint64());
-
-    EXPECT_FALSE(x.IsDouble());
-    EXPECT_FALSE(x.IsFloat());
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    // SetUint64()
-    Value z;
-    z.SetUint64(1234);
-    EXPECT_EQ(1234u, z.GetUint64());
-
-    z.SetUint64(uint64_t(2147483648u));  // 2^31, cannot cast as int
-    EXPECT_FALSE(z.IsInt());
-    EXPECT_TRUE(z.IsUint());
-    EXPECT_TRUE(z.IsInt64());
-
-    z.SetUint64(uint64_t(4294967295u) + 1);  // 2^32, cannot cast as uint
-    EXPECT_FALSE(z.IsInt());
-    EXPECT_FALSE(z.IsUint());
-    EXPECT_TRUE(z.IsInt64());
-
-    uint64_t u = RAPIDJSON_UINT64_C2(0x80000000, 0x00000000);
-    z.SetUint64(u);    // 2^63 cannot cast as int64
-    EXPECT_FALSE(z.IsInt64());
-    EXPECT_EQ(u, z.GetUint64()); // Issue 48
-    EXPECT_DOUBLE_EQ(9223372036854775808.0, z.GetDouble());
-
-    // Templated functions
-    EXPECT_TRUE(z.Is<uint64_t>());
-    EXPECT_EQ(u, z.Get<uint64_t>());
-    EXPECT_EQ(u + 1, z.Set(u + 1).Get<uint64_t>());
-    EXPECT_EQ(u + 2, z.Set<uint64_t>(u + 2).Get<uint64_t>());
-}
-
-TEST(Value, Double) {
-    // Constructor with double
-    Value x(12.34);
-    EXPECT_EQ(kNumberType, x.GetType());
-    EXPECT_NEAR(12.34, x.GetDouble(), 0.0);
-    EXPECT_TRUE(x.IsNumber());
-    EXPECT_TRUE(x.IsDouble());
-
-    EXPECT_FALSE(x.IsInt());
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    // SetDouble()
-    Value z;
-    z.SetDouble(12.34);
-    EXPECT_NEAR(12.34, z.GetDouble(), 0.0);
-
-    z = 56.78;
-    EXPECT_NEAR(56.78, z.GetDouble(), 0.0);
-
-    // Templated functions
-    EXPECT_TRUE(z.Is<double>());
-    EXPECT_EQ(56.78, z.Get<double>());
-    EXPECT_EQ(57.78, z.Set(57.78).Get<double>());
-    EXPECT_EQ(58.78, z.Set<double>(58.78).Get<double>());
-}
-
-TEST(Value, Float) {
-    // Constructor with double
-    Value x(12.34f);
-    EXPECT_EQ(kNumberType, x.GetType());
-    EXPECT_NEAR(12.34f, x.GetFloat(), 0.0);
-    EXPECT_TRUE(x.IsNumber());
-    EXPECT_TRUE(x.IsDouble());
-    EXPECT_TRUE(x.IsFloat());
-
-    EXPECT_FALSE(x.IsInt());
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    // SetFloat()
-    Value z;
-    z.SetFloat(12.34f);
-    EXPECT_NEAR(12.34f, z.GetFloat(), 0.0f);
-
-    // Issue 573
-    z.SetInt(0);
-    EXPECT_EQ(0.0f, z.GetFloat());
-
-    z = 56.78f;
-    EXPECT_NEAR(56.78f, z.GetFloat(), 0.0f);
-
-    // Templated functions
-    EXPECT_TRUE(z.Is<float>());
-    EXPECT_EQ(56.78f, z.Get<float>());
-    EXPECT_EQ(57.78f, z.Set(57.78f).Get<float>());
-    EXPECT_EQ(58.78f, z.Set<float>(58.78f).Get<float>());
-}
-
-TEST(Value, IsLosslessDouble) {
-    EXPECT_TRUE(Value(0.0).IsLosslessDouble());
-    EXPECT_TRUE(Value(12.34).IsLosslessDouble());
-    EXPECT_TRUE(Value(-123).IsLosslessDouble());
-    EXPECT_TRUE(Value(2147483648u).IsLosslessDouble());
-    EXPECT_TRUE(Value(-static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x40000000, 0x00000000))).IsLosslessDouble());
-#if !(defined(_MSC_VER) && _MSC_VER < 1800) // VC2010 has problem
-    EXPECT_TRUE(Value(RAPIDJSON_UINT64_C2(0xA0000000, 0x00000000)).IsLosslessDouble());
-#endif
-
-    EXPECT_FALSE(Value(static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x7FFFFFFF, 0xFFFFFFFF))).IsLosslessDouble()); // INT64_MAX
-    EXPECT_FALSE(Value(-static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x7FFFFFFF, 0xFFFFFFFF))).IsLosslessDouble()); // -INT64_MAX
-    EXPECT_TRUE(Value(-static_cast<int64_t>(RAPIDJSON_UINT64_C2(0x7FFFFFFF, 0xFFFFFFFF)) - 1).IsLosslessDouble()); // INT64_MIN
-    EXPECT_FALSE(Value(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0xFFFFFFFF)).IsLosslessDouble()); // UINT64_MAX
-
-    EXPECT_TRUE(Value(3.4028234e38f).IsLosslessDouble()); // FLT_MAX
-    EXPECT_TRUE(Value(-3.4028234e38f).IsLosslessDouble()); // -FLT_MAX
-    EXPECT_TRUE(Value(1.17549435e-38f).IsLosslessDouble()); // FLT_MIN
-    EXPECT_TRUE(Value(-1.17549435e-38f).IsLosslessDouble()); // -FLT_MIN
-    EXPECT_TRUE(Value(1.7976931348623157e+308).IsLosslessDouble()); // DBL_MAX
-    EXPECT_TRUE(Value(-1.7976931348623157e+308).IsLosslessDouble()); // -DBL_MAX
-    EXPECT_TRUE(Value(2.2250738585072014e-308).IsLosslessDouble()); // DBL_MIN
-    EXPECT_TRUE(Value(-2.2250738585072014e-308).IsLosslessDouble()); // -DBL_MIN
-}
-
-TEST(Value, IsLosslessFloat) {
-    EXPECT_TRUE(Value(12.25).IsLosslessFloat());
-    EXPECT_TRUE(Value(-123).IsLosslessFloat());
-    EXPECT_TRUE(Value(2147483648u).IsLosslessFloat());
-    EXPECT_TRUE(Value(3.4028234e38f).IsLosslessFloat());
-    EXPECT_TRUE(Value(-3.4028234e38f).IsLosslessFloat());
-    EXPECT_FALSE(Value(3.4028235e38).IsLosslessFloat());
-    EXPECT_FALSE(Value(0.3).IsLosslessFloat());
-}
-
-TEST(Value, String) {
-    // Construction with const string
-    Value x("Hello", 5); // literal
-    EXPECT_EQ(kStringType, x.GetType());
-    EXPECT_TRUE(x.IsString());
-    EXPECT_STREQ("Hello", x.GetString());
-    EXPECT_EQ(5u, x.GetStringLength());
-
-    EXPECT_FALSE(x.IsNumber());
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsObject());
-    EXPECT_FALSE(x.IsArray());
-
-    static const char cstr[] = "World"; // const array
-    Value(cstr).Swap(x);
-    EXPECT_TRUE(x.IsString());
-    EXPECT_EQ(x.GetString(), cstr);
-    EXPECT_EQ(x.GetStringLength(), sizeof(cstr)-1);
-
-    static char mstr[] = "Howdy"; // non-const array
-    // Value(mstr).Swap(x); // should not compile
-    Value(StringRef(mstr)).Swap(x);
-    EXPECT_TRUE(x.IsString());
-    EXPECT_EQ(x.GetString(), mstr);
-    EXPECT_EQ(x.GetStringLength(), sizeof(mstr)-1);
-    strncpy(mstr,"Hello", sizeof(mstr));
-    EXPECT_STREQ(x.GetString(), "Hello");
-
-    const char* pstr = cstr;
-    //Value(pstr).Swap(x); // should not compile
-    Value(StringRef(pstr)).Swap(x);
-    EXPECT_TRUE(x.IsString());
-    EXPECT_EQ(x.GetString(), cstr);
-    EXPECT_EQ(x.GetStringLength(), sizeof(cstr)-1);
-
-    char* mpstr = mstr;
-    Value(StringRef(mpstr,sizeof(mstr)-1)).Swap(x);
-    EXPECT_TRUE(x.IsString());
-    EXPECT_EQ(x.GetString(), mstr);
-    EXPECT_EQ(x.GetStringLength(), 5u);
-    EXPECT_STREQ(x.GetString(), "Hello");
-
-    // Constructor with copy string
-    MemoryPoolAllocator<> allocator;
-    Value c(x.GetString(), x.GetStringLength(), allocator);
-    EXPECT_NE(x.GetString(), c.GetString());
-    EXPECT_EQ(x.GetStringLength(), c.GetStringLength());
-    EXPECT_STREQ(x.GetString(), c.GetString());
-    //x.SetString("World");
-    x.SetString("World", 5);
-    EXPECT_STREQ("Hello", c.GetString());
-    EXPECT_EQ(5u, c.GetStringLength());
-
-    // Constructor with type
-    Value y(kStringType);
-    EXPECT_TRUE(y.IsString());
-    EXPECT_STREQ("", y.GetString());    // Empty string should be "" instead of 0 (issue 226)
-    EXPECT_EQ(0u, y.GetStringLength());
-
-    // SetConsttring()
-    Value z;
-    z.SetString("Hello");
-    EXPECT_TRUE(x.IsString());
-    z.SetString("Hello", 5);
-    EXPECT_STREQ("Hello", z.GetString());
-    EXPECT_STREQ("Hello", z.GetString());
-    EXPECT_EQ(5u, z.GetStringLength());
-
-    z.SetString("Hello");
-    EXPECT_TRUE(z.IsString());
-    EXPECT_STREQ("Hello", z.GetString());
-
-    //z.SetString(mstr); // should not compile
-    //z.SetString(pstr); // should not compile
-    z.SetString(StringRef(mstr));
-    EXPECT_TRUE(z.IsString());
-    EXPECT_STREQ(z.GetString(), mstr);
-
-    z.SetString(cstr);
-    EXPECT_TRUE(z.IsString());
-    EXPECT_EQ(cstr, z.GetString());
-
-    z = cstr;
-    EXPECT_TRUE(z.IsString());
-    EXPECT_EQ(cstr, z.GetString());
-
-    // SetString()
-    char s[] = "World";
-    Value w;
-    w.SetString(s, static_cast<SizeType>(strlen(s)), allocator);
-    s[0] = '\0';
-    EXPECT_STREQ("World", w.GetString());
-    EXPECT_EQ(5u, w.GetStringLength());
-
-    // templated functions
-    EXPECT_TRUE(z.Is<const char*>());
-    EXPECT_STREQ(cstr, z.Get<const char*>());
-    EXPECT_STREQ("Apple", z.Set<const char*>("Apple").Get<const char*>());
-
-#if RAPIDJSON_HAS_STDSTRING
-    {
-        std::string str = "Hello World";
-        str[5] = '\0';
-        EXPECT_STREQ(str.data(),"Hello"); // embedded '\0'
-        EXPECT_EQ(str.size(), 11u);
-
-        // no copy
-        Value vs0(StringRef(str));
-        EXPECT_TRUE(vs0.IsString());
-        EXPECT_EQ(vs0.GetString(), str.data());
-        EXPECT_EQ(vs0.GetStringLength(), str.size());
-        TestEqual(vs0, str);
-
-        // do copy
-        Value vs1(str, allocator);
-        EXPECT_TRUE(vs1.IsString());
-        EXPECT_NE(vs1.GetString(), str.data());
-        EXPECT_NE(vs1.GetString(), str); // not equal due to embedded '\0'
-        EXPECT_EQ(vs1.GetStringLength(), str.size());
-        TestEqual(vs1, str);
-
-        // SetString
-        str = "World";
-        vs0.SetNull().SetString(str, allocator);
-        EXPECT_TRUE(vs0.IsString());
-        EXPECT_STREQ(vs0.GetString(), str.c_str());
-        EXPECT_EQ(vs0.GetStringLength(), str.size());
-        TestEqual(str, vs0);
-        TestUnequal(str, vs1);
-
-        // vs1 = str; // should not compile
-        vs1 = StringRef(str);
-        TestEqual(str, vs1);
-        TestEqual(vs0, vs1);
-
-        // Templated function.
-        EXPECT_TRUE(vs0.Is<std::string>());
-        EXPECT_EQ(str, vs0.Get<std::string>());
-        vs0.Set<std::string>(std::string("Apple"), allocator);
-        EXPECT_EQ(std::string("Apple"), vs0.Get<std::string>());
-        vs0.Set(std::string("Orange"), allocator);
-        EXPECT_EQ(std::string("Orange"), vs0.Get<std::string>());
-    }
-#endif // RAPIDJSON_HAS_STDSTRING
-}
-
-// Issue 226: Value of string type should not point to NULL
-TEST(Value, SetStringNull) {
-
-    MemoryPoolAllocator<> allocator;
-    const char* nullPtr = 0;
-    {
-        // Construction with string type creates empty string
-        Value v(kStringType);
-        EXPECT_NE(v.GetString(), nullPtr); // non-null string returned
-        EXPECT_EQ(v.GetStringLength(), 0u);
-
-        // Construction from/setting to null without length not allowed
-        EXPECT_THROW(Value(StringRef(nullPtr)), AssertException);
-        EXPECT_THROW(Value(StringRef(nullPtr), allocator), AssertException);
-        EXPECT_THROW(v.SetString(nullPtr, allocator), AssertException);
-
-        // Non-empty length with null string is not allowed
-        EXPECT_THROW(v.SetString(nullPtr, 17u), AssertException);
-        EXPECT_THROW(v.SetString(nullPtr, 42u, allocator), AssertException);
-
-        // Setting to null string with empty length is allowed
-        v.SetString(nullPtr, 0u);
-        EXPECT_NE(v.GetString(), nullPtr); // non-null string returned
-        EXPECT_EQ(v.GetStringLength(), 0u);
-
-        v.SetNull();
-        v.SetString(nullPtr, 0u, allocator);
-        EXPECT_NE(v.GetString(), nullPtr); // non-null string returned
-        EXPECT_EQ(v.GetStringLength(), 0u);
-    }
-    // Construction with null string and empty length is allowed
-    {
-        Value v(nullPtr,0u);
-        EXPECT_NE(v.GetString(), nullPtr); // non-null string returned
-        EXPECT_EQ(v.GetStringLength(), 0u);
-    }
-    {
-        Value v(nullPtr, 0u, allocator);
-        EXPECT_NE(v.GetString(), nullPtr); // non-null string returned
-        EXPECT_EQ(v.GetStringLength(), 0u);
-    }
-}
-
-template <typename T, typename Allocator>
-static void TestArray(T& x, Allocator& allocator) {
-    const T& y = x;
-
-    // PushBack()
-    Value v;
-    x.PushBack(v, allocator);
-    v.SetBool(true);
-    x.PushBack(v, allocator);
-    v.SetBool(false);
-    x.PushBack(v, allocator);
-    v.SetInt(123);
-    x.PushBack(v, allocator);
-    //x.PushBack((const char*)"foo", allocator); // should not compile
-    x.PushBack("foo", allocator);
-
-    EXPECT_FALSE(x.Empty());
-    EXPECT_EQ(5u, x.Size());
-    EXPECT_FALSE(y.Empty());
-    EXPECT_EQ(5u, y.Size());
-    EXPECT_TRUE(x[SizeType(0)].IsNull());
-    EXPECT_TRUE(x[1].IsTrue());
-    EXPECT_TRUE(x[2].IsFalse());
-    EXPECT_TRUE(x[3].IsInt());
-    EXPECT_EQ(123, x[3].GetInt());
-    EXPECT_TRUE(y[SizeType(0)].IsNull());
-    EXPECT_TRUE(y[1].IsTrue());
-    EXPECT_TRUE(y[2].IsFalse());
-    EXPECT_TRUE(y[3].IsInt());
-    EXPECT_EQ(123, y[3].GetInt());
-    EXPECT_TRUE(y[4].IsString());
-    EXPECT_STREQ("foo", y[4].GetString());
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    // PushBack(GenericValue&&, Allocator&);
-    {
-        Value y2(kArrayType);
-        y2.PushBack(Value(true), allocator);
-        y2.PushBack(std::move(Value(kArrayType).PushBack(Value(1), allocator).PushBack("foo", allocator)), allocator);
-        EXPECT_EQ(2u, y2.Size());
-        EXPECT_TRUE(y2[0].IsTrue());
-        EXPECT_TRUE(y2[1].IsArray());
-        EXPECT_EQ(2u, y2[1].Size());
-        EXPECT_TRUE(y2[1][0].IsInt());
-        EXPECT_TRUE(y2[1][1].IsString());
-    }
-#endif
-
-    // iterator
-    typename T::ValueIterator itr = x.Begin();
-    EXPECT_TRUE(itr != x.End());
-    EXPECT_TRUE(itr->IsNull());
-    ++itr;
-    EXPECT_TRUE(itr != x.End());
-    EXPECT_TRUE(itr->IsTrue());
-    ++itr;
-    EXPECT_TRUE(itr != x.End());
-    EXPECT_TRUE(itr->IsFalse());
-    ++itr;
-    EXPECT_TRUE(itr != x.End());
-    EXPECT_TRUE(itr->IsInt());
-    EXPECT_EQ(123, itr->GetInt());
-    ++itr;
-    EXPECT_TRUE(itr != x.End());
-    EXPECT_TRUE(itr->IsString());
-    EXPECT_STREQ("foo", itr->GetString());
-
-    // const iterator
-    typename T::ConstValueIterator citr = y.Begin();
-    EXPECT_TRUE(citr != y.End());
-    EXPECT_TRUE(citr->IsNull());
-    ++citr;
-    EXPECT_TRUE(citr != y.End());
-    EXPECT_TRUE(citr->IsTrue());
-    ++citr;
-    EXPECT_TRUE(citr != y.End());
-    EXPECT_TRUE(citr->IsFalse());
-    ++citr;
-    EXPECT_TRUE(citr != y.End());
-    EXPECT_TRUE(citr->IsInt());
-    EXPECT_EQ(123, citr->GetInt());
-    ++citr;
-    EXPECT_TRUE(citr != y.End());
-    EXPECT_TRUE(citr->IsString());
-    EXPECT_STREQ("foo", citr->GetString());
-
-    // PopBack()
-    x.PopBack();
-    EXPECT_EQ(4u, x.Size());
-    EXPECT_TRUE(y[SizeType(0)].IsNull());
-    EXPECT_TRUE(y[1].IsTrue());
-    EXPECT_TRUE(y[2].IsFalse());
-    EXPECT_TRUE(y[3].IsInt());
-
-    // Clear()
-    x.Clear();
-    EXPECT_TRUE(x.Empty());
-    EXPECT_EQ(0u, x.Size());
-    EXPECT_TRUE(y.Empty());
-    EXPECT_EQ(0u, y.Size());
-
-    // Erase(ValueIterator)
-
-    // Use array of array to ensure removed elements' destructor is called.
-    // [[0],[1],[2],...]
-    for (int i = 0; i < 10; i++)
-        x.PushBack(Value(kArrayType).PushBack(i, allocator).Move(), allocator);
-
-    // Erase the first
-    itr = x.Erase(x.Begin());
-    EXPECT_EQ(x.Begin(), itr);
-    EXPECT_EQ(9u, x.Size());
-    for (int i = 0; i < 9; i++)
-        EXPECT_EQ(i + 1, x[static_cast<SizeType>(i)][0].GetInt());
-
-    // Ease the last
-    itr = x.Erase(x.End() - 1);
-    EXPECT_EQ(x.End(), itr);
-    EXPECT_EQ(8u, x.Size());
-    for (int i = 0; i < 8; i++)
-        EXPECT_EQ(i + 1, x[static_cast<SizeType>(i)][0].GetInt());
-
-    // Erase the middle
-    itr = x.Erase(x.Begin() + 4);
-    EXPECT_EQ(x.Begin() + 4, itr);
-    EXPECT_EQ(7u, x.Size());
-    for (int i = 0; i < 4; i++)
-        EXPECT_EQ(i + 1, x[static_cast<SizeType>(i)][0].GetInt());
-    for (int i = 4; i < 7; i++)
-        EXPECT_EQ(i + 2, x[static_cast<SizeType>(i)][0].GetInt());
-
-    // Erase(ValueIterator, ValueIterator)
-    // Exhaustive test with all 0 <= first < n, first <= last <= n cases
-    const unsigned n = 10;
-    for (unsigned first = 0; first < n; first++) {
-        for (unsigned last = first; last <= n; last++) {
-            x.Clear();
-            for (unsigned i = 0; i < n; i++)
-                x.PushBack(Value(kArrayType).PushBack(i, allocator).Move(), allocator);
-            
-            itr = x.Erase(x.Begin() + first, x.Begin() + last);
-            if (last == n)
-                EXPECT_EQ(x.End(), itr);
-            else
-                EXPECT_EQ(x.Begin() + first, itr);
-
-            size_t removeCount = last - first;
-            EXPECT_EQ(n - removeCount, x.Size());
-            for (unsigned i = 0; i < first; i++)
-                EXPECT_EQ(i, x[i][0].GetUint());
-            for (unsigned i = first; i < n - removeCount; i++)
-                EXPECT_EQ(i + removeCount, x[static_cast<SizeType>(i)][0].GetUint());
-        }
-    }
-}
-
-TEST(Value, Array) {
-    Value x(kArrayType);
-    const Value& y = x;
-    Value::AllocatorType allocator;
-
-    EXPECT_EQ(kArrayType, x.GetType());
-    EXPECT_TRUE(x.IsArray());
-    EXPECT_TRUE(x.Empty());
-    EXPECT_EQ(0u, x.Size());
-    EXPECT_TRUE(y.IsArray());
-    EXPECT_TRUE(y.Empty());
-    EXPECT_EQ(0u, y.Size());
-
-    EXPECT_FALSE(x.IsNull());
-    EXPECT_FALSE(x.IsBool());
-    EXPECT_FALSE(x.IsFalse());
-    EXPECT_FALSE(x.IsTrue());
-    EXPECT_FALSE(x.IsString());
-    EXPECT_FALSE(x.IsObject());
-
-    TestArray(x, allocator);
-
-    // Working in gcc without C++11, but VS2013 cannot compile. To be diagnosed.
-    // http://en.wikipedia.org/wiki/Erase-remove_idiom
-    x.Clear();
-    for (int i = 0; i < 10; i++)
-        if (i % 2 == 0)
-            x.PushBack(i, allocator);
-        else
-            x.PushBack(Value(kNullType).Move(), allocator);
-
-    const Value null(kNullType);
-    x.Erase(std::remove(x.Begin(), x.End(), null), x.End());
-    EXPECT_EQ(5u, x.Size());
-    for (int i = 0; i < 5; i++)
-        EXPECT_EQ(i * 2, x[static_cast<SizeType>(i)]);
-
-    // SetArray()
-    Value z;
-    z.SetArray();
-    EXPECT_TRUE(z.IsArray());
-    EXPECT_TRUE(z.Empty());
-}
-
-TEST(Value, ArrayHelper) {
-    Value::AllocatorType allocator;
-    {
-        Value x(kArrayType);
-        Value::Array a = x.GetArray();
-        TestArray(a, allocator);
-    }
-
-    {
-        Value x(kArrayType);
-        Value::Array a = x.GetArray();
-        a.PushBack(1, allocator);
-
-        Value::Array a2(a); // copy constructor
-        EXPECT_EQ(1, a2.Size());
-
-        Value::Array a3 = a;
-        EXPECT_EQ(1, a3.Size());
-
-        Value::ConstArray y = static_cast<const Value&>(x).GetArray();
-        (void)y;
-        // y.PushBack(1, allocator); // should not compile
-
-        // Templated functions
-        x.Clear();
-        EXPECT_TRUE(x.Is<Value::Array>());
-        EXPECT_TRUE(x.Is<Value::ConstArray>());
-        a.PushBack(1, allocator);
-        EXPECT_EQ(1, x.Get<Value::Array>()[0].GetInt());
-        EXPECT_EQ(1, x.Get<Value::ConstArray>()[0].GetInt());
-
-        Value x2;
-        x2.Set<Value::Array>(a);
-        EXPECT_TRUE(x.IsArray());   // IsArray() is invariant after moving.
-        EXPECT_EQ(1, x2.Get<Value::Array>()[0].GetInt());
-    }
-
-    {
-        Value y(kArrayType);
-        y.PushBack(123, allocator);
-
-        Value x(y.GetArray());      // Construct value form array.
-        EXPECT_TRUE(x.IsArray());
-        EXPECT_EQ(123, x[0].GetInt());
-        EXPECT_TRUE(y.IsArray());   // Invariant
-        EXPECT_TRUE(y.Empty());
-    }
-
-    {
-        Value x(kArrayType);
-        Value y(kArrayType);
-        y.PushBack(123, allocator);
-        x.PushBack(y.GetArray(), allocator);    // Implicit constructor to convert Array to GenericValue
-
-        EXPECT_EQ(1, x.Size());
-        EXPECT_EQ(123, x[0][0].GetInt());
-        EXPECT_TRUE(y.IsArray());
-        EXPECT_TRUE(y.Empty());
-    }
-}
-
-#if RAPIDJSON_HAS_CXX11_RANGE_FOR
-TEST(Value, ArrayHelperRangeFor) {
-    Value::AllocatorType allocator;
-    Value x(kArrayType);
-
-    for (int i = 0; i < 10; i++)
-        x.PushBack(i, allocator);
-
-    {
-        int i = 0;
-        for (auto& v : x.GetArray()) {
-            EXPECT_EQ(i, v.GetInt());
-            i++;
-        }
-        EXPECT_EQ(i, 10);
-    }
-    {
-        int i = 0;
-        for (const auto& v : const_cast<const Value&>(x).GetArray()) {
-            EXPECT_EQ(i, v.GetInt());
-            i++;
-        }
-        EXPECT_EQ(i, 10);
-    }
-
-    // Array a = x.GetArray();
-    // Array ca = const_cast<const Value&>(x).GetArray();
-}
-#endif
-
-template <typename T, typename Allocator>
-static void TestObject(T& x, Allocator& allocator) {
-    const T& y = x; // const version
-
-    // AddMember()
-    x.AddMember("A", "Apple", allocator);
-    EXPECT_FALSE(x.ObjectEmpty());
-    EXPECT_EQ(1u, x.MemberCount());
-
-    Value value("Banana", 6);
-    x.AddMember("B", "Banana", allocator);
-    EXPECT_EQ(2u, x.MemberCount());
-
-    // AddMember<T>(StringRefType, T, Allocator)
-    {
-        Value o(kObjectType);
-        o.AddMember("true", true, allocator);
-        o.AddMember("false", false, allocator);
-        o.AddMember("int", -1, allocator);
-        o.AddMember("uint", 1u, allocator);
-        o.AddMember("int64", int64_t(-4294967296), allocator);
-        o.AddMember("uint64", uint64_t(4294967296), allocator);
-        o.AddMember("double", 3.14, allocator);
-        o.AddMember("string", "Jelly", allocator);
-
-        EXPECT_TRUE(o["true"].GetBool());
-        EXPECT_FALSE(o["false"].GetBool());
-        EXPECT_EQ(-1, o["int"].GetInt());
-        EXPECT_EQ(1u, o["uint"].GetUint());
-        EXPECT_EQ(int64_t(-4294967296), o["int64"].GetInt64());
-        EXPECT_EQ(uint64_t(4294967296), o["uint64"].GetUint64());
-        EXPECT_STREQ("Jelly",o["string"].GetString());
-        EXPECT_EQ(8u, o.MemberCount());
-    }
-
-    // AddMember<T>(Value&, T, Allocator)
-    {
-        Value o(kObjectType);
-
-        Value n("s");
-        o.AddMember(n, "string", allocator);
-        EXPECT_EQ(1u, o.MemberCount());
-
-        Value count("#");
-        o.AddMember(count, o.MemberCount(), allocator);
-        EXPECT_EQ(2u, o.MemberCount());
-    }
-
-#if RAPIDJSON_HAS_STDSTRING
-    {
-        // AddMember(StringRefType, const std::string&, Allocator)
-        Value o(kObjectType);
-        o.AddMember("b", std::string("Banana"), allocator);
-        EXPECT_STREQ("Banana", o["b"].GetString());
-
-        // RemoveMember(const std::string&)
-        o.RemoveMember(std::string("b"));
-        EXPECT_TRUE(o.ObjectEmpty());
-    }
-#endif
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    // AddMember(GenericValue&&, ...) variants
-    {
-        Value o(kObjectType);
-        o.AddMember(Value("true"), Value(true), allocator);
-        o.AddMember(Value("false"), Value(false).Move(), allocator);    // value is lvalue ref
-        o.AddMember(Value("int").Move(), Value(-1), allocator);         // name is lvalue ref
-        o.AddMember("uint", std::move(Value().SetUint(1u)), allocator); // name is literal, value is rvalue
-        EXPECT_TRUE(o["true"].GetBool());
-        EXPECT_FALSE(o["false"].GetBool());
-        EXPECT_EQ(-1, o["int"].GetInt());
-        EXPECT_EQ(1u, o["uint"].GetUint());
-        EXPECT_EQ(4u, o.MemberCount());
-    }
-#endif
-
-    // Tests a member with null character
-    Value name;
-    const Value C0D("C\0D", 3);
-    name.SetString(C0D.GetString(), 3);
-    value.SetString("CherryD", 7);
-    x.AddMember(name, value, allocator);
-
-    // HasMember()
-    EXPECT_TRUE(x.HasMember("A"));
-    EXPECT_TRUE(x.HasMember("B"));
-    EXPECT_TRUE(y.HasMember("A"));
-    EXPECT_TRUE(y.HasMember("B"));
-
-#if RAPIDJSON_HAS_STDSTRING
-    EXPECT_TRUE(x.HasMember(std::string("A")));
-#endif
-
-    name.SetString("C\0D");
-    EXPECT_TRUE(x.HasMember(name));
-    EXPECT_TRUE(y.HasMember(name));
-
-    GenericValue<UTF8<>, CrtAllocator> othername("A");
-    EXPECT_TRUE(x.HasMember(othername));
-    EXPECT_TRUE(y.HasMember(othername));
-    othername.SetString("C\0D");
-    EXPECT_TRUE(x.HasMember(othername));
-    EXPECT_TRUE(y.HasMember(othername));
-
-    // operator[]
-    EXPECT_STREQ("Apple", x["A"].GetString());
-    EXPECT_STREQ("Banana", x["B"].GetString());
-    EXPECT_STREQ("CherryD", x[C0D].GetString());
-    EXPECT_STREQ("CherryD", x[othername].GetString());
-    EXPECT_THROW(x["nonexist"], AssertException);
-
-    // const operator[]
-    EXPECT_STREQ("Apple", y["A"].GetString());
-    EXPECT_STREQ("Banana", y["B"].GetString());
-    EXPECT_STREQ("CherryD", y[C0D].GetString());
-
-#if RAPIDJSON_HAS_STDSTRING
-    EXPECT_STREQ("Apple", x["A"].GetString());
-    EXPECT_STREQ("Apple", y[std::string("A")].GetString());
-#endif
-
-    // member iterator
-    Value::MemberIterator itr = x.MemberBegin(); 
-    EXPECT_TRUE(itr != x.MemberEnd());
-    EXPECT_STREQ("A", itr->name.GetString());
-    EXPECT_STREQ("Apple", itr->value.GetString());
-    ++itr;
-    EXPECT_TRUE(itr != x.MemberEnd());
-    EXPECT_STREQ("B", itr->name.GetString());
-    EXPECT_STREQ("Banana", itr->value.GetString());
-    ++itr;
-    EXPECT_TRUE(itr != x.MemberEnd());
-    EXPECT_TRUE(memcmp(itr->name.GetString(), "C\0D", 4) == 0);
-    EXPECT_STREQ("CherryD", itr->value.GetString());
-    ++itr;
-    EXPECT_FALSE(itr != x.MemberEnd());
-
-    // const member iterator
-    Value::ConstMemberIterator citr = y.MemberBegin(); 
-    EXPECT_TRUE(citr != y.MemberEnd());
-    EXPECT_STREQ("A", citr->name.GetString());
-    EXPECT_STREQ("Apple", citr->value.GetString());
-    ++citr;
-    EXPECT_TRUE(citr != y.MemberEnd());
-    EXPECT_STREQ("B", citr->name.GetString());
-    EXPECT_STREQ("Banana", citr->value.GetString());
-    ++citr;
-    EXPECT_TRUE(citr != y.MemberEnd());
-    EXPECT_TRUE(memcmp(citr->name.GetString(), "C\0D", 4) == 0);
-    EXPECT_STREQ("CherryD", citr->value.GetString());
-    ++citr;
-    EXPECT_FALSE(citr != y.MemberEnd());
-
-    // member iterator conversions/relations
-    itr  = x.MemberBegin();
-    citr = x.MemberBegin(); // const conversion
-    TestEqual(itr, citr);
-    EXPECT_TRUE(itr < x.MemberEnd());
-    EXPECT_FALSE(itr > y.MemberEnd());
-    EXPECT_TRUE(citr < x.MemberEnd());
-    EXPECT_FALSE(citr > y.MemberEnd());
-    ++citr;
-    TestUnequal(itr, citr);
-    EXPECT_FALSE(itr < itr);
-    EXPECT_TRUE(itr < citr);
-    EXPECT_FALSE(itr > itr);
-    EXPECT_TRUE(citr > itr);
-    EXPECT_EQ(1, citr - x.MemberBegin());
-    EXPECT_EQ(0, itr - y.MemberBegin());
-    itr += citr - x.MemberBegin();
-    EXPECT_EQ(1, itr - y.MemberBegin());
-    TestEqual(citr, itr);
-    EXPECT_TRUE(itr <= citr);
-    EXPECT_TRUE(citr <= itr);
-    itr++;
-    EXPECT_TRUE(itr >= citr);
-    EXPECT_FALSE(citr >= itr);
-
-    // RemoveMember()
-    EXPECT_TRUE(x.RemoveMember("A"));
-    EXPECT_FALSE(x.HasMember("A"));
-
-    EXPECT_TRUE(x.RemoveMember("B"));
-    EXPECT_FALSE(x.HasMember("B"));
-
-    EXPECT_FALSE(x.RemoveMember("nonexist"));
-
-    EXPECT_TRUE(x.RemoveMember(othername));
-    EXPECT_FALSE(x.HasMember(name));
-
-    EXPECT_TRUE(x.MemberBegin() == x.MemberEnd());
-
-    // EraseMember(ConstMemberIterator)
-
-    // Use array members to ensure removed elements' destructor is called.
-    // { "a": [0], "b": [1],[2],...]
-    const char keys[][2] = { "a", "b", "c", "d", "e", "f", "g", "h", "i", "j" };
-    for (int i = 0; i < 10; i++)
-        x.AddMember(keys[i], Value(kArrayType).PushBack(i, allocator), allocator);
-
-    // MemberCount, iterator difference
-    EXPECT_EQ(x.MemberCount(), SizeType(x.MemberEnd() - x.MemberBegin()));
-
-    // Erase the first
-    itr = x.EraseMember(x.MemberBegin());
-    EXPECT_FALSE(x.HasMember(keys[0]));
-    EXPECT_EQ(x.MemberBegin(), itr);
-    EXPECT_EQ(9u, x.MemberCount());
-    for (; itr != x.MemberEnd(); ++itr) {
-        size_t i = static_cast<size_t>((itr - x.MemberBegin())) + 1;
-        EXPECT_STREQ(itr->name.GetString(), keys[i]);
-        EXPECT_EQ(i, itr->value[0].GetInt());
-    }
-
-    // Erase the last
-    itr = x.EraseMember(x.MemberEnd() - 1);
-    EXPECT_FALSE(x.HasMember(keys[9]));
-    EXPECT_EQ(x.MemberEnd(), itr);
-    EXPECT_EQ(8u, x.MemberCount());
-    for (; itr != x.MemberEnd(); ++itr) {
-        size_t i = static_cast<size_t>(itr - x.MemberBegin()) + 1;
-        EXPECT_STREQ(itr->name.GetString(), keys[i]);
-        EXPECT_EQ(i, itr->value[0].GetInt());
-    }
-
-    // Erase the middle
-    itr = x.EraseMember(x.MemberBegin() + 4);
-    EXPECT_FALSE(x.HasMember(keys[5]));
-    EXPECT_EQ(x.MemberBegin() + 4, itr);
-    EXPECT_EQ(7u, x.MemberCount());
-    for (; itr != x.MemberEnd(); ++itr) {
-        size_t i = static_cast<size_t>(itr - x.MemberBegin());
-        i += (i < 4) ? 1 : 2;
-        EXPECT_STREQ(itr->name.GetString(), keys[i]);
-        EXPECT_EQ(i, itr->value[0].GetInt());
-    }
-
-    // EraseMember(ConstMemberIterator, ConstMemberIterator)
-    // Exhaustive test with all 0 <= first < n, first <= last <= n cases
-    const unsigned n = 10;
-    for (unsigned first = 0; first < n; first++) {
-        for (unsigned last = first; last <= n; last++) {
-            x.RemoveAllMembers();
-            for (unsigned i = 0; i < n; i++)
-                x.AddMember(keys[i], Value(kArrayType).PushBack(i, allocator), allocator);
-
-            itr = x.EraseMember(x.MemberBegin() + static_cast<int>(first), x.MemberBegin() + static_cast<int>(last));
-            if (last == n)
-                EXPECT_EQ(x.MemberEnd(), itr);
-            else
-                EXPECT_EQ(x.MemberBegin() + static_cast<int>(first), itr);
-
-            size_t removeCount = last - first;
-            EXPECT_EQ(n - removeCount, x.MemberCount());
-            for (unsigned i = 0; i < first; i++)
-                EXPECT_EQ(i, x[keys[i]][0].GetUint());
-            for (unsigned i = first; i < n - removeCount; i++)
-                EXPECT_EQ(i + removeCount, x[keys[i+removeCount]][0].GetUint());
-        }
-    }
-
-    // RemoveAllMembers()
-    x.RemoveAllMembers();
-    EXPECT_TRUE(x.ObjectEmpty());
-    EXPECT_EQ(0u, x.MemberCount());
-}
-
-TEST(Value, Object) {
-    Value x(kObjectType);
-    const Value& y = x; // const version
-    Value::AllocatorType allocator;
-
-    EXPECT_EQ(kObjectType, x.GetType());
-    EXPECT_TRUE(x.IsObject());
-    EXPECT_TRUE(x.ObjectEmpty());
-    EXPECT_EQ(0u, x.MemberCount());
-    EXPECT_EQ(kObjectType, y.GetType());
-    EXPECT_TRUE(y.IsObject());
-    EXPECT_TRUE(y.ObjectEmpty());
-    EXPECT_EQ(0u, y.MemberCount());
-
-    TestObject(x, allocator);
-
-    // SetObject()
-    Value z;
-    z.SetObject();
-    EXPECT_TRUE(z.IsObject());
-}
-
-TEST(Value, ObjectHelper) {
-    Value::AllocatorType allocator;
-    {
-        Value x(kObjectType);
-        Value::Object o = x.GetObject();
-        TestObject(o, allocator);
-    }
-
-    {
-        Value x(kObjectType);
-        Value::Object o = x.GetObject();
-        o.AddMember("1", 1, allocator);
-
-        Value::Object o2(o); // copy constructor
-        EXPECT_EQ(1, o2.MemberCount());
-
-        Value::Object o3 = o;
-        EXPECT_EQ(1, o3.MemberCount());
-
-        Value::ConstObject y = static_cast<const Value&>(x).GetObject();
-        (void)y;
-        // y.AddMember("1", 1, allocator); // should not compile
-
-        // Templated functions
-        x.RemoveAllMembers();
-        EXPECT_TRUE(x.Is<Value::Object>());
-        EXPECT_TRUE(x.Is<Value::ConstObject>());
-        o.AddMember("1", 1, allocator);
-        EXPECT_EQ(1, x.Get<Value::Object>()["1"].GetInt());
-        EXPECT_EQ(1, x.Get<Value::ConstObject>()["1"].GetInt());
-
-        Value x2;
-        x2.Set<Value::Object>(o);
-        EXPECT_TRUE(x.IsObject());   // IsObject() is invariant after moving
-        EXPECT_EQ(1, x2.Get<Value::Object>()["1"].GetInt());
-    }
-
-    {
-        Value x(kObjectType);
-        x.AddMember("a", "apple", allocator);
-        Value y(x.GetObject());
-        EXPECT_STREQ("apple", y["a"].GetString());
-        EXPECT_TRUE(x.IsObject());  // Invariant
-    }
-    
-    {
-        Value x(kObjectType);
-        x.AddMember("a", "apple", allocator);
-        Value y(kObjectType);
-        y.AddMember("fruits", x.GetObject(), allocator);
-        EXPECT_STREQ("apple", y["fruits"]["a"].GetString());
-        EXPECT_TRUE(x.IsObject());  // Invariant
-    }
-}
-
-#if RAPIDJSON_HAS_CXX11_RANGE_FOR
-TEST(Value, ObjectHelperRangeFor) {
-    Value::AllocatorType allocator;
-    Value x(kObjectType);
-
-    for (int i = 0; i < 10; i++) {
-        char name[10];
-        Value n(name, static_cast<SizeType>(sprintf(name, "%d", i)), allocator);
-        x.AddMember(n, i, allocator);
-    }
-
-    {
-        int i = 0;
-        for (auto& m : x.GetObject()) {
-            char name[10];
-            sprintf(name, "%d", i);
-            EXPECT_STREQ(name, m.name.GetString());
-            EXPECT_EQ(i, m.value.GetInt());
-            i++;
-        }
-        EXPECT_EQ(i, 10);
-    }
-    {
-        int i = 0;
-        for (const auto& m : const_cast<const Value&>(x).GetObject()) {
-            char name[10];
-            sprintf(name, "%d", i);
-            EXPECT_STREQ(name, m.name.GetString());
-            EXPECT_EQ(i, m.value.GetInt());
-            i++;
-        }
-        EXPECT_EQ(i, 10);
-    }
-
-    // Object a = x.GetObject();
-    // Object ca = const_cast<const Value&>(x).GetObject();
-}
-#endif
-
-TEST(Value, EraseMember_String) {
-    Value::AllocatorType allocator;
-    Value x(kObjectType);
-    x.AddMember("A", "Apple", allocator);
-    x.AddMember("B", "Banana", allocator);
-
-    EXPECT_TRUE(x.EraseMember("B"));
-    EXPECT_FALSE(x.HasMember("B"));
-
-    EXPECT_FALSE(x.EraseMember("nonexist"));
-
-    GenericValue<UTF8<>, CrtAllocator> othername("A");
-    EXPECT_TRUE(x.EraseMember(othername));
-    EXPECT_FALSE(x.HasMember("A"));
-
-    EXPECT_TRUE(x.MemberBegin() == x.MemberEnd());
-}
-
-TEST(Value, BigNestedArray) {
-    MemoryPoolAllocator<> allocator;
-    Value x(kArrayType);
-    static const SizeType  n = 200;
-
-    for (SizeType i = 0; i < n; i++) {
-        Value y(kArrayType);
-        for (SizeType  j = 0; j < n; j++) {
-            Value number(static_cast<int>(i * n + j));
-            y.PushBack(number, allocator);
-        }
-        x.PushBack(y, allocator);
-    }
-
-    for (SizeType i = 0; i < n; i++)
-        for (SizeType j = 0; j < n; j++) {
-            EXPECT_TRUE(x[i][j].IsInt());
-            EXPECT_EQ(static_cast<int>(i * n + j), x[i][j].GetInt());
-        }
-}
-
-TEST(Value, BigNestedObject) {
-    MemoryPoolAllocator<> allocator;
-    Value x(kObjectType);
-    static const SizeType n = 200;
-
-    for (SizeType i = 0; i < n; i++) {
-        char name1[10];
-        sprintf(name1, "%d", i);
-
-        // Value name(name1); // should not compile
-        Value name(name1, static_cast<SizeType>(strlen(name1)), allocator);
-        Value object(kObjectType);
-
-        for (SizeType j = 0; j < n; j++) {
-            char name2[10];
-            sprintf(name2, "%d", j);
-
-            Value name3(name2, static_cast<SizeType>(strlen(name2)), allocator);
-            Value number(static_cast<int>(i * n + j));
-            object.AddMember(name3, number, allocator);
-        }
-
-        // x.AddMember(name1, object, allocator); // should not compile
-        x.AddMember(name, object, allocator);
-    }
-
-    for (SizeType i = 0; i < n; i++) {
-        char name1[10];
-        sprintf(name1, "%d", i);
-        
-        for (SizeType j = 0; j < n; j++) {
-            char name2[10];
-            sprintf(name2, "%d", j);
-            x[name1];
-            EXPECT_EQ(static_cast<int>(i * n + j), x[name1][name2].GetInt());
-        }
-    }
-}
-
-// Issue 18: Error removing last element of object
-// http://code.google.com/p/rapidjson/issues/detail?id=18
-TEST(Value, RemoveLastElement) {
-    rapidjson::Document doc;
-    rapidjson::Document::AllocatorType& allocator = doc.GetAllocator();
-    rapidjson::Value objVal(rapidjson::kObjectType);        
-    objVal.AddMember("var1", 123, allocator);       
-    objVal.AddMember("var2", "444", allocator);
-    objVal.AddMember("var3", 555, allocator);
-    EXPECT_TRUE(objVal.HasMember("var3"));
-    objVal.RemoveMember("var3");    // Assertion here in r61
-    EXPECT_FALSE(objVal.HasMember("var3"));
-}
-
-// Issue 38:    Segmentation fault with CrtAllocator
-TEST(Document, CrtAllocator) {
-    typedef GenericValue<UTF8<>, CrtAllocator> V;
-
-    V::AllocatorType allocator;
-    V o(kObjectType);
-    o.AddMember("x", 1, allocator); // Should not call destructor on uninitialized name/value of newly allocated members.
-
-    V a(kArrayType);
-    a.PushBack(1, allocator);   // Should not call destructor on uninitialized Value of newly allocated elements.
-}
-
-static void TestShortStringOptimization(const char* str) {
-    const rapidjson::SizeType len = static_cast<rapidjson::SizeType>(strlen(str));
-	
-    rapidjson::Document doc;
-    rapidjson::Value val;
-    val.SetString(str, len, doc.GetAllocator());
-	
-	EXPECT_EQ(val.GetStringLength(), len);
-	EXPECT_STREQ(val.GetString(), str);
-}
-
-TEST(Value, AllocateShortString) {
-	TestShortStringOptimization("");                 // edge case: empty string
-	TestShortStringOptimization("12345678");         // regular case for short strings: 8 chars
-	TestShortStringOptimization("12345678901");      // edge case: 11 chars in 32-bit mode (=> short string)
-	TestShortStringOptimization("123456789012");     // edge case: 12 chars in 32-bit mode (=> regular string)
-	TestShortStringOptimization("123456789012345");  // edge case: 15 chars in 64-bit mode (=> short string)
-	TestShortStringOptimization("1234567890123456"); // edge case: 16 chars in 64-bit mode (=> regular string)
-}
-
-template <int e>
-struct TerminateHandler {
-    bool Null() { return e != 0; }
-    bool Bool(bool) { return e != 1; }
-    bool Int(int) { return e != 2; }
-    bool Uint(unsigned) { return e != 3; }
-    bool Int64(int64_t) { return e != 4; }
-    bool Uint64(uint64_t) { return e != 5; }
-    bool Double(double) { return e != 6; }
-    bool RawNumber(const char*, SizeType, bool) { return e != 7; }
-    bool String(const char*, SizeType, bool) { return e != 8; }
-    bool StartObject() { return e != 9; }
-    bool Key(const char*, SizeType, bool)  { return e != 10; }
-    bool EndObject(SizeType) { return e != 11; }
-    bool StartArray() { return e != 12; }
-    bool EndArray(SizeType) { return e != 13; }
-};
-
-#define TEST_TERMINATION(e, json)\
-{\
-    Document d; \
-    EXPECT_FALSE(d.Parse(json).HasParseError()); \
-    Reader reader; \
-    TerminateHandler<e> h;\
-    EXPECT_FALSE(d.Accept(h));\
-}
-
-TEST(Value, AcceptTerminationByHandler) {
-    TEST_TERMINATION(0, "[null]");
-    TEST_TERMINATION(1, "[true]");
-    TEST_TERMINATION(1, "[false]");
-    TEST_TERMINATION(2, "[-1]");
-    TEST_TERMINATION(3, "[2147483648]");
-    TEST_TERMINATION(4, "[-1234567890123456789]");
-    TEST_TERMINATION(5, "[9223372036854775808]");
-    TEST_TERMINATION(6, "[0.5]");
-    // RawNumber() is never called
-    TEST_TERMINATION(8, "[\"a\"]");
-    TEST_TERMINATION(9, "[{}]");
-    TEST_TERMINATION(10, "[{\"a\":1}]");
-    TEST_TERMINATION(11, "[{}]");
-    TEST_TERMINATION(12, "{\"a\":[]}");
-    TEST_TERMINATION(13, "{\"a\":[]}");
-}
-
-struct ValueIntComparer {
-    bool operator()(const Value& lhs, const Value& rhs) const {
-        return lhs.GetInt() < rhs.GetInt();
-    }
-};
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-TEST(Value, Sorting) {
-    Value::AllocatorType allocator;
-    Value a(kArrayType);
-    a.PushBack(5, allocator);
-    a.PushBack(1, allocator);
-    a.PushBack(3, allocator);
-    std::sort(a.Begin(), a.End(), ValueIntComparer());
-    EXPECT_EQ(1, a[0].GetInt());
-    EXPECT_EQ(3, a[1].GetInt());
-    EXPECT_EQ(5, a[2].GetInt());
-}
-#endif
-
-// http://stackoverflow.com/questions/35222230/
-
-static void MergeDuplicateKey(Value& v, Value::AllocatorType& a) {
-    if (v.IsObject()) {
-        // Convert all key:value into key:[value]
-        for (Value::MemberIterator itr = v.MemberBegin(); itr != v.MemberEnd(); ++itr)
-            itr->value = Value(kArrayType).Move().PushBack(itr->value, a);
-        
-        // Merge arrays if key is duplicated
-        for (Value::MemberIterator itr = v.MemberBegin(); itr != v.MemberEnd();) {
-            Value::MemberIterator itr2 = v.FindMember(itr->name);
-            if (itr != itr2) {
-                itr2->value.PushBack(itr->value[0], a);
-                itr = v.EraseMember(itr);
-            }
-            else
-                ++itr;
-        }
-
-        // Convert key:[values] back to key:value if there is only one value
-        for (Value::MemberIterator itr = v.MemberBegin(); itr != v.MemberEnd(); ++itr) {
-            if (itr->value.Size() == 1)
-                itr->value = itr->value[0];
-            MergeDuplicateKey(itr->value, a); // Recursion on the value
-        }
-    }
-    else if (v.IsArray())
-        for (Value::ValueIterator itr = v.Begin(); itr != v.End(); ++itr)
-            MergeDuplicateKey(*itr, a);
-}
-
-TEST(Value, MergeDuplicateKey) {
-    Document d;
-    d.Parse(
-        "{"
-        "    \"key1\": {"
-        "        \"a\": \"asdf\","
-        "        \"b\": \"foo\","
-        "        \"b\": \"bar\","
-        "        \"c\": \"fdas\""
-        "    }"
-        "}");
-
-    Document d2;
-    d2.Parse(
-        "{"
-        "    \"key1\": {"
-        "        \"a\": \"asdf\","
-        "        \"b\": ["
-        "            \"foo\","
-        "            \"bar\""
-        "        ],"
-        "        \"c\": \"fdas\""
-        "    }"
-        "}");
-
-    EXPECT_NE(d2, d);
-    MergeDuplicateKey(d, d.GetAllocator());
-    EXPECT_EQ(d2, d);
-}
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
diff --git a/src/sioclient/lib/rapidjson/test/unittest/writertest.cpp b/src/sioclient/lib/rapidjson/test/unittest/writertest.cpp
deleted file mode 100644
index 232b03d1..00000000
--- a/src/sioclient/lib/rapidjson/test/unittest/writertest.cpp
+++ /dev/null
@@ -1,598 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "unittest.h"
-
-#include "rapidjson/document.h"
-#include "rapidjson/reader.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/memorybuffer.h"
-
-#ifdef __clang__
-RAPIDJSON_DIAG_PUSH
-RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-using namespace rapidjson;
-
-TEST(Writer, Compact) {
-    StringStream s("{ \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3] } ");
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    buffer.ShrinkToFit();
-    Reader reader;
-    reader.Parse<0>(s, writer);
-    EXPECT_STREQ("{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3]}", buffer.GetString());
-    EXPECT_EQ(77u, buffer.GetSize());
-    EXPECT_TRUE(writer.IsComplete());
-}
-
-// json -> parse -> writer -> json
-#define TEST_ROUNDTRIP(json) \
-    { \
-        StringStream s(json); \
-        StringBuffer buffer; \
-        Writer<StringBuffer> writer(buffer); \
-        Reader reader; \
-        reader.Parse<kParseFullPrecisionFlag>(s, writer); \
-        EXPECT_STREQ(json, buffer.GetString()); \
-        EXPECT_TRUE(writer.IsComplete()); \
-    }
-
-TEST(Writer, Root) {
-    TEST_ROUNDTRIP("null");
-    TEST_ROUNDTRIP("true");
-    TEST_ROUNDTRIP("false");
-    TEST_ROUNDTRIP("0");
-    TEST_ROUNDTRIP("\"foo\"");
-    TEST_ROUNDTRIP("[]");
-    TEST_ROUNDTRIP("{}");
-}
-
-TEST(Writer, Int) {
-    TEST_ROUNDTRIP("[-1]");
-    TEST_ROUNDTRIP("[-123]");
-    TEST_ROUNDTRIP("[-2147483648]");
-}
-
-TEST(Writer, UInt) {
-    TEST_ROUNDTRIP("[0]");
-    TEST_ROUNDTRIP("[1]");
-    TEST_ROUNDTRIP("[123]");
-    TEST_ROUNDTRIP("[2147483647]");
-    TEST_ROUNDTRIP("[4294967295]");
-}
-
-TEST(Writer, Int64) {
-    TEST_ROUNDTRIP("[-1234567890123456789]");
-    TEST_ROUNDTRIP("[-9223372036854775808]");
-}
-
-TEST(Writer, Uint64) {
-    TEST_ROUNDTRIP("[1234567890123456789]");
-    TEST_ROUNDTRIP("[9223372036854775807]");
-}
-
-TEST(Writer, String) {
-    TEST_ROUNDTRIP("[\"Hello\"]");
-    TEST_ROUNDTRIP("[\"Hello\\u0000World\"]");
-    TEST_ROUNDTRIP("[\"\\\"\\\\/\\b\\f\\n\\r\\t\"]");
-
-#if RAPIDJSON_HAS_STDSTRING
-    {
-        StringBuffer buffer;
-        Writer<StringBuffer> writer(buffer);
-        writer.String(std::string("Hello\n"));
-        EXPECT_STREQ("\"Hello\\n\"", buffer.GetString());
-    }
-#endif
-}
-
-TEST(Writer, Issue_889) {
-    char buf[100] = "Hello";
-    
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    writer.StartArray();
-    writer.String(buf);
-    writer.EndArray();
-    
-    EXPECT_STREQ("[\"Hello\"]", buffer.GetString());
-    EXPECT_TRUE(writer.IsComplete()); \
-}
-
-TEST(Writer, ScanWriteUnescapedString) {
-    const char json[] = "[\" \\\"0123456789ABCDEF\"]";
-    //                       ^ scanning stops here.
-    char buffer2[sizeof(json) + 32];
-
-    // Use different offset to test different alignments
-    for (int i = 0; i < 32; i++) {
-        char* p = buffer2 + i;
-        memcpy(p, json, sizeof(json));
-        TEST_ROUNDTRIP(p);
-    }
-}
-
-TEST(Writer, Double) {
-    TEST_ROUNDTRIP("[1.2345,1.2345678,0.123456789012,1234567.8]");
-    TEST_ROUNDTRIP("0.0");
-    TEST_ROUNDTRIP("-0.0"); // Issue #289
-    TEST_ROUNDTRIP("1e30");
-    TEST_ROUNDTRIP("1.0");
-    TEST_ROUNDTRIP("5e-324"); // Min subnormal positive double
-    TEST_ROUNDTRIP("2.225073858507201e-308"); // Max subnormal positive double
-    TEST_ROUNDTRIP("2.2250738585072014e-308"); // Min normal positive double
-    TEST_ROUNDTRIP("1.7976931348623157e308"); // Max double
-
-}
-
-// UTF8 -> TargetEncoding -> UTF8
-template <typename TargetEncoding>
-void TestTranscode(const char* json) {
-    StringStream s(json);
-    GenericStringBuffer<TargetEncoding> buffer;
-    Writer<GenericStringBuffer<TargetEncoding>, UTF8<>, TargetEncoding> writer(buffer);
-    Reader reader;
-    reader.Parse(s, writer);
-
-    StringBuffer buffer2;
-    Writer<StringBuffer> writer2(buffer2);
-    GenericReader<TargetEncoding, UTF8<> > reader2;
-    GenericStringStream<TargetEncoding> s2(buffer.GetString());
-    reader2.Parse(s2, writer2);
-
-    EXPECT_STREQ(json, buffer2.GetString());
-}
-
-TEST(Writer, Transcode) {
-    const char json[] = "{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3],\"dollar\":\"\x24\",\"cents\":\"\xC2\xA2\",\"euro\":\"\xE2\x82\xAC\",\"gclef\":\"\xF0\x9D\x84\x9E\"}";
-
-    // UTF8 -> UTF16 -> UTF8
-    TestTranscode<UTF8<> >(json);
-
-    // UTF8 -> ASCII -> UTF8
-    TestTranscode<ASCII<> >(json);
-
-    // UTF8 -> UTF16 -> UTF8
-    TestTranscode<UTF16<> >(json);
-
-    // UTF8 -> UTF32 -> UTF8
-    TestTranscode<UTF32<> >(json);
-
-    // UTF8 -> AutoUTF -> UTF8
-    UTFType types[] = { kUTF8, kUTF16LE , kUTF16BE, kUTF32LE , kUTF32BE };
-    for (size_t i = 0; i < 5; i++) {
-        StringStream s(json);
-        MemoryBuffer buffer;
-        AutoUTFOutputStream<unsigned, MemoryBuffer> os(buffer, types[i], true);
-        Writer<AutoUTFOutputStream<unsigned, MemoryBuffer>, UTF8<>, AutoUTF<unsigned> > writer(os);
-        Reader reader;
-        reader.Parse(s, writer);
-
-        StringBuffer buffer2;
-        Writer<StringBuffer> writer2(buffer2);
-        GenericReader<AutoUTF<unsigned>, UTF8<> > reader2;
-        MemoryStream s2(buffer.GetBuffer(), buffer.GetSize());
-        AutoUTFInputStream<unsigned, MemoryStream> is(s2);
-        reader2.Parse(is, writer2);
-
-        EXPECT_STREQ(json, buffer2.GetString());
-    }
-
-}
-
-#include <sstream>
-
-class OStreamWrapper {
-public:
-    typedef char Ch;
-
-    OStreamWrapper(std::ostream& os) : os_(os) {}
-
-    Ch Peek() const { assert(false); return '\0'; }
-    Ch Take() { assert(false); return '\0'; }
-    size_t Tell() const { return 0; }
-
-    Ch* PutBegin() { assert(false); return 0; }
-    void Put(Ch c) { os_.put(c); }
-    void Flush() { os_.flush(); }
-    size_t PutEnd(Ch*) { assert(false); return 0; }
-
-private:
-    OStreamWrapper(const OStreamWrapper&);
-    OStreamWrapper& operator=(const OStreamWrapper&);
-
-    std::ostream& os_;
-};
-
-TEST(Writer, OStreamWrapper) {
-    StringStream s("{ \"hello\" : \"world\", \"t\" : true , \"f\" : false, \"n\": null, \"i\":123, \"pi\": 3.1416, \"a\":[1, 2, 3], \"u64\": 1234567890123456789, \"i64\":-1234567890123456789 } ");
-    
-    std::stringstream ss;
-    OStreamWrapper os(ss);
-    
-    Writer<OStreamWrapper> writer(os);
-
-    Reader reader;
-    reader.Parse<0>(s, writer);
-    
-    std::string actual = ss.str();
-    EXPECT_STREQ("{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3],\"u64\":1234567890123456789,\"i64\":-1234567890123456789}", actual.c_str());
-}
-
-TEST(Writer, AssertRootMayBeAnyValue) {
-#define T(x)\
-    {\
-        StringBuffer buffer;\
-        Writer<StringBuffer> writer(buffer);\
-        EXPECT_TRUE(x);\
-    }
-    T(writer.Bool(false));
-    T(writer.Bool(true));
-    T(writer.Null());
-    T(writer.Int(0));
-    T(writer.Uint(0));
-    T(writer.Int64(0));
-    T(writer.Uint64(0));
-    T(writer.Double(0));
-    T(writer.String("foo"));
-#undef T
-}
-
-TEST(Writer, AssertIncorrectObjectLevel) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    writer.StartObject();
-    writer.EndObject();
-    ASSERT_THROW(writer.EndObject(), AssertException);
-}
-
-TEST(Writer, AssertIncorrectArrayLevel) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    writer.StartArray();
-    writer.EndArray();
-    ASSERT_THROW(writer.EndArray(), AssertException);
-}
-
-TEST(Writer, AssertIncorrectEndObject) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    writer.StartObject();
-    ASSERT_THROW(writer.EndArray(), AssertException);
-}
-
-TEST(Writer, AssertIncorrectEndArray) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    writer.StartObject();
-    ASSERT_THROW(writer.EndArray(), AssertException);
-}
-
-TEST(Writer, AssertObjectKeyNotString) {
-#define T(x)\
-    {\
-        StringBuffer buffer;\
-        Writer<StringBuffer> writer(buffer);\
-        writer.StartObject();\
-        ASSERT_THROW(x, AssertException); \
-    }
-    T(writer.Bool(false));
-    T(writer.Bool(true));
-    T(writer.Null());
-    T(writer.Int(0));
-    T(writer.Uint(0));
-    T(writer.Int64(0));
-    T(writer.Uint64(0));
-    T(writer.Double(0));
-    T(writer.StartObject());
-    T(writer.StartArray());
-#undef T
-}
-
-TEST(Writer, AssertMultipleRoot) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-
-    writer.StartObject();
-    writer.EndObject();
-    ASSERT_THROW(writer.StartObject(), AssertException);
-
-    writer.Reset(buffer);
-    writer.Null();
-    ASSERT_THROW(writer.Int(0), AssertException);
-
-    writer.Reset(buffer);
-    writer.String("foo");
-    ASSERT_THROW(writer.StartArray(), AssertException);
-
-    writer.Reset(buffer);
-    writer.StartArray();
-    writer.EndArray();
-    //ASSERT_THROW(writer.Double(3.14), AssertException);
-}
-
-TEST(Writer, RootObjectIsComplete) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    EXPECT_FALSE(writer.IsComplete());
-    writer.StartObject();
-    EXPECT_FALSE(writer.IsComplete());
-    writer.String("foo");
-    EXPECT_FALSE(writer.IsComplete());
-    writer.Int(1);
-    EXPECT_FALSE(writer.IsComplete());
-    writer.EndObject();
-    EXPECT_TRUE(writer.IsComplete());
-}
-
-TEST(Writer, RootArrayIsComplete) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    EXPECT_FALSE(writer.IsComplete());
-    writer.StartArray();
-    EXPECT_FALSE(writer.IsComplete());
-    writer.String("foo");
-    EXPECT_FALSE(writer.IsComplete());
-    writer.Int(1);
-    EXPECT_FALSE(writer.IsComplete());
-    writer.EndArray();
-    EXPECT_TRUE(writer.IsComplete());
-}
-
-TEST(Writer, RootValueIsComplete) {
-#define T(x)\
-    {\
-        StringBuffer buffer;\
-        Writer<StringBuffer> writer(buffer);\
-        EXPECT_FALSE(writer.IsComplete()); \
-        x; \
-        EXPECT_TRUE(writer.IsComplete()); \
-    }
-    T(writer.Null());
-    T(writer.Bool(true));
-    T(writer.Bool(false));
-    T(writer.Int(0));
-    T(writer.Uint(0));
-    T(writer.Int64(0));
-    T(writer.Uint64(0));
-    T(writer.Double(0));
-    T(writer.String(""));
-#undef T
-}
-
-TEST(Writer, InvalidEncoding) {
-    // Fail in decoding invalid UTF-8 sequence http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
-    {
-        GenericStringBuffer<UTF16<> > buffer;
-        Writer<GenericStringBuffer<UTF16<> >, UTF8<>, UTF16<> > writer(buffer);
-        writer.StartArray();
-        EXPECT_FALSE(writer.String("\xfe"));
-        EXPECT_FALSE(writer.String("\xff"));
-        EXPECT_FALSE(writer.String("\xfe\xfe\xff\xff"));
-        writer.EndArray();
-    }
-
-    // Fail in encoding
-    {
-        StringBuffer buffer;
-        Writer<StringBuffer, UTF32<> > writer(buffer);
-        static const UTF32<>::Ch s[] = { 0x110000, 0 }; // Out of U+0000 to U+10FFFF
-        EXPECT_FALSE(writer.String(s));
-    }
-
-    // Fail in unicode escaping in ASCII output
-    {
-        StringBuffer buffer;
-        Writer<StringBuffer, UTF32<>, ASCII<> > writer(buffer);
-        static const UTF32<>::Ch s[] = { 0x110000, 0 }; // Out of U+0000 to U+10FFFF
-        EXPECT_FALSE(writer.String(s));
-    }
-}
-
-TEST(Writer, ValidateEncoding) {
-    {
-        StringBuffer buffer;
-        Writer<StringBuffer, UTF8<>, UTF8<>, CrtAllocator, kWriteValidateEncodingFlag> writer(buffer);
-        writer.StartArray();
-        EXPECT_TRUE(writer.String("\x24"));             // Dollar sign U+0024
-        EXPECT_TRUE(writer.String("\xC2\xA2"));         // Cents sign U+00A2
-        EXPECT_TRUE(writer.String("\xE2\x82\xAC"));     // Euro sign U+20AC
-        EXPECT_TRUE(writer.String("\xF0\x9D\x84\x9E")); // G clef sign U+1D11E
-        EXPECT_TRUE(writer.String("\x01"));             // SOH control U+0001
-        EXPECT_TRUE(writer.String("\x1B"));             // Escape control U+001B
-        writer.EndArray();
-        EXPECT_STREQ("[\"\x24\",\"\xC2\xA2\",\"\xE2\x82\xAC\",\"\xF0\x9D\x84\x9E\",\"\\u0001\",\"\\u001B\"]", buffer.GetString());
-    }
-
-    // Fail in decoding invalid UTF-8 sequence http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
-    {
-        StringBuffer buffer;
-        Writer<StringBuffer, UTF8<>, UTF8<>, CrtAllocator, kWriteValidateEncodingFlag> writer(buffer);
-        writer.StartArray();
-        EXPECT_FALSE(writer.String("\xfe"));
-        EXPECT_FALSE(writer.String("\xff"));
-        EXPECT_FALSE(writer.String("\xfe\xfe\xff\xff"));
-        writer.EndArray();
-    }
-}
-
-TEST(Writer, InvalidEventSequence) {
-    // {]
-    {
-        StringBuffer buffer;
-        Writer<StringBuffer> writer(buffer);
-        writer.StartObject();
-        EXPECT_THROW(writer.EndArray(), AssertException);
-        EXPECT_FALSE(writer.IsComplete());
-    }
-
-    // [}
-    {
-        StringBuffer buffer;
-        Writer<StringBuffer> writer(buffer);
-        writer.StartArray();
-        EXPECT_THROW(writer.EndObject(), AssertException);
-        EXPECT_FALSE(writer.IsComplete());
-    }
-
-    // { 1: 
-    {
-        StringBuffer buffer;
-        Writer<StringBuffer> writer(buffer);
-        writer.StartObject();
-        EXPECT_THROW(writer.Int(1), AssertException);
-        EXPECT_FALSE(writer.IsComplete());
-    }
-
-    // { 'a' }
-    {
-        StringBuffer buffer;
-        Writer<StringBuffer> writer(buffer);
-        writer.StartObject();
-        writer.Key("a");
-        EXPECT_THROW(writer.EndObject(), AssertException);
-        EXPECT_FALSE(writer.IsComplete());
-    }
-
-    // { 'a':'b','c' }
-    {
-        StringBuffer buffer;
-        Writer<StringBuffer> writer(buffer);
-        writer.StartObject();
-        writer.Key("a");
-        writer.String("b");
-        writer.Key("c");
-        EXPECT_THROW(writer.EndObject(), AssertException);
-        EXPECT_FALSE(writer.IsComplete());
-    }
-}
-
-TEST(Writer, NaN) {
-    double nan = std::numeric_limits<double>::quiet_NaN();
-
-    EXPECT_TRUE(internal::Double(nan).IsNan());
-    StringBuffer buffer;
-    {
-        Writer<StringBuffer> writer(buffer);
-        EXPECT_FALSE(writer.Double(nan));
-    }
-    {
-        Writer<StringBuffer, UTF8<>, UTF8<>, CrtAllocator, kWriteNanAndInfFlag> writer(buffer);
-        EXPECT_TRUE(writer.Double(nan));
-        EXPECT_STREQ("NaN", buffer.GetString());
-    }
-    GenericStringBuffer<UTF16<> > buffer2;
-    Writer<GenericStringBuffer<UTF16<> > > writer2(buffer2);
-    EXPECT_FALSE(writer2.Double(nan));
-}
-
-TEST(Writer, Inf) {
-    double inf = std::numeric_limits<double>::infinity();
-
-    EXPECT_TRUE(internal::Double(inf).IsInf());
-    StringBuffer buffer;
-    {
-        Writer<StringBuffer> writer(buffer);
-        EXPECT_FALSE(writer.Double(inf));
-    }
-    {
-        Writer<StringBuffer> writer(buffer);
-        EXPECT_FALSE(writer.Double(-inf));
-    }
-    {
-        Writer<StringBuffer, UTF8<>, UTF8<>, CrtAllocator, kWriteNanAndInfFlag> writer(buffer);
-        EXPECT_TRUE(writer.Double(inf));
-    }
-    {
-        Writer<StringBuffer, UTF8<>, UTF8<>, CrtAllocator, kWriteNanAndInfFlag> writer(buffer);
-        EXPECT_TRUE(writer.Double(-inf));
-    }
-    EXPECT_STREQ("Infinity-Infinity", buffer.GetString());
-}
-
-TEST(Writer, RawValue) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(buffer);
-    writer.StartObject();
-    writer.Key("a");
-    writer.Int(1);
-    writer.Key("raw");
-    const char json[] = "[\"Hello\\nWorld\", 123.456]";
-    writer.RawValue(json, strlen(json), kArrayType);
-    writer.EndObject();
-    EXPECT_TRUE(writer.IsComplete());
-    EXPECT_STREQ("{\"a\":1,\"raw\":[\"Hello\\nWorld\", 123.456]}", buffer.GetString());
-}
-
-TEST(Write, RawValue_Issue1152) {
-    {
-        GenericStringBuffer<UTF32<> > sb;
-        Writer<GenericStringBuffer<UTF32<> >, UTF8<>, UTF32<> > writer(sb);
-        writer.RawValue("null", 4, kNullType);
-        EXPECT_TRUE(writer.IsComplete());
-        const unsigned *out = sb.GetString();
-        EXPECT_EQ(static_cast<unsigned>('n'), out[0]);
-        EXPECT_EQ(static_cast<unsigned>('u'), out[1]);
-        EXPECT_EQ(static_cast<unsigned>('l'), out[2]);
-        EXPECT_EQ(static_cast<unsigned>('l'), out[3]);
-        EXPECT_EQ(static_cast<unsigned>(0  ), out[4]);
-    }
-
-    {
-        GenericStringBuffer<UTF8<> > sb;
-        Writer<GenericStringBuffer<UTF8<> >, UTF16<>, UTF8<> > writer(sb);
-        writer.RawValue(L"null", 4, kNullType);
-        EXPECT_TRUE(writer.IsComplete());
-        EXPECT_STREQ("null", sb.GetString());
-    }
-
-    {
-        // Fail in transcoding
-        GenericStringBuffer<UTF16<> > buffer;
-        Writer<GenericStringBuffer<UTF16<> >, UTF8<>, UTF16<> > writer(buffer);
-        EXPECT_FALSE(writer.RawValue("\"\xfe\"", 3, kStringType));
-    }
-
-    {
-        // Fail in encoding validation
-        StringBuffer buffer;
-        Writer<StringBuffer, UTF8<>, UTF8<>, CrtAllocator, kWriteValidateEncodingFlag> writer(buffer);
-        EXPECT_FALSE(writer.RawValue("\"\xfe\"", 3, kStringType));
-    }
-}
-
-#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
-static Writer<StringBuffer> WriterGen(StringBuffer &target) {
-    Writer<StringBuffer> writer(target);
-    writer.StartObject();
-    writer.Key("a");
-    writer.Int(1);
-    return writer;
-}
-
-TEST(Writer, MoveCtor) {
-    StringBuffer buffer;
-    Writer<StringBuffer> writer(WriterGen(buffer));
-    writer.EndObject();
-    EXPECT_TRUE(writer.IsComplete());
-    EXPECT_STREQ("{\"a\":1}", buffer.GetString());
-}
-#endif
-
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
diff --git a/src/sioclient/lib/rapidjson/test/valgrind.supp b/src/sioclient/lib/rapidjson/test/valgrind.supp
deleted file mode 100644
index 1fed18be..00000000
--- a/src/sioclient/lib/rapidjson/test/valgrind.supp
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	Suppress wcslen valgrind report 1
-	Memcheck:Cond
-	fun:__wcslen_sse2
-}
-
-{
-    Suppress wcslen valgrind report 2
-    Memcheck:Addr8
-    fun:__wcslen_sse2
-}
-
-{
-    Suppress wcslen valgrind report 3
-    Memcheck:Value8
-    fun:__wcslen_sse2
-}
diff --git a/src/sioclient/lib/rapidjson/thirdparty/gtest b/src/sioclient/lib/rapidjson/thirdparty/gtest
deleted file mode 160000
index 0a439623..00000000
--- a/src/sioclient/lib/rapidjson/thirdparty/gtest
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0a439623f75c029912728d80cb7f1b8b48739ca4
diff --git a/src/sioclient/lib/rapidjson/travis-doxygen.sh b/src/sioclient/lib/rapidjson/travis-doxygen.sh
deleted file mode 100755
index 33ec6ab3..00000000
--- a/src/sioclient/lib/rapidjson/travis-doxygen.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-# Update Doxygen documentation after push to 'master'.
-# Author: @pah
-
-set -e
-
-DOXYGEN_VER=doxygen-1.8.13
-DOXYGEN_TAR=${DOXYGEN_VER}.linux.bin.tar.gz
-DOXYGEN_URL="http://ftp.stack.nl/pub/users/dimitri/${DOXYGEN_TAR}"
-
-: ${GITHUB_REPO:="Tencent/rapidjson"}
-GITHUB_HOST="github.com"
-GITHUB_CLONE="git://${GITHUB_HOST}/${GITHUB_REPO}"
-GITHUB_URL="https://${GITHUB_HOST}/${GITHUB_PUSH-${GITHUB_REPO}}"
-
-# if not set, ignore password
-#GIT_ASKPASS="${TRAVIS_BUILD_DIR}/gh_ignore_askpass.sh"
-
-skip() {
-	echo "$@" 1>&2
-	echo "Exiting..." 1>&2
-	exit 0
-}
-
-abort() {
-	echo "Error: $@" 1>&2
-	echo "Exiting..." 1>&2
-	exit 1
-}
-
-# TRAVIS_BUILD_DIR not set, exiting
-[ -d "${TRAVIS_BUILD_DIR-/nonexistent}" ] || \
-	abort '${TRAVIS_BUILD_DIR} not set or nonexistent.'
-
-# check for pull-requests
-[ "${TRAVIS_PULL_REQUEST}" = "false" ] || \
-	skip "Not running Doxygen for pull-requests."
-
-# check for branch name
-[ "${TRAVIS_BRANCH}" = "master" ] || \
-	skip "Running Doxygen only for updates on 'master' branch (current: ${TRAVIS_BRANCH})."
-
-# check for job number
-# [ "${TRAVIS_JOB_NUMBER}" = "${TRAVIS_BUILD_NUMBER}.1" ] || \
-# 	skip "Running Doxygen only on first job of build ${TRAVIS_BUILD_NUMBER} (current: ${TRAVIS_JOB_NUMBER})."
-
-# install doxygen binary distribution
-doxygen_install()
-{
-	wget -O - "${DOXYGEN_URL}" | \
-		tar xz -C ${TMPDIR-/tmp} ${DOXYGEN_VER}/bin/doxygen
-    export PATH="${TMPDIR-/tmp}/${DOXYGEN_VER}/bin:$PATH"
-}
-
-doxygen_run()
-{
-	cd "${TRAVIS_BUILD_DIR}";
-	doxygen ${TRAVIS_BUILD_DIR}/build/doc/Doxyfile;
-	doxygen ${TRAVIS_BUILD_DIR}/build/doc/Doxyfile.zh-cn;
-}
-
-gh_pages_prepare()
-{
-	cd "${TRAVIS_BUILD_DIR}/build/doc";
-	[ ! -d "html" ] || \
-		abort "Doxygen target directory already exists."
-	git --version
-	git clone --single-branch -b gh-pages "${GITHUB_CLONE}" html
-	cd html
-	# setup git config (with defaults)
-	git config user.name "${GIT_NAME-travis}"
-	git config user.email "${GIT_EMAIL-"travis@localhost"}"
-	# clean working dir
-	rm -f .git/index
-	git clean -df
-}
-
-gh_pages_commit() {
-	cd "${TRAVIS_BUILD_DIR}/build/doc/html";
-	echo "rapidjson.org" > CNAME
-	git add --all;
-	git diff-index --quiet HEAD || git commit -m "Automatic doxygen build";
-}
-
-gh_setup_askpass() {
-	cat > ${GIT_ASKPASS} <<EOF
-#!/bin/bash
-echo
-exit 0
-EOF
-	chmod a+x "$GIT_ASKPASS"
-}
-
-gh_pages_push() {
-	# check for secure variables
-	[ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] || \
-		skip "Secure variables not available, not updating GitHub pages."
-	# check for GitHub access token
-	[ "${GH_TOKEN+set}" = set ] || \
-		skip "GitHub access token not available, not updating GitHub pages."
-	[ "${#GH_TOKEN}" -eq 40 ] || \
-		abort "GitHub token invalid: found ${#GH_TOKEN} characters, expected 40."
-
-	cd "${TRAVIS_BUILD_DIR}/build/doc/html";
-	# setup credentials (hide in "set -x" mode)
-	git remote set-url --push origin "${GITHUB_URL}"
-	git config credential.helper 'store'
-	# ( set +x ; git config credential.username "${GH_TOKEN}" )
-	( set +x ; [ -f ${HOME}/.git-credentials ] || \
-			( echo "https://${GH_TOKEN}:@${GITHUB_HOST}" > ${HOME}/.git-credentials ; \
-			 chmod go-rw ${HOME}/.git-credentials ) )
-	# push to GitHub
-	git push origin gh-pages
-}
-
-doxygen_install
-gh_pages_prepare
-doxygen_run
-gh_pages_commit
-gh_pages_push
-
diff --git a/src/sioclient/lib/websocketpp/.gitattributes b/src/sioclient/lib/websocketpp/.gitattributes
deleted file mode 100644
index a9e4fc78..00000000
--- a/src/sioclient/lib/websocketpp/.gitattributes
+++ /dev/null
@@ -1,18 +0,0 @@
-# Lineendings
-*.sln       eol=crlf
-*.vcproj    eol=crlf
-*.vcxproj*  eol=crlf
-
-# Whitespace rules
-# strict (no trailing, no tabs)
-*.cpp       whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
-*.hpp       whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
-*.c         whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
-*.h         whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
-
-# normal (no trailing)
-*.sql       whitespace=trailing-space,space-before-tab,cr-at-eol
-*.txt       whitespace=trailing-space,space-before-tab,cr-at-eol
-
-# special files which must ignore whitespace
-*.patch     whitespace=-trailing-space
diff --git a/src/sioclient/lib/websocketpp/.gitignore b/src/sioclient/lib/websocketpp/.gitignore
deleted file mode 100644
index 1d0c7151..00000000
--- a/src/sioclient/lib/websocketpp/.gitignore
+++ /dev/null
@@ -1,94 +0,0 @@
-# make .git* files visible to git
-!.gitignore
-!.gitattributes
-
-.DS_Store
-
-#vim stuff
-*~
-*.swp
-
-*.o
-*.so
-*.so.?
-*.so.?.?.?
-*.a
-*.dylib
-lib/*
-
-# CMake
-*.cmake
-*.dir
-CMakeFiles
-INSTALL.*
-ZERO_CHECK.*
-CMakeCache.txt
-install_manifest.txt
-
-# Windows/Visual Studio
-*.vcproj*
-*.sln
-*.suo
-*.ncb
-*/Debug/*
-*/*/Debug/*
-bin/Debug
-*/Release/*
-*/*/Release/*
-*/RelWithDebInfo/*
-*/*/RelWithDebInfo/*
-
-# explicitly allow this path with /debug/ in it
-!websocketpp/transport/debug/*
-
-objs_shared/
-objs_static/
-
-examples/chat_server/chat_server
-examples/echo_server/echo_server
-examples/chat_client/chat_client
-examples/echo_client/echo_client
-test/basic/tests
-libwebsocketpp.dylib.0.1.0
-
-websocketpp.xcodeproj/xcuserdata/*
-websocketpp.xcodeproj/project.xcworkspace/xcuserdata/*
-policy_based_notes.hpp
-
-examples/echo_server_tls/echo_server_tls
-
-examples/fuzzing_client/fuzzing_client
-
-examples/stress_client/stress_client
-
-examples/broadcast_server_tls/broadcast_server
-
-test/basic/perf
-
-examples/echo_server_tls/echo_server_tls
-
-examples/concurrent_server/concurrent_server
-
-examples/fuzzing_server_tls/fuzzing_server
-
-examples/wsperf/wsperf
-
-.sconsign.dblite
-
-build/
-doxygen/
-examples/wsperf/wsperf_client
-
-*.out
-
-*.log
-*.opensdf
-*.sdf
-*.vcxproj
-*.vcxproj.filters
-*.user
-install
-Makefile
-bin
-
-Testing/Temporary/CTestCostData.txt
diff --git a/src/sioclient/lib/websocketpp/.travis.yml b/src/sioclient/lib/websocketpp/.travis.yml
deleted file mode 100644
index a2aa9705..00000000
--- a/src/sioclient/lib/websocketpp/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: cpp
-compiler:
-  - gcc
-before_install:
- #- sudo apt-get install libboost-chrono1.48-dev libboost-regex1.48-dev libboost-system1.48-dev libboost-thread1.48-dev libboost-test1.48-dev libboost-random1.48-dev -y
- - sudo add-apt-repository -y ppa:boost-latest/ppa && sudo apt-get update -q && sudo apt-get install -y libboost-chrono1.55-dev libboost-random1.55-dev libboost-regex1.55-dev libboost-system1.55-dev libboost-thread1.55-dev libboost-test1.55-dev
-env:
-  global:
-    - BOOST_INCLUDES=/usr/include
-    - BOOST_LIBS=/usr/lib/x86_64-linux-gnu
-script: scons -j 2 && scons test
-branches:
-  only:
-    - master
-    - develop
-notifications:
-  recipients:
-    - travis@zaphoyd.com
-  email:
-    on_success: change
-    on_failure: always
diff --git a/src/sioclient/lib/websocketpp/CMakeLists.txt b/src/sioclient/lib/websocketpp/CMakeLists.txt
deleted file mode 100644
index 2786aba9..00000000
--- a/src/sioclient/lib/websocketpp/CMakeLists.txt
+++ /dev/null
@@ -1,278 +0,0 @@
-
-############ Setup project and cmake
-# Minimum cmake requirement. We should require a quite recent
-# cmake for the dependency find macros etc. to be up to date.
-cmake_minimum_required (VERSION 2.8.8)
-
-############ Paths
-
-set (WEBSOCKETPP_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
-set (WEBSOCKETPP_INCLUDE ${WEBSOCKETPP_ROOT}/websocketpp)
-set (WEBSOCKETPP_BUILD_ROOT ${CMAKE_CURRENT_BINARY_DIR})
-set (WEBSOCKETPP_BIN ${WEBSOCKETPP_BUILD_ROOT}/bin)
-set (WEBSOCKETPP_LIB ${WEBSOCKETPP_BUILD_ROOT}/lib)
-
-# CMake install step prefix. I assume linux users want the prefix to
-# be the default /usr or /usr/local so this is only adjusted on Windows.
-# This must be set prior to any call to project or it will not be read correctly.
-# - Windows: Build the INSTALL project in your solution file.
-# - Linux/OSX: make install.
-if (WIN32)
-    set (CMAKE_INSTALL_PREFIX "${WEBSOCKETPP_ROOT}/install" CACHE PATH "")
-endif ()
-
-############ Project name and version
-set (WEBSOCKETPP_MAJOR_VERSION 0)
-set (WEBSOCKETPP_MINOR_VERSION 8)
-set (WEBSOCKETPP_PATCH_VERSION 0)
-set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
-
-if(POLICY CMP0048)
-  cmake_policy(GET CMP0048 _version_policy)
-endif()
-
-if(_version_allowed STREQUAL NEW)
-  project (websocketpp VERSION ${WEBSOCKETPP_VERSION})
-else()
-  project (websocketpp)
-endif()
-
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
-set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
-if (WIN32 AND NOT CYGWIN)
-  set (DEF_INSTALL_CMAKE_DIR cmake)
-else ()
-  set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp)
-endif ()
-set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
-
-# Make relative paths absolute (needed later on)
-foreach (p INCLUDE CMAKE)
-  set (var INSTALL_${p}_DIR)
-  if (NOT IS_ABSOLUTE "${${var}}")
-    set (${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
-  endif ()
-endforeach ()
-
-# Set CMake library search policy
-if (COMMAND cmake_policy)
-    cmake_policy (SET CMP0003 NEW)
-    cmake_policy (SET CMP0005 NEW)
-endif ()
-
-# Disable unnecessary build types
-set (CMAKE_CONFIGURATION_TYPES "Release;RelWithDebInfo;Debug" CACHE STRING "Configurations" FORCE)
-
-# Include our cmake macros
-set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-include (CMakeHelpers)
-
-
-############  Build customization
-
-# Override from command line "CMake -D<OPTION>=TRUE/FALSE/0/1/ON/OFF"
-option (ENABLE_CPP11 "Build websocketpp with CPP11 features enabled." TRUE)
-option (BUILD_EXAMPLES "Build websocketpp examples." FALSE)
-option (BUILD_TESTS "Build websocketpp tests." FALSE)
-
-if (BUILD_TESTS OR BUILD_EXAMPLES)
-
-    enable_testing ()
-
-    ############ Compiler specific setup
-
-    set (WEBSOCKETPP_PLATFORM_LIBS "")
-    set (WEBSOCKETPP_PLATFORM_TLS_LIBS "")
-    set (WEBSOCKETPP_BOOST_LIBS "")
-
-    # VC9 and C++11 reasoning
-    if (ENABLE_CPP11 AND MSVC AND MSVC90)
-        message("* Detected Visual Studio 9 2008, disabling C++11 support.")
-        set (ENABLE_CPP11 FALSE)
-    endif ()
-
-    # Detect clang. Not officially reported by cmake.
-    execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "-v" ERROR_VARIABLE CXX_VER_STDERR)
-    if ("${CXX_VER_STDERR}" MATCHES ".*clang.*")
-        set (CMAKE_COMPILER_IS_CLANGXX 1)
-    endif ()
-
-    # C++11 defines
-    if (ENABLE_CPP11)
-        if (MSVC)
-            add_definitions (-D_WEBSOCKETPP_CPP11_FUNCTIONAL_)
-            add_definitions (-D_WEBSOCKETPP_CPP11_SYSTEM_ERROR_)
-            add_definitions (-D_WEBSOCKETPP_CPP11_RANDOM_DEVICE_)
-            add_definitions (-D_WEBSOCKETPP_CPP11_MEMORY_)
-        else()
-            add_definitions (-D_WEBSOCKETPP_CPP11_STL_)
-        endif()
-    endif ()
-
-    # Visual studio
-    if (MSVC)
-        set (WEBSOCKETPP_BOOST_LIBS system thread)
-        set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /Gy /GF /Ox /Ob2 /Ot /Oi /MP /arch:SSE2 /fp:fast")
-        set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG /INCREMENTAL:NO /OPT:REF /OPT:ICF")
-        add_definitions (/W3 /wd4996 /wd4995 /wd4355)
-        add_definitions (-DUNICODE -D_UNICODE)
-        add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
-        add_definitions (-DNOMINMAX)
-    endif ()
-
-    # g++
-    if (CMAKE_COMPILER_IS_GNUCXX)
-        set (WEBSOCKETPP_PLATFORM_LIBS pthread rt)
-        set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
-        set (WEBSOCKETPP_BOOST_LIBS system thread)
-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-        if (NOT APPLE)
-            add_definitions (-DNDEBUG -Wall -Wcast-align) # todo: should we use CMAKE_C_FLAGS for these?
-        endif ()
-
-        # Try to detect version. Note: Not tested!
-        execute_process (COMMAND ${CMAKE_CXX_COMPILER} "-dumpversion" OUTPUT_VARIABLE GCC_VERSION)
-        if ("${GCC_VERSION}" STRGREATER "4.4.0")
-            message("* C++11 support partially enabled due to GCC version ${GCC_VERSION}")
-            set (WEBSOCKETPP_BOOST_LIBS system thread)
-        endif ()
-    endif ()
-
-    # clang
-    if (CMAKE_COMPILER_IS_CLANGXX)
-        if (NOT APPLE)
-            set (WEBSOCKETPP_PLATFORM_LIBS pthread rt)
-        else()
-            set (WEBSOCKETPP_PLATFORM_LIBS pthread)
-        endif()
-        set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
-        set (WEBSOCKETPP_BOOST_LIBS system thread)
-        set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here?
-        if (NOT APPLE)
-            add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these?
-        endif ()
-    endif ()
-
-    # OSX, can override above.
-    if (APPLE)
-        add_definitions (-DNDEBUG -Wall)
-    endif ()
-
-    if (BUILD_EXAMPLES)
-        list (APPEND WEBSOCKETPP_BOOST_LIBS random)
-    endif()
-
-    if (BUILD_TESTS)
-        list (APPEND WEBSOCKETPP_BOOST_LIBS unit_test_framework)
-    endif()
-
-    ############ Dependencies
-
-    # Set BOOST_ROOT env variable or pass with cmake -DBOOST_ROOT=path.
-    # BOOST_ROOT can also be defined by a previous run from cmake cache.
-    if (NOT "$ENV{BOOST_ROOT_CPP11}" STREQUAL "")
-        # Scons documentation for BOOST_ROOT_CPP11:
-        # "look for optional second boostroot compiled with clang's libc++ STL library
-        # this prevents warnings/errors when linking code built with two different
-        # incompatible STL libraries."
-        file (TO_CMAKE_PATH "$ENV{BOOST_ROOT_CPP11}" BOOST_ROOT)
-        set (BOOST_ROOT ${BOOST_ROOT} CACHE PATH "BOOST_ROOT dependency path" FORCE)
-    endif ()
-    if ("${BOOST_ROOT}" STREQUAL "")
-        file (TO_CMAKE_PATH "$ENV{BOOST_ROOT}" BOOST_ROOT)
-        # Cache BOOST_ROOT for runs that do not define $ENV{BOOST_ROOT}.
-        set (BOOST_ROOT ${BOOST_ROOT} CACHE PATH "BOOST_ROOT dependency path" FORCE)
-    endif ()
-
-    message ("* Configuring Boost")
-    message (STATUS "-- Using BOOST_ROOT")
-    message (STATUS "       " ${BOOST_ROOT})
-
-    if (MSVC)
-        set (Boost_USE_MULTITHREADED TRUE)
-        set (Boost_USE_STATIC_LIBS TRUE)
-    else ()
-        set (Boost_USE_MULTITHREADED FALSE)
-        set (Boost_USE_STATIC_LIBS FALSE)
-    endif ()
-
-	if (BOOST_STATIC)
-		set (Boost_USE_STATIC_LIBS TRUE)
-	endif ()
-
-    if (NOT Boost_USE_STATIC_LIBS)
-        add_definitions (/DBOOST_TEST_DYN_LINK)
-    endif ()
-
-    set (Boost_FIND_REQUIRED TRUE)
-    set (Boost_FIND_QUIETLY TRUE)
-    set (Boost_DEBUG FALSE)
-    set (Boost_USE_MULTITHREADED TRUE)
-    set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these!
-
-    find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}")
-
-    if (Boost_FOUND)
-        # Boost is a project wide global dependency.
-        include_directories (${Boost_INCLUDE_DIRS})
-        link_directories (${Boost_LIBRARY_DIRS})
-
-        # Pretty print status
-        message (STATUS "-- Include Directories")
-        foreach (include_dir ${Boost_INCLUDE_DIRS})
-            message (STATUS "       " ${include_dir})
-        endforeach ()
-        message (STATUS "-- Library Directories")
-        foreach (library_dir ${Boost_LIBRARY_DIRS})
-            message (STATUS "       " ${library_dir})
-        endforeach ()
-        message (STATUS "-- Libraries")
-        foreach (boost_lib ${Boost_LIBRARIES})
-            message (STATUS "       " ${boost_lib})
-        endforeach ()
-        message ("")
-    else ()
-        message (FATAL_ERROR "Failed to find required dependency: boost")
-    endif ()
-
-    find_package(OpenSSL)
-    find_package(ZLIB)
-endif()
-
-############ Add projects
-
-# Add main library
-add_subdirectory (websocketpp)
-
-# Add examples
-if (BUILD_EXAMPLES)
-    include_subdirs ("examples")
-endif ()
-
-# Add tests
-if (BUILD_TESTS)
-    include_subdirs ("test")
-endif ()
-
-print_used_build_config()
-
-export (PACKAGE websocketpp)
-
-include(CMakePackageConfigHelpers)
-configure_package_config_file(websocketpp-config.cmake.in
-  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-config.cmake"
-  PATH_VARS INSTALL_INCLUDE_DIR
-  INSTALL_DESTINATION "${INSTALL_CMAKE_DIR}"
-  NO_CHECK_REQUIRED_COMPONENTS_MACRO
-)
-write_basic_package_version_file("${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake"
-  VERSION ${WEBSOCKETPP_VERSION}
-  COMPATIBILITY ExactVersion)
-
-# Install the websocketpp-config.cmake and websocketpp-configVersion.cmake
-install (FILES
-  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-config.cmake"
-  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake"
-  DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
-
diff --git a/src/sioclient/lib/websocketpp/COPYING b/src/sioclient/lib/websocketpp/COPYING
deleted file mode 100644
index f8cc5ba1..00000000
--- a/src/sioclient/lib/websocketpp/COPYING
+++ /dev/null
@@ -1,145 +0,0 @@
-Main Library:
-
-Copyright (c) 2014, Peter Thorson. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the WebSocket++ Project nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Bundled Libraries:
-
-****** Base 64 Library (base64/base64.hpp) ******
-base64.hpp is a repackaging of the base64.cpp and base64.h files into a
-single header suitable for use as a header only library. This conversion was
-done by Peter Thorson (webmaster@zaphoyd.com) in 2012. All modifications to
-the code are redistributed under the same license as the original, which is
-listed below.
-
-base64.cpp and base64.h
-
-Copyright (C) 2004-2008 René Nyffenegger
-
-This source code is provided 'as-is', without any express or implied
-warranty. In no event will the author be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this source code must not be misrepresented; you must not
-  claim that you wrote the original source code. If you use this source code
-  in a product, an acknowledgment in the product documentation would be
-  appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not be
-  misrepresented as being the original source code.
-
-3. This notice may not be removed or altered from any source distribution.
-
-René Nyffenegger rene.nyffenegger@adp-gmbh.ch
-
-****** SHA1 Library (sha1/sha1.hpp) ******
-sha1.hpp is a repackaging of the sha1.cpp and sha1.h files from the shallsha1
-library (http://code.google.com/p/smallsha1/) into a single header suitable for
-use as a header only library. This conversion was done by Peter Thorson
-(webmaster@zaphoyd.com) in 2013. All modifications to the code are redistributed
-under the same license as the original, which is listed below.
-
- Copyright (c) 2011, Micael Hildenborg
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of Micael Hildenborg nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY Micael Hildenborg ''AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL Micael Hildenborg BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-****** MD5 Library (common/md5.hpp) ******
-md5.hpp is a reformulation of the md5.h and md5.c code from
-http://www.opensource.apple.com/source/cups/cups-59/cups/md5.c to allow it to
-function as a component of a header only library. This conversion was done by
-Peter Thorson (webmaster@zaphoyd.com) in 2012 for the WebSocket++ project. The
-changes are released under the same license as the original (listed below)
-
-Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
-L. Peter Deutsch
-ghost@aladdin.com
-
-****** UTF8 Validation logic (utf8_validation.hpp) ******
-utf8_validation.hpp is adapted from code originally written by Bjoern Hoehrmann
-<bjoern@hoehrmann.de>. See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for
-details.
-
-The original license:
-
-Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/src/sioclient/lib/websocketpp/Doxyfile b/src/sioclient/lib/websocketpp/Doxyfile
deleted file mode 100644
index e2061659..00000000
--- a/src/sioclient/lib/websocketpp/Doxyfile
+++ /dev/null
@@ -1,2355 +0,0 @@
-# Doxyfile 1.8.8
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = WebSocket++
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         = 0.8.1
-
-# 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 a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "C++ websocket client/server library"
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
-# the documentation. The maximum height of the logo should not exceed 55 pixels
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
-# to the output directory.
-
-PROJECT_LOGO           = 
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = doxygen
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       = 
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        = 
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
-# new page for each member. If set to NO, the documentation of a member will be
-# part of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                = 
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              = 
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      = 
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
-# or globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = YES
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO these classes will be included in the various overviews. This option has
-# no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
-# todo list. This list is created by putting \todo commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
-# test list. This list is created by putting \test commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES the list
-# will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    = 
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            = 
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO doxygen will only warn about wrong or incomplete parameter
-# documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = readme.md \
-                         changelog.md \
-                         roadmap.md \
-                         websocketpp \
-                         tutorials \
-                         docs
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
-
-FILE_PATTERNS          = 
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                = build
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = 
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        = 
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           = 
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       = 
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             = 
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-
-INPUT_FILTER           = 
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER ) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS = 
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = YES
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        = 
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra stylesheet files is of importance (e.g. the last
-# stylesheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  = docs/manual.css
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       = 
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the stylesheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 236
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 0
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 148
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = NO
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               = 
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler ( hhc.exe). If non-empty
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           = 
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated (
-# YES) or that it should be included in the master .chm file ( NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     = 
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated (
-# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               = 
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   = 
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  = 
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  = 
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           = 
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using prerendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     = 
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       = 
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       = 
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     = 
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = YES
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,
-# for the replacement values of the other commands the user is refered to
-# HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           = 
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           = 
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    = 
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             = 
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
-# Definitions (see http://autogen.sf.net) file that captures the structure of
-# the code including all documentation. Note that this feature is still
-# experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
-# in the source code. If set to NO only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES the includes files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           = 
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  = 
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             = 
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       = 
-
-# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
-# class index. If set to NO only the inherited external classes will be listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
-# the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            = 
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               = 
-
-# If set to YES, the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           = 
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif and svg.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               = 
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           = 
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           = 
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           = 
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-PLANTUML_JAR_PATH      = 
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/src/sioclient/lib/websocketpp/SConstruct b/src/sioclient/lib/websocketpp/SConstruct
deleted file mode 100644
index ae3df10b..00000000
--- a/src/sioclient/lib/websocketpp/SConstruct
+++ /dev/null
@@ -1,285 +0,0 @@
-import os, sys, commands
-env = Environment(ENV = os.environ)
-
-# figure out a better way to configure this
-if os.environ.has_key('CXX'):
-    env['CXX'] = os.environ['CXX']
-
-if os.environ.has_key('DEBUG'):
-    env['DEBUG'] = os.environ['DEBUG']
-
-if os.environ.has_key('CXXFLAGS'):
-    #env['CXXFLAGS'] = os.environ['CXXFLAGS']
-    env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
-
-if os.environ.has_key('LINKFLAGS'):
-    #env['LDFLAGS'] = os.environ['LDFLAGS']
-    env.Append(LINKFLAGS = os.environ['LINKFLAGS'])
-
-## Boost
-##
-## Note: You need to either set BOOSTROOT to the root of a stock Boost distribution
-## or set BOOST_INCLUDES and BOOST_LIBS if Boost comes with your OS distro e.g. and
-## needs BOOST_INCLUDES=/usr/include/boost and BOOST_LIBS=/usr/lib like Ubuntu.
-##
-if os.environ.has_key('BOOSTROOT'):
-    os.environ['BOOST_ROOT'] = os.environ['BOOSTROOT']
-
-if os.environ.has_key('BOOST_ROOT'):
-   env['BOOST_INCLUDES'] = os.environ['BOOST_ROOT']
-   env['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT'], 'stage', 'lib')
-elif os.environ.has_key('BOOST_INCLUDES') and os.environ.has_key('BOOST_LIBS'):
-   env['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES']
-   env['BOOST_LIBS'] = os.environ['BOOST_LIBS']
-else:
-   raise SCons.Errors.UserError, "Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS was set!"
-
-## Custom OpenSSL
-if os.environ.has_key('OPENSSL_PATH'):
-   env.Append(CPPPATH = os.path.join(os.environ['OPENSSL_PATH'], 'include'))
-   env.Append(LIBPATH = os.environ['OPENSSL_PATH'])
-
-if os.environ.has_key('WSPP_ENABLE_CPP11'):
-   env['WSPP_ENABLE_CPP11'] = True
-else:
-   env['WSPP_ENABLE_CPP11'] = False
-
-boost_linkshared = False
-
-def boostlibs(libnames,localenv):
-   if localenv['PLATFORM'].startswith('win'):
-      # Win/VC++ supports autolinking. nothing to do.
-      # http://www.boost.org/doc/libs/1_49_0/more/getting_started/windows.html#auto-linking
-      return []
-   else:
-      libs = []
-      prefix = localenv['SHLIBPREFIX'] if boost_linkshared else localenv['LIBPREFIX']
-      suffix = localenv['SHLIBSUFFIX'] if boost_linkshared else localenv['LIBSUFFIX']
-      for name in libnames:
-         lib = File(os.path.join(localenv['BOOST_LIBS'], '%sboost_%s%s' % (prefix, name, suffix)))
-         libs.append(lib)
-      return libs
-
-if env['PLATFORM'].startswith('win'):
-   env.Append(CPPDEFINES = ['WIN32',
-                            'NDEBUG',
-                            'WIN32_LEAN_AND_MEAN',
-                            '_WIN32_WINNT=0x0600',
-                            '_CONSOLE',
-                            'BOOST_TEST_DYN_LINK',
-                            'NOMINMAX',
-                            '_WEBSOCKETPP_CPP11_MEMORY_',
-                            '_WEBSOCKETPP_CPP11_FUNCTIONAL_'])
-   arch_flags  = '/arch:SSE2'
-   opt_flags   = '/Ox /Oi /fp:fast'
-   warn_flags  = '/W3 /wd4996 /wd4995 /wd4355'
-   env['CCFLAGS'] = '%s /EHsc /GR /GS- /MD /nologo %s %s' % (warn_flags, arch_flags, opt_flags)
-   env['LINKFLAGS'] = '/INCREMENTAL:NO /MANIFEST /NOLOGO /OPT:REF /OPT:ICF /MACHINE:X86'
-elif env['PLATFORM'] == 'posix':
-   if env.has_key('DEBUG'):
-      env.Append(CCFLAGS = ['-g', '-O0'])
-   else:
-      env.Append(CPPDEFINES = ['NDEBUG'])
-      env.Append(CCFLAGS = ['-O1', '-fomit-frame-pointer'])
-   env.Append(CCFLAGS = ['-Wall'])
-   #env['LINKFLAGS'] = ''
-elif env['PLATFORM'] == 'darwin':
-   if not os.environ.has_key('CXX'):
-      env['CXX'] = "clang++"
-   if env.has_key('DEBUG'):
-      env.Append(CCFLAGS = ['-g', '-O0'])
-   else:
-      env.Append(CPPDEFINES = ['NDEBUG'])
-      env.Append(CCFLAGS = ['-O1', '-fomit-frame-pointer'])
-   env.Append(CCFLAGS = ['-Wall'])
-   #env['LINKFLAGS'] = ''
-
-if env['PLATFORM'].startswith('win'):
-   #env['LIBPATH'] = env['BOOST_LIBS']
-   pass
-else:
-   env.Append(LIBPATH = ['/usr/lib', '/usr/local/lib'])
-
-# Compiler specific warning flags
-if env['CXX'].startswith('g++'):
-   #env.Append(CCFLAGS = ['-Wconversion'])
-   env.Append(CCFLAGS = ['-Wcast-align'])
-   env.Append(CCFLAGS = ['-Wshadow'])
-   env.Append(CCFLAGS = ['-Wunused-parameter'])
-elif env['CXX'].startswith('clang++'):
-   #env.Append(CCFLAGS = ['-Wcast-align'])
-   #env.Append(CCFLAGS = ['-Wglobal-constructors'])
-   #env.Append(CCFLAGS = ['-Wconversion'])
-   env.Append(CCFLAGS = ['-Wno-padded'])
-   env.Append(CCFLAGS = ['-Wshadow'])
-   env.Append(CCFLAGS = ['-Wunused-parameter'])
-
-   env.Append(CCFLAGS = ['-Wsometimes-uninitialized'])
-   env.Append(CCFLAGS = ['-Wuninitialized'])
-
-   #env.Append(CCFLAGS = ['-Weverything'])
-   #env.Append(CCFLAGS = ['-Wno-documentation'])
-   #env.Append(CCFLAGS = ['-Wno-weak-vtables'])
-   #env.Append(CCFLAGS = ['-Wno-global-constructors'])
-   #env.Append(CCFLAGS = ['-Wno-sign-conversion'])
-   #env.Append(CCFLAGS = ['-Wno-exit-time-destructors'])
-
-
-
-
-   # Wpadded
-   # Wsign-conversion
-   #
-
-platform_libs = []
-tls_libs = []
-
-tls_build = False
-
-if env['PLATFORM'] == 'posix':
-   platform_libs = ['pthread', 'rt']
-   tls_libs = ['ssl', 'crypto']
-   tls_build = True
-elif env['PLATFORM'] == 'darwin':
-   tls_libs = ['ssl', 'crypto']
-   tls_build = True
-elif env['PLATFORM'].startswith('win'):
-   # Win/VC++ supports autolinking. nothing to do.
-   pass
-
-## Append WebSocket++ path
-env.Append(CPPPATH = ['#'])
-
-##### Set up C++11 environment
-polyfill_libs = [] # boost libraries used as drop in replacements for incomplete
-                   # C++11 STL implementations
-env_cpp11 = env.Clone ()
-
-if env_cpp11['CXX'].startswith('g++'):
-   # TODO: check g++ version
-   GCC_VERSION = commands.getoutput(env_cpp11['CXX'] + ' -dumpversion')
-
-   if GCC_VERSION > "4.4.0":
-      print "C++11 build environment partially enabled"
-      env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x'],TOOLSET = ['g++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_'])
-   else:
-      print "C++11 build environment is not supported on this version of G++"
-elif env_cpp11['CXX'].startswith('clang++'):
-   print "C++11 build environment enabled"
-   env.Append(CXXFLANGS = ['-stdlib=libc++'],LINKFLAGS=['-stdlib=libc++'])
-   env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x','-stdlib=libc++'],LINKFLAGS = ['-stdlib=libc++'],TOOLSET = ['clang++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_'])
-
-   # look for optional second boostroot compiled with clang's libc++ STL library
-   # this prevents warnings/errors when linking code built with two different
-   # incompatible STL libraries.
-   if os.environ.has_key('BOOST_ROOT_CPP11'):
-      env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_ROOT_CPP11']
-      env_cpp11['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT_CPP11'], 'stage', 'lib')
-   elif os.environ.has_key('BOOST_INCLUDES_CPP11') and os.environ.has_key('BOOST_LIBS_CPP11'):
-      env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES_CPP11']
-      env_cpp11['BOOST_LIBS'] = os.environ['BOOST_LIBS_CPP11']
-else:
-   print "C++11 build environment disabled"
-
-# if the build system is known to allow the isystem modifier for library include
-# values then use it for the boost libraries. Otherwise just add them to the
-# regular CPPPATH values.
-if env['CXX'].startswith('g++') or env['CXX'].startswith('clang'):
-    env.Append(CPPFLAGS = '-isystem ' + env['BOOST_INCLUDES'])
-else:
-    env.Append(CPPPATH = [env['BOOST_INCLUDES']])
-env.Append(LIBPATH = [env['BOOST_LIBS']])
-
-# if the build system is known to allow the isystem modifier for library include
-# values then use it for the boost libraries. Otherwise just add them to the
-# regular CPPPATH values.
-if env_cpp11['CXX'].startswith('g++') or env_cpp11['CXX'].startswith('clang'):
-    env_cpp11.Append(CPPFLAGS = '-isystem ' + env_cpp11['BOOST_INCLUDES'])
-else:
-    env_cpp11.Append(CPPPATH = [env_cpp11['BOOST_INCLUDES']])
-env_cpp11.Append(LIBPATH = [env_cpp11['BOOST_LIBS']])
-
-releasedir = 'build/release/'
-debugdir = 'build/debug/'
-testdir = 'build/test/'
-builddir = releasedir
-
-Export('env')
-Export('env_cpp11')
-Export('platform_libs')
-Export('boostlibs')
-Export('tls_libs')
-Export('polyfill_libs')
-
-## END OF CONFIG !!
-
-## TARGETS:
-
-if not env['PLATFORM'].startswith('win'):
-    # Unit tests, add test folders with SConscript files to to_test list.
-    to_test = ['utility','http','logger','random','processors','message_buffer','extension','transport/iostream','transport/asio','roles','endpoint','connection','transport'] #,'http','processors','connection'
-
-    for t in to_test:
-       new_tests = SConscript('#/test/'+t+'/SConscript',variant_dir = testdir + t, duplicate = 0)
-       for a in new_tests:
-          new_alias = Alias('test', [a], a.abspath)
-          AlwaysBuild(new_alias)
-
-# Main test application
-#main = SConscript('#/examples/dev/SConscript',variant_dir = builddir + 'dev',duplicate = 0)
-
-# echo_server
-echo_server = SConscript('#/examples/echo_server/SConscript',variant_dir = builddir + 'echo_server',duplicate = 0)
-
-# echo_client
-echo_client = SConscript('#/examples/echo_client/SConscript',variant_dir = builddir + 'echo_client',duplicate = 0)
-
-# print_client
-print_client = SConscript('#/examples/print_client/SConscript',variant_dir = builddir + 'print_client',duplicate = 0)
-
-# echo_server_tls
-if tls_build:
-    echo_server_tls = SConscript('#/examples/echo_server_tls/SConscript',variant_dir = builddir + 'echo_server_tls',duplicate = 0)
-    echo_server_both = SConscript('#/examples/echo_server_both/SConscript',variant_dir = builddir + 'echo_server_both',duplicate = 0)
-    print_client_tls = SConscript('#/examples/print_client_tls/SConscript',variant_dir = builddir + 'print_client_tls',duplicate = 0)
-
-# broadcast_server
-broadcast_server = SConscript('#/examples/broadcast_server/SConscript',variant_dir = builddir + 'broadcast_server',duplicate = 0)
-
-# testee_server
-testee_server = SConscript('#/examples/testee_server/SConscript',variant_dir = builddir + 'testee_server',duplicate = 0)
-
-# testee_client
-testee_client = SConscript('#/examples/testee_client/SConscript',variant_dir = builddir + 'testee_client',duplicate = 0)
-
-# scratch_client
-scratch_client = SConscript('#/examples/scratch_client/SConscript',variant_dir = builddir + 'scratch_client',duplicate = 0)
-
-# scratch_server
-scratch_server = SConscript('#/examples/scratch_server/SConscript',variant_dir = builddir + 'scratch_server',duplicate = 0)
-
-
-# debug_client
-debug_client = SConscript('#/examples/debug_client/SConscript',variant_dir = builddir + 'debug_client',duplicate = 0)
-
-# debug_server
-debug_server = SConscript('#/examples/debug_server/SConscript',variant_dir = builddir + 'debug_server',duplicate = 0)
-
-# subprotocol_server
-subprotocol_server = SConscript('#/examples/subprotocol_server/SConscript',variant_dir = builddir + 'subprotocol_server',duplicate = 0)
-
-# telemetry_server
-telemetry_server = SConscript('#/examples/telemetry_server/SConscript',variant_dir = builddir + 'telemetry_server',duplicate = 0)
-
-# external_io_service
-external_io_service = SConscript('#/examples/external_io_service/SConscript',variant_dir = builddir + 'external_io_service',duplicate = 0)
-
-if not env['PLATFORM'].startswith('win'):
-    # iostream_server
-    iostream_server = SConscript('#/examples/iostream_server/SConscript',variant_dir = builddir + 'iostream_server',duplicate = 0)
-
-    # telemetry_client
-    telemetry_client = SConscript('#/examples/telemetry_client/SConscript',variant_dir = builddir + 'telemetry_client',duplicate = 0)
-
-    # print_server
-    print_server = SConscript('#/examples/print_server/SConscript',variant_dir = builddir + 'print_server',duplicate = 0)
diff --git a/src/sioclient/lib/websocketpp/changelog.md b/src/sioclient/lib/websocketpp/changelog.md
deleted file mode 100644
index 6771d6e9..00000000
--- a/src/sioclient/lib/websocketpp/changelog.md
+++ /dev/null
@@ -1,432 +0,0 @@
-HEAD
-
-0.8.1 - 2018-07-16
-Note: This release does not change library behavior. It only corrects issues
-in the installer and test system.
-- Test Suite: Adjust test suite to match behavior introduced in 0.8.0. Thank
-  you Gianfranco Costamagna for reporting and a patch. #731
-- CMake: Update cmake installer to only install library files globally.
-  Thank you Gianfraco Costamanga for reporting and a patch. #732
-
-0.8.0 - 2018-07-12
-- Examples: Add `print_client` example. This demonstrates a minimal non-TLS
-  client that connects to a server and prints out the messages it receives.
-- Examples: Add `print_client_tls` example. This demonstrates a minimal TLS
-  client, including basic support via Asio+OpenSSL for certificate chain
-  and hostname verification.
-- Feature: Add getter for all headers to the HTTP parsers. This allows a
-  wrapping library to enumerate all headers to send upstream. Thank you Jupp
-  Müller for reporting and an initial pull request.
-- Improvement: Move the `socket_init_handler` to execute as a part of `init_asio`
-  rather than connection `pre_init`. This allows setting of socket options prior
-  to the bind/listen/accept system calls. Thank you ChristianRobl3D for
-  reporting #530.
-- Improvement: Timers in transport integration tests should only fail if their
-  own test times out, rather than any test. #643 Thank you Alex Korotkin for
-  reporting and a patch.
-- Improvement: Preserve transport layer error codes in more cases, particularly
-  during calls to `endpoint::listen`. #652 Thank you vadz for reporting and
-  patches.
-- Compatibility: Make sure the chrono library used by Boost/Asio is in sync
-  with what the websocketpp is using. Thank you Flow86 for reporting and a
-  patch.
-- Compatibility: Update `telemetry_client` to use a slightly more cross platform
-  method of sleeping. Should work on windows now. Thank you Meir Yanovich for
-  reporting.
-- Compatibility: Updated permessage-deflate support to reflect that the zlib
-  library does not actually support a sliding window size of 256 bits. 
-  WebSocket++ will no longer negotiate 256 bit deflate windows. If the user
-  of the library tries to request a 256 bit window a 512 bit window will be
-  specified instead (This was the previous behavior). #596 #653 Thank you 
-  Vinnie Falco and Gianfranco Costamagna for reporting.
-- Compatibility: Better error handling and logging in cases where extension
-  requests parse correctly but negotiation fails.
-- Compatibility: Removed custom handling of `SSL_R_SHORT_READ` error condition.
-  This error code no longer exists in modern versions of OpenSSL and causes
-  a build error. It wasn't being used for anything particularly important
-  (slightly improving error reporting) and there isn't a great replacement.
-  #599 Thank you Gianfranco Costamagna for reporting.
-- Compatibility: Add missing `<stdint>` headers. Fixes issues with g++ 5.4.0.
-  #638 Thank you Alex Korotkin for reporting and a patch.
-- Compatibility: Remove the use of `std::auto_ptr` and `std::binary_function`
-  from builds with C++11 or later. These features are deprecated and were
-  removed entirely in C++17. This change allows building WebSocket++ on
-  C++17 compilers. #592 Thank you Michal Fojtak for reporting and a patch
-- Compatibility: Add 1014 close code and adds missing descriptions for codes
-  1012 and 1013. #589 Thank you jbwdevries and ronneke1996 for reporting and
-  patches.
-- Compatibility: Add hooks to support `mingw-std-threads` C++11 thread and mutex
-  polyfill library as an alternative to Boost. #608 Thank you Peter Taylor for
-  reporting and an initial patch.
-- Compatibility: Changed the handshake connection token to 'Upgrade' from
-  'upgrade'. Technically this header is supposed to be processed case
-  insensitively. In practice, there are browsers (such as Edge) that don't do
-  this and they tend to use the uppercase value used as an example in RFC6455.
-  Thank you Johann Bauer for reporting and a patch. #727
-- Bug: Store loggers in shared pointers to avoid crashes related to connections
-  trying to write logs entries after their respective endpoint has been
-  deallocated. Thank you Thalhammer for reporting and Jupp Müller for the 
-  patch. #539 #501
-- Bug: Change default listen backlog from 0 to `socket_base::max_connections`.
-  #549. Thank you derwassi and zwelab for reporting and na1pir for providing
-  access to hardware to debug the issue.
-- Bug: Fix a crash in the accept loop when `get_connection` fails. #551 Thank you
-  Walter Gray for a patch.
-- Bug/Documentation: Fix incorrect example code that used 
-  `websocketpp::lib::error_code` instead of `websocketpp::exception`. Thank you
-  heretic13 for reporting
-- Bug: Fix uninitialized shared pointer in Asio transport test suite. #647
-  Thank you Alex Korotkin for reporting and a patch.
-- Bug: Fix a thread safety issue in the permessage-deflate extension that
-  caused message corruption when sending compressed messages from a different
-  thread than the main I/O thread. #615 Thank you KyleNyenhuis and Pieter De 
-  Gendt for reporting and a patch.
-- Bug: Fix an undefined behavior issue performing a 64 bit wide shift on a 64
-  bit value. #636 Thank you Gregor Jasny for reporting and a patch
-- Bug: Fix some compile issues with ASIO_STANDALONE. #662 #665 Thank you
-  chronoxor and Guillaume Egles for reporting and patches.
-
-0.7.0 - 2016-02-22
-- MINOR BREAKING SOCKET POLICY CHANGE: Asio transport socket policy method 
-  `cancel_socket` will now return `lib::asio::error_code` instead of `void`.
-  Custom Asio transport socket policies will need to be updated accordingly.
-  This does not affect anyone using the bundled socket policies.
-- Feature: Basic support for the permessage-deflate extension. #344
-- Feature: Allow accessing the local endpoint when using the Asio transport.
-  This allows inspection of the address and port in cases where they are chosen
-  by the operating system rather than the user. Thank you Andreas Weis and 
-  Muzahid Hussain for reporting and related code. #458
-- Feature: Add support for subprotocols in Hybi00. Thank you Lukas Obermann
-  for reporting and a patch. #518
-- Feature: Adds `tcp_pre_bind handler` to Asio transport. This allows setting
-  arbitrary socket options after the listen acceptor has been created but before
-  the socket bind has been performed. #634 #439 Thank you Gregor Jasny for
-  the patch.
-- Improvement: Better automatic std::chrono feature detection for Visual Studio
-- Improvement: Major refactoring to bundled CMake build system. CMake can now be
-  used to build all of the examples and the test suite. Thank you Thijs Wenker
-  for a significant portion of this code. #378, #435, #449
-- Improvement: In build environments where `lib::error_code` and 
-  `lib::asio::error_code` match (such as using `boost::asio` with 
-  `boost::system_error` or standalone asio with `std::system_error`, transport
-  errors are passed through natively rather than being reported as a translated 
-  `pass_through` error type.
-- Improvement: Add a `get_transport_error` method to Asio transport connections
-  to allow retrieving a machine readable native transport error.
-- Improvement: Add `connection::get_response`, `connection::get_response_code`,
-  and `connection::get_response_msg` methods to allow accessing additional
-  information about the HTTP responses that WebSocket++ sends. #465 Thank you
-  Flow86 for reporting.
-- Improvement: Removes use of empty strings ("") in favor of `string::clear()`
-  and `string::empty()`. This avoids generating unnecessary temporary objects.
-  #468 Thank you Vladislav Yaroslavlev for reporting and a patch.
-- Documentation: Adds an example demonstrating the use of external `io_service`
-- Documentation: Adds a simple `echo_client` example.
-- Documentation: Begins migration of the web based user manual into Doxygen.
-- Bug: Fix memory leak when `init_asio` produces an error. #454 Thank you Mark 
-  Grimes for reporting and fixing.
-- Bug: Fix crash when processing a specially crafted HTTP header. Thank you Eli 
-  Fidler for reporting, test cases, and a patch. #456
-- Bug: Fix an issue where standalone Asio builds that use TLS would not compile
-  due to lingering boost code. #448 Thank you mjsp for reporting
-- Bug: Fix an issue where canceling a socket could throw an exception on some
-  older Windows XP platforms. It now prints an appropriate set of log messages
-  instead. Thank you Thijs Wenker for reporting and researching solutions. #460
-- Bug: Fix an issue where deferred HTTP connections that start sending a very 
-  long response before their HTTP handler ends would result in a second set of
-  HTTP headers being injected into the output. Thank you Kevin Smith for
-  reporting and providing test case details. #443
-- Bug: Fix an issue where the wrong type of strand was being created. Thank you 
-  Bastien Brunnenstein for reporting and a patch. #462
-- Bug: Fix an issue where TLS includes were broken for Asio Standalone builds.
-  Thank you giachi and Bastien Brunnenstein for reporting. #491
-- Bug: Remove the use of cached read and write handlers in the Asio transport.
-  This feature caused memory leaks when the `io_service` the connection was
-  running on was abruptly stopped. There isn't a clean and safe way of using
-  this optimization without global state and the associated locks. The locks
-  perform worse. Thank you Xavier Gibert for reporting, test cases, and code.
-  Fixes #490.
-- Bug: Fix a heap buffer overflow when checking very short URIs. Thank you 
-  Xavier Gibert for reporting and a patch #524
-- Compatibility: Fixes a number of build & config issues on Visual Studio 2015
-- Compatibility: Removes non-standards compliant masking behavior. #395, #469
-- Compatibility: Replace deprecated use of `auto_ptr` on systems where 
-  `unique_ptr` is available.
-
-0.6.0 - 2015-06-02
-- MINOR BREAKING TRANSPORT POLICY CHANGE: Custom transport policies will now be
-  required to include a new method `void set_uri(uri_ptr u)`. An implementation
-  is not required. The stub transport policy includes an example stub method
-  that can be added to any existing custom transport policy to fulfill this
-  requirement. This does not affect anyone using the bundled transports or
-  configs.
-- MINOR BREAKING SOCKET POLICY CHANGE: Custom asio transport socket policies 
-  will now be required to include a new method `void set_uri(uri_ptr u)`. Like
-  with the transport layer, an implementation is not required. This does not 
-  affect anyone using the bundled socket policies.
-- MINOR BREAKING DEPENDENCY CHANGE: When using Boost versions greater than or 
-  equal to 1.49 in C++03 mode, `libboost-chrono` is needed now instead of 
-  `libboost-date_time`. Users with C++11 compilers or using Boost versions 1.48
-  and earlier are not affected. Note: This change affects the bundled unit test
-  suite.
-- Feature: WebSocket++ Asio transport policy can now be used with the standalone
-  version of Asio (1.8.0+) when a C++11 compiler and standard library are 
-  present. This means that it is possible now to use WebSocket++'s Asio
-  transport entirely without Boost. Thank you Robert Seiler for proof of concept
-  code that was used as a guide for this implementation. Fixes #324 
-- Feature: Adds a vectored/scatter-gather write handler to the iostream
-  transport.
-- Feature: Adds the ability to defer sending an HTTP response until sometime
-  after the `http_handler` is run. This allows processing of long running http
-  handlers to defer their response until it is ready without blocking the
-  network thread. references #425
-- Improvement: `echo_server_tls` has been update to demonstrate how to configure
-  it for Mozilla's recommended intermediate and modern TLS security profiles.
-- Improvement: `endpoint::set_timer` now uses a steady clock provided by 
-  `boost::chrono` or `std::chrono` where available instead of the non-monotonic
-  system clock. Thank you breyed for reporting. fixes #241
-- Improvement: Outgoing TLS connections to servers using the SNI extension to
-  choose a certificate will now work. Thank you moozzyk for reporting. 
-  Fixes #400
-- Improvement: Removes an unnecessary mutex lock in `get_con_from_hdl`.
-- Cleanup: Asio transport policy has been refactored to remove many Boost
-  dependencies. On C++03 compilers the `boost::noncopyable` dependency has been
-  removed and the `boost::date_time` dependency has been replaced with the newer
-  `boost::chrono` when possible. On C++11 compilers the `boost::aligned_storage`
-  and `boost::date_time` dependencies are gone, replaced with equivalent C++11
-  standard library features.
-- Bug: Fixes a potential dangling pointer and inconsistent error message
-  handling in `websocketpp::exception`. #432 Thank you Tom Swirly for the fix.
-
-0.5.1 - 2015-02-27
-- Bug: Fixes an issue where some frame data was counted against the max header
-  size limit, resulting in connections that included a lot of frame data
-  immediately after the opening handshake to fail.
-- Bug: Fix a typo in the name of the set method for `max_http_body_size`. #406
-  Thank you jplatte for reporting.
-
-0.5.0 - 2015-01-22
-- BREAKING UTILITY CHANGE: Deprecated methods `http::parser::parse_headers`,
-  `http::response::parse_complete`, and `http::request::parse_complete` have
-  been removed.
-- Security: Disabled SSLv3 in example servers.
-- Feature: Adds basic support for accessing HTTP request bodies in the http
-  handler. #181
-- Feature: Adds the ability to register a shutdown handler when using the
-  iostream transport. This provides a clean interface for triggering the shut
-  down of external sockets and other cleanup without hooking in to higher level
-  WebSocket handlers.
-- Feature: Adds the ability to register a write handler when using the iostream
-  transport. This handler can be used to handle transport output in place of
-  registering an ostream to write to.
-- Feature: Adds a new logging policy that outputs to syslog. #386 Thank you Tom
-  Hughes for submitting the initial version of this policy.
-- Improvement: Message payload logging now prints text for text messages rather
-  than binary.
-- Improvement: Overhaul of handshake state machine. Should make it impossible
-  for exceptions to bubble out of transport methods like `io_service::run`.
-- Improvement: Overhaul of handshake error reporting. Fail handler error codes
-  will be more detailed and precise. Adds new [fail] and [http] logging channels
-  that log failed websocket connections and successful HTTP connections
-  respectively. A new aggregate channel package, `alevel::access_core`, allows
-  enabling connect, disconnect, fail, and http together. Successful HTTP
-  connections will no longer trigger a fail handler.
-- Improvement: Ability to terminate connection during an http handler to cleanly
-  suppress the default outgoing HTTP response.
-- Documentation: Add Sending & Receiving Messages step to chapter one of the
-  `utility_client` tutorial. Update `utility_client` example to match.
-- Cleanup: Removes unused files & STL includes. Adds required STL includes.
-  Normalizes include order.
-- Bug: Fixes a fatal state error when a handshake response is completed
-  immediately after that handshake times out. #389
-- Bug: MinGW fixes; C++11 feature detection, localtime use. #393 Thank you
-  Schebb for reporting, code, and testing.
-- Bug: Fixes an issue where `websocketpp::exception::what()` could return an out
-  of scope pointer. #397 Thank you fabioang for reporting.
-- Bug: Fixes an issue where endpoints were not reset properly after a call to
-  `endpoint::listen` failed. #390 Thank you wyyqyl for reporting.
-
-0.4.0 - 2014-11-04
-- BREAKING API CHANGE: All WebSocket++ methods now throw an exception of type
-  `websocketpp::exception` which derives from `std::exception`. This normalizes
-  all exception types under the standard exception hierarchy and allows
-  WebSocket++ exceptions to be caught in the same statement as others. The error
-  code that was previously thrown is wrapped in the exception object and can be
-  accessed via the `websocketpp::exception::code()` method.
-- BREAKING API CHANGE: Custom logging policies have some new required
-  constructors that take generic config settings rather than pointers to
-  std::ostreams. This allows writing logging policies that do not involve the
-  use of std::ostream. This does not affect anyone using the built in logging
-  policies.
-- BREAKING UTILITY CHANGE: `websocketpp::lib::net::htonll` and
-  `websocketpp::lib::net::ntohll` have been prefixed with an underscore to avoid
-  conflicts with similarly named macros in some operating systems. If you are
-  using the WebSocket++ provided 64 bit host/network byte order functions you
-  will need to switch to the prefixed versions.
-- BREAKING UTILITY CHANGE: The signature of `base64_encode` has changed from
-  `websocketpp::base64_encode(unsigned char const *, unsigned int)` to
-  `websocketpp::base64_encode(unsigned char const *, size_t)`.
-- BREAKING UTILITY CHANGE: The signature of `sha1::calc` has changed from
-  `websocketpp::sha1::calc(void const *, int, unsigned char *)` to
-  `websocketpp::sha1::calc(void const *, size_t, unsigned char *)`
-- Feature: Adds incomplete `minimal_server` and `minimal_client` configs that
-  can be used to build custom configs without pulling in the dependencies of
-  `core` or `core_client`. These configs will offer a stable base config to
-  future-proof custom configs.
-- Improvement: Core library no longer has std::iostream as a dependency.
-  std::iostream is still required for the optional iostream logging policy and
-  iostream transport.
-- Bug: C++11 Chrono support was being incorrectly detected by the `boost_config`
-  header. Thank you Max Dmitrichenko for reporting and a patch.
-- Bug: use of `std::put_time` is now guarded by a unique flag rather than a
-  chrono library flag. Thank you Max Dmitrichenko for reporting.
-- Bug: Fixes non-thread safe use of std::localtime. #347 #383
-- Compatibility: Adjust usage of std::min to be more compatible with systems
-  that define a min(...) macro.
-- Compatibility: Removes unused parameters from all library, test, and example
-  code. This assists with those developing with -Werror and -Wunused-parameter
-  #376
-- Compatibility: Renames ntohll and htonll methods to avoid conflicts with
-  platform specific macros. #358 #381, #382 Thank you logotype, unphased,
-  svendjo
-- Cleanup: Removes unused functions, fixes variable shadow warnings, normalizes
-  all whitespace in library, examples, and tests to 4 spaces. #376
-
-0.3.0 - 2014-08-10
-- Feature: Adds `start_perpetual` and `stop_perpetual` methods to asio transport
-  These may be used to replace manually managed `asio::io_service::work` objects
-- Feature: Allow setting pong and handshake timeouts at runtime.
-- Feature: Allows changing the listen backlog queue length.
-- Feature: Split tcp init into pre and post init.
-- Feature: Adds URI method to extract query string from URI. Thank you Banaan
-  for code. #298
-- Feature: Adds a compile time switch to asio transport config to disable
-  certain multithreading features (some locks, asio strands)
-- Feature: Adds the ability to pause reading on a connection. Paused connections
-  will not read more data from their socket, allowing TCP flow control to work
-  without blocking the main thread.
-- Feature: Adds the ability to specify whether or not to use the `SO_REUSEADDR`
-  TCP socket option. The default for this value has been changed from `true` to
-  `false`.
-- Feature: Adds the ability to specify a maximum message size.
-- Feature: Adds `close::status::get_string(...)` method to look up a human
-  readable string given a close code value.
-- Feature: Adds `connection::read_all(...)` method to iostream transport as a
-  convenience method for reading all data into the connection buffer without the
-  end user needing to manually loop on `read_some`.
-- Improvement: Open, close, and pong timeouts can be disabled entirely by
-  setting their duration to 0.
-- Improvement: Numerous performance improvements. Including: tuned default
-  buffer sizes based on profiling, caching of handler binding for async
-  reads/writes, non-malloc allocators for read/write handlers, disabling of a
-  number of questionably useful range sanity checks in tight inner loops.
-- Improvement: Cleaned up the handling of TLS related errors. TLS errors will
-  now be reported with more detail on the info channel rather than all being
-  `tls_short_read` or `pass_through`. In addition, many cases where a TLS short
-  read was in fact expected are no longer classified as errors. Expected TLS
-  short reads and quasi-expected socket shutdown related errors will no longer
-  be reported as unclean WebSocket shutdowns to the application. Information
-  about them will remain in the info error channel for debugging purposes.
-- Improvement: `start_accept` and `listen` errors are now reported to the caller
-  either via an exception or an ec parameter.
-- Improvement: Outgoing writes are now batched for improved message throughput
-  and reduced system call and TCP frame overhead.
-- Bug: Fix some cases of calls to empty lib::function objects.
-- Bug: Fix memory leak of connection objects due to cached handlers holding on to
-  reference counted pointers. #310 Thank you otaras for reporting.
-- Bug: Fix issue with const endpoint accessors (such as `get_user_agent`) not
-  compiling due to non-const mutex use. #292 Thank you logofive for reporting.
-- Bug: Fix handler allocation crash with multithreaded `io_service`.
-- Bug: Fixes incorrect whitespace handling in header parsing. #301 Thank you
-  Wolfram Schroers for reporting
-- Bug: Fix a crash when parsing empty HTTP headers. Thank you Thingol for
-  reporting.
-- Bug: Fix a crash following use of the `stop_listening` function. Thank you
-  Thingol for reporting.
-- Bug: Fix use of variable names that shadow function parameters. The library
-  should compile cleanly with -Wshadow now. Thank you giszo for reporting. #318
-- Bug: Fix an issue where `set_open_handshake_timeout` was ignored by server
-  code. Thank you Robin Rowe for reporting.
-- Bug: Fix an issue where custom timeout values weren't being propagated from
-  endpoints to new connections.
-- Bug: Fix a number of memory leaks related to server connection failures. #323
-  #333 #334 #335 Thank you droppy and aydany for reporting and patches.
-  reporting.
-- Compatibility: Fix compile time conflict with Visual Studio's MIN/MAX macros.
-  Thank you Robin Rowe for reporting.
-- Documentation: Examples and test suite build system now defaults to clang on
-  OS X
-
-0.3.0-alpha4 - 2013-10-11
-- HTTP requests ending normally are no longer logged as errors. Thank you Banaan
-  for reporting. #294
-- Eliminates spurious expired timers in certain error conditions. Thank you
-  Banaan for reporting. #295
-- Consolidates all bundled library licenses into the COPYING file. #294
-- Updates bundled sha1 library to one with a cleaner interface and more
-  straight-forward license. Thank you lotodore for reporting and Evgeni Golov
-  for reviewing. #294
-- Re-introduces strands to asio transport, allowing `io_service` thread pools to
-  be used (with some limitations).
-- Removes endpoint code that kept track of a connection list that was never used
-  anywhere. Removes a lock and reduces connection creation/deletion complexity
-  from O(log n) to O(1) in the number of connections.
-- A number of internal changes to transport APIs
-- Deprecates iostream transport `readsome` in favor of `read_some` which is more
-  consistent with the naming of the rest of the library.
-- Adds preliminary signaling to iostream transport of eof and fatal transport
-  errors
-- Updates transport code to use shared pointers rather than raw pointers to
-  prevent asio from retaining pointers to connection methods after the
-  connection goes out of scope. #293 Thank you otaras for reporting.
-- Fixes an issue where custom headers couldn't be set for client connections
-  Thank you Jerry Win and Wolfram Schroers for reporting.
-- Fixes a compile error on visual studio when using interrupts. Thank you Javier
-  Rey Neira for reporting this.
-- Adds new 1012 and 1013 close codes per IANA registry
-- Add `set_remote_endpoint` method to iostream transport.
-- Add `set_secure` method to iostream transport.
-- Fix typo in .gitattributes file. Thank you jstarasov for reporting this. #280
-- Add missing locale include. Thank you Toninoso for reporting this. #281
-- Refactors `asio_transport` endpoint and adds full documentation and exception
-  free varients of all methods.
-- Removes `asio_transport` endpoint method cancel(). Use `stop_listen()` instead
-- Wrap internal `io_service` `run_one()` method
-- Suppress error when trying to shut down a connection that was already closed
-
-0.3.0-alpha3 - 2013-07-16
-- Minor refactor to bundled sha1 library
-- HTTP header comparisons are now case insensitive. #220, #275
-- Refactors URI to be exception free and not use regular expressions. This
-  eliminates the dependency on boost or C++11 regex libraries allowing native
-  C++11 usage on GCC 4.4 and higher and significantly reduces staticly built
-  binary sizes.
-- Updates handling of Server and User-Agent headers to better handle custom
-  settings and allow suppression of these headers for security purposes.
-- Fix issue where pong timeout handler always fired. Thank you Steven Klassen
-  for reporting this bug.
-- Add ping and pong endpoint wrapper methods
-- Add `get_request()` pass through method to connection to allow calling methods
-  specific to the HTTP policy in use.
-- Fix issue compile error with `WEBSOCKETPP_STRICT_MASKING` enabled and another
-  issue where `WEBSOCKETPP_STRICT_MASKING` was not applied to incoming messages.
-  Thank you Petter Norby for reporting and testing these bugs. #264
-- Add additional macro guards for use with boost_config. Thank you breyed
-  for testing and code. #261
-
-0.3.0-alpha2 - 2013-06-09
-- Fix a regression that caused servers being sent two close frames in a row
-  to end a connection uncleanly. #259
-- Fix a regression that caused spurious frames following a legitimate close
-  frames to erroneously trigger handlers. #258
-- Change default HTTP response error code when no http_handler is defined from
-  500/Internal Server Error to 426/Upgrade Required
-- Remove timezone from logger timestamp to work around issues with the Windows
-  implementation of strftime. Thank you breyed for testing and code. #257
-- Switch integer literals to char literals to improve VCPP compatibility.
-  Thank you breyed for testing and code. #257
-- Add MSVCPP warning suppression for the bundled SHA1 library. Thank you breyed
-  for testing and code. #257
-
-0.3.0-alpha1 - 2013-06-09
-- Initial Release
diff --git a/src/sioclient/lib/websocketpp/cmake/CMakeHelpers.cmake b/src/sioclient/lib/websocketpp/cmake/CMakeHelpers.cmake
deleted file mode 100644
index 1478f4b5..00000000
--- a/src/sioclient/lib/websocketpp/cmake/CMakeHelpers.cmake
+++ /dev/null
@@ -1,109 +0,0 @@
-
-# Print build configuration
-macro (print_used_build_config)
-    message ("\n=========== Used Build Configuration =============\n")
-    message (STATUS "ENABLE_CPP11        = " ${ENABLE_CPP11})
-    message (STATUS "BUILD_EXAMPLES      = " ${BUILD_EXAMPLES})
-    message (STATUS "BUILD_TESTS         = " ${BUILD_TESTS})
-    message ("")
-    message (STATUS "WEBSOCKETPP_ROOT    = " ${WEBSOCKETPP_ROOT})
-    message (STATUS "WEBSOCKETPP_BIN     = " ${WEBSOCKETPP_BIN})
-    message (STATUS "WEBSOCKETPP_LIB     = " ${WEBSOCKETPP_LIB})
-    message (STATUS "Install prefix      = " ${CMAKE_INSTALL_PREFIX})
-    message ("")
-    message (STATUS "WEBSOCKETPP_BOOST_LIBS        = ${WEBSOCKETPP_BOOST_LIBS}")
-    message (STATUS "WEBSOCKETPP_PLATFORM_LIBS     = ${WEBSOCKETPP_PLATFORM_LIBS}")
-    message (STATUS "WEBSOCKETPP_PLATFORM_TLS_LIBS = ${WEBSOCKETPP_PLATFORM_TLS_LIBS}")
-    message ("")
-    message (STATUS "OPENSSL_FOUND        = ${OPENSSL_FOUND}")
-    message (STATUS "OPENSSL_INCLUDE_DIR     = ${OPENSSL_INCLUDE_DIR}")
-    message (STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}")
-    message (STATUS "OPENSSL_VERSION = ${OPENSSL_VERSION}")
-    message ("")
-endmacro ()
-
-# Adds the given folder_name into the source files of the current project.
-# Use this macro when your module contains .cpp and .h files in several subdirectories.
-# Your sources variable needs to be WSPP_SOURCE_FILES and headers variable WSPP_HEADER_FILES.
-macro(add_source_folder folder_name)
-    file(GLOB H_FILES_IN_FOLDER_${folder_name} ${folder_name}/*.hpp ${folder_name}/*.h)
-    file(GLOB CPP_FILES_IN_FOLDER_${folder_name} ${folder_name}/*.cpp ${folder_name}/*.c)
-    source_group("Header Files\\${folder_name}" FILES ${H_FILES_IN_FOLDER_${folder_name}})
-    source_group("Source Files\\${folder_name}" FILES ${CPP_FILES_IN_FOLDER_${folder_name}})
-    set(WSPP_HEADER_FILES ${WSPP_HEADER_FILES} ${H_FILES_IN_FOLDER_${folder_name}})
-    set(WSPP_SOURCE_FILES ${WSPP_SOURCE_FILES} ${CPP_FILES_IN_FOLDER_${folder_name}})
-endmacro()
-
-# Initialize target.
-macro (init_target NAME)
-    set (TARGET_NAME ${NAME})
-    message ("** " ${TARGET_NAME})
-
-    # Include our own module path. This makes #include "x.h"
-    # work in project subfolders to include the main directory headers.
-    include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-endmacro ()
-
-# Build executable for executables
-macro (build_executable TARGET_NAME)
-    set (TARGET_LIB_TYPE "EXECUTABLE")
-    message (STATUS "-- Build Type:")
-    message (STATUS "       " ${TARGET_LIB_TYPE})
-
-    add_executable (${TARGET_NAME} ${ARGN})
-
-    include_directories (${WEBSOCKETPP_ROOT} ${WEBSOCKETPP_INCLUDE})
-
-    target_link_libraries(${TARGET_NAME} ${WEBSOCKETPP_PLATFORM_LIBS})
-
-    set_target_properties (${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${WEBSOCKETPP_BIN})
-    set_target_properties (${TARGET_NAME} PROPERTIES DEBUG_POSTFIX d)
-endmacro ()
-
-# Build executable and register as test
-macro (build_test TARGET_NAME)
-    build_executable (${TARGET_NAME} ${ARGN})
-
-    if (${CMAKE_VERSION} VERSION_LESS 3)
-        message(WARNING "CMake too old to register ${TARGET_NAME} as a test")
-    else ()
-        add_test(NAME ${TARGET_NAME} COMMAND $<TARGET_FILE:${TARGET_NAME}>)
-    endif ()
-endmacro ()
-
-# Finalize target for all types
-macro (final_target)
-    if ("${TARGET_LIB_TYPE}" STREQUAL "EXECUTABLE")
-        install (TARGETS ${TARGET_NAME}
-                 RUNTIME DESTINATION "bin"
-                 CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES})
-    endif ()
-
-    install (DIRECTORY ${CMAKE_SOURCE_DIR}/${TARGET_NAME}
-             DESTINATION include/
-             FILES_MATCHING PATTERN "*.hpp*")
-endmacro ()
-
-macro (link_boost)
-    target_link_libraries (${TARGET_NAME} ${Boost_LIBRARIES})
-    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR})
-endmacro ()
-
-macro (link_openssl)
-    target_link_libraries (${TARGET_NAME} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
-    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${OPENSSL_INCLUDE_DIR})
-endmacro ()
-
-macro (link_zlib)
-	target_link_libraries (${TARGET_NAME} ${ZLIB_LIBRARIES})
-    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIR})
-endmacro ()
-
-macro (include_subdirs PARENT)
-    file (GLOB SDIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PARENT}/*")
-    foreach (SUBDIR ${SDIRS})
-        if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/CMakeLists.txt")
-            add_subdirectory ("${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}")
-        endif ()
-    endforeach ()
-endmacro()
diff --git a/src/sioclient/lib/websocketpp/docs/config.dox b/src/sioclient/lib/websocketpp/docs/config.dox
deleted file mode 100644
index 4a811c58..00000000
--- a/src/sioclient/lib/websocketpp/docs/config.dox
+++ /dev/null
@@ -1,138 +0,0 @@
-/** \page reference.config Config Reference
-
-WebSocket++ uses a config template parameter to supply a number of compile type policy types and default numerical values for buffer sizes, timeouts, security behavior, etc. Swapping policies allows changing certain core library behavior designed to be pluggable.
-
-A custom config can be made standalone or can subclass one of the bundled configs and just override a few things.
-
-__Example__
-```
-// some config options may require additional includes or dependencies.
-// syslog logging policy, for example, requires <syslog.h>, 
-// the permessage deflate settings require zlib.
-#include <websocketpp/logger/syslog.hpp>
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
-
-// Custom server config based on bundled asio config
-struct custom_server_config : public websocketpp::config::asio {
-	// Replace default stream logger with a syslog logger
-	typedef websocketpp::log::syslog<concurrency_type, websocketpp::log::elevel> elog_type;
-	typedef websocketpp::log::syslog<concurrency_type, websocketpp::log::alevel> alog_type;
-
-	// Reduce read buffer size to optimize for small messages
-	static const size_t connection_read_buffer_size = 1024;
-
-	// enable permessage_compress extension
-    struct permessage_deflate_config {};
-
-    typedef websocketpp::extensions::permessage_deflate::enabled
-        <permessage_deflate_config> permessage_deflate_type;
-};
-
-typedef websocketpp::server<custom_server_config> server_endpoint_type;
-```
-
-Core Config Options
--------------------
-
-### Policies
-
-Policies are classes used to allow clean swapping of behavior without changing the core library
-
-| Typedef Name              | Effect                                 |
-| ------------------------- | -------------------------------------- |
-| concurrency_type          | Concurrency policy                     |
-| elog_type                 | Error logger type                      |
-| alog_type                 | Access logger type                     |
-| request_type              | HTTP request type                      |
-| response_type             | HTTP response type                     |
-| message_type              | Type to deliver recieved messages      |
-| con_msg_manager_type      | Connection level message manager       |
-| endpoint_msg_manager_type | Endpoint level message manager         |
-| rng_type                  | Random Number Generation policy        |
-| transport_type            | Transport policy to use                |
-| endpoint_base             | User overridable Endpoint base class   |
-| connection_base           | User overridable Connection base class |
-
-### Timeouts Values
-
-These represent the length of time (in ms) before the given operation is aborted
-
-| Field                   | Type | Default | Operation                   |
-| ----------------------- | ---- | ------- | --------------------------- |
-| timeout_open_handshake  | long | 5000    | Opening handshake           |
-| timeout_close_handshake | long | 5000    | Closing handshake           |
-| timeout_pong            | long | 5000    | No pong recieved after ping |
-
-### Performance tuning
-
-| Field                       | Type   | Default  | Meaning                                                            |
-| --------------------------- | ------ | -------- | ------------------------------------------------------------------ |
-| connection_read_buffer_size | size_t | 16384    | Size of the per-connection read buffer                             |
-| enable_multithreading       | bool   | true     | Disabling may reduce locking overhead for single threaded programs |
-
-#### Connection Read Buffer
-
-Each connection has an internal buffer of this size. A larger value will result in fewer trips through the library and less CPU overhead at the expense of increased memory usage per connection.
-
-If your application primarily deals in very large messages you may want to try setting this value higher.
-
-If your application has a lot of connections or primarily deals in small messages you may want to try setting this smaller.
-
-### Security settings
-
-| Field                  | Type   | Default | Effect                                 |
-| ---------------------- | ------ | ------- | -------------------------------------- |
-| drop_on_protocol_error | bool   | false   | Omit close handshake on protocol error |
-| silent_close           | bool   | false   | Don't return close codes or reasons    |
-| max_message_size       | size_t | 32MB    | WebSocket max message size limit       |
-| max_http_body_size     | size_t | 32MB    | HTTP Parser's max body size limit      |
-
-#### Drop on protocol error
-Drop connections on protocol error rather than sending a close frame. Off by default. This may result in legitimate messages near the error being dropped as well. It may free up resources otherwise spent dealing with misbehaving clients.
-
-#### Silent Close
-Silence close suppresses the return of detailed connection close information during the closing handshake. This information is useful for debugging and presenting useful errors to end users but may be undesirable for security reasons in some production environments. Close reasons could be used by an attacker to confirm that the endpoint is out of resources or be used to identify the WebSocket implementation in use.
-
-Note: this will suppress *all* close codes, including those explicitly sent by local applications.
-
-#### Max message size
-Default value for the processor's maximum message size. Maximum message size determines the point at which the library will drop a connection with the message_too_big protocol error.
-
-#### Max HTTP header size
-Maximum body size determines the point at which the library will abort reading an HTTP message body and return the 413/request entity too large error.
-
-Transport Config Options
-------------------------
-
-### Policies
-
-Policies are classes used to allow clean swapping of behavior without changing the core library
-
-| Typedef Name     | Effect             |
-| ---------------- | ------------------ |
-| concurrency_type | Concurrency Policy |
-| elog_type        | Error logger type  |
-| alog_type        | Access logger type |
-| request_type     | HTTP request type  |
-| response_type    | HTTP response type |
-
-### Timeouts Values
-
-These represent the length of time (in ms) before the given operation is aborted
-
-| Field                    | Type | Default | Operation                                     |
-| ------------------------ | ---- | ------- | --------------------------------------------- |
-| timeout_socket_pre_init  | long | 5000    | Transport dependent                           |
-| timeout_proxy            | long | 5000    | Proxy handshake                               |
-| timeout_socket_post_init | long | 5000    | Transport dependent (commonly: TLS handshake) |
-| timeout_dns_resolve      | long | 5000    | DNS resolution                                |
-| timeout_connect          | long | 5000    | TCP Connect                                   |
-| timeout_socket_shutdown  | long | 5000    | Socket shutdown                               |
-
-### Performance tuning
-
-| Field                       | Type   | Default  | Meaning                                                            |
-| --------------------------- | ------ | -------- | ------------------------------------------------------------------ |
-| enable_multithreading       | bool   | true     | Disabling may reduce locking overhead for single threaded programs |
-
-*/
diff --git a/src/sioclient/lib/websocketpp/docs/faq.dox b/src/sioclient/lib/websocketpp/docs/faq.dox
deleted file mode 100644
index 24059f75..00000000
--- a/src/sioclient/lib/websocketpp/docs/faq.dox
+++ /dev/null
@@ -1,162 +0,0 @@
-/** \page faq FAQ
-
-## General Library Usage
-
-### Can a handler be changed after a connection is established? Can one be removed?
-Yes, but not globally.
-
-Handlers assigned to endpoints will be automatically copied to the connections created by that endpoint. Changing a handler on an endpoint will only affect future connections.
-
-Once a particular connection is created, it's handlers can be changed individually by calling the `set_*_handler` methods. Once changed, all future events of that type for that connection will use the new handler.
-
-To remove a handler that was previously set, call the set method with `nullptr` or `NULL`.
-
-### Can I reject or conditionally accept a connection
-Yes. The `validate` handler is called after the initial handshake has been recieved but before WebSocket++ has responded. This gives you the opportunity to inspect the incoming connection request, its headers, origin, subprotocols, and the remote endpoint IP. Return `true` from the validate handler to accept the connection and `false` to reject it.
-
-To set a custom HTTP error message for your rejection, use `websocketpp::connection::set_status` and (optionally) `websocketpp::connection::set_body()` to set the HTTP status code and error message body text. If you do not set body text a message will be generated automatically based on the status code.
-
-### How do I negotiate subprotocols?
-WebSocket connections may offer a particular subprotocol they want to use. The WebSocket protocol does not define the meaning or interpretation of the subprotocol. This interpretation is left up to the individual application endpoints.
-
-WebSocket++ servers can read the requested subprotocols during the `validate` handler by calling `websocketpp::connection::get_requested_subprotocols`. The list is ordered by client priority. You may optionally choose one of these subprotocols with `websocketpp::connection::select_subprotocol`. The handshake will then complete and let the client know which one was chosen. If you do not choose any, the "blank"/empty/none subprotocol will be used.
-
-WebSocket++ clients can add a subprotocol to an outgoing connection by calling `websocketpp::connection::add_subprotocol` before calling `websocketpp::client::connect`. The order of adding will be interpreted as the order of preference.
-
-In both caases, after the connection has been established, the selected subprotocol is available via the `websocketpp::connection::get_subprotocol` method.
-
-Note: some browsers will allow the connection to continue if they requested a subprotocol and your server doesn't select one. Others will reject the connection. 
-
-### How do I cleanly exit an Asio transport based program
-
-The Asio transport based clients and servers use the Asio library's underlying `io_service` to handle asyncronous networking operations. The standard behavior of the io_service is to run until there are no async operations left and then return. WebSocket++, when using the Asio transport, behaves like a standard Asio application. If you want your WebSocket++/Asio based program to stop network operations and cleanly close all sockets you will want to do the following:
-
-- For servers, call `websocketpp::transport::asio::endpoint::stop_listening` to initiate the closing of the server listening socket.
-- For clients, if you have engaged perpetual mode with `websocketpp::transport::asio::endpoint::start_perpetual`, disable it with `websocketpp::transport::asio::endpoint::stop_perpetual`.
-- For both, run `websocketpp::endpoint::close` or `websocketpp::connection::close` on all currently outstanding connections. This will initiate the WebSocket closing handshake for these connections
-- Wait. Asio is asyncronous. When the calls to the above methods (stop_listening, close, etc) complete the server *will still be listening*, the connections *will still be active* until the io_service gets around to asyncronously processing the socket and WebSocket protocol closing handshakes. The `io_service::run` method will exit cleanly and automatically when all operations are complete.
-
-__WARNING__: Asio's `io_service` has a method called `stop`. WebSocket++ wraps this method as `websocketpp::transport::asio::endpoint::stop`. While this operation has a benign sounding name, it is a powerful and destructive operation that should only be used in special cases. If you are using `io_service::stop` or `endpoint::stop` without a very good reason your program is likely broken and may exhibit erratic behavior. Specifically, `io_service::stop` stops the processing of events entirely. This does not give current operations (such as socket closing handshakes) the opportunity to finish. It will leave your sockets in a dangling state that may invoke operating system level timeouts or other errors.
-
-__Special cases__:
-- If your client uses the `start_perpetual` method it will prevent the io_service from exiting even if it has nothing to do. This is useful if you want a client endpoint to idle in the background to allow new connections to be formed on demand rather than generating a new endpoint for each.
-- If you are using an external io_service and/or are placing non-WebSocket++ operations on the `io_service` those operations may keep the `io_service` open even after all WebSocket++ operations have completed.
-- If you are using `poll`/`poll_one`/`run_one` or otherwise manually driving the `io_service` event loop you may need to adjust usage to make sure you are correctly recognizing the "done with work" and "not done but idling / `io_service::work`" cases.
-
-### Is there a way to check the validity of a `connection_hdl`?
-
-Sometimes, not generally though, because there isn’t a way to check if a TCP connection is valid.
-
-You can try upgrading your hdl to a full connection_ptr using `websocketpp::endpoint::get_con_from_hdl`. If this fails, the hdl is definitely invalid. If it succeeds it may or may not be. The only way to tell definitively is to try and send something (either a message or a ping).
-
-If you handle errors from methods like send, ping, close, etc correctly then you shouldn’t have to worry about accidentally sending to dead connections. The send/ping/pong/close methods will set or throw a specific error in the case that you tried to send something but the connection was closed/gone/etc.
-
-### How do I fix the "address is in use" error when trying to restart my server?
-
-Normally, for security purposes, operating systems prevent programs from listening on sockets created by other programs. When your program crashes and restarts, the new instance is a different program from the perspective of the operating system. As such it can’t listen on the socket address/port that the previous program was using until after a timeout occurs to make sure the old program was done with it.
-
-The the first step for handling this is to make sure that you provide a method (signal handler, admin websocket message, etc) to perform a clean server shutdown. There is a question elsewhere in this FAQ that describes the steps necessary for this.
-
-The clean close strategy won't help in the case of crashes or other abnormal closures. An option to consider for these cases is the use of the SO_REUSEADDR socket option. This instructs the OS to not request an exclusive lock on the socket. This means that after your program crashes the replacement you start can immediately listen on that address/port combo again.
-
-__Please note__: how this works exactly depends on your operating system. Additionally, not exclusively locking your listening socket could allow hijacking by other programs if you are running in a shared resource environment. For development this is generally no problem. For a production environment, think carefully about the security model. `websocketpp::transport::asio::endpoint::set_reuse_addr` is the method to do this. You must specify this setting before calling `websocketpp::transport::asio::endpoint::listen`.
-
-### How do I send and recieve binary messages?
-
-When supported by the remote endpoint, WebSocket++ allows reading and sending messages in the two formats specified in RFC6455, UTF8 text and binary. WebSocket++ performs UTF8 validation on all outgoing text messages to ensure that they meet the specification. Binary messages do not have any additional processing and their interpretation is left entirely to the library user.
-
-To determine the type of an incoming message, use `websocketpp::message_buffer::message::get_opcode`. The relevant return values are `websocketpp::frame::opcode::text` and `websocketpp::frame::opcode::binary`. There is no difference in how payloads are retrieved between these modes, only in how WebSocket++ validated the contents and how the library user is to interpret the data.
-
-To specify the type of an outgoing message, use the frame opcode values listed above as the second op parameter for `websocketpp::connection::send`. There are two relevant overloads of send. One that takes a `std::string` and defaults to op=text. The other that takes a `void const *` and a `size_t` length and defaults to op=binary. Note: You can send binary messages via the string overload and text messages via the void * overload. In the case that you are manually building a message buffer rather than using the automatic send member functions, you can pass the opcode in as a parameter to the message buffer constructor or user the `websocketpp::message_buffer::message::set_opcode` member function to set or re-set it later.
-
-## Dependency Management
-
-### Can WebSocket++ be used without Boost?
-Yes. WebSocket++ only uses Boost features as polyfills for C++11 language features and libraries. If you have a C++11 compiler and standard library you can use WebSocket++ without Boost. In most cases setting your build environment to use the C++11 (or later) language dialect is sufficient to enable this mode of use.
-
-With less common compilers (and sometimes very recently release compilers) there may be specific issues with certain libraries that aren't automatically detected by the library. For these situations there are additional defines available to fine tune which C++11 libraries and features are used. TODO: more details about them.
-
-For the iostream/raw transport the C++11 standard library is sufficient. For the Asio based transports, there is no C++11 library that provides the networking capabilaties that Asio does. As such even with a C++11 build system, you will need a standalone copy of Asio to use if Boost Asio is not available.
-
-MinGW users who want to avoid Boost should also consult the nearby question about MinGW compatibility.
-
-### Can WebSocket++ be used with standalone Asio
-Yes. The process is the same as used with standalone Asio itself. Define `ASIO_STANDALONE` before including Asio or WebSocket++ headers. You will need to download a copy of the Asio headers separately (http://www.think-async.com) and make sure they are in your build system's include path.
-
-### Can WebSocket++ be used without TLS or OpenSSL?
-Yes. When using the iostream/raw transport, there are no TLS features and OpenSSL is not required. When using the Asio transport TLS features are optional. You only need OpenSSL if you want to use TLS. You can only make or recieve encrypted connections (https/wss) if you have enabled TLS features.
-
-Whether an Asio endpoint uses TLS or not is determined by its config template parameter. The default bundled `websocketpp::config::asio` and `websocketpp::config::asio_client` configs do not support TLS, the `websocketpp::config::asio_tls` and `websocketpp::config::asio_tls_client` do.
-
-The `<websocketpp/config/asio.hpp>` and `<websocketpp/config/asio_client.hpp>` headers will include both the TLS and non-TLS varients of their respective configs and require the presence of OpenSSL. The `<websocketpp/config/asio_no_tls.hpp>` and `<websocketpp/config/asio_no_tls_client.hpp>` headers will include only the non-TLS configs and do not require OpenSSL.
-
-### Build issues with TLS on recent versions of OS X
-Mac OS X ships a severely outdated version of the OpenSSL library. To securely use TLS with WebSocket++ on OS X you will need to install a modern version of OpenSSL via homebrew or compiling from source.
-
-### Can WebSocket++ be used with MinGW
-Generally, yes. Note that in C++11 mode MinGW does not currently support the C++11 STL `<thread>` library. WebSocket++ requires a thread/mutex library. Options include Boost thread (the default when a compatible C++11 `<thread>` can't be found) or `mingw-std-threads` (https://github.com/meganz/mingw-std-threads) by including those headers and defining `_WEBSOCKETPP_MINGW_THREAD_`.
-
-## Compression
-
-### How do I use permessage-deflate in version 0.6.0-permessagedeflate and 0.7.0?
-
-These versions of the library require a custom config to use the permessage-deflate extension. Here is a minimal example of such a custom config. You can also integrate these lines into an existing custom config.
-
-Note that in these versions there is no fine grained control over which connections are compressed or not. Clients will request compression with the default settings and use it if the server supports it. Servers will accept whatever parameters clients request.
-
-Outgoing messages by default will be compressed if compression was auto-negotiated during the handshake. There is an option to force a specific message to be sent uncompressed even if compression was negotiated. This may be useful for sending data that you know to be compressed already (images, zip files, etc).
-
-
-__Server Example__
-```
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
-
-struct deflate_server_config : public websocketpp::config::asio {
-	// ... additional custom config if you need it for other things
-
-	/// permessage_compress extension
-    struct permessage_deflate_config {};
-
-    typedef websocketpp::extensions::permessage_deflate::enabled
-        <permessage_deflate_config> permessage_deflate_type;
-};
-
-typedef websocketpp::server<deflate_server_config> server_endpoint_type;
-```
-
-__Client Example__
-```
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
-
-struct deflate_client_config : public websocketpp::config::asio_client {
-	// ... additional custom config if you need it for other things
-
-	/// permessage_compress extension
-    struct permessage_deflate_config {};
-
-    typedef websocketpp::extensions::permessage_deflate::enabled
-        <permessage_deflate_config> permessage_deflate_type;
-};
-
-typedef websocketpp::client<deflate_client_config> client_endpoint_type;
-```
-
-## Security
-
-### Is it possible to terminate a malicious connection quickly, without tying up resources performing clean close steps, 
-
-Yes. The library will automatically detect and terminate connections that violate the WebSocket protocol. In cases where the library believes the remote endpoint to be malicious or sufficiently broken to be unlikely to understand or process the closing handshake, it will be omited.
-
-If your application detects conditions above the protocol level that you believe to be malicious, for example, if you recognize an IP from a known denial of service attack, you can close the connection with two different levels of urgency. Use the standard `websocketpp::endpoint::close` or `websocketpp::connection::close` methods with one of the following special close codes:
-- `websocketpp::close::status::omit_handshake`: Omits the closing handshake, but cleanly closes the TCP connection.
-- `websocketpp::close::status::force_tcp_drop`: Forcibly drop the TCP connection.
-
-Please note that usage of these disconnect methods results in a violation of the WebSocket protocol and may have negative reprocusions for the remote endpoint with respect to network timeouts. Please use caution when using them.
-
-## Build Issues
-
-### Getting compile errors related to `std::chrono`, `boost::chrono`, `waitable_timer`, or `steady_clock`
-
-Your build system may be confused about whether it is supposed to be using `boost::chrono` or `std::chrono`. Boost automatically detects this setup on some compilers but not others. Defining `BOOST_ASIO_HAS_STD_CHRONO` can help. See http://www.boost.org/doc/libs/1_60_0/doc/html/boost_asio/overview/cpp2011/chrono.html for more details.
-
-*/
diff --git a/src/sioclient/lib/websocketpp/docs/getting_started.dox b/src/sioclient/lib/websocketpp/docs/getting_started.dox
deleted file mode 100644
index d9a74c0d..00000000
--- a/src/sioclient/lib/websocketpp/docs/getting_started.dox
+++ /dev/null
@@ -1,27 +0,0 @@
-/** \page getting_started Getting Started
-
-WebSocket++ code is available on github at https://github.com/zaphoyd/websocketpp
-The official project homepage lives at http://www.zaphoyd.com/websocketpp
-
-The git repository is organized into several directories:
-
-- **docs**: This documentation
-- **examples**: Example programs that demonstrate how to build basic versions of some commonly used patterns for WebSocket clients and servers.
-- **test**: Unit tests that confirm that the code you have works properly and help detect platform specific issues.
-- **tutorials**: Detailed walkthroughs of a select set of the example programs.
-- **websocketpp**: All of the library code and default configuration files.
-
-WebSocket++ is a header only library. You can start using it by including the websocketpp source directory in your project's include path and including the appropriate WebSocket++ headers in your program. You may also need to include and/or link to appropriate Boost/system libraries. TODO: More information: Building a program with WebSocket++, Walkthroughs of the example programs
-
-WebSocket++ includes cmake and scons scripts for building the examples and unit tests. Neither system is needed unless you want to build tests or examples in an automated fashion.
-
-__Usage questions__ should be posted to the project mailing list at http://groups.google.com/group/websocketpp/ or the IRC channel (\#websocketpp on freenode).
-
-__Bugs and issues__ should be posted to the project GitHub issues queue: https://github.com/zaphoyd/websocketpp/issues.
-
-__Pull requests__ on GitHub are welcome. Please make them against the `develop` branch.
-
-WebSocket++ is written and maintained by Peter Thorson. You can contact me via GitHub messaging, IRC, or via email at websocket@zaphoyd.com.
-
-*/
-
diff --git a/src/sioclient/lib/websocketpp/docs/handlers.dox b/src/sioclient/lib/websocketpp/docs/handlers.dox
deleted file mode 100644
index d5abeb6d..00000000
--- a/src/sioclient/lib/websocketpp/docs/handlers.dox
+++ /dev/null
@@ -1,165 +0,0 @@
-/** \page reference.handlers Handler Reference
-
-Handlers allow WebSocket++ programs to receive notifications about events
-that happen in relation to their connections. Some handlers also behave as
-hooks that give the program a chance to modify state or adjust settings before
-the connection continues.
-
-Handlers are registered by calling the appropriate `set_*_handler` method on either an
-endpoint or connection. The * refers to the name of the handler (as 
-specified in the signature field below). For example, to set the open handler,
-call `set_open_handler(...)`.
-
-Setting handlers on an endpoint will result in them being copied as the default
-handler to all new connections created by that endpoint. Changing an endpoint's
-handlers will not affect connections that are already in progress. This includes
-connections that are in the listening state. As such, it is important to set any
-endpoint handlers before you call `endpoint::start_accept` or else the handlers
-will not be attached to your first connection.
-
-Setting handlers on a connection will result in the handler being changed for
-that connection only, starting at the next time that handler is called. This can
-be used to change the handler during a connection.
-
-Connection Handlers
--------------------
-
-These handlers will be called at most once per connection in the order specified below.
-
-### Socket Init Handler
-
-| Event                 | Signature                                             | Availability         |
-| --------------------- | ----------------------------------------------------- | -------------------- |
-| Socket initialization | `socket_init(connection_hdl, asio::ip::tcp::socket&)` | 0.3.0 Asio Transport |
-
-This hook is triggered after the socket has been initialized but before a connection is established. 
-It allows setting arbitrary socket options before connections are sent/recieved.
-
-### TCP Pre-init Handler
-
-| Event                         | Signature                      | Availability         |
-| ----------------------------- | ------------------------------ | -------------------- |
-| TCP established, no data sent | `tcp_pre_init(connection_hdl)` | 0.3.0 Asio Transport |
-
-This hook is triggered after the TCP connection is established, but before any pre-WebSocket-handshake 
-operations have been run. Common pre-handshake operations include TLS handshakes and proxy connections.
-
-### TCP Post-init Handler
-
-| Event                   | Signature                                  | Availability                  |
-| ----------------------- | ------------------------------------------ | ----------------------------- |
-| Request for TLS context | `tls_context_ptr tls_init(connection_hdl)` | 0.3.0 Asio Transport with TLS |
-
-This hook is triggered before the TLS handshake to request the TLS context to use. You must 
-return a pointer to a configured TLS conext to continue. This provides the opportuinity to 
-set up the TLS settings, certificates, etc.
-
-### Validate Handler
-
-| Event                                 | Signature                       | Availability                 |
-| ------------------------------------- | ------------------------------- | ---------------------------- |
-| Hook to accept or reject a connection | `bool validate(connection_hdl)` | 0.3.0 Core, Server role only |
-
-This hook is triggered for servers during the opening handshake after the request has been 
-processed but before the response has been sent. It gives a program the opportunity to inspect
-headers and other connection details and either accept or reject the connection. Validate happens
-before the open or fail handler.
-
-Return true to accept the connection, false to reject. If no validate handler is registered, 
-all connections will be accepted.
-
-### Open Connection Handler
-
-| Event                     | Signature              | Availability |
-| ------------------------- | ---------------------- | ------------ |
-| Successful new connection | `open(connection_hdl)` | 0.3.0 Core   |
-
-Either open or fail will be called for each connection. Never both. All
-connections that begin with an open handler call will also have a matching
-close handler call when the connection ends.
-
-### Fail Connection Handler
-
-| Event                               | Signature              | Availability |
-| ----------------------------------- | ---------------------- | ------------ |
-| Connection failed (before opening)  | `fail(connection_hdl)` | 0.3.0 Core   |
-
-Either open or fail will be called for each connection. Never both. Connections
-that fail will never have a close handler called.
-
-### Close Connection Handler
-
-| Event                             | Signature               | Availability |
-| --------------------------------- | ----------------------- | ------------ |
-| Connection closed (after opening) | `close(connection_hdl)` | 0.3.0 Core   |
-
-Close will be called exactly once for every connection that open was called for.
-Close is not called for failed connections.
-
-Message Handlers
-----------------
-
-These handers are called in response to incoming messages or message like events. They only will be called while the connection is in the open state.
-
-### Message Handler
-
-| Event                 | Signature                              | Availability |
-| --------------------- | -------------------------------------- | ------------ |
-| Data message recieved | `message(connection_hdl, message_ptr)` | 0.3.0 Core   |
-
-Applies to all non-control messages, including both text and binary opcodes. The
-`message_ptr` type and its API depends on your endpoint type and its config.
-
-### Ping Handler
-
-| Event         | Signature                                | Availability |
-| ------------- | ---------------------------------------- | ------------ |
-| Ping recieved | `bool ping(connection_hdl, std::string)` | 0.3.0 Core   |
-
-Second (string) argument is the binary ping payload. Handler return value
-indicates whether or not to respond to the ping with a pong. If no ping handler
-is set, WebSocket++ will respond with a pong containing the same binary data as
-the ping (Per requirements in RFC6455).
-
-### Pong Handler
-
-| Event         | Signature                           | Availability |
-| ------------- | ----------------------------------- | ------------ |
-| Pong recieved | `pong(connection_hdl, std::string)` | 0.3.0 Core   |
-
-Second (string) argument is the binary pong payload.
-
-### Pong Timeout Handler
-
-| Event                              | Signature                                   | Availability                             |
-| ---------------------------------- | ------------------------------------------- | ---------------------------------------- |
-| Timed out while waiting for a pong | `pong_timeout(connection_hdl, std::string)` | 0.3.0 Core, transport with timer support |
-
-Triggered if there is no response to a ping after the configured duration. The second
-(string) argument is the binary payload of the unanswered ping.
-
-### HTTP Handler
-
-| Event                 | Signature             | Availability                 |
-| --------------------- | --------------------- | ---------------------------- |
-| HTTP request recieved | `http(connection_hdl` | 0.3.0 Core, Server role only |
-
-Called when HTTP requests that are not WebSocket handshake upgrade requests are
-recieved. Allows responding to regular HTTP requests. If no handler is registered
-a 426/Upgrade Required error is returned.
-
-### Interrupt Handler
-
-| Event                               | Signature                   | Availability |
-| ----------------------------------- | --------------------------- | ------------ |
-| Connection was manually interrupted | `interrupt(connection_hdl)` | 0.3.0 Core   |
-
-Interrupt events can be triggered by calling `endpoint::interrupt` or `connection::interrupt`. 
-Interrupt is similar to a timer event with duration zero but with lower overhead. It is useful
-for single threaded programs to allow breaking up a very long handler into multiple parts and 
-for multi threaded programs as a way for worker threads to signale to the main/network thread 
-that an event is ready.
-
-todo: write low and high watermark handlers
-
-*/
diff --git a/src/sioclient/lib/websocketpp/docs/logging.dox b/src/sioclient/lib/websocketpp/docs/logging.dox
deleted file mode 100644
index bdf8a7f6..00000000
--- a/src/sioclient/lib/websocketpp/docs/logging.dox
+++ /dev/null
@@ -1,102 +0,0 @@
-/** \page reference.logging Logging Reference
-
-WebSocket++ has the capability of logging events during the lifetime of the connections that it processes. Each endpoint has two independent logging interfaces that are used by all connections created by that endpoint. The first is an access interface that allows logging routine events in the life of a connection (such as connect/disconnect and receipt of messages). The other is an error interface that allows logging non-routine problems or errors. Each interface has a number of different named channels that can be toggled on and off independently.
-
-Exactly how these logs are processed and where they are written to depends on which logging policy is in use. Several logging policies are included by default and you can write your own policy if you need something more specialized. Selecting a policy is done via the  \subpage reference.config "endpoint config".
-
-Common functionality (all policies)
------------------------------------
-
-### Logging Channels
-
-Each logging interface is divided into 32 named channels. Log messages are written to a specific interface on a specific channel. Which log messages are actually printed is determined by which channels are enabled or not. Channels can be enabled or disabled either at compile time or at runtime.
-
-### Enabling and Disabling Channels
-
-Channels disabled at compile time are removed from the code entirely (assuming correct compiler optimization settings) and are not available for runtime enabling or disabling. To disable channels at compile time, use the `alog_level` and `elog_level` values within your \subpage reference.config "endpoint config". Channels not disabled at compile time can be enabled or disabled at runtime using the `websocketpp::endpoint::set_access_channels()`, `websocketpp::endpoint::clear_access_channels()`, `websocketpp::endpoint::set_error_channels()`, and `websocketpp::endpoint::clear_error_channels()` methods.
-
-The set and clear functions act only on the channels specified. `set_access_channels(log::alevel::connect)` will enable logging of new connections. Following this with `set_access_channels(log::alevel::disconnect)` will enable logging of disconnections in addition to connections. Use `clear*` functions to disable a specific channel. Channels may be combined using bitwise operations to create aggregate packages of channels that may be set or cleared at once. Default packages include `websocketpp::log::alevel::all`, `websocketpp::log::elevel::all`, `websocketpp::log::alevel::none`, `websocketpp::log::elevel::none`. These represent all possible access/error channels and no access/error channels respectively. For convenience, setting none is aliased to clearing all.
-
-### Examples
-
-__Disable all__
-
-`clear_access_channels(log::alevel::all)`
-
-__Disable all (alternative method)__
-
-`set_access_channels(log::alevel::none)`
-
-__Multiple channels at once__
-
-`log::alevel::message_payload | log::alevel::message_payload`
-
-__All except one__
-
-`log::alevel::all ^ log::alevel::message_payload`
-
-__Default settings__
-
-By default, only debug/development logging is disabled.
-
-### Access to underlying loggers
-
-Logging interfaces may be directly accessed via their associated endpoint or connection using get_alog() and get_elog(). This allows access to methods specific to the chosen logging policy. 
-
-Basic Logging (Default Policy)
-------------------------------
-
-The basic logging policy (`websocketpp::log::basic`) writes logs to a std::ostream. By default, access logs are written to stdout and error logs are written to stderr. Each logging interface may be optionally redirected to an arbitrary C++ stream (including file streams) using the `websocketpp::log::basic::set_ostream()` method.
-
-Syslog Logging
---------------
-
-The syslog logging policy (`websocketpp::log::syslog`) logs to POSIX syslog. It is included in the header `<websocketpp/logger/syslog.hpp>`. It requires a system with `<syslog.h>`.
-
-Stub Logging
-------------
-
-The stub logging policy (`websocketpp::log::stub`) implements the logging policy interface but ignores all input and provides no output. It can be used to stub out the logging system in tests or to completely disable and remove nearly all logging related code. 
-
-The stub logger also provides documentation for the minimal required interface to build a custom logging policy.
-
-Log level reference
--------------------
-
-### Error Logging Levels
-
-Each of these channels is in the namespace `websocketpp::log::elevel`
-
-| Level   | Description                                                                                                                |
-| ------- | -------------------------------------------------------------------------------------------------------------------------- |
-| none    | Special aggregate value representing "no levels"                                                                           |
-| devel   | Low level debugging information (warning: very chatty). Requires debug or custom config.                                   |
-| library | Information about unusual system states or other minor internal library problems, less chatty than devel.                  |
-| info    | Information about minor configuration problems or additional information about other warnings.                             |
-| warn    | Information about important problems not severe enough to terminate connections.                                           |
-| rerror  | Recoverable error. Recovery may mean cleanly closing the connection with an appropriate error code to the remote endpoint. |
-| fatal   | Unrecoverable error. This error will trigger immediate unclean termination of the connection or endpoint.                  |
-| all     | Special aggregate value representing "all levels"                                                                          |
-
-### Access Logging Levels
-
-Each of these channels is in the namespace `websocketpp::log::alevel`
-
-| Level           | Description                                                                                        |
-| --------------- | -------------------------------------------------------------------------------------------------- |
-| none            | Special aggregate value representing "no levels"                                                   |
-| connect         | One line for each new connection that includes a host of information including: the remote address, websocket version, requested resource, http code, remote user agent |
-| disconnect      | One line for each connection that is closed. Includes closing codes and reasons                    |
-| control         | One line per control message                                                                       |
-| frame_header    | One line per frame, includes the full frame header                                                 |
-| frame_payload   | One line per frame, includes the full message payload (warning: lots of output for large messages) |
-| message_header  | Reserved                                                                                           |
-| message_payload | Reserved                                                                                           |
-| endpoint        | Reserved                                                                                           |
-| debug_handshake | Extra information about opening handshakes                                                         |
-| debug_close     | Extra information about closing handshakes                                                         |
-| devel           | Development messages (warning: very chatty). Requires debug or custom config.                      |
-| app             | Special channel for application specific logs. Not used by the library.                            |
-| all             | Special aggregate value representing "all levels"                                                  |
-
-*/
diff --git a/src/sioclient/lib/websocketpp/docs/manual.css b/src/sioclient/lib/websocketpp/docs/manual.css
deleted file mode 100644
index 7c40b185..00000000
--- a/src/sioclient/lib/websocketpp/docs/manual.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.tabs, .tabs2, .tabs3, .navpath ul {
-    background-image: none;
-    background-color: #333;
-    border: none;
-    border-bottom: 1px solid #575757;
-}
-
-.tablist li, .navpath li {
-    background-image: none;
-    background-color: #333;
-}
-
-.tablist a, .navpath li.navelem a {
-    color: #ccc;
-    text-shadow: 0px 1px 1px black;
-}
-
-.tablist a:hover, .navpath li.navelem a:hover {
-    background-image: none;
-    background-color: #444;
-    color: #ccc;
-}
diff --git a/src/sioclient/lib/websocketpp/docs/manual.dox b/src/sioclient/lib/websocketpp/docs/manual.dox
deleted file mode 100644
index 2aa5da6f..00000000
--- a/src/sioclient/lib/websocketpp/docs/manual.dox
+++ /dev/null
@@ -1,23 +0,0 @@
-/** \mainpage
-
-WebSocket++ is a C++ library that can be used to implement WebSocket functionality. The goals of the project are to provide a WebSocket implementation that is portable, flexible, lightweight, low level, and high performance.
-
-WebSocket++ does not intend to be used alone as a web application framework or full featured web services platform. As such the components, examples, and performance tuning are geared towards operation as a WebSocket client or server. There are some minimal convenience features that stray from this (for example the ability to respond to HTTP requests other than WebSocket Upgrades) but these are not the focus of the project. In particular WebSocket++ does not intend to implement any non-WebSocket related fallback options (ajax / long polling / comet / etc).
-
-In order to remain compact and improve portability, the WebSocket++ project strives to reduce or eliminate external dependencies where possible and appropriate. WebSocket++ core has no dependencies other than the C++11 standard library. For non-C++11 compilers the Boost libraries provide drop in polyfills for the C++11 functionality used.
-
-WebSocket++ implements a pluggable data transport component. The default component allows reduced functionality by using STL iostream or raw byte shuffling via reading and writing char buffers. This component has no non-STL dependencies and can be used in a C++11 environment without Boost. Also included is an Asio based transport component that provides full featured network client/server functionality. This component requires either Boost Asio or a C++11 compiler and standalone Asio. As an advanced option, WebSocket++ supports custom transport layers if you want to provide your own using another library.
-
-In order to accommodate the wide variety of use cases WebSocket++ has collected, the library is built in a way that most of the major components are loosely coupled and can be swapped out and replaced. WebSocket++ will attempt to track the future development of the WebSocket protocol and any extensions as they are developed.
-
-- \subpage getting_started "Getting Started"
-- \subpage faq "FAQ"
-- \subpage tutorials "Tutorials"
-- \subpage md_changelog "Change Log / Version History"
-- Reference
- - \subpage reference.handlers "Handler Reference"
- - \subpage reference.config "Config Reference"
- - \subpage reference.logging "Logging Reference"
-
-*/
-
diff --git a/src/sioclient/lib/websocketpp/docs/simple_broadcast_server.cpp b/src/sioclient/lib/websocketpp/docs/simple_broadcast_server.cpp
deleted file mode 100644
index 955d7111..00000000
--- a/src/sioclient/lib/websocketpp/docs/simple_broadcast_server.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <set>
-
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-typedef websocketpp::server<websocketpp::config::asio> server;
-
-using websocketpp::connection_hdl;
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-class broadcast_server {
-public:
-    broadcast_server() {
-        m_server.init_asio();
-                
-        m_server.set_open_handler(bind(&broadcast_server::on_open,this,::_1));
-        m_server.set_close_handler(bind(&broadcast_server::on_close,this,::_1));
-        m_server.set_message_handler(bind(&broadcast_server::on_message,this,::_1,::_2));
-    }
-    
-    void on_open(connection_hdl hdl) {
-        m_connections.insert(hdl);
-    }
-    
-    void on_close(connection_hdl hdl) {
-        m_connections.erase(hdl);
-    }
-    
-    void on_message(connection_hdl hdl, server::message_ptr msg) {
-        for (auto it : m_connections) {
-            m_server.send(it,msg);
-        }
-    }
-
-    void run(uint16_t port) {
-        m_server.listen(port);
-        m_server.start_accept();
-        m_server.run();
-    }
-private:
-    typedef std::set<connection_hdl,std::owner_less<connection_hdl>> con_list;
-
-    server m_server;
-    con_list m_connections;
-};
-
-int main() {
-    broadcast_server server;
-    server.run(9002);
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/docs/simple_count_server_thread.cpp b/src/sioclient/lib/websocketpp/docs/simple_count_server_thread.cpp
deleted file mode 100644
index a30af994..00000000
--- a/src/sioclient/lib/websocketpp/docs/simple_count_server_thread.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <functional>
-#include <mutex>
-#include <set>
-#include <thread>
-
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-typedef websocketpp::server<websocketpp::config::asio> server;
-
-using websocketpp::connection_hdl;
-
-class count_server {
-public:
-    count_server() : m_count(0) {
-        m_server.init_asio();
-                
-        m_server.set_open_handler(bind(&count_server::on_open,this,_1));
-        m_server.set_close_handler(bind(&count_server::on_close,this,_1));
-    }
-    
-    void on_open(connection_hdl hdl) {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        m_connections.insert(hdl);
-    }
-    
-    void on_close(connection_hdl hdl) {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        m_connections.erase(hdl);
-    }
-    
-    void count() {
-        while (1) {
-            sleep(1);
-            m_count++;
-            
-            std::stringstream ss;
-            ss << m_count;
-            
-            std::lock_guard<std::mutex> lock(m_mutex);    
-            for (auto it : m_connections) {
-                m_server.send(it,ss.str(),websocketpp::frame::opcode::text);
-            }
-        }
-    }
-    
-    void run(uint16_t port) {
-        m_server.listen(port);
-        m_server.start_accept();
-        m_server.run();
-    }
-private:
-    typedef std::set<connection_hdl,std::owner_less<connection_hdl>> con_list;
-    
-    int m_count;
-    server m_server;
-    con_list m_connections;
-    std::mutex m_mutex;
-};
-
-int main() {
-    count_server server;
-    std::thread t(std::bind(&count_server::count,&server));
-    server.run(9002);
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/docs/tutorials.dox b/src/sioclient/lib/websocketpp/docs/tutorials.dox
deleted file mode 100644
index 8751e971..00000000
--- a/src/sioclient/lib/websocketpp/docs/tutorials.dox
+++ /dev/null
@@ -1,10 +0,0 @@
-/** \page tutorials Tutorials
-
-These tutorials are works in progress, some are more complete than others.
-
-- \subpage md_tutorials_utility_client_utility_client
-- \subpage md_tutorials_utility_server_utility_server
-- \subpage md_tutorials_broadcast_tutorial_broadcast_tutorial
-- \subpage md_tutorials_chat_tutorial_chat_tutorial
-
-*/
diff --git a/src/sioclient/lib/websocketpp/examples/associative_storage/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/associative_storage/CMakeLists.txt
deleted file mode 100644
index 2f77e7bb..00000000
--- a/src/sioclient/lib/websocketpp/examples/associative_storage/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (associative_storage)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/associative_storage/associative_storage.cpp b/src/sioclient/lib/websocketpp/examples/associative_storage/associative_storage.cpp
deleted file mode 100644
index 2ac84941..00000000
--- a/src/sioclient/lib/websocketpp/examples/associative_storage/associative_storage.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-#include <iostream>
-#include <map>
-#include <exception>
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-typedef websocketpp::server<websocketpp::config::asio> server;
-
-using websocketpp::connection_hdl;
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-struct connection_data {
-    int sessionid;
-    std::string name;
-};
-
-class print_server {
-public:
-    print_server() : m_next_sessionid(1) {
-        m_server.init_asio();
-
-        m_server.set_open_handler(bind(&print_server::on_open,this,::_1));
-        m_server.set_close_handler(bind(&print_server::on_close,this,::_1));
-        m_server.set_message_handler(bind(&print_server::on_message,this,::_1,::_2));
-    }
-
-    void on_open(connection_hdl hdl) {
-        connection_data data;
-
-        data.sessionid = m_next_sessionid++;
-        data.name.clear();
-
-        m_connections[hdl] = data;
-    }
-
-    void on_close(connection_hdl hdl) {
-        connection_data& data = get_data_from_hdl(hdl);
-
-        std::cout << "Closing connection " << data.name
-                  << " with sessionid " << data.sessionid << std::endl;
-
-        m_connections.erase(hdl);
-    }
-
-    void on_message(connection_hdl hdl, server::message_ptr msg) {
-        connection_data& data = get_data_from_hdl(hdl);
-
-        if (data.name.empty()) {
-            data.name = msg->get_payload();
-            std::cout << "Setting name of connection with sessionid "
-                      << data.sessionid << " to " << data.name << std::endl;
-        } else {
-            std::cout << "Got a message from connection " << data.name
-                      << " with sessionid " << data.sessionid << std::endl;
-        }
-    }
-
-    connection_data& get_data_from_hdl(connection_hdl hdl) {
-        auto it = m_connections.find(hdl);
-
-        if (it == m_connections.end()) {
-            // this connection is not in the list. This really shouldn't happen
-            // and probably means something else is wrong.
-            throw std::invalid_argument("No data available for session");
-        }
-
-        return it->second;
-    }
-
-    void run(uint16_t port) {
-        m_server.listen(port);
-        m_server.start_accept();
-        m_server.run();
-    }
-private:
-    typedef std::map<connection_hdl,connection_data,std::owner_less<connection_hdl>> con_list;
-
-    int m_next_sessionid;
-    server m_server;
-    con_list m_connections;
-};
-
-int main() {
-    print_server server;
-    server.run(9002);
-}
diff --git a/src/sioclient/lib/websocketpp/examples/broadcast_server/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/broadcast_server/CMakeLists.txt
deleted file mode 100644
index 5fb5fe3b..00000000
--- a/src/sioclient/lib/websocketpp/examples/broadcast_server/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (broadcast_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/broadcast_server/SConscript b/src/sioclient/lib/websocketpp/examples/broadcast_server/SConscript
deleted file mode 100644
index 5786f570..00000000
--- a/src/sioclient/lib/websocketpp/examples/broadcast_server/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## Broadcast Server example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('broadcast_server', ["broadcast_server.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system','thread'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('broadcast_server', ["broadcast_server.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/broadcast_server/broadcast_server.cpp b/src/sioclient/lib/websocketpp/examples/broadcast_server/broadcast_server.cpp
deleted file mode 100644
index b02e7cd2..00000000
--- a/src/sioclient/lib/websocketpp/examples/broadcast_server/broadcast_server.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-#include <websocketpp/config/asio_no_tls.hpp>
-
-#include <websocketpp/server.hpp>
-
-#include <iostream>
-#include <set>
-
-/*#include <boost/thread.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition_variable.hpp>*/
-#include <websocketpp/common/thread.hpp>
-
-typedef websocketpp::server<websocketpp::config::asio> server;
-
-using websocketpp::connection_hdl;
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-using websocketpp::lib::thread;
-using websocketpp::lib::mutex;
-using websocketpp::lib::lock_guard;
-using websocketpp::lib::unique_lock;
-using websocketpp::lib::condition_variable;
-
-/* on_open insert connection_hdl into channel
- * on_close remove connection_hdl from channel
- * on_message queue send to all channels
- */
-
-enum action_type {
-    SUBSCRIBE,
-    UNSUBSCRIBE,
-    MESSAGE
-};
-
-struct action {
-    action(action_type t, connection_hdl h) : type(t), hdl(h) {}
-    action(action_type t, connection_hdl h, server::message_ptr m)
-      : type(t), hdl(h), msg(m) {}
-
-    action_type type;
-    websocketpp::connection_hdl hdl;
-    server::message_ptr msg;
-};
-
-class broadcast_server {
-public:
-    broadcast_server() {
-        // Initialize Asio Transport
-        m_server.init_asio();
-
-        // Register handler callbacks
-        m_server.set_open_handler(bind(&broadcast_server::on_open,this,::_1));
-        m_server.set_close_handler(bind(&broadcast_server::on_close,this,::_1));
-        m_server.set_message_handler(bind(&broadcast_server::on_message,this,::_1,::_2));
-    }
-
-    void run(uint16_t port) {
-        // listen on specified port
-        m_server.listen(port);
-
-        // Start the server accept loop
-        m_server.start_accept();
-
-        // Start the ASIO io_service run loop
-        try {
-            m_server.run();
-        } catch (const std::exception & e) {
-            std::cout << e.what() << std::endl;
-        }
-    }
-
-    void on_open(connection_hdl hdl) {
-        {
-            lock_guard<mutex> guard(m_action_lock);
-            //std::cout << "on_open" << std::endl;
-            m_actions.push(action(SUBSCRIBE,hdl));
-        }
-        m_action_cond.notify_one();
-    }
-
-    void on_close(connection_hdl hdl) {
-        {
-            lock_guard<mutex> guard(m_action_lock);
-            //std::cout << "on_close" << std::endl;
-            m_actions.push(action(UNSUBSCRIBE,hdl));
-        }
-        m_action_cond.notify_one();
-    }
-
-    void on_message(connection_hdl hdl, server::message_ptr msg) {
-        // queue message up for sending by processing thread
-        {
-            lock_guard<mutex> guard(m_action_lock);
-            //std::cout << "on_message" << std::endl;
-            m_actions.push(action(MESSAGE,hdl,msg));
-        }
-        m_action_cond.notify_one();
-    }
-
-    void process_messages() {
-        while(1) {
-            unique_lock<mutex> lock(m_action_lock);
-
-            while(m_actions.empty()) {
-                m_action_cond.wait(lock);
-            }
-
-            action a = m_actions.front();
-            m_actions.pop();
-
-            lock.unlock();
-
-            if (a.type == SUBSCRIBE) {
-                lock_guard<mutex> guard(m_connection_lock);
-                m_connections.insert(a.hdl);
-            } else if (a.type == UNSUBSCRIBE) {
-                lock_guard<mutex> guard(m_connection_lock);
-                m_connections.erase(a.hdl);
-            } else if (a.type == MESSAGE) {
-                lock_guard<mutex> guard(m_connection_lock);
-
-                con_list::iterator it;
-                for (it = m_connections.begin(); it != m_connections.end(); ++it) {
-                    m_server.send(*it,a.msg);
-                }
-            } else {
-                // undefined.
-            }
-        }
-    }
-private:
-    typedef std::set<connection_hdl,std::owner_less<connection_hdl> > con_list;
-
-    server m_server;
-    con_list m_connections;
-    std::queue<action> m_actions;
-
-    mutex m_action_lock;
-    mutex m_connection_lock;
-    condition_variable m_action_cond;
-};
-
-int main() {
-    try {
-    broadcast_server server_instance;
-
-    // Start a thread to run the processing loop
-    thread t(bind(&broadcast_server::process_messages,&server_instance));
-
-    // Run the asio loop with the main thread
-    server_instance.run(9002);
-
-    t.join();
-
-    } catch (websocketpp::exception const & e) {
-        std::cout << e.what() << std::endl;
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/examples/debug_client/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/debug_client/CMakeLists.txt
deleted file mode 100644
index 651208a3..00000000
--- a/src/sioclient/lib/websocketpp/examples/debug_client/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-if (OPENSSL_FOUND)
-
-init_target (debug_client)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-link_openssl()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
-
-endif()
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/examples/debug_client/SConscript b/src/sioclient/lib/websocketpp/examples/debug_client/SConscript
deleted file mode 100644
index 781db837..00000000
--- a/src/sioclient/lib/websocketpp/examples/debug_client/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-## Debug client example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-Import('tls_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   prgs += env_cpp11.Program('debug_client', ["debug_client.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   prgs += env.Program('debug_client', ["debug_client.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/debug_client/debug_client.cpp b/src/sioclient/lib/websocketpp/examples/debug_client/debug_client.cpp
deleted file mode 100644
index d3e9153d..00000000
--- a/src/sioclient/lib/websocketpp/examples/debug_client/debug_client.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** ====== WARNING ========
- * This example is presently used as a scratch space. It may or may not be broken
- * at any given time.
- */
-
-#include <websocketpp/config/asio_client.hpp>
-
-#include <websocketpp/client.hpp>
-
-#include <iostream>
-#include <chrono>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-// pull out the type of messages sent by our config
-typedef websocketpp::config::asio_tls_client::message_type::ptr message_ptr;
-typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
-typedef client::connection_ptr connection_ptr;
-
-
-
-class perftest {
-public:
-    typedef perftest type;
-    typedef std::chrono::duration<int,std::micro> dur_type;
-
-    perftest () {
-        m_endpoint.set_access_channels(websocketpp::log::alevel::all);
-        m_endpoint.set_error_channels(websocketpp::log::elevel::all);
-
-        // Initialize ASIO
-        m_endpoint.init_asio();
-
-        // Register our handlers
-        m_endpoint.set_socket_init_handler(bind(&type::on_socket_init,this,::_1));
-        //m_endpoint.set_tls_init_handler(bind(&type::on_tls_init,this,::_1));
-        m_endpoint.set_message_handler(bind(&type::on_message,this,::_1,::_2));
-        m_endpoint.set_open_handler(bind(&type::on_open,this,::_1));
-        m_endpoint.set_close_handler(bind(&type::on_close,this,::_1));
-        m_endpoint.set_fail_handler(bind(&type::on_fail,this,::_1));
-    }
-
-    void start(std::string uri) {
-        websocketpp::lib::error_code ec;
-        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
-
-        if (ec) {
-            m_endpoint.get_alog().write(websocketpp::log::alevel::app,ec.message());
-            return;
-        }
-
-        //con->set_proxy("http://humupdates.uchicago.edu:8443");
-
-        m_endpoint.connect(con);
-
-        // Start the ASIO io_service run loop
-        m_start = std::chrono::high_resolution_clock::now();
-        m_endpoint.run();
-    }
-
-    void on_socket_init(websocketpp::connection_hdl) {
-        m_socket_init = std::chrono::high_resolution_clock::now();
-    }
-
-    context_ptr on_tls_init(websocketpp::connection_hdl) {
-        m_tls_init = std::chrono::high_resolution_clock::now();
-        context_ptr ctx = websocketpp::lib::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tlsv1);
-
-        try {
-            ctx->set_options(boost::asio::ssl::context::default_workarounds |
-                             boost::asio::ssl::context::no_sslv2 |
-                             boost::asio::ssl::context::no_sslv3 |
-                             boost::asio::ssl::context::single_dh_use);
-        } catch (std::exception& e) {
-            std::cout << e.what() << std::endl;
-        }
-        return ctx;
-    }
-
-    void on_fail(websocketpp::connection_hdl hdl) {
-        client::connection_ptr con = m_endpoint.get_con_from_hdl(hdl);
-        
-        std::cout << "Fail handler" << std::endl;
-        std::cout << con->get_state() << std::endl;
-        std::cout << con->get_local_close_code() << std::endl;
-        std::cout << con->get_local_close_reason() << std::endl;
-        std::cout << con->get_remote_close_code() << std::endl;
-        std::cout << con->get_remote_close_reason() << std::endl;
-        std::cout << con->get_ec() << " - " << con->get_ec().message() << std::endl;
-    }
-
-    void on_open(websocketpp::connection_hdl hdl) {
-        m_open = std::chrono::high_resolution_clock::now();
-        m_endpoint.send(hdl, "", websocketpp::frame::opcode::text);
-    }
-    void on_message(websocketpp::connection_hdl hdl, message_ptr) {
-        m_message = std::chrono::high_resolution_clock::now();
-        m_endpoint.close(hdl,websocketpp::close::status::going_away,"");
-    }
-    void on_close(websocketpp::connection_hdl) {
-        m_close = std::chrono::high_resolution_clock::now();
-
-        std::cout << "Socket Init: " << std::chrono::duration_cast<dur_type>(m_socket_init-m_start).count() << std::endl;
-        std::cout << "TLS Init: " << std::chrono::duration_cast<dur_type>(m_tls_init-m_start).count() << std::endl;
-        std::cout << "Open: " << std::chrono::duration_cast<dur_type>(m_open-m_start).count() << std::endl;
-        std::cout << "Message: " << std::chrono::duration_cast<dur_type>(m_message-m_start).count() << std::endl;
-        std::cout << "Close: " << std::chrono::duration_cast<dur_type>(m_close-m_start).count() << std::endl;
-    }
-private:
-    client m_endpoint;
-
-    std::chrono::high_resolution_clock::time_point m_start;
-    std::chrono::high_resolution_clock::time_point m_socket_init;
-    std::chrono::high_resolution_clock::time_point m_tls_init;
-    std::chrono::high_resolution_clock::time_point m_open;
-    std::chrono::high_resolution_clock::time_point m_message;
-    std::chrono::high_resolution_clock::time_point m_close;
-};
-
-int main(int argc, char* argv[]) {
-    std::string uri = "wss://echo.websocket.org";
-
-    if (argc == 2) {
-        uri = argv[1];
-    }
-
-    try {
-        perftest endpoint;
-        endpoint.start(uri);
-    } catch (websocketpp::exception const & e) {
-        std::cout << e.what() << std::endl;
-    } catch (std::exception const & e) {
-        std::cout << e.what() << std::endl;
-    } catch (...) {
-        std::cout << "other exception" << std::endl;
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/examples/debug_server/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/debug_server/CMakeLists.txt
deleted file mode 100644
index d134d318..00000000
--- a/src/sioclient/lib/websocketpp/examples/debug_server/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (debug_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/debug_server/SConscript b/src/sioclient/lib/websocketpp/examples/debug_server/SConscript
deleted file mode 100644
index 4d02261c..00000000
--- a/src/sioclient/lib/websocketpp/examples/debug_server/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## Debug server example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('debug_server', ["debug_server.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('debug_server', ["debug_server.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/debug_server/debug_server.cpp b/src/sioclient/lib/websocketpp/examples/debug_server/debug_server.cpp
deleted file mode 100644
index 8d1ff0ee..00000000
--- a/src/sioclient/lib/websocketpp/examples/debug_server/debug_server.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** ====== WARNING ========
- * This example is presently used as a scratch space. It may or may not be broken
- * at any given time.
- */
-
-#include <websocketpp/config/debug_asio_no_tls.hpp>
-
-// Custom logger
-#include <websocketpp/logger/syslog.hpp>
-
-#include <websocketpp/server.hpp>
-
-#include <iostream>
-
-////////////////////////////////////////////////////////////////////////////////
-///////////////// Custom Config for debugging custom policies //////////////////
-////////////////////////////////////////////////////////////////////////////////
-
-struct debug_custom : public websocketpp::config::debug_asio {
-    typedef debug_custom type;
-    typedef debug_asio base;
-
-    typedef base::concurrency_type concurrency_type;
-
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    /// Custom Logging policies
-    /*typedef websocketpp::log::syslog<concurrency_type,
-        websocketpp::log::elevel> elog_type;
-    typedef websocketpp::log::syslog<concurrency_type,
-        websocketpp::log::alevel> alog_type;
-    */
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-
-    typedef base::rng_type rng_type;
-
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint
-            socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config>
-        transport_type;
-    
-    static const long timeout_open_handshake = 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-typedef websocketpp::server<debug_custom> server;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-// pull out the type of messages sent by our config
-typedef server::message_ptr message_ptr;
-
-bool validate(server *, websocketpp::connection_hdl) {
-    //sleep(6);
-    return true;
-}
-
-void on_http(server* s, websocketpp::connection_hdl hdl) {
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-
-    std::string res = con->get_request_body();
-
-    std::stringstream ss;
-    ss << "got HTTP request with " << res.size() << " bytes of body data.";
-
-    con->set_body(ss.str());
-    con->set_status(websocketpp::http::status_code::ok);
-}
-
-void on_fail(server* s, websocketpp::connection_hdl hdl) {
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-    
-    std::cout << "Fail handler: " << con->get_ec() << " " << con->get_ec().message()  << std::endl;
-}
-
-void on_close(websocketpp::connection_hdl) {
-    std::cout << "Close handler" << std::endl;
-}
-
-// Define a callback to handle incoming messages
-void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    std::cout << "on_message called with hdl: " << hdl.lock().get()
-              << " and message: " << msg->get_payload()
-              << std::endl;
-
-    try {
-        s->send(hdl, msg->get_payload(), msg->get_opcode());
-    } catch (websocketpp::exception const & e) {
-        std::cout << "Echo failed because: " 
-                  << "(" << e.what() << ")" << std::endl;
-    }
-}
-
-int main() {
-    // Create a server endpoint
-    server echo_server;
-
-    try {
-        // Set logging settings
-        echo_server.set_access_channels(websocketpp::log::alevel::all);
-        echo_server.clear_access_channels(websocketpp::log::alevel::frame_payload);
-
-        // Initialize ASIO
-        echo_server.init_asio();
-        echo_server.set_reuse_addr(true);
-
-        // Register our message handler
-        echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
-
-        echo_server.set_http_handler(bind(&on_http,&echo_server,::_1));
-        echo_server.set_fail_handler(bind(&on_fail,&echo_server,::_1));
-        echo_server.set_close_handler(&on_close);
-
-        echo_server.set_validate_handler(bind(&validate,&echo_server,::_1));
-
-        // Listen on port 9012
-        echo_server.listen(9012);
-
-        // Start the server accept loop
-        echo_server.start_accept();
-
-        // Start the ASIO io_service run loop
-        echo_server.run();
-    } catch (websocketpp::exception const & e) {
-        std::cout << e.what() << std::endl;
-    } catch (const std::exception & e) {
-        std::cout << e.what() << std::endl;
-    } catch (...) {
-        std::cout << "other exception" << std::endl;
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/examples/dev/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/dev/CMakeLists.txt
deleted file mode 100644
index f820c6b5..00000000
--- a/src/sioclient/lib/websocketpp/examples/dev/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-#init_target (dev)
-
-#build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-#link_boost ()
-#final_target ()
-
-#set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/dev/SConscript b/src/sioclient/lib/websocketpp/examples/dev/SConscript
deleted file mode 100644
index 34ddac2d..00000000
--- a/src/sioclient/lib/websocketpp/examples/dev/SConscript
+++ /dev/null
@@ -1,18 +0,0 @@
-## Main development example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system','timer','chrono'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('main', ["main.cpp"], LIBS = BOOST_LIBS_CPP11)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/dev/main.cpp b/src/sioclient/lib/websocketpp/examples/dev/main.cpp
deleted file mode 100644
index 79d7bf1d..00000000
--- a/src/sioclient/lib/websocketpp/examples/dev/main.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-//#ifndef _WEBSOCKETPP_CPP11_STL_
-//    #define _WEBSOCKETPP_CPP11_STL_
-//#endif
-
-#include <random>
-#include <boost/timer/timer.hpp>
-
-#include <websocketpp/config/core.hpp>
-
-//#include <websocketpp/security/none.hpp>
-
-//#include <websocketpp/concurrency/none.hpp>
-//#include <websocketpp/concurrency/stl.hpp>
-
-//#include <websocketpp/transport/iostream.hpp>
-#include <websocketpp/server.hpp>
-
-#include <iostream>
-#include <sstream>
-
-//typedef websocketpp::concurrency::stl concurrency;
-//typedef websocketpp::transport::iostream<concurrency> transport;
-//typedef websocketpp::server<concurrency,transport> server;
-typedef websocketpp::server<websocketpp::config::core> server;
-
-/*class handler : public server::handler {
-    bool validate(connection_ptr con) {
-        std::cout << "handler validate" << std::endl;
-        if (con->get_origin() != "http://www.example.com") {
-            con->set_status(websocketpp::http::status_code::FORBIDDEN);
-            return false;
-        }
-        return true;
-    }
-
-    void http(connection_ptr con) {
-        std::cout << "handler http" << std::endl;
-    }
-
-    void on_load(connection_ptr con, ptr old_handler) {
-        std::cout << "handler on_load" << std::endl;
-    }
-    void on_unload(connection_ptr con, ptr new_handler) {
-        std::cout << "handler on_unload" << std::endl;
-    }
-
-    void on_open(connection_ptr con) {
-        std::cout << "handler on_open" << std::endl;
-    }
-    void on_fail(connection_ptr con) {
-        std::cout << "handler on_fail" << std::endl;
-    }
-
-    void on_message(connection_ptr con, message_ptr msg) {
-        std::cout << "handler on_message" << std::endl;
-
-
-    }
-
-    void on_close(connection_ptr con) {
-        std::cout << "handler on_close" << std::endl;
-    }
-};*/
-
-int main() {
-    typedef websocketpp::message_buffer::message<websocketpp::message_buffer::alloc::con_msg_manager>
-        message_type;
-    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
-        con_msg_man_type;
-
-    con_msg_man_type::ptr manager = websocketpp::lib::make_shared<con_msg_man_type>();
-
-    size_t foo = 1024;
-
-    message_type::ptr input = manager->get_message(websocketpp::frame::opcode::TEXT,foo);
-    message_type::ptr output = manager->get_message(websocketpp::frame::opcode::TEXT,foo);
-    websocketpp::frame::masking_key_type key;
-
-    std::random_device dev;
-
-
-
-    key.i = 0x12345678;
-
-    double m = 18094238402394.0824923;
-
-    /*std::cout << "Some Math" << std::endl;
-    {
-        boost::timer::auto_cpu_timer t;
-
-        for (int i = 0; i < foo; i++) {
-            m /= 1.001;
-        }
-
-    }*/
-
-    std::cout << m << std::endl;
-
-    std::cout << "Random Gen" << std::endl;
-    {
-        boost::timer::auto_cpu_timer t;
-
-        input->get_raw_payload().replace(0,foo,foo,'\0');
-        output->get_raw_payload().replace(0,foo,foo,'\0');
-    }
-
-    std::cout << "Out of place accelerated" << std::endl;
-    {
-        boost::timer::auto_cpu_timer t;
-
-        websocketpp::frame::word_mask_exact(reinterpret_cast<uint8_t*>(const_cast<char*>(input->get_raw_payload().data())), reinterpret_cast<uint8_t*>(const_cast<char*>(output->get_raw_payload().data())), foo, key);
-    }
-
-    std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
-    std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-
-    input->get_raw_payload().replace(0,foo,foo,'\0');
-    output->get_raw_payload().replace(0,foo,foo,'\0');
-
-    std::cout << "In place accelerated" << std::endl;
-    {
-        boost::timer::auto_cpu_timer t;
-
-        websocketpp::frame::word_mask_exact(reinterpret_cast<uint8_t*>(const_cast<char*>(input->get_raw_payload().data())), reinterpret_cast<uint8_t*>(const_cast<char*>(input->get_raw_payload().data())), foo, key);
-    }
-
-    std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
-    std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-
-    input->get_raw_payload().replace(0,foo,foo,'\0');
-    output->get_raw_payload().replace(0,foo,foo,'\0');
-    std::cout << "Out of place byte by byte" << std::endl;
-    {
-        boost::timer::auto_cpu_timer t;
-
-        websocketpp::frame::byte_mask(input->get_raw_payload().begin(), input->get_raw_payload().end(), output->get_raw_payload().begin(), key);
-    }
-
-    std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
-    std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-
-    input->get_raw_payload().replace(0,foo,foo,'\0');
-    output->get_raw_payload().replace(0,foo,foo,'\0');
-    std::cout << "In place byte by byte" << std::endl;
-    {
-        boost::timer::auto_cpu_timer t;
-
-        websocketpp::frame::byte_mask(input->get_raw_payload().begin(), input->get_raw_payload().end(), input->get_raw_payload().begin(), key);
-    }
-
-    std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
-    std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-
-    input->get_raw_payload().replace(0,foo,foo,'a');
-    output->get_raw_payload().replace(0,foo,foo,'b');
-    std::cout << "Copy" << std::endl;
-    {
-        boost::timer::auto_cpu_timer t;
-
-        std::copy(input->get_raw_payload().begin(), input->get_raw_payload().end(), output->get_raw_payload().begin());
-    }
-
-    std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
-    std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-
-    /*server::handler::ptr h(new handler());
-
-    server test_server(h);
-    server::connection_ptr con;
-
-    std::stringstream output;
-
-    test_server.register_ostream(&output);
-
-    con = test_server.get_connection();
-
-    con->start();
-
-    //foo.handle_accept(con,true);
-
-    std::stringstream input;
-    input << "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-    //input << "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-    input >> *con;
-
-    std::stringstream input2;
-    input2 << "messageabc2";
-    input2 >> *con;
-
-    std::stringstream input3;
-    input3 << "messageabc3";
-    input3 >> *con;
-
-    std::stringstream input4;
-    input4 << "close";
-    input4 >> *con;
-
-    std::cout << "connection output:" << std::endl;
-    std::cout << output.str() << std::endl;*/
-}
diff --git a/src/sioclient/lib/websocketpp/examples/echo_client/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/echo_client/CMakeLists.txt
deleted file mode 100644
index 1fdf39e9..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_client/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (echo_client)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/echo_client/SConscript b/src/sioclient/lib/websocketpp/examples/echo_client/SConscript
deleted file mode 100644
index 0e411082..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_client/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## echo_client example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
-   prgs += env_cpp11.Program('echo_client', ["echo_client.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + ['z']
-   prgs += env.Program('echo_client', ["echo_client.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/echo_client/echo_client.cpp b/src/sioclient/lib/websocketpp/examples/echo_client/echo_client.cpp
deleted file mode 100644
index 59af6614..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_client/echo_client.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2016, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-
-#include <iostream>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-// pull out the type of messages sent by our config
-typedef websocketpp::config::asio_client::message_type::ptr message_ptr;
-
-// This message handler will be invoked once for each incoming message. It
-// prints the message and then sends a copy of the message back to the server.
-void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
-    std::cout << "on_message called with hdl: " << hdl.lock().get()
-              << " and message: " << msg->get_payload()
-              << std::endl;
-
-
-    websocketpp::lib::error_code ec;
-
-    c->send(hdl, msg->get_payload(), msg->get_opcode(), ec);
-    if (ec) {
-        std::cout << "Echo failed because: " << ec.message() << std::endl;
-    }
-}
-
-int main(int argc, char* argv[]) {
-    // Create a client endpoint
-    client c;
-
-    std::string uri = "ws://localhost:9002";
-
-    if (argc == 2) {
-        uri = argv[1];
-    }
-
-    try {
-        // Set logging to be pretty verbose (everything except message payloads)
-        c.set_access_channels(websocketpp::log::alevel::all);
-        c.clear_access_channels(websocketpp::log::alevel::frame_payload);
-
-        // Initialize ASIO
-        c.init_asio();
-
-        // Register our message handler
-        c.set_message_handler(bind(&on_message,&c,::_1,::_2));
-
-        websocketpp::lib::error_code ec;
-        client::connection_ptr con = c.get_connection(uri, ec);
-        if (ec) {
-            std::cout << "could not create connection because: " << ec.message() << std::endl;
-            return 0;
-        }
-
-        // Note that connect here only requests a connection. No network messages are
-        // exchanged until the event loop starts running in the next line.
-        c.connect(con);
-
-        // Start the ASIO io_service run loop
-        // this will cause a single connection to be made to the server. c.run()
-        // will exit when this connection is closed.
-        c.run();
-    } catch (websocketpp::exception const & e) {
-        std::cout << e.what() << std::endl;
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/examples/echo_server/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/echo_server/CMakeLists.txt
deleted file mode 100644
index a48be524..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_server/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (echo_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/echo_server/SConscript b/src/sioclient/lib/websocketpp/examples/echo_server/SConscript
deleted file mode 100644
index a2978852..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_server/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## Main development example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('echo_server', ["echo_server.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('echo_server', ["echo_server.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/echo_server/echo_handler.hpp b/src/sioclient/lib/websocketpp/examples/echo_server/echo_handler.hpp
deleted file mode 100644
index f55b867a..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_server/echo_handler.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2012, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP
-#define WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP
-
-class echo_handler : public server::handler {
-    void on_message(connection_ptr con, std::string msg) {
-        con->write(msg);
-    }
-};
-
-#endif // WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP
diff --git a/src/sioclient/lib/websocketpp/examples/echo_server/echo_server.cpp b/src/sioclient/lib/websocketpp/examples/echo_server/echo_server.cpp
deleted file mode 100644
index d234009c..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_server/echo_server.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <websocketpp/config/asio_no_tls.hpp>
-
-#include <websocketpp/server.hpp>
-
-#include <iostream>
-
-typedef websocketpp::server<websocketpp::config::asio> server;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-// pull out the type of messages sent by our config
-typedef server::message_ptr message_ptr;
-
-// Define a callback to handle incoming messages
-void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    std::cout << "on_message called with hdl: " << hdl.lock().get()
-              << " and message: " << msg->get_payload()
-              << std::endl;
-
-    // check for a special command to instruct the server to stop listening so
-    // it can be cleanly exited.
-    if (msg->get_payload() == "stop-listening") {
-        s->stop_listening();
-        return;
-    }
-
-    try {
-        s->send(hdl, msg->get_payload(), msg->get_opcode());
-    } catch (websocketpp::exception const & e) {
-        std::cout << "Echo failed because: "
-                  << "(" << e.what() << ")" << std::endl;
-    }
-}
-
-int main() {
-    // Create a server endpoint
-    server echo_server;
-
-    try {
-        // Set logging settings
-        echo_server.set_access_channels(websocketpp::log::alevel::all);
-        echo_server.clear_access_channels(websocketpp::log::alevel::frame_payload);
-
-        // Initialize Asio
-        echo_server.init_asio();
-
-        // Register our message handler
-        echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
-
-        // Listen on port 9002
-        echo_server.listen(9002);
-
-        // Start the server accept loop
-        echo_server.start_accept();
-
-        // Start the ASIO io_service run loop
-        echo_server.run();
-    } catch (websocketpp::exception const & e) {
-        std::cout << e.what() << std::endl;
-    } catch (...) {
-        std::cout << "other exception" << std::endl;
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/examples/echo_server_both/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/echo_server_both/CMakeLists.txt
deleted file mode 100644
index 83c50dc1..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_server_both/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-
-if (OPENSSL_FOUND)
-
-init_target (echo_server_both)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-link_openssl()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
-
-endif()
diff --git a/src/sioclient/lib/websocketpp/examples/echo_server_both/SConscript b/src/sioclient/lib/websocketpp/examples/echo_server_both/SConscript
deleted file mode 100644
index d1ecf202..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_server_both/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-## Combo plain+tls echo server
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-Import('tls_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   prgs += env_cpp11.Program('echo_server_both', ["echo_server_both.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   prgs += env.Program('echo_server_both', ["echo_server_both.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/echo_server_both/echo_server_both.cpp b/src/sioclient/lib/websocketpp/examples/echo_server_both/echo_server_both.cpp
deleted file mode 100644
index 2c2c4eaf..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_server_both/echo_server_both.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#include <websocketpp/config/asio.hpp>
-#include <websocketpp/server.hpp>
-
-#include <iostream>
-
-// define types for two different server endpoints, one for each config we are
-// using
-typedef websocketpp::server<websocketpp::config::asio> server_plain;
-typedef websocketpp::server<websocketpp::config::asio_tls> server_tls;
-
-// alias some of the bind related functions as they are a bit long
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-// type of the ssl context pointer is long so alias it
-typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
-
-// The shared on_message handler takes a template parameter so the function can
-// resolve any endpoint dependent types like message_ptr or connection_ptr
-template <typename EndpointType>
-void on_message(EndpointType* s, websocketpp::connection_hdl hdl,
-    typename EndpointType::message_ptr msg)
-{
-    std::cout << "on_message called with hdl: " << hdl.lock().get()
-              << " and message: " << msg->get_payload()
-              << std::endl;
-
-    try {
-        s->send(hdl, msg->get_payload(), msg->get_opcode());
-    } catch (websocketpp::exception const & e) {
-        std::cout << "Echo failed because: "
-                  << "(" << e.what() << ")" << std::endl;
-    }
-}
-
-// No change to TLS init methods from echo_server_tls
-std::string get_password() {
-    return "test";
-}
-
-context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
-    std::cout << "on_tls_init called with hdl: " << hdl.lock().get() << std::endl;
-    context_ptr ctx(new boost::asio::ssl::context(boost::asio::ssl::context::tlsv1));
-
-    try {
-        ctx->set_options(boost::asio::ssl::context::default_workarounds |
-                         boost::asio::ssl::context::no_sslv2 |
-                         boost::asio::ssl::context::no_sslv3 |
-                         boost::asio::ssl::context::single_dh_use);
-        ctx->set_password_callback(bind(&get_password));
-        ctx->use_certificate_chain_file("server.pem");
-        ctx->use_private_key_file("server.pem", boost::asio::ssl::context::pem);
-    } catch (std::exception& e) {
-        std::cout << e.what() << std::endl;
-    }
-    return ctx;
-}
-
-int main() {
-    // set up an external io_service to run both endpoints on. This is not
-    // strictly necessary, but simplifies thread management a bit.
-    boost::asio::io_service ios;
-
-    // set up plain endpoint
-    server_plain endpoint_plain;
-    // initialize asio with our external io_service rather than an internal one
-    endpoint_plain.init_asio(&ios);
-    endpoint_plain.set_message_handler(
-        bind(&on_message<server_plain>,&endpoint_plain,::_1,::_2));
-    endpoint_plain.listen(80);
-    endpoint_plain.start_accept();
-
-    // set up tls endpoint
-    server_tls endpoint_tls;
-    endpoint_tls.init_asio(&ios);
-    endpoint_tls.set_message_handler(
-        bind(&on_message<server_tls>,&endpoint_tls,::_1,::_2));
-    // TLS endpoint has an extra handler for the tls init
-    endpoint_tls.set_tls_init_handler(bind(&on_tls_init,::_1));
-    // tls endpoint listens on a different port
-    endpoint_tls.listen(443);
-    endpoint_tls.start_accept();
-
-    // Start the ASIO io_service run loop running both endpoints
-    ios.run();
-}
diff --git a/src/sioclient/lib/websocketpp/examples/echo_server_both/server.pem b/src/sioclient/lib/websocketpp/examples/echo_server_both/server.pem
deleted file mode 100644
index 9f679a49..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_server_both/server.pem
+++ /dev/null
@@ -1,58 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,A0ED66EF872A48A9
-
-gXuvKojXzApVhhPVNdRliiajbC4PtwQG5c8TA7JADLgwOR7o9t6KtXEr37bDRpvB
-9aO9P+SJaK5OOp3XKPGthOdqv+tvCRTlmzmC8GjPLBX389DWT2xoGu7JkGwDtdSm
-rnF49Rlp5bfjpACk5xKNiKeDo1CWfeEJzw9Kto0g+5eMaEdors64oPzjXs3geA2g
-TxCJSHv9qSX6++pCLKKCUTbyzidAxV/Zb0AAubt5V40QKqX4HhSwwstFnTaX3tlb
-3QOdY+y04VIkM6d7qN5W8M7NzRkMpZ1qBpQcUMpkhQcRzWP2wub5AAff9D2GntRd
-4Dz1vn3u41U3Okdr0CNj+iH7byCzuokoAhk6ZQEN6WB+GTpGgfBXdtUZrfpb0MKm
-UNYP5AF2AmUqJRXhViTDVtu/V2tHF3LGuNT+W2Dz+spFZEq0byEO0N858eR0dikc
-6jOASvNQbSwD0+mkgBC1gXKKU3ngj2gpJUwljeACdWFd8N2egrZfyI05CmX7vPNC
-NXbs7k2buWNdjP4/D8IM+HDVidWzQa/kG/qokXKqllem9Egg37lUucwnP3cX2/Hw
-U2mfaBWzeZtqc+GqRp08rYIql+Reai3sUYlQMnNk01prVY47UQb+dxuqjaxGV5Xx
-Xkx0s2mfQnNRjL4S7Hjhqelufi6GpkCQ2EGsPpA+6K1ztZ0ame9Q2BE1SXeM/6vU
-rxT5nRrCxueyXAyQSGcqMX9//gSeK8WWBqG/c1IAMVDa0NWrJeOJhSziE+ta3B0m
-bHAPBY6vh0iB3lLdRlbUOPbC6R1TpxMOs+6Vbs2+OTifFpvOVymEoZq/nroyg68P
-vn5uCKogwWA7o8EArf/UTlIwWJmH9bgILdZKld4wMel2HQg16RDzm+mEXAJi52a/
-FC+fgfphdxltmUJ+rqOyR4AHULjaTWUQqTIB6sdlzgmES1nXAiE71zX//KFqomar
-O60SPPk3C1bs0x5DsvmGJa8SIfDhyd+D7NPyqwEKqrZsaotYGklNkfqxa6pa8mrc
-ejxquW1PK4FvBk26+osu5a90Jih0PcQM7DUMMr2WHdTiMSXWAiK2ToYF8Itt25Qv
-Cd0CsSYw9CJkXNr1u1+mObheaY9QYOmztnSJLy4ZO2JsMhqNwuAueIcwmhXOREq7
-kzlnGMgJcuSeAS/OBNj8Zgx0c7QQ0kzc+YmnOCsqoMtPsu/CsXJ4iJiM3Tki/2jT
-bywrTiQwE6R3a/87GREOREX+WLicZBWX3k9/4tBL5XSe1p5wPpuIRQUDvAGNfNHP
-JN7kujDF4SehilF1qtvCygAwvxHFDj+EwhXKNDKJzoZZIM15rAk3k92n2j6nz1qH
-a3xOU05yydOlO6F6w51I1QoDddmkzCRNB0TeO3D6rekHsCK1aDWmC+qRcm2ZFtVz
-sY6fdZN2NEmMQokIh9Opi1f8CSYSizPESMzdu2SF0xVO9n/IGIkn1ksK04O2BZo0
-X3LBPHLfCRsQNY1eF17bj07fYU2oPZKs/XzJiwxkqK6LFvpeAVaYrtg9fqRO/UVe
-QhUIj3BL550ocEpa15xLehLrmwzYiW5zwGjSHQ4EgZluGLCwyKGTh4QswEJRA9Rt
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIE0DCCA7igAwIBAgIJAM5MuKJezXq0MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xGDAW
-BgNVBAoTD1phcGhveWQgU3R1ZGlvczEUMBIGA1UECxMLV2ViU29ja2V0KysxFjAU
-BgNVBAMTDVBldGVyIFRob3Jzb24xJDAiBgkqhkiG9w0BCQEWFXdlYm1hc3RlckB6
-YXBob3lkLmNvbTAeFw0xMTExMTUyMTIwMDZaFw0xMjExMTQyMTIwMDZaMIGgMQsw
-CQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28x
-GDAWBgNVBAoTD1phcGhveWQgU3R1ZGlvczEUMBIGA1UECxMLV2ViU29ja2V0Kysx
-FjAUBgNVBAMTDVBldGVyIFRob3Jzb24xJDAiBgkqhkiG9w0BCQEWFXdlYm1hc3Rl
-ckB6YXBob3lkLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANR0
-tdwAnIB8I9qRZ7QbzEWY95RpM7GIn0u/9oH90PzdHiE0rXSkKT+yw3XUzH0iw5t0
-5dEwSC+srSP5Vm4cA6kXc94agVVaPW89tGcdP4fHptCruSrzQsDXELCPl5UUvMpA
-YUcGisdXYPN/EeOoqb9wKWxoW5mREsyyeWWS89fYN5qU/d0QpbSvEWghqLbL/ZS2
-hOlXT9LufOeA+vHiV1/T/h5xC7ecIH02YDQw1EnqxbPmkLPcWThztLS9FiufNDRM
-Rhcoaj2b9VDHvDwdbeA0T5v5qNdG34LaapYOelxzQMOtM0f9Dgqehodyxl2qm9mR
-lq432dlOEzDnVCPNHwECAwEAAaOCAQkwggEFMB0GA1UdDgQWBBTTPKfNMnKOykhv
-+vKS7vql5JsMyzCB1QYDVR0jBIHNMIHKgBTTPKfNMnKOykhv+vKS7vql5JsMy6GB
-pqSBozCBoDELMAkGA1UEBhMCVVMxETAPBgNVBAgTCElsbGlub2lzMRAwDgYDVQQH
-EwdDaGljYWdvMRgwFgYDVQQKEw9aYXBob3lkIFN0dWRpb3MxFDASBgNVBAsTC1dl
-YlNvY2tldCsrMRYwFAYDVQQDEw1QZXRlciBUaG9yc29uMSQwIgYJKoZIhvcNAQkB
-FhV3ZWJtYXN0ZXJAemFwaG95ZC5jb22CCQDOTLiiXs16tDAMBgNVHRMEBTADAQH/
-MA0GCSqGSIb3DQEBBQUAA4IBAQB+SH0s/hrv5VYqgX6SNLzxdSLvCVsUkCdTpxwY
-wOJ84XmYcXDMhKDtZqLtOtN6pfEwVusFlC9mkieuunztCnWNmsSG83RuljJPjFSi
-1d4Id4bKEQkQ4cfnjoHKivRrViWLnxuNnLzC6tpyGH/35kKWhhr6T58AXerFgVw3
-mHvLPTr1DuhdAZA0ZuvuseVAFFAjI3RetSySwHJE3ak8KswDVfLi6E3XxMVsIWTS
-/iFsC2WwoZQlljya2V/kRYIhu+uCdqJ01wunn2BvmURPSgr4GTBF0FQ9JGpNbXxM
-TAU7oQJgyFc5sCcuEgPTO0dWVQTvdZVgay4tkmduKDRkmJBF
------END CERTIFICATE-----
diff --git a/src/sioclient/lib/websocketpp/examples/echo_server_tls/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/echo_server_tls/CMakeLists.txt
deleted file mode 100644
index 99f0c142..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_server_tls/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-
-if (OPENSSL_FOUND)
-
-init_target (echo_server_tls)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-link_openssl()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
-
-endif()
diff --git a/src/sioclient/lib/websocketpp/examples/echo_server_tls/SConscript b/src/sioclient/lib/websocketpp/examples/echo_server_tls/SConscript
deleted file mode 100644
index e24cc4ce..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_server_tls/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-## Main development example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-Import('tls_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   prgs += env_cpp11.Program('echo_server_tls', ["echo_server_tls.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   prgs += env.Program('echo_server_tls', ["echo_server_tls.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/echo_server_tls/dh.pem b/src/sioclient/lib/websocketpp/examples/echo_server_tls/dh.pem
deleted file mode 100644
index 6b1c74d4..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_server_tls/dh.pem
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN DH PARAMETERS-----
-MIIBCAKCAQEAqxMGKZB8YNV8WQnbJWwwwmifc+PfVRtd1FN5v5aQSsf6dpjX3Zlh
-N1NmgecsQyg4u2EWe4Umta10QzCgYaxf6QdTCg7iprLzFNw7IvWYbQ6du12NMGDr
-hmwA6KQKwbTgPL6mSlSlcK2wTP2FzxDTNffFu10cB/6Fj4kdQjPG0c1Koz/z7OOq
-BuDElJLClS8rjp3z1xvrc7gX95dFa2KaKgOAYDkpe8tfHRhHfJeIVS/whH9hzx6r
-OBg+E5K9JyvayrUoKgPeptRKCqo8A4YevtMLpRxMup0nMUgAIv6+BGTwPAFpwgl/
-8UIVcvjh1v95PwGDM/Q8yvIBJznBYk/e2wIBAg==
------END DH PARAMETERS-----
diff --git a/src/sioclient/lib/websocketpp/examples/echo_server_tls/echo_server_tls.cpp b/src/sioclient/lib/websocketpp/examples/echo_server_tls/echo_server_tls.cpp
deleted file mode 100644
index 3d704f5a..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_server_tls/echo_server_tls.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
- /**
-  * NOTES
-  *
-  * This example uses a number of standard classes through the websocketpp::lib
-  * namespace. This is to allow easy switching between Boost, the C++11 STL, and 
-  * the standalone Asio library. Your program need not use these namespaces if
-  * you do not need this sort of flexibility.
-  */
-
-#include <websocketpp/config/asio.hpp>
-
-#include <websocketpp/server.hpp>
-
-#include <iostream>
-
-typedef websocketpp::server<websocketpp::config::asio_tls> server;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-// pull out the type of messages sent by our config
-typedef websocketpp::config::asio::message_type::ptr message_ptr;
-typedef websocketpp::lib::shared_ptr<websocketpp::lib::asio::ssl::context> context_ptr;
-
-void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    std::cout << "on_message called with hdl: " << hdl.lock().get()
-              << " and message: " << msg->get_payload()
-              << std::endl;
-
-    try {
-        s->send(hdl, msg->get_payload(), msg->get_opcode());
-    } catch (websocketpp::exception const & e) {
-        std::cout << "Echo failed because: "
-                  << "(" << e.what() << ")" << std::endl;
-    }
-}
-
-void on_http(server* s, websocketpp::connection_hdl hdl) {
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-    
-    con->set_body("Hello World!");
-    con->set_status(websocketpp::http::status_code::ok);
-}
-
-std::string get_password() {
-    return "test";
-}
-
-// See https://wiki.mozilla.org/Security/Server_Side_TLS for more details about
-// the TLS modes. The code below demonstrates how to implement both the modern
-enum tls_mode {
-    MOZILLA_INTERMEDIATE = 1,
-    MOZILLA_MODERN = 2
-};
-
-context_ptr on_tls_init(tls_mode mode, websocketpp::connection_hdl hdl) {
-    namespace asio = websocketpp::lib::asio;
-
-    std::cout << "on_tls_init called with hdl: " << hdl.lock().get() << std::endl;
-    std::cout << "using TLS mode: " << (mode == MOZILLA_MODERN ? "Mozilla Modern" : "Mozilla Intermediate") << std::endl;
-
-    context_ptr ctx = websocketpp::lib::make_shared<asio::ssl::context>(asio::ssl::context::sslv23);
-
-    try {
-        if (mode == MOZILLA_MODERN) {
-            // Modern disables TLSv1
-            ctx->set_options(asio::ssl::context::default_workarounds |
-                             asio::ssl::context::no_sslv2 |
-                             asio::ssl::context::no_sslv3 |
-                             asio::ssl::context::no_tlsv1 |
-                             asio::ssl::context::single_dh_use);
-        } else {
-            ctx->set_options(asio::ssl::context::default_workarounds |
-                             asio::ssl::context::no_sslv2 |
-                             asio::ssl::context::no_sslv3 |
-                             asio::ssl::context::single_dh_use);
-        }
-        ctx->set_password_callback(bind(&get_password));
-        ctx->use_certificate_chain_file("server.pem");
-        ctx->use_private_key_file("server.pem", asio::ssl::context::pem);
-        
-        // Example method of generating this file:
-        // `openssl dhparam -out dh.pem 2048`
-        // Mozilla Intermediate suggests 1024 as the minimum size to use
-        // Mozilla Modern suggests 2048 as the minimum size to use.
-        ctx->use_tmp_dh_file("dh.pem");
-        
-        std::string ciphers;
-        
-        if (mode == MOZILLA_MODERN) {
-            ciphers = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK";
-        } else {
-            ciphers = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA";
-        }
-        
-        if (SSL_CTX_set_cipher_list(ctx->native_handle() , ciphers.c_str()) != 1) {
-            std::cout << "Error setting cipher list" << std::endl;
-        }
-    } catch (std::exception& e) {
-        std::cout << "Exception: " << e.what() << std::endl;
-    }
-    return ctx;
-}
-
-int main() {
-    // Create a server endpoint
-    server echo_server;
-
-    // Initialize ASIO
-    echo_server.init_asio();
-
-    // Register our message handler
-    echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
-    echo_server.set_http_handler(bind(&on_http,&echo_server,::_1));
-    echo_server.set_tls_init_handler(bind(&on_tls_init,MOZILLA_INTERMEDIATE,::_1));
-
-    // Listen on port 9002
-    echo_server.listen(9002);
-
-    // Start the server accept loop
-    echo_server.start_accept();
-
-    // Start the ASIO io_service run loop
-    echo_server.run();
-
-}
diff --git a/src/sioclient/lib/websocketpp/examples/echo_server_tls/server.pem b/src/sioclient/lib/websocketpp/examples/echo_server_tls/server.pem
deleted file mode 100644
index da233f52..00000000
--- a/src/sioclient/lib/websocketpp/examples/echo_server_tls/server.pem
+++ /dev/null
@@ -1,57 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDMYjHlTUeUGSys
-Fz5PZcvgS3gojBlEAOu2gXFQDcJ7kq6dJ4jKsPaH1Q5jAtEDkU/el8otzfacOgyp
-2ZxioRimpmcORWGU0bKJcenh4ZQ1oK1CQObjeYk1YgE7H8/sBetSdtL4n1rB8LIz
-AV/k6kwSZFu3/lSmc6g09H4efSKGKVBcVOjBamcvFGVH4KhM2NyL+ffeV5H2Ucxk
-ipyhpr4uxEoC3EV60sQxloqZb+upBM0LS4kVvaYMcn39XkUx3Z8FwN5+hFGwsWda
-tU8zDxEuRMrZxG7mwDXLBGehtQvoJIVMQbOuwBQcgAbsVyy1dxV3aczbLX0iGEuG
-eBhdFE+BAgMBAAECggEAQaPn0nUXYAEVz89HO8i9ybNzS9Jy6txA18SK1+MTawyY
-9/AShsZ+5vEORc5JwpOQyzSEwmE7qsEaABLbnvGOMTeQMY0m4dzXMj1bmCgSqYaJ
-HpYpkTUfU/2913dIF81u3nU7HI5RX6gmEyuF2MdG10FUE6ujFDJg+2DqgHA//kYD
-hkXFinVS2PuZs8d5xdzpF0aCIWTuOc+Fgsyhdm/lZRIzFdID45YUVuPIN2uh+GkM
-ENp/r1x7dPlDRqiL1ufP0mTQGs26S5kQSF8W0BClkOIOgmrhSON4+Vqhqx+ki/7w
-RY+7mmgdvt0uzYT+Lk2cDw4f89Rsh7rR1EieBpQ2YQKBgQDq6zAHWfweJmkugT0w
-HzI0UKfcOdzlJBwMu6tSgSHU99dnXlTwQY8sG7vtfRekokoo7XY4JsSk1n6E9OVy
-4UKuEvU1+llDGxtvHxEEGOAgwB8wxMuY4uNYgDVhTlUzr2ERcet7FOIGzxEWzSsg
-5vgnTQfyMzAh5/6k8CsHVI4u2wKBgQDeuYVCgg555lcc5rvTFxfU15d3fweSd78+
-akgIBaXAlFbxI+5znGPmKG/ii4N2XObC8B568fA2nIxw6M1xgbKyvvmN3ECYiqWv
-bx8x6Vg5Slg0vJr+DrPgvIKbOWEEKF/cfpTeeVLP0gUBT63mA3qezuRx1r0JJr7A
-k9a4Td9j0wKBgDmRQMfMaVgKGaRnz1LHkkn3qerx0wvj+Wu1YZpqQpwp0ANovm/R
-4P/yG+9qxCx4CKxW5K2F8pJibcavLLsmMGzwAF8l5lHnhqWIe2cBoYrlCb+tuibR
-Et1RLcOWqpJr2+GmhQo4Z9s7SvjHdlYtw4n9+oCDwrvMWj6ZDDJTqjQZAoGAEhRt
-RODZ2/texvHT/Wa6gISfvwuIydL+q0plXoFW2zMve5O3H5tqYJyXuIQqv8j60og7
-cS+CmGxM2j2Lr9MfdnMaPvHKLJfUq1ER7zNJ/hyS3HUS/9yhrXSgBYm63mOIpJWB
-8C1ZE5Ww4lJdg3Z01b9lu/f6kGucwHU/0OZBZBECgYAQ+dl2kKKd+lQ9O/LVz7oD
-goQMPYF+QZcEhY4vlYKkWVtR2A0CiY6XeTi6vO/qVUt/ht+UO3XIJFOjGV1VyORQ
-Bhibfstxl5s59jGlns5y5QqcRKzCiX74BKG0xQUtHgga7Od6L+GJKbJAPBfncYwW
-U7Tfwwi0WbbgQoy5Xr/5gg==
------END PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIFBTCCAu2gAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVT
-MQswCQYDVQQIDAJJTDEUMBIGA1UECgwLV2ViU29ja2V0KysxKjAoBgNVBAsMIVdl
-YlNvY2tldCsrIENlcnRpZmljYXRlIEF1dGhvcml0eTEkMCIGA1UEAwwbV2ViU29j
-a2V0KysgSW50ZXJtZWRpYXRlIENBMB4XDTE2MDYwODEyNDUxMloXDTI2MDYwNjEy
-NDUxMlowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMRAwDgYDVQQHDAdDaGlj
-YWdvMRQwEgYDVQQKDAtXZWJTb2NrZXQrKzEgMB4GA1UECwwXV2ViU29ja2V0Kysg
-VExTIEV4YW1wbGUxGDAWBgNVBAMMD3dlYnNvY2tldHBwLm9yZzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMxiMeVNR5QZLKwXPk9ly+BLeCiMGUQA67aB
-cVANwnuSrp0niMqw9ofVDmMC0QORT96Xyi3N9pw6DKnZnGKhGKamZw5FYZTRsolx
-6eHhlDWgrUJA5uN5iTViATsfz+wF61J20vifWsHwsjMBX+TqTBJkW7f+VKZzqDT0
-fh59IoYpUFxU6MFqZy8UZUfgqEzY3Iv5995XkfZRzGSKnKGmvi7ESgLcRXrSxDGW
-iplv66kEzQtLiRW9pgxyff1eRTHdnwXA3n6EUbCxZ1q1TzMPES5EytnEbubANcsE
-Z6G1C+gkhUxBs67AFByABuxXLLV3FXdpzNstfSIYS4Z4GF0UT4ECAwEAAaOBhzCB
-hDALBgNVHQ8EBAMCBDAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwYAYDVR0RBFkwV4IP
-d2Vic29ja2V0cHAub3JnghN3d3cud2Vic29ja2V0cHAub3Jnghl1dGlsaXRpZXMu
-d2Vic29ja2V0cHAub3JnghRkb2NzLndlYnNvY2tldHBwLm9yZzANBgkqhkiG9w0B
-AQsFAAOCAgEAelJvIWFikBU3HVoP0icuoezTHGqABPLCeooTC/GELq7lHCFEjiqW
-p96Zc3vrk+0Z0tkYy3E0fpuzPtlTUhBzO3fMF41FpB5ix3W/tH9YJvrozlIuDD1I
-IEusxomeeiMRbyYpX/gkSOO74ylCzMEQVzleMNdpzpeXOg0Kp5z2JNShdEoT7eMR
-qkJQJjMdL6QeXUqWNvX1Zqb8v6VeWGWjuu/cl374P8D8bjn89VwZQ5HFqoLOhI5v
-XEYsMViZWwLSMcfWTU2Rdi0RxUZQVciLP/3GQROR1/0/e1J1kd7GsRWQMZcU20Vy
-jXBVAiWhW1bgd0XOrrFILsAmnBtinEJiE+h5UC4ksZtwWf9x1IhXGlpb9bmD4+Ud
-93wmqytPXBFL6wwlj4IYjjy0gU6xP6h7nwhHXnBlwFWGDpe8Cco9qgyJxJxBTtj9
-MbBv+BSLXJoniDASdk6RIqCjPWZtWbQ7j5mIKV0bdJQZpBX553QOy8AoIpJE32An
-FzR0SSCHOCgSAbqtM8CvLO6mquEJunmwKQx6xfos5N6ee+D+JtUFTw04TrjZUzFs
-Z7v3SN/N4Hd13iTBDSu4XY/tJYICvTRLYNrzQRh/XEVbEEVxXhL8rxNn5aL1pqrV
-yEnvHXrnSXWxTif1K+hS2HfTkQ6d1GjglvmwkoBqBHuRH0OJ1VguTqM=
------END CERTIFICATE-----
diff --git a/src/sioclient/lib/websocketpp/examples/enriched_storage/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/enriched_storage/CMakeLists.txt
deleted file mode 100644
index 78fa7d25..00000000
--- a/src/sioclient/lib/websocketpp/examples/enriched_storage/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (enriched_storage)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/enriched_storage/enriched_storage.cpp b/src/sioclient/lib/websocketpp/examples/enriched_storage/enriched_storage.cpp
deleted file mode 100644
index fb233198..00000000
--- a/src/sioclient/lib/websocketpp/examples/enriched_storage/enriched_storage.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#include <iostream>
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-struct connection_data {
-    int sessionid;
-    std::string name;
-};
-
-struct custom_config : public websocketpp::config::asio {
-    // pull default settings from our core config
-    typedef websocketpp::config::asio core;
-    
-    typedef core::concurrency_type concurrency_type;
-    typedef core::request_type request_type;
-    typedef core::response_type response_type;
-    typedef core::message_type message_type;
-    typedef core::con_msg_manager_type con_msg_manager_type;
-    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
-    typedef core::alog_type alog_type;
-    typedef core::elog_type elog_type;
-    typedef core::rng_type rng_type;
-    typedef core::transport_type transport_type;
-    typedef core::endpoint_base endpoint_base;
-    
-    // Set a custom connection_base class
-    typedef connection_data connection_base;
-};
-
-typedef websocketpp::server<custom_config> server;
-typedef server::connection_ptr connection_ptr;
-
-using websocketpp::connection_hdl;
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-class print_server {
-public:
-    print_server() : m_next_sessionid(1) {
-        m_server.init_asio();
-                
-        m_server.set_open_handler(bind(&print_server::on_open,this,::_1));
-        m_server.set_close_handler(bind(&print_server::on_close,this,::_1));
-        m_server.set_message_handler(bind(&print_server::on_message,this,::_1,::_2));
-    }
-    
-    void on_open(connection_hdl hdl) {
-        connection_ptr con = m_server.get_con_from_hdl(hdl);
-        
-        con->sessionid = m_next_sessionid++;
-    }
-    
-    void on_close(connection_hdl hdl) {
-        connection_ptr con = m_server.get_con_from_hdl(hdl);
-        
-        std::cout << "Closing connection " << con->name 
-                  << " with sessionid " << con->sessionid << std::endl;
-    }
-    
-    void on_message(connection_hdl hdl, server::message_ptr msg) {
-        connection_ptr con = m_server.get_con_from_hdl(hdl);
-        
-        if (con->name.empty()) {
-            con->name = msg->get_payload();
-            std::cout << "Setting name of connection with sessionid " 
-                      << con->sessionid << " to " << con->name << std::endl;
-        } else {
-            std::cout << "Got a message from connection " << con->name 
-                      << " with sessionid " << con->sessionid << std::endl;
-        }
-    }
-    
-    void run(uint16_t port) {
-        m_server.listen(port);
-        m_server.start_accept();
-        m_server.run();
-    }
-private:
-    int m_next_sessionid;
-    server m_server;
-};
-
-int main() {
-    print_server server;
-    server.run(9002);
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/examples/external_io_service/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/external_io_service/CMakeLists.txt
deleted file mode 100644
index 5223da1b..00000000
--- a/src/sioclient/lib/websocketpp/examples/external_io_service/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (external_io_service)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/external_io_service/SConscript b/src/sioclient/lib/websocketpp/examples/external_io_service/SConscript
deleted file mode 100644
index beb7c1c4..00000000
--- a/src/sioclient/lib/websocketpp/examples/external_io_service/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## Main development example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('external_io_service', ["external_io_service.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('external_io_service', ["external_io_service.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/external_io_service/external_io_service.cpp b/src/sioclient/lib/websocketpp/examples/external_io_service/external_io_service.cpp
deleted file mode 100644
index 7372d59c..00000000
--- a/src/sioclient/lib/websocketpp/examples/external_io_service/external_io_service.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "tcp_echo_server.hpp"
-
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-#include <iostream>
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-typedef websocketpp::server<websocketpp::config::asio> ws_echo_server;
-
-// Define a callback to handle incoming messages
-void on_message(ws_echo_server* s, websocketpp::connection_hdl hdl, ws_echo_server::message_ptr msg) {
-    std::cout << "on_message called with hdl: " << hdl.lock().get()
-              << " and message: " << msg->get_payload()
-              << std::endl;
-
-    // check for a special command to instruct the server to stop listening so
-    // it can be cleanly exited.
-    if (msg->get_payload() == "stop-listening") {
-        s->stop_listening();
-        return;
-    }
-
-    try {
-        s->send(hdl, msg->get_payload(), msg->get_opcode());
-    } catch (websocketpp::exception const & e) {
-        std::cout << "Echo failed because: "
-                  << "(" << e.what() << ")" << std::endl;
-    }
-}
-
-int main() {
-    asio::io_service service;
-
-    // Add a TCP echo server on port 9003
-    tcp_echo_server custom_http_server(service, 9003);
-
-    // Add a WebSocket echo server on port 9002
-    ws_echo_server ws_server;
-    ws_server.set_access_channels(websocketpp::log::alevel::all);
-    ws_server.clear_access_channels(websocketpp::log::alevel::frame_payload);
-
-    // The only difference in this code between an internal and external
-    // io_service is the different constructor to init_asio
-    ws_server.init_asio(&service);
-
-    // Register our message handler
-    ws_server.set_message_handler(bind(&on_message,&ws_server,::_1,::_2));
-    ws_server.listen(9002);
-    ws_server.start_accept();
-
-    // TODO: add a timer?
-
-    // Start the Asio io_service run loop for all
-    service.run();
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/examples/external_io_service/tcp_echo_server.hpp b/src/sioclient/lib/websocketpp/examples/external_io_service/tcp_echo_server.hpp
deleted file mode 100644
index ef4ce185..00000000
--- a/src/sioclient/lib/websocketpp/examples/external_io_service/tcp_echo_server.hpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- 
-/**
- * TCP Echo Server
- *
- * This file defines a simple TCP Echo Server. It is adapted from the Asio
- * example: cpp03/echo/async_tcp_echo_server.cpp
- */ 
-
-#include <websocketpp/common/asio.hpp>
-#include <websocketpp/common/memory.hpp>
-#include <websocketpp/common/functional.hpp>
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-namespace asio = websocketpp::lib::asio;
-
-struct tcp_echo_session : websocketpp::lib::enable_shared_from_this<tcp_echo_session> {
-    typedef websocketpp::lib::shared_ptr<tcp_echo_session> ptr;
-    
-    tcp_echo_session(asio::io_service & service) : m_socket(service) {}
-
-    void start() {
-        m_socket.async_read_some(asio::buffer(m_buffer, sizeof(m_buffer)),
-            websocketpp::lib::bind(
-                &tcp_echo_session::handle_read, shared_from_this(), _1, _2));
-    }
-    
-    void handle_read(const asio::error_code & ec, size_t transferred) {
-        if (!ec) {
-            asio::async_write(m_socket,
-                asio::buffer(m_buffer, transferred),
-                    bind(&tcp_echo_session::handle_write, shared_from_this(), _1));
-        }
-    }
-    
-    void handle_write(const asio::error_code & ec) {
-        if (!ec) {
-            m_socket.async_read_some(asio::buffer(m_buffer, sizeof(m_buffer)),
-                bind(&tcp_echo_session::handle_read, shared_from_this(), _1, _2));
-        }
-    }
-
-    asio::ip::tcp::socket m_socket;
-    char m_buffer[1024];
-};
-
-struct tcp_echo_server {
-    tcp_echo_server(asio::io_service & service, short port)
-        : m_service(service)
-        , m_acceptor(service, asio::ip::tcp::endpoint(asio::ip::tcp::v6(), port))
-    {
-        this->start_accept();
-    }
-    
-    void start_accept() {
-        tcp_echo_session::ptr new_session(new tcp_echo_session(m_service));
-        m_acceptor.async_accept(new_session->m_socket,
-            bind(&tcp_echo_server::handle_accept, this, new_session, _1));
-    }
-    
-    void handle_accept(tcp_echo_session::ptr new_session, const asio::error_code & ec) {
-        if (!ec) {
-            new_session->start();
-        }
-        start_accept();
-    }
-
-    asio::io_service & m_service;
-    asio::ip::tcp::acceptor m_acceptor;
-};
diff --git a/src/sioclient/lib/websocketpp/examples/handler_switch/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/handler_switch/CMakeLists.txt
deleted file mode 100644
index 45917d51..00000000
--- a/src/sioclient/lib/websocketpp/examples/handler_switch/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (handler_switch)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/handler_switch/handler_switch.cpp b/src/sioclient/lib/websocketpp/examples/handler_switch/handler_switch.cpp
deleted file mode 100644
index c2cf6ffa..00000000
--- a/src/sioclient/lib/websocketpp/examples/handler_switch/handler_switch.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <iostream>
-
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-typedef websocketpp::server<websocketpp::config::asio> server;
-
-using websocketpp::connection_hdl;
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-using websocketpp::lib::ref;
-
-void custom_on_msg(server & s, connection_hdl hdl, server::message_ptr msg) {
-        std::cout << "Message sent to custom handler" << std::endl;
-}
-
-void default_on_msg(server & s, connection_hdl hdl, server::message_ptr msg) {
-    std::cout << "Message sent to default handler" << std::endl;
-
-    if (msg->get_payload() == "upgrade") {
-        // Upgrade our connection_hdl to a full connection_ptr
-        server::connection_ptr con = s.get_con_from_hdl(hdl);
-
-        // Change the on message handler for this connection only to
-        // custom_on_mesage
-        con->set_message_handler(bind(&custom_on_msg,ref(s),::_1,::_2));
-        std::cout << "Upgrading connection to custom handler" << std::endl;
-    }
-}
-
-int main() {
-    server s;
-
-    s.set_message_handler(bind(&default_on_msg,ref(s),::_1,::_2));
-
-    s.init_asio();
-    s.listen(9002);
-    s.start_accept();
-
-    s.run();
-}
diff --git a/src/sioclient/lib/websocketpp/examples/iostream_server/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/iostream_server/CMakeLists.txt
deleted file mode 100644
index 962d9097..00000000
--- a/src/sioclient/lib/websocketpp/examples/iostream_server/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (iostream_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/iostream_server/SConscript b/src/sioclient/lib/websocketpp/examples/iostream_server/SConscript
deleted file mode 100644
index dc90834c..00000000
--- a/src/sioclient/lib/websocketpp/examples/iostream_server/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## iostream server example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('iostream_server', ["iostream_server.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('iostream_server', ["iostream_server.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/iostream_server/iostream_server.cpp b/src/sioclient/lib/websocketpp/examples/iostream_server/iostream_server.cpp
deleted file mode 100644
index 4fc5c1d7..00000000
--- a/src/sioclient/lib/websocketpp/examples/iostream_server/iostream_server.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include <websocketpp/config/core.hpp>
-
-#include <websocketpp/server.hpp>
-
-#include <iostream>
-#include <fstream>
-
-typedef websocketpp::server<websocketpp::config::core> server;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-// pull out the type of messages sent by our config
-typedef server::message_ptr message_ptr;
-
-// Define a callback to handle incoming messages
-void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    if (msg->get_opcode() == websocketpp::frame::opcode::text) {
-        s->get_alog().write(websocketpp::log::alevel::app,
-                    "Text Message Received: "+msg->get_payload());
-    } else {
-        s->get_alog().write(websocketpp::log::alevel::app,
-                    "Binary Message Received: "+websocketpp::utility::to_hex(msg->get_payload()));
-    }
-
-    try {
-        s->send(hdl, msg->get_payload(), msg->get_opcode());
-    } catch (websocketpp::exception const & e) {
-        s->get_alog().write(websocketpp::log::alevel::app,
-                    std::string("Echo Failed: ")+e.what());
-    }
-}
-
-int main() {
-    server s;
-    std::ofstream log;
-
-    try {
-        // set up access channels to only log interesting things
-        s.clear_access_channels(websocketpp::log::alevel::all);
-        s.set_access_channels(websocketpp::log::alevel::connect);
-        s.set_access_channels(websocketpp::log::alevel::disconnect);
-        s.set_access_channels(websocketpp::log::alevel::app);
-
-        // Log to a file rather than stdout, as we are using stdout for real
-        // output
-        log.open("output.log");
-        s.get_alog().set_ostream(&log);
-        s.get_elog().set_ostream(&log);
-
-        // print all output to stdout
-        s.register_ostream(&std::cout);
-
-        // Register our message handler
-        s.set_message_handler(bind(&on_message,&s,::_1,::_2));
-
-        server::connection_ptr con = s.get_connection();
-
-        con->start();
-
-        // C++ iostream's don't support the idea of asynchronous i/o. As such
-        // there are two input strategies demonstrated here. Buffered I/O will
-        // read from stdin in chunks until EOF. This works very well for
-        // replaying canned connections as would be done in automated testing.
-        //
-        // If the server is being used live however, assuming input is being
-        // piped from elsewhere in realtime, this strategy will result in small
-        // messages being buffered forever. The non-buffered strategy below
-        // reads characters from stdin one at a time. This is inefficient and
-        // for more serious uses should be replaced with a platform specific
-        // asyncronous i/o technique like select, poll, IOCP, etc
-        bool buffered_io = false;
-
-        if (buffered_io) {
-            std::cin >> *con;
-            con->eof();
-        } else {
-            char a;
-            while(std::cin.get(a)) {
-                con->read_some(&a,1);
-            }
-            con->eof();
-        }
-    } catch (websocketpp::exception const & e) {
-        std::cout << e.what() << std::endl;
-    }
-    log.close();
-}
diff --git a/src/sioclient/lib/websocketpp/examples/print_client/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/print_client/CMakeLists.txt
deleted file mode 100644
index 98b975a9..00000000
--- a/src/sioclient/lib/websocketpp/examples/print_client/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (print_client)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/print_client/SConscript b/src/sioclient/lib/websocketpp/examples/print_client/SConscript
deleted file mode 100644
index 8da4ce5b..00000000
--- a/src/sioclient/lib/websocketpp/examples/print_client/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## Print client example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('print_client', ["print_client.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('print_client', ["print_client.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/print_client/print_client.cpp b/src/sioclient/lib/websocketpp/examples/print_client/print_client.cpp
deleted file mode 100644
index 7ba6e5fc..00000000
--- a/src/sioclient/lib/websocketpp/examples/print_client/print_client.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2016, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-
-#include <iostream>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-void on_message(websocketpp::connection_hdl, client::message_ptr msg) {
-	std::cout << msg->get_payload() << std::endl;
-}
-
-int main(int argc, char* argv[]) {
-    client c;
-
-    std::string uri = "ws://localhost:9002";
-
-    if (argc == 2) {
-        uri = argv[1];
-    }
-
-	try {
-        // Set logging to be pretty verbose (everything except message payloads)
-        c.set_access_channels(websocketpp::log::alevel::all);
-        c.clear_access_channels(websocketpp::log::alevel::frame_payload);
-        c.set_error_channels(websocketpp::log::elevel::all);
-
-        // Initialize ASIO
-        c.init_asio();
-
-        // Register our message handler
-        c.set_message_handler(&on_message);
-
-        websocketpp::lib::error_code ec;
-        client::connection_ptr con = c.get_connection(uri, ec);
-        if (ec) {
-            std::cout << "could not create connection because: " << ec.message() << std::endl;
-            return 0;
-        }
-
-        // Note that connect here only requests a connection. No network messages are
-        // exchanged until the event loop starts running in the next line.
-        c.connect(con);
-
-        // Start the ASIO io_service run loop
-        // this will cause a single connection to be made to the server. c.run()
-        // will exit when this connection is closed.
-        c.run();
-    } catch (websocketpp::exception const & e) {
-        std::cout << e.what() << std::endl;
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/examples/print_client_tls/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/print_client_tls/CMakeLists.txt
deleted file mode 100644
index 18ea7537..00000000
--- a/src/sioclient/lib/websocketpp/examples/print_client_tls/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-if (OPENSSL_FOUND)
-
-init_target (print_client_tls)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-link_openssl()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
-
-endif()
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/examples/print_client_tls/SConscript b/src/sioclient/lib/websocketpp/examples/print_client_tls/SConscript
deleted file mode 100644
index 01b01147..00000000
--- a/src/sioclient/lib/websocketpp/examples/print_client_tls/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-## Print client tls example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-Import('tls_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   prgs += env_cpp11.Program('print_client_tls', ["print_client_tls.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   prgs += env.Program('print_client_tls', ["print_client_tls.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/print_client_tls/ca-chain.cert.pem b/src/sioclient/lib/websocketpp/examples/print_client_tls/ca-chain.cert.pem
deleted file mode 100644
index 12e233b7..00000000
--- a/src/sioclient/lib/websocketpp/examples/print_client_tls/ca-chain.cert.pem
+++ /dev/null
@@ -1,66 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFxTCCA62gAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwYDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgMAklMMRAwDgYDVQQHDAdDaGljYWdvMRQwEgYDVQQKDAtXZWJTb2Nr
-ZXQrKzEcMBoGA1UEAwwTV2ViU29ja2V0KysgUm9vdCBDQTAeFw0xNjA1MjUxMzU4
-MjdaFw0yNjA1MjMxMzU4MjdaMIGCMQswCQYDVQQGEwJVUzELMAkGA1UECAwCSUwx
-FDASBgNVBAoMC1dlYlNvY2tldCsrMSowKAYDVQQLDCFXZWJTb2NrZXQrKyBDZXJ0
-aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG1dlYlNvY2tldCsrIEludGVybWVk
-aWF0ZSBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMNaFAzlx0KJ
-gG15yRHI3xn9+B1woHG4uuOr124Sk1JllPcO3enusgIYTMl0FiYYW9CsyPoe4L0P
-wflbz20vDDjxmXG+NPgjuYmnPaq7q2JXYz+cShv9+o60EIwEIe+EWk1ZQs9YSdQ0
-r4UOxGVq6eEuWJi8Wh02cbnxdjwvrk7lTMFVY+z5EX8cCj6Tbrd0lyIf/0X8OkOb
-q2HOqqzTgT2apBCWCEW6grW6rtMOoDx93BOZDBEGz39sJ5i8AQ8XIdYCdUcOMdJU
-SCAw/MMyFTHXhv8hJdG5GcDSfc7woB9xRUf8UHuCH0nYkTb260TWvyDCYJy001ko
-SWoRbh2hVgPqQ9FTDMzMTY8T8C5u3BRfGN5PHuSPhwfHv/p1g4uPnltDBe4CNtOs
-wu8w1wbrr3uI7qETnqOzbXlcT7o4rCrrRQqLbNOssf2mMH+Phq6dINjXpZjiAhO0
-SURtBMmQdAZcQkGStzFitEkb2Py5LEIxQ068i8RCowTyD9+/jbO1fZyxJ4X8TDUe
-Xx48xWnu0i4f8/9ldnWLwX9h3ilaZVsr7buNYJoMlz+v73TQoWKSybJ2SMe/Cddj
-OZCy5r1UakuZhX6n1ScD/hbO8FEfmQRpAywYajyU4dZ9XMbf5bo6OAUqlJ2f4yYh
-VAy5mi1JHfD5PiJN90j79GXXvtBTJc4hAgMBAAGjZjBkMB0GA1UdDgQWBBTKMn5O
-3NUPpztL1bAz8UCsOBLpkjAfBgNVHSMEGDAWgBTNBBKZQN694xplMGyMruXFv27o
-eTASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0B
-AQsFAAOCAgEAyNkZUEAdP73th4/RLu0d2foMiIqKlcvw3JsW0tto3MT5lvQ5UugH
-OwluhWhnMLE0KsknQd7/p4ZwyZugWAYjGcDydp0GDIDfNBBEOQkOAL23KkYiRFqt
-VPBTZi9S7P2MJLY0j94liIg94nikhz/0q7JxxWFlvSHUjwZxXrbFjfZRPOS1vIq/
-/VK2QjUsdIXE3NOPYfQwd9FpG2YS8ZcMeipwNYVAs2FBEeWzGH1j6i2hP8FFBDYP
-0LTvJYOJvlCeyIvPBjKk9461/Z4CPJcKtKC59onQmiqSK/Juak/bpPoY7jJ228KG
-bEBzClIEHgbDiBewFTHbyOWhW2ySRLOGsPeqKDSbm4J1N5rfKnrSQB9PfOmWoRfJ
-vqPlXFSlpdgD4j/WnEumpvt78fT+cn+AkRG8tE5DQrCWZTK47TSWn902Fm0A19Rl
-pSbE9qsulXurOqEuOOayrzcUmbZ/jkU+wj+/tN4Gl8K98WbjcXvwz0sRL3SgRRrI
-awUdaGWKQHrTJNEOTisepUAuHVDmvuQz0j/Ru+PbB9K3GcKY6X6+o1c2JBC1V6KX
-aHHZQ+xPm+VEa1pG/QVHGpt2AbGUQlXwDYtOIRwEhO27tFbH8Q68s2cMLYjsF5gd
-MWuMYCPkFv10/V2f2lAIPSEzw2pldIGERcb4VG4xuD0qU+HH/aAID7k=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFpjCCA46gAwIBAgIJAL42eqbfw976MA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJJTDEQMA4GA1UEBwwHQ2hpY2FnbzEUMBIGA1UECgwL
-V2ViU29ja2V0KysxHDAaBgNVBAMME1dlYlNvY2tldCsrIFJvb3QgQ0EwHhcNMTYw
-NTI1MTM1MTUzWhcNMzYwNTIwMTM1MTUzWjBgMQswCQYDVQQGEwJVUzELMAkGA1UE
-CAwCSUwxEDAOBgNVBAcMB0NoaWNhZ28xFDASBgNVBAoMC1dlYlNvY2tldCsrMRww
-GgYDVQQDDBNXZWJTb2NrZXQrKyBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOC
-Ag8AMIICCgKCAgEA4QjJ0v5yri+pAN67I/XPz88D8oIczCW96CIuwc44aDC9Kptb
-9iY8xwbGCyQsFZ/1IQ74QfnXZSwq8EwedcBIdcyHdBu6qtNkCVKeDIZAMBef6Hx+
-tWSe1op3sDbUlT8NHiTxZCZWk/2/yIi8yPzQTi4y1vF04vvrQS5RFomCz17kdyOa
-NdxO5p+I4afdoVKtzA1aHoBqdTe7vzM3eww4AxKfgIEDdIuOGDiglI/b/frlwiOi
-SfTOsPzu52TOPW2d1Ad5BG4GuMpnTUOVnc8j18w9LdeXO0J10oVyCmwiPuzFCcDB
-g1xvVr5TXzIZ5J+qlso7+mUfZGH+nxOT7Tc78o1EvX6JbfQAI2PrpcksmJfFnN4l
-4XnXDW/eKl8AlLUr/cW5axAfql4QHJoBCZcfYldQpMoL5R1ikLtY53cOJpycFoWm
-1IEfkLBZ4C1old+KoaErG0+Aur8/kwAJGMnmMvZqGZ5pgXtVipOLy5TKuS6ZKO8g
-MRzalaF/naiu3pF+/sctaqkAPvOr65WrANNGxTQ93ePdyuT6sOEUKXxaXcTtAOOM
-5FCgX8dPxkOACxTrxppvb+bYmYL9GIuYDGYxSRu3Fm+04eXIh+uCqcuWPQuRPc5t
-VXvk/M0fPaJvKfP6lRAoE5Dp4qPRvL6tRVtOXfP6d+O+yGnxRoLKAW7ejoMCAwEA
-AaNjMGEwHQYDVR0OBBYEFM0EEplA3r3jGmUwbIyu5cW/buh5MB8GA1UdIwQYMBaA
-FM0EEplA3r3jGmUwbIyu5cW/buh5MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQAQ4eY4LhW795wl9XuDVg2vOFTYmIS0
-OxrunFX4f3RjddbIbXzYmQ0cJ8pJ5l7eGYcg/DYQRY4Tk6LjXMs9VhIU10akqLS4
-qGE+Bmp3Jhu5NxZbKkY+k+kTAA1LYxFCjGjSV0v5QNLFULDAmGer2zWwU5DcDwwq
-8yWyBuI974UyE/49/TeckfqwBrb90LL2lFEwoL86XZK2IZMPyMBC/S1X5P/Kc15Q
-d8lwOPS5AirFkkrzs/px+mRia5U1uWKIPRLq9Medvjf8HR8SFWq9eRtkxiLaWyRv
-HBVyVRKCubCZR8psVLK/zrF+Bc+Hr9aAi3TuqTKjIOI7hrq5oJcJpebZDNoBIqoj
-kab13WcRwG+BQvuK1CEkd1aq8Nh2GX6Reb2Zv82/WntgP1a0sztbIGgrUBYQryb5
-HF79v4e2byY613SiQ3lz+g/AWxaZsYH80/Zl+hEwEtU4fFz34Jcv9Kvda1JpknBT
-Fi63ugfoNeNriO02AReMmDvuBG3X8RF1UQyBoTU3uZuW7X26MizEjiVCK9qaOLED
-WDSEoyKLe4JKd387CVlsCY8K/6fBlFTI/hJhggDz8pZFj3n2irUI44kjgOmoxOrW
-JY2jgY89AEMN9yOKkyQGara8pF9IJxTQ7jurYnWcUbompWeybJRwvWN0h+tGV+bd
-l/aq/5LwL3fVpg==
------END CERTIFICATE-----
diff --git a/src/sioclient/lib/websocketpp/examples/print_client_tls/print_client_tls.cpp b/src/sioclient/lib/websocketpp/examples/print_client_tls/print_client_tls.cpp
deleted file mode 100644
index 0a1c72c0..00000000
--- a/src/sioclient/lib/websocketpp/examples/print_client_tls/print_client_tls.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright (c) 2016, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <websocketpp/config/asio_client.hpp>
-#include <websocketpp/client.hpp>
-
-#include <iostream>
-
-typedef websocketpp::client<websocketpp::config::asio_tls_client> client;
-typedef websocketpp::lib::shared_ptr<websocketpp::lib::asio::ssl::context> context_ptr;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-void on_message(websocketpp::connection_hdl, client::message_ptr msg) {
-    std::cout << msg->get_payload() << std::endl;
-}
-
-/// Verify that one of the subject alternative names matches the given hostname
-bool verify_subject_alternative_name(const char * hostname, X509 * cert) {
-    STACK_OF(GENERAL_NAME) * san_names = NULL;
-    
-    san_names = (STACK_OF(GENERAL_NAME) *) X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL);
-    if (san_names == NULL) {
-        return false;
-    }
-    
-    int san_names_count = sk_GENERAL_NAME_num(san_names);
-    
-    bool result = false;
-    
-    for (int i = 0; i < san_names_count; i++) {
-        const GENERAL_NAME * current_name = sk_GENERAL_NAME_value(san_names, i);
-        
-        if (current_name->type != GEN_DNS) {
-            continue;
-        }
-        
-        char * dns_name = (char *) ASN1_STRING_data(current_name->d.dNSName);
-        
-        // Make sure there isn't an embedded NUL character in the DNS name
-        if (ASN1_STRING_length(current_name->d.dNSName) != strlen(dns_name)) {
-            break;
-        }
-        // Compare expected hostname with the CN
-        result = (strcasecmp(hostname, dns_name) == 0);
-    }
-    sk_GENERAL_NAME_pop_free(san_names, GENERAL_NAME_free);
-    
-    return result;
-}
-
-/// Verify that the certificate common name matches the given hostname
-bool verify_common_name(const char * hostname, X509 * cert) {
-    // Find the position of the CN field in the Subject field of the certificate
-    int common_name_loc = X509_NAME_get_index_by_NID(X509_get_subject_name(cert), NID_commonName, -1);
-    if (common_name_loc < 0) {
-        return false;
-    }
-    
-    // Extract the CN field
-    X509_NAME_ENTRY * common_name_entry = X509_NAME_get_entry(X509_get_subject_name(cert), common_name_loc);
-    if (common_name_entry == NULL) {
-        return false;
-    }
-    
-    // Convert the CN field to a C string
-    ASN1_STRING * common_name_asn1 = X509_NAME_ENTRY_get_data(common_name_entry);
-    if (common_name_asn1 == NULL) {
-        return false;
-    }
-    
-    char * common_name_str = (char *) ASN1_STRING_data(common_name_asn1);
-    
-    // Make sure there isn't an embedded NUL character in the CN
-    if (ASN1_STRING_length(common_name_asn1) != strlen(common_name_str)) {
-        return false;
-    }
-    
-    // Compare expected hostname with the CN
-    return (strcasecmp(hostname, common_name_str) == 0);
-}
-
-/**
- * This code is derived from examples and documentation found ato00po
- * http://www.boost.org/doc/libs/1_61_0/doc/html/boost_asio/example/cpp03/ssl/client.cpp
- * and
- * https://github.com/iSECPartners/ssl-conservatory
- */
-bool verify_certificate(const char * hostname, bool preverified, boost::asio::ssl::verify_context& ctx) {
-    // The verify callback can be used to check whether the certificate that is
-    // being presented is valid for the peer. For example, RFC 2818 describes
-    // the steps involved in doing this for HTTPS. Consult the OpenSSL
-    // documentation for more details. Note that the callback is called once
-    // for each certificate in the certificate chain, starting from the root
-    // certificate authority.
-
-    // Retrieve the depth of the current cert in the chain. 0 indicates the
-    // actual server cert, upon which we will perform extra validation
-    // (specifically, ensuring that the hostname matches. For other certs we
-    // will use the 'preverified' flag from Asio, which incorporates a number of
-    // non-implementation specific OpenSSL checking, such as the formatting of
-    // certs and the trusted status based on the CA certs we imported earlier.
-    int depth = X509_STORE_CTX_get_error_depth(ctx.native_handle());
-
-    // if we are on the final cert and everything else checks out, ensure that
-    // the hostname is present on the list of SANs or the common name (CN).
-    if (depth == 0 && preverified) {
-        X509* cert = X509_STORE_CTX_get_current_cert(ctx.native_handle());
-        
-        if (verify_subject_alternative_name(hostname, cert)) {
-            return true;
-        } else if (verify_common_name(hostname, cert)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    return preverified;
-}
-
-/// TLS Initialization handler
-/**
- * WebSocket++ core and the Asio Transport do not handle TLS context creation
- * and setup. This callback is provided so that the end user can set up their
- * TLS context using whatever settings make sense for their application.
- *
- * As Asio and OpenSSL do not provide great documentation for the very common
- * case of connect and actually perform basic verification of server certs this
- * example includes a basic implementation (using Asio and OpenSSL) of the
- * following reasonable default settings and verification steps:
- *
- * - Disable SSLv2 and SSLv3
- * - Load trusted CA certificates and verify the server cert is trusted.
- * - Verify that the hostname matches either the common name or one of the
- *   subject alternative names on the certificate.
- *
- * This is not meant to be an exhaustive reference implimentation of a perfect
- * TLS client, but rather a reasonable starting point for building a secure
- * TLS encrypted WebSocket client.
- *
- * If any TLS, Asio, or OpenSSL experts feel that these settings are poor
- * defaults or there are critically missing steps please open a GitHub issue
- * or drop a line on the project mailing list.
- *
- * Note the bundled CA cert ca-chain.cert.pem is the CA cert that signed the
- * cert bundled with echo_server_tls. You can use print_client_tls with this
- * CA cert to connect to echo_server_tls as long as you use /etc/hosts or
- * something equivilent to spoof one of the names on that cert 
- * (websocketpp.org, for example).
- */
-context_ptr on_tls_init(const char * hostname, websocketpp::connection_hdl) {
-    context_ptr ctx = websocketpp::lib::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::sslv23);
-
-    try {
-        ctx->set_options(boost::asio::ssl::context::default_workarounds |
-                         boost::asio::ssl::context::no_sslv2 |
-                         boost::asio::ssl::context::no_sslv3 |
-                         boost::asio::ssl::context::single_dh_use);
-
-
-        ctx->set_verify_mode(boost::asio::ssl::verify_peer);
-        ctx->set_verify_callback(bind(&verify_certificate, hostname, ::_1, ::_2));
-
-        // Here we load the CA certificates of all CA's that this client trusts.
-        ctx->load_verify_file("ca-chain.cert.pem");
-    } catch (std::exception& e) {
-        std::cout << e.what() << std::endl;
-    }
-    return ctx;
-}
-
-int main(int argc, char* argv[]) {
-    client c;
-
-    std::string hostname = "localhost";
-    std::string port = "9002";
-
-
-    if (argc == 3) {
-        hostname = argv[1];
-        port = argv[2];
-    } else {
-        std::cout << "Usage: print_server_tls <hostname> <port>" << std::endl;
-        return 1;
-    }
-    
-    std::string uri = "wss://" + hostname + ":" + port;
-
-    try {
-        // Set logging to be pretty verbose (everything except message payloads)
-        c.set_access_channels(websocketpp::log::alevel::all);
-        c.clear_access_channels(websocketpp::log::alevel::frame_payload);
-        c.set_error_channels(websocketpp::log::elevel::all);
-
-        // Initialize ASIO
-        c.init_asio();
-
-        // Register our message handler
-        c.set_message_handler(&on_message);
-        c.set_tls_init_handler(bind(&on_tls_init, hostname.c_str(), ::_1));
-
-        websocketpp::lib::error_code ec;
-        client::connection_ptr con = c.get_connection(uri, ec);
-        if (ec) {
-            std::cout << "could not create connection because: " << ec.message() << std::endl;
-            return 0;
-        }
-
-        // Note that connect here only requests a connection. No network messages are
-        // exchanged until the event loop starts running in the next line.
-        c.connect(con);
-
-        c.get_alog().write(websocketpp::log::alevel::app, "Connecting to " + uri);
-
-        // Start the ASIO io_service run loop
-        // this will cause a single connection to be made to the server. c.run()
-        // will exit when this connection is closed.
-        c.run();
-    } catch (websocketpp::exception const & e) {
-        std::cout << e.what() << std::endl;
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/examples/print_server/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/print_server/CMakeLists.txt
deleted file mode 100644
index 32c6e0fa..00000000
--- a/src/sioclient/lib/websocketpp/examples/print_server/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (print_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/print_server/SConscript b/src/sioclient/lib/websocketpp/examples/print_server/SConscript
deleted file mode 100644
index 4f0e492b..00000000
--- a/src/sioclient/lib/websocketpp/examples/print_server/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## Print server example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('print_server', ["print_server.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('print_server', ["print_server.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/print_server/print_server.cpp b/src/sioclient/lib/websocketpp/examples/print_server/print_server.cpp
deleted file mode 100644
index 5f6f444d..00000000
--- a/src/sioclient/lib/websocketpp/examples/print_server/print_server.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <iostream>
-
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-typedef websocketpp::server<websocketpp::config::asio> server;
-
-void on_message(websocketpp::connection_hdl, server::message_ptr msg) {
-        std::cout << msg->get_payload() << std::endl;
-}
-
-int main() {
-    server print_server;
-
-    print_server.set_message_handler(&on_message);
-    print_server.set_access_channels(websocketpp::log::alevel::all);
-    print_server.set_error_channels(websocketpp::log::elevel::all);
-
-    print_server.init_asio();
-    print_server.listen(9002);
-    print_server.start_accept();
-
-    print_server.run();
-}
diff --git a/src/sioclient/lib/websocketpp/examples/scratch_client/SConscript b/src/sioclient/lib/websocketpp/examples/scratch_client/SConscript
deleted file mode 100644
index 6e7b2ef0..00000000
--- a/src/sioclient/lib/websocketpp/examples/scratch_client/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-## Scratch client example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-Import('tls_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   prgs += env_cpp11.Program('scratch_client', ["scratch_client.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
-   
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/scratch_client/scratch_client.cpp b/src/sioclient/lib/websocketpp/examples/scratch_client/scratch_client.cpp
deleted file mode 100644
index a6a1fbcf..00000000
--- a/src/sioclient/lib/websocketpp/examples/scratch_client/scratch_client.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
-// Additional related material can be found in the tutorials/utility_client
-// directory of the WebSocket++ repository.
-
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-
-#include <websocketpp/common/thread.hpp>
-#include <websocketpp/common/memory.hpp>
-
-#include <cstdlib>
-#include <iostream>
-#include <map>
-#include <string>
-#include <sstream>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-class connection_metadata {
-public:
-    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
-
-    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
-      : m_id(id)
-      , m_hdl(hdl)
-      , m_status("Connecting")
-      , m_uri(uri)
-      , m_server("N/A")
-    {}
-
-    void on_open(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Open";
-
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        m_server = con->get_response_header("Server");
-    }
-
-    void on_fail(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Failed";
-
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        m_server = con->get_response_header("Server");
-        m_error_reason = con->get_ec().message();
-    }
-    
-    void on_close(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Closed";
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        std::stringstream s;
-        s << "close code: " << con->get_remote_close_code() << " (" 
-          << websocketpp::close::status::get_string(con->get_remote_close_code()) 
-          << "), close reason: " << con->get_remote_close_reason();
-        m_error_reason = s.str();
-    }
-
-    websocketpp::connection_hdl get_hdl() const {
-        return m_hdl;
-    }
-    
-    int get_id() const {
-        return m_id;
-    }
-    
-    std::string get_status() const {
-        return m_status;
-    }
-
-    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
-private:
-    int m_id;
-    websocketpp::connection_hdl m_hdl;
-    std::string m_status;
-    std::string m_uri;
-    std::string m_server;
-    std::string m_error_reason;
-};
-
-std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
-    out << "> URI: " << data.m_uri << "\n"
-        << "> Status: " << data.m_status << "\n"
-        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
-        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason);
-
-    return out;
-}
-
-class websocket_endpoint {
-public:
-    websocket_endpoint () : m_next_id(0) {
-        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
-        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
-
-        m_endpoint.init_asio();
-        m_endpoint.start_perpetual();
-
-        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
-    }
-
-    ~websocket_endpoint() {
-        m_endpoint.stop_perpetual();
-        
-        for (con_list::const_iterator it = m_connection_list.begin(); it != m_connection_list.end(); ++it) {
-            if (it->second->get_status() != "Open") {
-                // Only close open connections
-                continue;
-            }
-            
-            std::cout << "> Closing connection " << it->second->get_id() << std::endl;
-            
-            websocketpp::lib::error_code ec;
-            m_endpoint.close(it->second->get_hdl(), websocketpp::close::status::going_away, "", ec);
-            if (ec) {
-                std::cout << "> Error closing connection " << it->second->get_id() << ": "  
-                          << ec.message() << std::endl;
-            }
-        }
-        
-        m_thread->join();
-    }
-
-    int connect(std::string const & uri) {
-        websocketpp::lib::error_code ec;
-
-        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
-
-        if (ec) {
-            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
-            return -1;
-        }
-
-        int new_id = m_next_id++;
-        connection_metadata::ptr metadata_ptr(new connection_metadata(new_id, con->get_handle(), uri));
-        m_connection_list[new_id] = metadata_ptr;
-
-        con->set_open_handler(websocketpp::lib::bind(
-            &connection_metadata::on_open,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_fail_handler(websocketpp::lib::bind(
-            &connection_metadata::on_fail,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_close_handler(websocketpp::lib::bind(
-            &connection_metadata::on_close,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-
-        m_endpoint.connect(con);
-
-        return new_id;
-    }
-
-    void close(int id, websocketpp::close::status::value code, std::string reason) {
-        websocketpp::lib::error_code ec;
-        
-        con_list::iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            std::cout << "> No connection found with id " << id << std::endl;
-            return;
-        }
-        
-        m_endpoint.close(metadata_it->second->get_hdl(), code, reason, ec);
-        if (ec) {
-            std::cout << "> Error initiating close: " << ec.message() << std::endl;
-        }
-    }
-
-    connection_metadata::ptr get_metadata(int id) const {
-        con_list::const_iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            return connection_metadata::ptr();
-        } else {
-            return metadata_it->second;
-        }
-    }
-private:
-    typedef std::map<int,connection_metadata::ptr> con_list;
-
-    client m_endpoint;
-    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
-
-    con_list m_connection_list;
-    int m_next_id;
-};
-
-int main() {
-    bool done = false;
-    std::string input;
-    websocket_endpoint endpoint;
-
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
-
-        if (input == "quit") {
-            done = true;
-        } else if (input == "help") {
-            std::cout
-                << "\nCommand List:\n"
-                << "connect <ws uri>\n"
-                << "close <connection id> [<close code:default=1000>] [<close reason>]\n"
-                << "show <connection id>\n"
-                << "help: Display this help text\n"
-                << "quit: Exit the program\n"
-                << std::endl;
-        } else if (input.substr(0,7) == "connect") {
-            int id = endpoint.connect(input.substr(8));
-            if (id != -1) {
-                std::cout << "> Created connection with id " << id << std::endl;
-            }
-        } else if (input.substr(0,5) == "close") {
-            std::stringstream ss(input);
-            
-            std::string cmd;
-            int id;
-            int close_code = websocketpp::close::status::normal;
-            std::string reason;
-            
-            ss >> cmd >> id >> close_code;
-            std::getline(ss,reason);
-            
-            endpoint.close(id, close_code, reason);
-        }  else if (input.substr(0,4) == "show") {
-            int id = atoi(input.substr(5).c_str());
-
-            connection_metadata::ptr metadata = endpoint.get_metadata(id);
-            if (metadata) {
-                std::cout << *metadata << std::endl;
-            } else {
-                std::cout << "> Unknown connection id " << id << std::endl;
-            }
-        } else {
-            std::cout << "> Unrecognized Command" << std::endl;
-        }
-    }
-
-    return 0;
-}
diff --git a/src/sioclient/lib/websocketpp/examples/scratch_server/SConscript b/src/sioclient/lib/websocketpp/examples/scratch_server/SConscript
deleted file mode 100644
index bf90f743..00000000
--- a/src/sioclient/lib/websocketpp/examples/scratch_server/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-## Scratch server example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-Import('tls_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + ['z']
-   prgs += env_cpp11.Program('scratch_server', ["scratch_server.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system','regex','random'],env) + [platform_libs] + [polyfill_libs] + [tls_libs] + ['z']
-   prgs += env.Program('scratch_server', ["scratch_server.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/scratch_server/scratch_server.cpp b/src/sioclient/lib/websocketpp/examples/scratch_server/scratch_server.cpp
deleted file mode 100644
index 901ae8e5..00000000
--- a/src/sioclient/lib/websocketpp/examples/scratch_server/scratch_server.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * This example is presently used as a scratch space. It may or may not be broken
- * at any given time.
- */
-
-#include <iostream>
-
-#include <websocketpp/config/debug_asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
-
-struct deflate_config : public websocketpp::config::debug_core {
-    typedef deflate_config type;
-    typedef debug_core base;
-    
-    typedef base::concurrency_type concurrency_type;
-    
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-    
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-    
-    typedef base::rng_type rng_type;
-    
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint 
-            socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config> 
-        transport_type;
-        
-    /// permessage_compress extension
-    struct permessage_deflate_config {};
-
-    typedef websocketpp::extensions::permessage_deflate::enabled
-        <permessage_deflate_config> permessage_deflate_type;
-};
-
-typedef websocketpp::server<deflate_config> server;
-
-typedef server::message_ptr message_ptr;
-
-// Define a callback to handle incoming messages
-void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    /*std::cout << "on_message called with hdl: " << hdl.lock().get() 
-              << " and message (" << msg->get_payload().size() << "): " << msg->get_payload()
-              << std::endl;
-    */
-    try {
-        s->send(hdl, msg->get_payload(), msg->get_opcode());
-    } catch (websocketpp::exception const & e) {
-        std::cout << "Echo failed because: " 
-                  << "(" << e.what() << ")" << std::endl;
-    }
-}
-
-int main(int argc, char * argv[]) {
-	// Create a server endpoint
-    server echo_server;
-	
-	try {
-        // Set logging settings        
-        if (argc > 1 && std::string(argv[1]) == "-d") {
-            echo_server.set_access_channels(websocketpp::log::alevel::all);
-            echo_server.set_error_channels(websocketpp::log::elevel::all);
-        } else {
-            echo_server.set_access_channels(websocketpp::log::alevel::none);
-            echo_server.set_error_channels(websocketpp::log::elevel::none);
-        }
-        
-        // Initialize ASIO
-        echo_server.init_asio();
-        
-        // Register our message handler
-        using websocketpp::lib::placeholders::_1;
-        using websocketpp::lib::placeholders::_2;
-        echo_server.set_message_handler(bind(&on_message,&echo_server,_1,_2));
-        
-        // Listen on port 9002
-        echo_server.listen(9002);
-        
-        // Start the server accept loop
-        echo_server.start_accept();
-	    
-	    // Start the ASIO io_service run loop
-        echo_server.run();
-    } catch (websocketpp::exception const & e) {
-        std::cout << e.what() << std::endl;
-    } catch (const std::exception & e) {
-        std::cout << e.what() << std::endl;
-    } catch (...) {
-        std::cout << "other exception" << std::endl;
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/examples/simple_broadcast_server/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/simple_broadcast_server/CMakeLists.txt
deleted file mode 100644
index 5828edb2..00000000
--- a/src/sioclient/lib/websocketpp/examples/simple_broadcast_server/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (simple_broadcast_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/simple_broadcast_server/simple_broadcast_server.cpp b/src/sioclient/lib/websocketpp/examples/simple_broadcast_server/simple_broadcast_server.cpp
deleted file mode 100644
index 7c484769..00000000
--- a/src/sioclient/lib/websocketpp/examples/simple_broadcast_server/simple_broadcast_server.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <set>
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-typedef websocketpp::server<websocketpp::config::asio> server;
-
-using websocketpp::connection_hdl;
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-class broadcast_server {
-public:
-    broadcast_server() {
-        m_server.init_asio();
-
-        m_server.set_open_handler(bind(&broadcast_server::on_open,this,::_1));
-        m_server.set_close_handler(bind(&broadcast_server::on_close,this,::_1));
-        m_server.set_message_handler(bind(&broadcast_server::on_message,this,::_1,::_2));
-    }
-
-    void on_open(connection_hdl hdl) {
-        m_connections.insert(hdl);
-    }
-
-    void on_close(connection_hdl hdl) {
-        m_connections.erase(hdl);
-    }
-
-    void on_message(connection_hdl hdl, server::message_ptr msg) {
-        for (auto it : m_connections) {
-            m_server.send(it,msg);
-        }
-    }
-
-    void run(uint16_t port) {
-        m_server.listen(port);
-        m_server.start_accept();
-        m_server.run();
-    }
-private:
-    typedef std::set<connection_hdl,std::owner_less<connection_hdl>> con_list;
-
-    server m_server;
-    con_list m_connections;
-};
-
-int main() {
-    broadcast_server server;
-    server.run(9002);
-}
diff --git a/src/sioclient/lib/websocketpp/examples/sip_client/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/sip_client/CMakeLists.txt
deleted file mode 100644
index 439fdf1f..00000000
--- a/src/sioclient/lib/websocketpp/examples/sip_client/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (sip_client)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/sip_client/README.txt b/src/sioclient/lib/websocketpp/examples/sip_client/README.txt
deleted file mode 100644
index ce3271c3..00000000
--- a/src/sioclient/lib/websocketpp/examples/sip_client/README.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-Checkout the project from git
-
-At the top level, run cmake:
-
-  cmake -G 'Unix Makefiles' \
-     -D BUILD_EXAMPLES=ON \
-     -D WEBSOCKETPP_ROOT=/tmp/cm1 \
-     -D ENABLE_CPP11=OFF .
-
-and then make the example:
-
-  make -C examples/sip_client
-
-Now run it:
-
-  bin/sip_client ws://ws-server:80
-
-It has been tested against the repro SIP proxy from reSIProcate
-
-  http://www.resiprocate.org/WebRTC_and_SIP_Over_WebSockets
diff --git a/src/sioclient/lib/websocketpp/examples/sip_client/SConscript b/src/sioclient/lib/websocketpp/examples/sip_client/SConscript
deleted file mode 100644
index fafe7b4f..00000000
--- a/src/sioclient/lib/websocketpp/examples/sip_client/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## SIP client example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/sip_client/sip_client.cpp b/src/sioclient/lib/websocketpp/examples/sip_client/sip_client.cpp
deleted file mode 100644
index 66fa8578..00000000
--- a/src/sioclient/lib/websocketpp/examples/sip_client/sip_client.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <condition_variable>
-
-#include <websocketpp/config/asio_no_tls_client.hpp>
-
-#include <websocketpp/client.hpp>
-
-#include <iostream>
-
-#include <boost/thread/thread.hpp>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-// pull out the type of messages sent by our config
-typedef websocketpp::config::asio_client::message_type::ptr message_ptr;
-
-// Create a server endpoint
-client sip_client;
-
-
-bool received;
-
-void on_open(client* c, websocketpp::connection_hdl hdl) {
-    // now it is safe to use the connection
-    std::cout << "connection ready" << std::endl;
-
-    received=false;
-    // Send a SIP OPTIONS message to the server:
-    std::string SIP_msg="OPTIONS sip:carol@chicago.com SIP/2.0\r\nVia: SIP/2.0/WS df7jal23ls0d.invalid;rport;branch=z9hG4bKhjhs8ass877\r\nMax-Forwards: 70\r\nTo: <sip:carol@chicago.com>\r\nFrom: Alice <sip:alice@atlanta.com>;tag=1928301774\r\nCall-ID: a84b4c76e66710\r\nCSeq: 63104 OPTIONS\r\nContact: <sip:alice@pc33.atlanta.com>\r\nAccept: application/sdp\r\nContent-Length: 0\r\n\r\n";
-    sip_client.send(hdl, SIP_msg.c_str(), websocketpp::frame::opcode::text);
-}
-
-void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
-    client::connection_ptr con = sip_client.get_con_from_hdl(hdl);
-
-    std::cout << "Received a reply:" << std::endl;
-    fwrite(msg->get_payload().c_str(), msg->get_payload().size(), 1, stdout);
-    received=true;
-}
-
-int main(int argc, char* argv[]) {
-
-    std::string uri = "ws://localhost:9001";
-
-    if (argc == 2) {
-        uri = argv[1];
-    }
-
-    try {
-        // We expect there to be a lot of errors, so suppress them
-        sip_client.clear_access_channels(websocketpp::log::alevel::all);
-        sip_client.clear_error_channels(websocketpp::log::elevel::all);
-
-        // Initialize ASIO
-        sip_client.init_asio();
-
-        // Register our handlers
-        sip_client.set_open_handler(bind(&on_open,&sip_client,::_1));
-        sip_client.set_message_handler(bind(&on_message,&sip_client,::_1,::_2));
-
-        websocketpp::lib::error_code ec;
-        client::connection_ptr con = sip_client.get_connection(uri, ec);
-
-        // Specify the SIP subprotocol:
-        con->add_subprotocol("sip");
-
-        sip_client.connect(con);
-
-        // Start the ASIO io_service run loop
-        sip_client.run();
-
-        while(!received) {
-            boost::this_thread::sleep(boost::posix_time::milliseconds(100));
-        }
-
-        std::cout << "done" << std::endl;
-
-    } catch (websocketpp::exception const & e) {
-        std::cout << e.what() << std::endl;
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/examples/subprotocol_server/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/subprotocol_server/CMakeLists.txt
deleted file mode 100644
index fa911eba..00000000
--- a/src/sioclient/lib/websocketpp/examples/subprotocol_server/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (subprotocol_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/subprotocol_server/SConscript b/src/sioclient/lib/websocketpp/examples/subprotocol_server/SConscript
deleted file mode 100644
index e97535ca..00000000
--- a/src/sioclient/lib/websocketpp/examples/subprotocol_server/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## Main development example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('subprotocol_server', ["subprotocol_server.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('subprotocol_server', ["subprotocol_server.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/subprotocol_server/subprotocol_server.cpp b/src/sioclient/lib/websocketpp/examples/subprotocol_server/subprotocol_server.cpp
deleted file mode 100644
index 9593c015..00000000
--- a/src/sioclient/lib/websocketpp/examples/subprotocol_server/subprotocol_server.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <iostream>
-
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-typedef websocketpp::server<websocketpp::config::asio> server;
-
-using websocketpp::connection_hdl;
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-using websocketpp::lib::ref;
-
-
-bool validate(server & s, connection_hdl hdl) {
-    server::connection_ptr con = s.get_con_from_hdl(hdl);
-
-    std::cout << "Cache-Control: " << con->get_request_header("Cache-Control") << std::endl;
-
-    const std::vector<std::string> & subp_requests = con->get_requested_subprotocols();
-    std::vector<std::string>::const_iterator it;
-
-    for (it = subp_requests.begin(); it != subp_requests.end(); ++it) {
-        std::cout << "Requested: " << *it << std::endl;
-    }
-
-    if (subp_requests.size() > 0) {
-        con->select_subprotocol(subp_requests[0]);
-    }
-
-    return true;
-}
-
-int main() {
-    try {
-        server s;
-
-        s.set_validate_handler(bind(&validate,ref(s),::_1));
-
-        s.init_asio();
-        s.listen(9005);
-        s.start_accept();
-
-        s.run();
-    } catch (websocketpp::exception const & e) {
-        std::cout << e.what() << std::endl;
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/examples/telemetry_client/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/telemetry_client/CMakeLists.txt
deleted file mode 100644
index 04462e98..00000000
--- a/src/sioclient/lib/websocketpp/examples/telemetry_client/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (telemetry_client)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/telemetry_client/SConscript b/src/sioclient/lib/websocketpp/examples/telemetry_client/SConscript
deleted file mode 100644
index 62396a5e..00000000
--- a/src/sioclient/lib/websocketpp/examples/telemetry_client/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## Telemetry client example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('telemetry_client', ["telemetry_client.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('telemetry_client', ["telemetry_client.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/telemetry_client/telemetry_client.cpp b/src/sioclient/lib/websocketpp/examples/telemetry_client/telemetry_client.cpp
deleted file mode 100644
index f0f7fae7..00000000
--- a/src/sioclient/lib/websocketpp/examples/telemetry_client/telemetry_client.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-
-// This header pulls in the WebSocket++ abstracted thread support that will
-// select between boost::thread and std::thread based on how the build system
-// is configured.
-#include <websocketpp/common/thread.hpp>
-
-/**
- * Define a semi-cross platform helper method that waits/sleeps for a bit.
- */
-void wait_a_bit() {
-#ifdef WIN32
-    Sleep(1000);
-#else
-    sleep(1);
-#endif
-}
-
-/**
- * The telemetry client connects to a WebSocket server and sends a message every
- * second containing an integer count. This example can be used as the basis for
- * programs where a client connects and pushes data for logging, stress/load
- * testing, etc.
- */
-class telemetry_client {
-public:
-    typedef websocketpp::client<websocketpp::config::asio_client> client;
-    typedef websocketpp::lib::lock_guard<websocketpp::lib::mutex> scoped_lock;
-
-    telemetry_client() : m_open(false),m_done(false) {
-        // set up access channels to only log interesting things
-        m_client.clear_access_channels(websocketpp::log::alevel::all);
-        m_client.set_access_channels(websocketpp::log::alevel::connect);
-        m_client.set_access_channels(websocketpp::log::alevel::disconnect);
-        m_client.set_access_channels(websocketpp::log::alevel::app);
-
-        // Initialize the Asio transport policy
-        m_client.init_asio();
-
-        // Bind the handlers we are using
-        using websocketpp::lib::placeholders::_1;
-        using websocketpp::lib::bind;
-        m_client.set_open_handler(bind(&telemetry_client::on_open,this,_1));
-        m_client.set_close_handler(bind(&telemetry_client::on_close,this,_1));
-        m_client.set_fail_handler(bind(&telemetry_client::on_fail,this,_1));
-    }
-
-    // This method will block until the connection is complete
-    void run(const std::string & uri) {
-        // Create a new connection to the given URI
-        websocketpp::lib::error_code ec;
-        client::connection_ptr con = m_client.get_connection(uri, ec);
-        if (ec) {
-            m_client.get_alog().write(websocketpp::log::alevel::app,
-                    "Get Connection Error: "+ec.message());
-            return;
-        }
-
-        // Grab a handle for this connection so we can talk to it in a thread
-        // safe manor after the event loop starts.
-        m_hdl = con->get_handle();
-
-        // Queue the connection. No DNS queries or network connections will be
-        // made until the io_service event loop is run.
-        m_client.connect(con);
-
-        // Create a thread to run the ASIO io_service event loop
-        websocketpp::lib::thread asio_thread(&client::run, &m_client);
-
-        // Create a thread to run the telemetry loop
-        websocketpp::lib::thread telemetry_thread(&telemetry_client::telemetry_loop,this);
-
-        asio_thread.join();
-        telemetry_thread.join();
-    }
-
-    // The open handler will signal that we are ready to start sending telemetry
-    void on_open(websocketpp::connection_hdl) {
-        m_client.get_alog().write(websocketpp::log::alevel::app,
-            "Connection opened, starting telemetry!");
-
-        scoped_lock guard(m_lock);
-        m_open = true;
-    }
-
-    // The close handler will signal that we should stop sending telemetry
-    void on_close(websocketpp::connection_hdl) {
-        m_client.get_alog().write(websocketpp::log::alevel::app,
-            "Connection closed, stopping telemetry!");
-
-        scoped_lock guard(m_lock);
-        m_done = true;
-    }
-
-    // The fail handler will signal that we should stop sending telemetry
-    void on_fail(websocketpp::connection_hdl) {
-        m_client.get_alog().write(websocketpp::log::alevel::app,
-            "Connection failed, stopping telemetry!");
-
-        scoped_lock guard(m_lock);
-        m_done = true;
-    }
-
-    void telemetry_loop() {
-        uint64_t count = 0;
-        std::stringstream val;
-        websocketpp::lib::error_code ec;
-
-        while(1) {
-            bool wait = false;
-
-            {
-                scoped_lock guard(m_lock);
-                // If the connection has been closed, stop generating telemetry
-                if (m_done) {break;}
-
-                // If the connection hasn't been opened yet wait a bit and retry
-                if (!m_open) {
-                    wait = true;
-                }
-            }
-
-            if (wait) {
-                wait_a_bit();
-                continue;
-            }
-
-            val.str("");
-            val << "count is " << count++;
-
-            m_client.get_alog().write(websocketpp::log::alevel::app, val.str());
-            m_client.send(m_hdl,val.str(),websocketpp::frame::opcode::text,ec);
-
-            // The most likely error that we will get is that the connection is
-            // not in the right state. Usually this means we tried to send a
-            // message to a connection that was closed or in the process of
-            // closing. While many errors here can be easily recovered from,
-            // in this simple example, we'll stop the telemetry loop.
-            if (ec) {
-                m_client.get_alog().write(websocketpp::log::alevel::app,
-                    "Send Error: "+ec.message());
-                break;
-            }
-
-            wait_a_bit();
-        }
-    }
-private:
-    client m_client;
-    websocketpp::connection_hdl m_hdl;
-    websocketpp::lib::mutex m_lock;
-    bool m_open;
-    bool m_done;
-};
-
-int main(int argc, char* argv[]) {
-    telemetry_client c;
-
-    std::string uri = "ws://localhost:9002";
-
-    if (argc == 2) {
-        uri = argv[1];
-    }
-
-    c.run(uri);
-}
diff --git a/src/sioclient/lib/websocketpp/examples/telemetry_server/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/telemetry_server/CMakeLists.txt
deleted file mode 100644
index 845fe863..00000000
--- a/src/sioclient/lib/websocketpp/examples/telemetry_server/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (telemetry_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/src/sioclient/lib/websocketpp/examples/telemetry_server/SConscript b/src/sioclient/lib/websocketpp/examples/telemetry_server/SConscript
deleted file mode 100644
index 1b8ff229..00000000
--- a/src/sioclient/lib/websocketpp/examples/telemetry_server/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## Main development example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('telemetry_server', ["telemetry_server.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('telemetry_server', ["telemetry_server.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/telemetry_server/index.html b/src/sioclient/lib/websocketpp/examples/telemetry_server/index.html
deleted file mode 100644
index def50dd6..00000000
--- a/src/sioclient/lib/websocketpp/examples/telemetry_server/index.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<title>WebSocket++ Telemetry Client</title>
-</head>
-<body>
-
-<script type="text/javascript">
-var ws;
-var url;
-
-function connect() {
-	url = document.getElementById("server_url").value;
-	
-	if ("WebSocket" in window) {
-		ws = new WebSocket(url);
-	} else if ("MozWebSocket" in window) {
-		ws = new MozWebSocket(url);
-	} else {
-		document.getElementById("messages").innerHTML += "This Browser does not support WebSockets<br />";
-		return;
-	}
-	ws.onopen = function(e) {
-		document.getElementById("messages").innerHTML += "Client: A connection to "+ws.url+" has been opened.<br />";
-		
-		document.getElementById("server_url").disabled = true;
-		document.getElementById("toggle_connect").innerHTML = "Disconnect";
-	};
-	
-	ws.onerror = function(e) {
-		document.getElementById("messages").innerHTML += "Client: An error occured, see console log for more details.<br />";
-		console.log(e);
-	};
-	
-	ws.onclose = function(e) {
-		document.getElementById("messages").innerHTML += "Client: The connection to "+url+" was closed. ["+e.code+(e.reason != "" ? ","+e.reason : "")+"]<br />";
-	    cleanup_disconnect();
-	};
-	
-	ws.onmessage = function(e) {
-		document.getElementById("messages").innerHTML += "Server: "+e.data+"<br />";
-	};
-}
-
-function disconnect() {
-	ws.close();
-	cleanup_disconnect();
-}
-
-function cleanup_disconnect() {
-    document.getElementById("server_url").disabled = false;
-	document.getElementById("toggle_connect").innerHTML = "Connect";
-}
-
-function toggle_connect() {
-	if (document.getElementById("server_url").disabled === false) {
-		connect();
-	} else {
-		disconnect();
-	}
-}
-</script>
-
-<style>
-body,html {
-	margin: 0px;
-	padding: 0px;
-}
-#controls {
-	float:right;
-	background-color: #999;
-}
-
-</style>
-
-<div id="controls">
-	<div id="server">
-	<input type="text" name="server_url" id="server_url" value="ws://localhost:9002" /><br />
-	<button id="toggle_connect" onclick="toggle_connect();">Connect</button>
-	</div>
-</div>
-<div id="messages"></div>
-
-</body>
-</html>
diff --git a/src/sioclient/lib/websocketpp/examples/telemetry_server/telemetry_server.cpp b/src/sioclient/lib/websocketpp/examples/telemetry_server/telemetry_server.cpp
deleted file mode 100644
index 3f8e604a..00000000
--- a/src/sioclient/lib/websocketpp/examples/telemetry_server/telemetry_server.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-#include <websocketpp/config/asio_no_tls.hpp>
-
-#include <websocketpp/server.hpp>
-
-#include <fstream>
-#include <iostream>
-#include <set>
-#include <streambuf>
-#include <string>
-
-/**
- * The telemetry server accepts connections and sends a message every second to
- * each client containing an integer count. This example can be used as the
- * basis for programs that expose a stream of telemetry data for logging,
- * dashboards, etc.
- *
- * This example uses the timer based concurrency method and is self contained
- * and singled threaded. Refer to telemetry client for an example of a similar
- * telemetry setup using threads rather than timers.
- *
- * This example also includes an example simple HTTP server that serves a web
- * dashboard displaying the count. This simple design is suitable for use 
- * delivering a small number of files to a small number of clients. It is ideal
- * for cases like embedded dashboards that don't want the complexity of an extra
- * HTTP server to serve static files.
- *
- * This design *will* fall over under high traffic or DoS conditions. In such
- * cases you are much better off proxying to a real HTTP server for the http
- * requests.
- */
-class telemetry_server {
-public:
-    typedef websocketpp::connection_hdl connection_hdl;
-    typedef websocketpp::server<websocketpp::config::asio> server;
-
-    telemetry_server() : m_count(0) {
-        // set up access channels to only log interesting things
-        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
-        m_endpoint.set_access_channels(websocketpp::log::alevel::access_core);
-        m_endpoint.set_access_channels(websocketpp::log::alevel::app);
-
-        // Initialize the Asio transport policy
-        m_endpoint.init_asio();
-
-        // Bind the handlers we are using
-        using websocketpp::lib::placeholders::_1;
-        using websocketpp::lib::bind;
-        m_endpoint.set_open_handler(bind(&telemetry_server::on_open,this,_1));
-        m_endpoint.set_close_handler(bind(&telemetry_server::on_close,this,_1));
-        m_endpoint.set_http_handler(bind(&telemetry_server::on_http,this,_1));
-    }
-
-    void run(std::string docroot, uint16_t port) {
-        std::stringstream ss;
-        ss << "Running telemetry server on port "<< port <<" using docroot=" << docroot;
-        m_endpoint.get_alog().write(websocketpp::log::alevel::app,ss.str());
-        
-        m_docroot = docroot;
-        
-        // listen on specified port
-        m_endpoint.listen(port);
-
-        // Start the server accept loop
-        m_endpoint.start_accept();
-
-        // Set the initial timer to start telemetry
-        set_timer();
-
-        // Start the ASIO io_service run loop
-        try {
-            m_endpoint.run();
-        } catch (websocketpp::exception const & e) {
-            std::cout << e.what() << std::endl;
-        }
-    }
-
-    void set_timer() {
-        m_timer = m_endpoint.set_timer(
-            1000,
-            websocketpp::lib::bind(
-                &telemetry_server::on_timer,
-                this,
-                websocketpp::lib::placeholders::_1
-            )
-        );
-    }
-
-    void on_timer(websocketpp::lib::error_code const & ec) {
-        if (ec) {
-            // there was an error, stop telemetry
-            m_endpoint.get_alog().write(websocketpp::log::alevel::app,
-                    "Timer Error: "+ec.message());
-            return;
-        }
-        
-        std::stringstream val;
-        val << "count is " << m_count++;
-        
-        // Broadcast count to all connections
-        con_list::iterator it;
-        for (it = m_connections.begin(); it != m_connections.end(); ++it) {
-            m_endpoint.send(*it,val.str(),websocketpp::frame::opcode::text);
-        }
-        
-        // set timer for next telemetry check
-        set_timer();
-    }
-
-    void on_http(connection_hdl hdl) {
-        // Upgrade our connection handle to a full connection_ptr
-        server::connection_ptr con = m_endpoint.get_con_from_hdl(hdl);
-    
-        std::ifstream file;
-        std::string filename = con->get_resource();
-        std::string response;
-    
-        m_endpoint.get_alog().write(websocketpp::log::alevel::app,
-            "http request1: "+filename);
-    
-        if (filename == "/") {
-            filename = m_docroot+"index.html";
-        } else {
-            filename = m_docroot+filename.substr(1);
-        }
-        
-        m_endpoint.get_alog().write(websocketpp::log::alevel::app,
-            "http request2: "+filename);
-    
-        file.open(filename.c_str(), std::ios::in);
-        if (!file) {
-            // 404 error
-            std::stringstream ss;
-        
-            ss << "<!doctype html><html><head>"
-               << "<title>Error 404 (Resource not found)</title><body>"
-               << "<h1>Error 404</h1>"
-               << "<p>The requested URL " << filename << " was not found on this server.</p>"
-               << "</body></head></html>";
-        
-            con->set_body(ss.str());
-            con->set_status(websocketpp::http::status_code::not_found);
-            return;
-        }
-    
-        file.seekg(0, std::ios::end);
-        response.reserve(file.tellg());
-        file.seekg(0, std::ios::beg);
-    
-        response.assign((std::istreambuf_iterator<char>(file)),
-                        std::istreambuf_iterator<char>());
-    
-        con->set_body(response);
-        con->set_status(websocketpp::http::status_code::ok);
-    }
-
-    void on_open(connection_hdl hdl) {
-        m_connections.insert(hdl);
-    }
-
-    void on_close(connection_hdl hdl) {
-        m_connections.erase(hdl);
-    }
-private:
-    typedef std::set<connection_hdl,std::owner_less<connection_hdl>> con_list;
-    
-    server m_endpoint;
-    con_list m_connections;
-    server::timer_ptr m_timer;
-    
-    std::string m_docroot;
-    
-    // Telemetry data
-    uint64_t m_count;
-};
-
-int main(int argc, char* argv[]) {
-    telemetry_server s;
-
-    std::string docroot;
-    uint16_t port = 9002;
-
-    if (argc == 1) {
-        std::cout << "Usage: telemetry_server [documentroot] [port]" << std::endl;
-        return 1;
-    }
-    
-    if (argc >= 2) {
-        docroot = std::string(argv[1]);
-    }
-        
-    if (argc >= 3) {
-        int i = atoi(argv[2]);
-        if (i <= 0 || i > 65535) {
-            std::cout << "invalid port" << std::endl;
-            return 1;
-        }
-        
-        port = uint16_t(i);
-    }
-
-    s.run(docroot, port);
-    return 0;
-}
diff --git a/src/sioclient/lib/websocketpp/examples/testee_client/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/testee_client/CMakeLists.txt
deleted file mode 100644
index e89fcc7f..00000000
--- a/src/sioclient/lib/websocketpp/examples/testee_client/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-if (ZLIB_FOUND)
-
-init_target (testee_client)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-link_zlib()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
-
-endif()
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/examples/testee_client/SConscript b/src/sioclient/lib/websocketpp/examples/testee_client/SConscript
deleted file mode 100644
index 64f0ef1f..00000000
--- a/src/sioclient/lib/websocketpp/examples/testee_client/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## Autobahn test client example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
-   prgs += env_cpp11.Program('testee_client', ["testee_client.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + ['z']
-   prgs += env.Program('testee_client', ["testee_client.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/testee_client/testee_client.cpp b/src/sioclient/lib/websocketpp/examples/testee_client/testee_client.cpp
deleted file mode 100644
index b66e6335..00000000
--- a/src/sioclient/lib/websocketpp/examples/testee_client/testee_client.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
-
-#include <iostream>
-
-struct deflate_config : public websocketpp::config::asio_client {
-    typedef deflate_config type;
-    typedef asio_client base;
-    
-    typedef base::concurrency_type concurrency_type;
-    
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-    
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-    
-    typedef base::rng_type rng_type;
-    
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint 
-            socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config> 
-        transport_type;
-        
-    /// permessage_compress extension
-    struct permessage_deflate_config {};
-
-    typedef websocketpp::extensions::permessage_deflate::enabled
-        <permessage_deflate_config> permessage_deflate_type;
-};
-
-typedef websocketpp::client<deflate_config> client;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-// pull out the type of messages sent by our config
-typedef websocketpp::config::asio_client::message_type::ptr message_ptr;
-
-int case_count = 0;
-
-void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
-    client::connection_ptr con = c->get_con_from_hdl(hdl);
-
-    if (con->get_resource() == "/getCaseCount") {
-        std::cout << "Detected " << msg->get_payload() << " test cases."
-                  << std::endl;
-        case_count = atoi(msg->get_payload().c_str());
-    } else {
-        c->send(hdl, msg->get_payload(), msg->get_opcode());
-    }
-}
-
-int main(int argc, char* argv[]) {
-    // Create a server endpoint
-    client c;
-
-    std::string uri = "ws://localhost:9001";
-
-    if (argc == 2) {
-        uri = argv[1];
-    }
-
-    try {
-        // We expect there to be a lot of errors, so suppress them
-        c.clear_access_channels(websocketpp::log::alevel::all);
-        c.clear_error_channels(websocketpp::log::elevel::all);
-
-        // Initialize ASIO
-        c.init_asio();
-
-        // Register our handlers
-        c.set_message_handler(bind(&on_message,&c,::_1,::_2));
-
-        websocketpp::lib::error_code ec;
-        client::connection_ptr con = c.get_connection(uri+"/getCaseCount", ec);
-        c.connect(con);
-
-        // Start the ASIO io_service run loop
-        c.run();
-
-        std::cout << "case count: " << case_count << std::endl;
-
-        for (int i = 1; i <= case_count; i++) {
-            c.reset();
-
-            std::stringstream url;
-
-            url << uri << "/runCase?case=" << i << "&agent="
-                << websocketpp::user_agent;
-
-            con = c.get_connection(url.str(), ec);
-
-            c.connect(con);
-
-            c.run();
-        }
-
-        std::cout << "done" << std::endl;
-
-    } catch (websocketpp::exception const & e) {
-        std::cout << e.what() << std::endl;
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/examples/testee_server/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/testee_server/CMakeLists.txt
deleted file mode 100644
index c95e42dc..00000000
--- a/src/sioclient/lib/websocketpp/examples/testee_server/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-if (ZLIB_FOUND)
-
-init_target (testee_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-link_zlib()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
-
-endif()
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/examples/testee_server/SConscript b/src/sioclient/lib/websocketpp/examples/testee_server/SConscript
deleted file mode 100644
index 3c75f4ff..00000000
--- a/src/sioclient/lib/websocketpp/examples/testee_server/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## Autobahn Testee Server
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
-   prgs += env_cpp11.Program('testee_server', ["testee_server.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs] + ['z']
-   prgs += env.Program('testee_server', ["testee_server.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/examples/testee_server/testee_server.cpp b/src/sioclient/lib/websocketpp/examples/testee_server/testee_server.cpp
deleted file mode 100644
index 9ac9a7d4..00000000
--- a/src/sioclient/lib/websocketpp/examples/testee_server/testee_server.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
-#include <iostream>
-
-struct testee_config : public websocketpp::config::asio {
-    // pull default settings from our core config
-    typedef websocketpp::config::asio core;
-
-    typedef core::concurrency_type concurrency_type;
-    typedef core::request_type request_type;
-    typedef core::response_type response_type;
-    typedef core::message_type message_type;
-    typedef core::con_msg_manager_type con_msg_manager_type;
-    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef core::alog_type alog_type;
-    typedef core::elog_type elog_type;
-    typedef core::rng_type rng_type;
-    typedef core::endpoint_base endpoint_base;
-
-    static bool const enable_multithreading = true;
-
-    struct transport_config : public core::transport_config {
-        typedef core::concurrency_type concurrency_type;
-        typedef core::elog_type elog_type;
-        typedef core::alog_type alog_type;
-        typedef core::request_type request_type;
-        typedef core::response_type response_type;
-
-        static bool const enable_multithreading = true;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config>
-        transport_type;
-
-    static const websocketpp::log::level elog_level =
-        websocketpp::log::elevel::none;
-    static const websocketpp::log::level alog_level =
-        websocketpp::log::alevel::none;
-        
-    /// permessage_compress extension
-    struct permessage_deflate_config {};
-
-    typedef websocketpp::extensions::permessage_deflate::enabled
-        <permessage_deflate_config> permessage_deflate_type;
-};
-
-typedef websocketpp::server<testee_config> server;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-// pull out the type of messages sent by our config
-typedef server::message_ptr message_ptr;
-
-// Define a callback to handle incoming messages
-void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    s->send(hdl, msg->get_payload(), msg->get_opcode());
-}
-
-void on_socket_init(websocketpp::connection_hdl, boost::asio::ip::tcp::socket & s) {
-    boost::asio::ip::tcp::no_delay option(true);
-    s.set_option(option);
-}
-
-int main(int argc, char * argv[]) {
-    // Create a server endpoint
-    server testee_server;
-
-    short port = 9002;
-    size_t num_threads = 1;
-
-    if (argc == 3) {
-        port = atoi(argv[1]);
-        num_threads = atoi(argv[2]);
-    }
-
-    try {
-        // Total silence
-        testee_server.clear_access_channels(websocketpp::log::alevel::all);
-        testee_server.clear_error_channels(websocketpp::log::alevel::all);
-
-        // Initialize ASIO
-        testee_server.init_asio();
-        testee_server.set_reuse_addr(true);
-
-        // Register our message handler
-        testee_server.set_message_handler(bind(&on_message,&testee_server,::_1,::_2));
-        testee_server.set_socket_init_handler(bind(&on_socket_init,::_1,::_2));
-
-        // Listen on specified port with extended listen backlog
-        testee_server.set_listen_backlog(8192);
-        testee_server.listen(port);
-
-        // Start the server accept loop
-        testee_server.start_accept();
-
-        // Start the ASIO io_service run loop
-        if (num_threads == 1) {
-            testee_server.run();
-        } else {
-            typedef websocketpp::lib::shared_ptr<websocketpp::lib::thread> thread_ptr;
-            std::vector<thread_ptr> ts;
-            for (size_t i = 0; i < num_threads; i++) {
-                ts.push_back(websocketpp::lib::make_shared<websocketpp::lib::thread>(&server::run, &testee_server));
-            }
-
-            for (size_t i = 0; i < num_threads; i++) {
-                ts[i]->join();
-            }
-        }
-
-    } catch (websocketpp::exception const & e) {
-        std::cout << "exception: " << e.what() << std::endl;
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/examples/utility_client/CMakeLists.txt b/src/sioclient/lib/websocketpp/examples/utility_client/CMakeLists.txt
deleted file mode 100644
index fbfd8682..00000000
--- a/src/sioclient/lib/websocketpp/examples/utility_client/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (utility_client)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
-
diff --git a/src/sioclient/lib/websocketpp/examples/utility_client/SConscript b/src/sioclient/lib/websocketpp/examples/utility_client/SConscript
deleted file mode 100644
index 6e6cd8c9..00000000
--- a/src/sioclient/lib/websocketpp/examples/utility_client/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## Utility client example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/examples/utility_client/utility_client.cpp b/src/sioclient/lib/websocketpp/examples/utility_client/utility_client.cpp
deleted file mode 100644
index aa43b8e3..00000000
--- a/src/sioclient/lib/websocketpp/examples/utility_client/utility_client.cpp
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
-// Additional related material can be found in the tutorials/utility_client
-// directory of the WebSocket++ repository.
-
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-
-#include <websocketpp/common/thread.hpp>
-#include <websocketpp/common/memory.hpp>
-
-#include <cstdlib>
-#include <iostream>
-#include <map>
-#include <string>
-#include <sstream>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-class connection_metadata {
-public:
-    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
-
-    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
-      : m_id(id)
-      , m_hdl(hdl)
-      , m_status("Connecting")
-      , m_uri(uri)
-      , m_server("N/A")
-    {}
-
-    void on_open(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Open";
-
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        m_server = con->get_response_header("Server");
-    }
-
-    void on_fail(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Failed";
-
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        m_server = con->get_response_header("Server");
-        m_error_reason = con->get_ec().message();
-    }
-    
-    void on_close(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Closed";
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        std::stringstream s;
-        s << "close code: " << con->get_remote_close_code() << " (" 
-          << websocketpp::close::status::get_string(con->get_remote_close_code()) 
-          << "), close reason: " << con->get_remote_close_reason();
-        m_error_reason = s.str();
-    }
-
-    void on_message(websocketpp::connection_hdl, client::message_ptr msg) {
-        if (msg->get_opcode() == websocketpp::frame::opcode::text) {
-            m_messages.push_back("<< " + msg->get_payload());
-        } else {
-            m_messages.push_back("<< " + websocketpp::utility::to_hex(msg->get_payload()));
-        }
-    }
-
-    websocketpp::connection_hdl get_hdl() const {
-        return m_hdl;
-    }
-    
-    int get_id() const {
-        return m_id;
-    }
-    
-    std::string get_status() const {
-        return m_status;
-    }
-
-    void record_sent_message(std::string message) {
-        m_messages.push_back(">> " + message);
-    }
-
-    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
-private:
-    int m_id;
-    websocketpp::connection_hdl m_hdl;
-    std::string m_status;
-    std::string m_uri;
-    std::string m_server;
-    std::string m_error_reason;
-    std::vector<std::string> m_messages;
-};
-
-std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
-    out << "> URI: " << data.m_uri << "\n"
-        << "> Status: " << data.m_status << "\n"
-        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
-        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason) << "\n";
-    out << "> Messages Processed: (" << data.m_messages.size() << ") \n";
-
-    std::vector<std::string>::const_iterator it;
-    for (it = data.m_messages.begin(); it != data.m_messages.end(); ++it) {
-        out << *it << "\n";
-    }
-
-    return out;
-}
-
-class websocket_endpoint {
-public:
-    websocket_endpoint () : m_next_id(0) {
-        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
-        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
-
-        m_endpoint.init_asio();
-        m_endpoint.start_perpetual();
-
-        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
-    }
-
-    ~websocket_endpoint() {
-        m_endpoint.stop_perpetual();
-        
-        for (con_list::const_iterator it = m_connection_list.begin(); it != m_connection_list.end(); ++it) {
-            if (it->second->get_status() != "Open") {
-                // Only close open connections
-                continue;
-            }
-            
-            std::cout << "> Closing connection " << it->second->get_id() << std::endl;
-            
-            websocketpp::lib::error_code ec;
-            m_endpoint.close(it->second->get_hdl(), websocketpp::close::status::going_away, "", ec);
-            if (ec) {
-                std::cout << "> Error closing connection " << it->second->get_id() << ": "  
-                          << ec.message() << std::endl;
-            }
-        }
-        
-        m_thread->join();
-    }
-
-    int connect(std::string const & uri) {
-        websocketpp::lib::error_code ec;
-
-        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
-
-        if (ec) {
-            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
-            return -1;
-        }
-
-        int new_id = m_next_id++;
-        connection_metadata::ptr metadata_ptr = websocketpp::lib::make_shared<connection_metadata>(new_id, con->get_handle(), uri);
-        m_connection_list[new_id] = metadata_ptr;
-
-        con->set_open_handler(websocketpp::lib::bind(
-            &connection_metadata::on_open,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_fail_handler(websocketpp::lib::bind(
-            &connection_metadata::on_fail,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_close_handler(websocketpp::lib::bind(
-            &connection_metadata::on_close,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_message_handler(websocketpp::lib::bind(
-            &connection_metadata::on_message,
-            metadata_ptr,
-            websocketpp::lib::placeholders::_1,
-            websocketpp::lib::placeholders::_2
-        ));
-
-        m_endpoint.connect(con);
-
-        return new_id;
-    }
-
-    void close(int id, websocketpp::close::status::value code, std::string reason) {
-        websocketpp::lib::error_code ec;
-        
-        con_list::iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            std::cout << "> No connection found with id " << id << std::endl;
-            return;
-        }
-        
-        m_endpoint.close(metadata_it->second->get_hdl(), code, reason, ec);
-        if (ec) {
-            std::cout << "> Error initiating close: " << ec.message() << std::endl;
-        }
-    }
-
-    void send(int id, std::string message) {
-        websocketpp::lib::error_code ec;
-        
-        con_list::iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            std::cout << "> No connection found with id " << id << std::endl;
-            return;
-        }
-        
-        m_endpoint.send(metadata_it->second->get_hdl(), message, websocketpp::frame::opcode::text, ec);
-        if (ec) {
-            std::cout << "> Error sending message: " << ec.message() << std::endl;
-            return;
-        }
-        
-        metadata_it->second->record_sent_message(message);
-    }
-
-    connection_metadata::ptr get_metadata(int id) const {
-        con_list::const_iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            return connection_metadata::ptr();
-        } else {
-            return metadata_it->second;
-        }
-    }
-private:
-    typedef std::map<int,connection_metadata::ptr> con_list;
-
-    client m_endpoint;
-    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
-
-    con_list m_connection_list;
-    int m_next_id;
-};
-
-int main() {
-    bool done = false;
-    std::string input;
-    websocket_endpoint endpoint;
-
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
-
-        if (input == "quit") {
-            done = true;
-        } else if (input == "help") {
-            std::cout
-                << "\nCommand List:\n"
-                << "connect <ws uri>\n"
-                << "send <connection id> <message>\n"
-                << "close <connection id> [<close code:default=1000>] [<close reason>]\n"
-                << "show <connection id>\n"
-                << "help: Display this help text\n"
-                << "quit: Exit the program\n"
-                << std::endl;
-        } else if (input.substr(0,7) == "connect") {
-            int id = endpoint.connect(input.substr(8));
-            if (id != -1) {
-                std::cout << "> Created connection with id " << id << std::endl;
-            }
-        } else if (input.substr(0,4) == "send") {
-            std::stringstream ss(input);
-            
-            std::string cmd;
-            int id;
-            std::string message;
-            
-            ss >> cmd >> id;
-            std::getline(ss,message);
-            
-            endpoint.send(id, message);
-        } else if (input.substr(0,5) == "close") {
-            std::stringstream ss(input);
-            
-            std::string cmd;
-            int id;
-            int close_code = websocketpp::close::status::normal;
-            std::string reason;
-            
-            ss >> cmd >> id >> close_code;
-            std::getline(ss,reason);
-            
-            endpoint.close(id, close_code, reason);
-        } else if (input.substr(0,4) == "show") {
-            int id = atoi(input.substr(5).c_str());
-
-            connection_metadata::ptr metadata = endpoint.get_metadata(id);
-            if (metadata) {
-                std::cout << *metadata << std::endl;
-            } else {
-                std::cout << "> Unknown connection id " << id << std::endl;
-            }
-        } else {
-            std::cout << "> Unrecognized Command" << std::endl;
-        }
-    }
-
-    return 0;
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/readme.md b/src/sioclient/lib/websocketpp/readme.md
deleted file mode 100644
index aa99f668..00000000
--- a/src/sioclient/lib/websocketpp/readme.md
+++ /dev/null
@@ -1,49 +0,0 @@
-WebSocket++ (0.8.1)
-==========================
-
-WebSocket++ is a header only C++ library that implements RFC6455 The WebSocket
-Protocol. It allows integrating WebSocket client and server functionality into
-C++ programs. It uses interchangeable network transport modules including one
-based on raw char buffers, one based on C++ iostreams, and one based on Asio 
-(either via Boost or standalone). End users can write additional transport
-policies to support other networking or event libraries as needed.
-
-Major Features
-==============
-* Full support for RFC6455
-* Partial support for Hixie 76 / Hybi 00, 07-17 draft specs (server only)
-* Message/event based interface
-* Supports secure WebSockets (TLS), IPv6, and explicit proxies.
-* Flexible dependency management (C++11 Standard Library or Boost)
-* Interchangeable network transport modules (raw, iostream, Asio, or custom)
-* Portable/cross platform (Posix/Windows, 32/64bit, Intel/ARM/PPC)
-* Thread-safe
-
-Get Involved
-============
-
-[![Build Status](https://travis-ci.org/zaphoyd/websocketpp.png)](https://travis-ci.org/zaphoyd/websocketpp)
-
-**Project Website**
-http://www.zaphoyd.com/websocketpp/
-
-**User Manual**
-http://docs.websocketpp.org/
-
-**GitHub Repository**
-https://github.com/zaphoyd/websocketpp/
-
-GitHub pull requests should be submitted to the `develop` branch.
-
-**Announcements Mailing List**
-http://groups.google.com/group/websocketpp-announcements/
-
-**IRC Channel**
- #websocketpp (freenode)
-
-**Discussion / Development / Support Mailing List / Forum**
-http://groups.google.com/group/websocketpp/
-
-Author
-======
-Peter Thorson - websocketpp@zaphoyd.com
diff --git a/src/sioclient/lib/websocketpp/roadmap.md b/src/sioclient/lib/websocketpp/roadmap.md
deleted file mode 100644
index b35c54ad..00000000
--- a/src/sioclient/lib/websocketpp/roadmap.md
+++ /dev/null
@@ -1,43 +0,0 @@
-Complete & Tested:
-- Server and client roles pass all Autobahn v0.5.9 test suite tests strictly
-- Streaming UTF8 validation
-- random number generation
-- iostream based transport
-- C++11 support
-- LLVM/Clang support
-- GCC support
-- 64 bit support
-- 32 bit support
-- Logging
-- Client role
-- message_handler
-- ping_handler
-- pong_handler
-- open_handler
-- close_handler
-- echo_server & echo_server_tls
-- External io_service support
-- TLS support
-- exception/error handling
-- Timeouts
-- Subprotocol negotiation
-- validate_handler
-- Hybi 00/Hixie 76 legacy protocol support
-- Outgoing Proxy Support
-- socket_init_handler
-- tls_init_handler
-- tcp_init_handler
-
-Ongoing work
-- Performance tuning
-- PowerPC support
-- Visual Studio / Windows support
-- CMake build/install support
-- http_handler
-
-Future feature roadmap
-- Extension support
-- permessage_compress extension
-- Message buffer pool
-- flow control
-- tutorials & documentation
diff --git a/src/sioclient/lib/websocketpp/test/connection/CMakeLists.txt b/src/sioclient/lib/websocketpp/test/connection/CMakeLists.txt
deleted file mode 100644
index cc501c7e..00000000
--- a/src/sioclient/lib/websocketpp/test/connection/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (test_connection)
-
-build_test (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/src/sioclient/lib/websocketpp/test/connection/SConscript b/src/sioclient/lib/websocketpp/test/connection/SConscript
deleted file mode 100644
index 4ed7a4e6..00000000
--- a/src/sioclient/lib/websocketpp/test/connection/SConscript
+++ /dev/null
@@ -1,25 +0,0 @@
-## connection unit tests
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
-
-objs = env.Object('connection_boost.o', ["connection.cpp"], LIBS = BOOST_LIBS)
-objs = env.Object('connection_tu2_boost.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS)
-prgs = env.Program('test_connection_boost', ["connection_boost.o","connection_tu2_boost.o"], LIBS = BOOST_LIBS)
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   objs += env_cpp11.Object('connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('connection_tu2_stl.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_connection_stl', ["connection_stl.o","connection_tu2_stl.o"], LIBS = BOOST_LIBS_CPP11)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/test/connection/connection.cpp b/src/sioclient/lib/websocketpp/test/connection/connection.cpp
deleted file mode 100644
index cb7b69a9..00000000
--- a/src/sioclient/lib/websocketpp/test/connection/connection.cpp
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE connection
-#include <boost/test/unit_test.hpp>
-
-#include "connection_tu2.hpp"
-
-// Include special debugging transport
-//#include <websocketpp/config/minimal_client.hpp>
-#include <websocketpp/transport/debug/endpoint.hpp>
-
-// NOTE: these tests currently test against hardcoded output values. I am not
-// sure how problematic this will be. If issues arise like order of headers the
-// output should be parsed by http::response and have values checked directly
-
-BOOST_AUTO_TEST_CASE( basic_http_request ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-    std::string output = "HTTP/1.1 426 Upgrade Required\r\nServer: " +
-                         std::string(websocketpp::user_agent)+"\r\n\r\n";
-
-    std::string o2 = run_server_test(input);
-
-    BOOST_CHECK(o2 == output);
-}
-
-struct connection_extension {
-    connection_extension() : extension_value(5) {}
-
-    int extension_method() {
-        return extension_value;
-    }
-
-    bool is_server() const {
-        return false;
-    }
-
-    int extension_value;
-};
-
-struct stub_config : public websocketpp::config::core {
-    typedef core::concurrency_type concurrency_type;
-
-    typedef core::request_type request_type;
-    typedef core::response_type response_type;
-
-    typedef core::message_type message_type;
-    typedef core::con_msg_manager_type con_msg_manager_type;
-    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef core::alog_type alog_type;
-    typedef core::elog_type elog_type;
-
-    typedef core::rng_type rng_type;
-
-    typedef core::transport_type transport_type;
-
-    typedef core::endpoint_base endpoint_base;
-    typedef connection_extension connection_base;
-};
-
-struct debug_config_client : public websocketpp::config::core {
-    typedef debug_config_client type;
-    
-    typedef core::concurrency_type concurrency_type;
-
-    typedef core::request_type request_type;
-    typedef core::response_type response_type;
-
-    typedef core::message_type message_type;
-    typedef core::con_msg_manager_type con_msg_manager_type;
-    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef core::alog_type alog_type;
-    typedef core::elog_type elog_type;
-
-    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-
-    struct transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::elog_type elog_type;
-        typedef type::alog_type alog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-
-        /// Controls compile time enabling/disabling of thread syncronization
-        /// code Disabling can provide a minor performance improvement to single
-        /// threaded applications
-        static bool const enable_multithreading = true;
-
-        /// Default timer values (in ms)
-        static const long timeout_socket_pre_init = 5000;
-        static const long timeout_proxy = 5000;
-        static const long timeout_socket_post_init = 5000;
-        static const long timeout_connect = 5000;
-        static const long timeout_socket_shutdown = 5000;
-    };
-
-    /// Transport Endpoint Component
-    typedef websocketpp::transport::debug::endpoint<transport_config>
-        transport_type;
-
-    typedef core::endpoint_base endpoint_base;
-    typedef connection_extension connection_base;
-    
-    static const websocketpp::log::level elog_level = websocketpp::log::elevel::none;
-    static const websocketpp::log::level alog_level = websocketpp::log::alevel::none;
-};
-
-struct connection_setup {
-    connection_setup(bool p_is_server)
-            : alog(websocketpp::lib::make_shared<stub_config::alog_type>())
-            , elog(websocketpp::lib::make_shared<stub_config::elog_type>())
-            , c(p_is_server, "", alog, elog, rng) {}
-
-    websocketpp::lib::error_code ec;
-    websocketpp::lib::shared_ptr<stub_config::alog_type> alog;
-    websocketpp::lib::shared_ptr<stub_config::elog_type> elog;
-    stub_config::rng_type rng;
-    websocketpp::connection<stub_config> c;
-};
-
-typedef websocketpp::client<debug_config_client> debug_client;
-typedef websocketpp::server<debug_config_client> debug_server;
-
-/*void echo_func(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    s->send(hdl, msg->get_payload(), msg->get_opcode());
-}*/
-
-void validate_func(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    s->send(hdl, msg->get_payload(), msg->get_opcode());
-}
-
-bool validate_set_ua(server* s, websocketpp::connection_hdl hdl) {
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-    con->replace_header("Server","foo");
-    return true;
-}
-
-void http_func(server* s, websocketpp::connection_hdl hdl) {
-    using namespace websocketpp::http;
-
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-
-    std::string res = con->get_resource();
-
-    con->set_body(res);
-    con->set_status(status_code::ok);
-
-    BOOST_CHECK_EQUAL(con->get_response_code(), status_code::ok);
-    BOOST_CHECK_EQUAL(con->get_response_msg(), status_code::get_string(status_code::ok));
-}
-
-void defer_http_func(server* s, bool * deferred, websocketpp::connection_hdl hdl) {
-    *deferred = true;
-    
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-    
-    websocketpp::lib::error_code ec = con->defer_http_response();
-    BOOST_CHECK_EQUAL(ec, websocketpp::lib::error_code());
-}
-
-void check_on_fail(server* s, websocketpp::lib::error_code ec, bool & called, 
-    websocketpp::connection_hdl hdl)
-{
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-
-    BOOST_CHECK_EQUAL(ec, con->get_ec());
-    called = true;
-}
-
-void on_open_print(server* s, websocketpp::connection_hdl hdl)
-{
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-
-    std::cout << con->get_uri() << std::endl;
-}
-
-void fail_on_open(websocketpp::connection_hdl) {
-    BOOST_CHECK(false);
-}
-void fail_on_http(websocketpp::connection_hdl) {
-    BOOST_CHECK(false);
-}
-
-BOOST_AUTO_TEST_CASE( connection_extensions ) {
-    connection_setup env(true);
-
-    BOOST_CHECK( env.c.extension_value == 5 );
-    BOOST_CHECK( env.c.extension_method() == 5 );
-
-    BOOST_CHECK( env.c.is_server() == true );
-}
-
-BOOST_AUTO_TEST_CASE( basic_websocket_request ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: ";
-    output+=websocketpp::user_agent;
-    output+="\r\nUpgrade: websocket\r\n\r\n";
-
-    server s;
-    s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
-
-    BOOST_CHECK(run_server_test(s,input) == output);
-}
-
-BOOST_AUTO_TEST_CASE( http_request ) {
-    std::string input = "GET /foo/bar HTTP/1.1\r\nHost: www.example.com\r\nOrigin: http://www.example.com\r\n\r\n";
-    std::string output = "HTTP/1.1 200 OK\r\nContent-Length: 8\r\nServer: ";
-    output+=websocketpp::user_agent;
-    output+="\r\n\r\n/foo/bar";
-
-    server s;
-    s.set_http_handler(bind(&http_func,&s,::_1));
-
-    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
-}
-
-BOOST_AUTO_TEST_CASE( deferred_http_request ) {
-    std::string input = "GET /foo/bar HTTP/1.1\r\nHost: www.example.com\r\nOrigin: http://www.example.com\r\n\r\n";
-    std::string output = "HTTP/1.1 200 OK\r\nContent-Length: 8\r\nServer: ";
-    output+=websocketpp::user_agent;
-    output+="\r\n\r\n/foo/bar";
-
-    server s;
-    server::connection_ptr con;
-    bool deferred = false;
-    s.set_http_handler(bind(&defer_http_func,&s, &deferred,::_1));
-
-    s.clear_access_channels(websocketpp::log::alevel::all);
-    s.clear_error_channels(websocketpp::log::elevel::all);
-    
-    std::stringstream ostream;
-    s.register_ostream(&ostream);
-
-    con = s.get_connection();
-    con->start();
-    
-    BOOST_CHECK(!deferred);
-    BOOST_CHECK_EQUAL(ostream.str(), "");
-    con->read_some(input.data(),input.size());
-    BOOST_CHECK(deferred);
-    BOOST_CHECK_EQUAL(ostream.str(), "");
-
-    con->set_body(con->get_resource());
-    con->set_status(websocketpp::http::status_code::ok);
-    
-    websocketpp::lib::error_code ec;
-    s.send_http_response(con->get_handle(),ec);
-    BOOST_CHECK_EQUAL(ec, websocketpp::lib::error_code());
-    BOOST_CHECK_EQUAL(ostream.str(), output);
-    con->send_http_response(ec);
-    BOOST_CHECK_EQUAL(ec, make_error_code(websocketpp::error::invalid_state));
-    
-}
-
-BOOST_AUTO_TEST_CASE( request_no_server_header ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nUpgrade: websocket\r\n\r\n";
-
-    server s;
-    s.set_user_agent("");
-    s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
-
-    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
-}
-
-BOOST_AUTO_TEST_CASE( request_no_server_header_override ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
-
-    server s;
-    s.set_user_agent("");
-    s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
-    s.set_validate_handler(bind(&validate_set_ua,&s,::_1));
-
-    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
-}
-
-BOOST_AUTO_TEST_CASE( basic_client_websocket ) {
-    std::string uri = "ws://localhost";
-
-    //std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
-
-    std::string ref = "GET / HTTP/1.1\r\nConnection: Upgrade\r\nFoo: Bar\r\nHost: localhost\r\nSec-WebSocket-Key: AAAAAAAAAAAAAAAAAAAAAA==\r\nSec-WebSocket-Version: 13\r\nUpgrade: websocket\r\nUser-Agent: foo\r\n\r\n";
-
-    std::stringstream output;
-
-    client e;
-    e.set_access_channels(websocketpp::log::alevel::none);
-    e.set_error_channels(websocketpp::log::elevel::none);
-    e.set_user_agent("foo");
-    e.register_ostream(&output);
-
-    client::connection_ptr con;
-    websocketpp::lib::error_code ec;
-    con = e.get_connection(uri, ec);
-    con->append_header("Foo","Bar");
-    e.connect(con);
-
-    BOOST_CHECK_EQUAL(ref, output.str());
-}
-
-BOOST_AUTO_TEST_CASE( set_max_message_size ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
-    
-    // After the handshake, add a single frame with a message that is too long.
-    char frame0[10] = {char(0x82), char(0x83), 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01};
-    input.append(frame0, 10);
-    
-    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
-
-    // After the handshake, add a single frame with a close message with message too big
-    // error code.
-    char frame1[4] = {char(0x88), 0x19, 0x03, char(0xf1)};
-    output.append(frame1, 4);
-    output.append("A message was too large");
-
-    server s;
-    s.set_user_agent("");
-    s.set_validate_handler(bind(&validate_set_ua,&s,::_1));
-    s.set_max_message_size(2);
-
-    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
-}
-
-BOOST_AUTO_TEST_CASE( websocket_fail_parse_error ) {
-    std::string input = "asdf\r\n\r\n";
-
-    server s;
-    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::http_parse_error);
-    bool called = false;
-    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
-
-    run_server_test(s,input,false);
-    BOOST_CHECK(called);
-}
-
-BOOST_AUTO_TEST_CASE( websocket_fail_invalid_version ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: foo\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-
-    server s;
-    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::invalid_version);
-    bool called = false;
-    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
-
-    run_server_test(s,input,false);
-    BOOST_CHECK(called);
-}
-
-BOOST_AUTO_TEST_CASE( websocket_fail_unsupported_version ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 12\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-
-    server s;
-    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::unsupported_version);
-    bool called = false;
-    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
-
-    run_server_test(s,input,false);
-    BOOST_CHECK(called);
-}
-
-// BOOST_AUTO_TEST_CASE( websocket_fail_invalid_uri ) {
-//     std::string input = "GET http://345.123.123.123/foo HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-
-//     server s;
-//     websocketpp::lib::error_code ec = make_error_code(websocketpp::error::unsupported_version);
-//     bool called = false;
-//     s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
-//     s.set_open_handler(bind(&on_open_print,&s,::_1));
-
-//     std::cout << run_server_test(s,input,true) << std::endl;
-//     BOOST_CHECK(called);
-// }
-
-// BOOST_AUTO_TEST_CASE( websocket_fail_invalid_uri_http ) {
-//     std::string input = "GET http://345.123.123.123/foo HTTP/1.1\r\nHost: www.example.com\r\nOrigin: http://www.example.com\r\n\r\n";
-
-//     server s;
-//     websocketpp::lib::error_code ec = make_error_code(websocketpp::error::unsupported_version);
-//     bool called = false;
-//     s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
-//     s.set_open_handler(bind(&on_open_print,&s,::_1));
-
-//     std::cout << run_server_test(s,input,true) << std::endl;
-//     BOOST_CHECK(called);
-// }
-
-BOOST_AUTO_TEST_CASE( websocket_fail_upgrade_required ) {
-    std::string input = "GET /foo/bar HTTP/1.1\r\nHost: www.example.com\r\nOrigin: http://www.example.com\r\n\r\n";
-
-    server s;
-    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::upgrade_required);
-    bool called = false;
-    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
-
-    run_server_test(s,input,false);
-    BOOST_CHECK(called);
-}
-
-// TODO: set max message size in client endpoint test case
-// TODO: set max message size mid connection test case
-// TODO: [maybe] set max message size in open handler
-
-
-
-// BOOST_AUTO_TEST_CASE( user_reject_origin ) {
-//     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example2.com\r\n\r\n";
-//     std::string output = "HTTP/1.1 403 Forbidden\r\nServer: "+websocketpp::USER_AGENT+"\r\n\r\n";
-
-//     BOOST_CHECK(run_server_test(input) == output);
-// }
-
-// BOOST_AUTO_TEST_CASE( basic_text_message ) {
-//     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-
-//     unsigned char frames[8] = {0x82,0x82,0xFF,0xFF,0xFF,0xFF,0xD5,0xD5};
-//     input.append(reinterpret_cast<char*>(frames),8);
-
-//     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: "+websocketpp::USER_AGENT+"\r\nUpgrade: websocket\r\n\r\n**";
-
-//     BOOST_CHECK( run_server_test(input) == output);
-// }
-
-
-
-
-
-
-BOOST_AUTO_TEST_CASE( client_handshake_timeout_race1 ) {
-    debug_client c;
-
-    websocketpp::lib::error_code ec;
-    debug_client::connection_ptr con = c.get_connection("ws://localhost:9002", ec);
-
-    BOOST_CHECK(!ec);
-
-    // This test the case where a handshake times out immediately before the 
-    // handler that would have completed it gets invoked. This situation happens
-    // when clients are connecting to overloaded servers and on servers that are
-    // overloaded. 
-    c.connect(con);
-    
-    con->expire_timer(websocketpp::lib::error_code());
-    // Fullfil the write to simulate the write completing immediately after
-    // timer expires
-    con->fullfil_write();
-    
-    BOOST_CHECK_EQUAL(con->get_ec(), make_error_code(websocketpp::error::open_handshake_timeout));
-}
-
-BOOST_AUTO_TEST_CASE( client_handshake_timeout_race2 ) {
-    debug_client c;
-
-    websocketpp::lib::error_code ec;
-    debug_client::connection_ptr con = c.get_connection("ws://localhost:9002", ec);
-
-    BOOST_CHECK(!ec);
-
-    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: ICX+Yqv66kxgM0FcWaLWlFLwTAI=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
-
-    // This test the case where a handshake times out immediately before the 
-    // handler that would have completed it gets invoked. This situation happens
-    // when clients are connecting to overloaded servers and on servers that are
-    // overloaded. 
-    c.connect(con);
-    con->fullfil_write();
-    
-    con->expire_timer(websocketpp::lib::error_code());
-    // Read valid handshake to simulate receiving the handshake response
-    // immediately after the timer expires
-    con->read_all(output.data(),output.size());
-    
-    BOOST_CHECK_EQUAL(con->get_ec(), make_error_code(websocketpp::error::open_handshake_timeout));
-}
-
-BOOST_AUTO_TEST_CASE( server_handshake_timeout_race1 ) {
-    debug_server s;
-
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: AAAAAAAAAAAAAAAAAAAAAA==\r\n\r\n";
-
-    debug_server::connection_ptr con = s.get_connection();
-    con->start();
-    
-    con->expire_timer(websocketpp::lib::error_code());
-    // Read handshake immediately after timer expire
-    con->read_all(input.data(), input.size());
-    
-    BOOST_CHECK_EQUAL(con->get_ec(), make_error_code(websocketpp::error::open_handshake_timeout));
-}
-
-BOOST_AUTO_TEST_CASE( server_handshake_timeout_race2 ) {
-    debug_server s;
-
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: AAAAAAAAAAAAAAAAAAAAAA==\r\n\r\n";
-
-    debug_server::connection_ptr con = s.get_connection();
-    con->start();
-    
-    con->read_all(input.data(), input.size());
-    
-    con->expire_timer(websocketpp::lib::error_code());
-    // Complete write immediately after timer expire
-    con->fullfil_write();
-    
-    BOOST_CHECK_EQUAL(con->get_ec(), make_error_code(websocketpp::error::open_handshake_timeout));
-}
-
-
diff --git a/src/sioclient/lib/websocketpp/test/connection/connection_tu2.cpp b/src/sioclient/lib/websocketpp/test/connection/connection_tu2.cpp
deleted file mode 100644
index 54096248..00000000
--- a/src/sioclient/lib/websocketpp/test/connection/connection_tu2.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include "connection_tu2.hpp"
-
-void echo_func(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    s->send(hdl, msg->get_payload(), msg->get_opcode());
-}
-
-std::string run_server_test(std::string input, bool log) {
-    server test_server;
-    return run_server_test(test_server,input,log);
-}
-
-std::string run_server_test(server & s, std::string input, bool log) {
-    server::connection_ptr con;
-    std::stringstream output;
-
-    if (log) {
-        s.set_access_channels(websocketpp::log::alevel::all);
-        s.set_error_channels(websocketpp::log::elevel::all);
-    } else {
-        s.clear_access_channels(websocketpp::log::alevel::all);
-        s.clear_error_channels(websocketpp::log::elevel::all);
-    }
-
-    s.register_ostream(&output);
-
-    con = s.get_connection();
-    con->start();
-
-    std::stringstream channel;
-
-    channel << input;
-    channel >> *con;
-
-    return output.str();
-}
diff --git a/src/sioclient/lib/websocketpp/test/connection/connection_tu2.hpp b/src/sioclient/lib/websocketpp/test/connection/connection_tu2.hpp
deleted file mode 100644
index 8990ce00..00000000
--- a/src/sioclient/lib/websocketpp/test/connection/connection_tu2.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <iostream>
-#include <sstream>
-
-// Test Environment:
-// server, no TLS, no locks, iostream based transport
-#include <websocketpp/config/debug.hpp>
-#include <websocketpp/config/core.hpp>
-#include <websocketpp/server.hpp>
-#include <websocketpp/client.hpp>
-
-typedef websocketpp::server<websocketpp::config::core> server;
-/// NOTE: the "server" config is being used for the client here because we don't
-/// want to pull in the real RNG. A better way to do this might be a custom
-/// client config with the RNG explicitly stubbed out.
-typedef websocketpp::client<websocketpp::config::core> client;
-typedef websocketpp::config::core::message_type::ptr message_ptr;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-void echo_func(server* s, websocketpp::connection_hdl hdl, message_ptr msg);
-std::string run_server_test(std::string input, bool log = false);
-std::string run_server_test(server & s, std::string input, bool log = false);
diff --git a/src/sioclient/lib/websocketpp/test/endpoint/CMakeLists.txt b/src/sioclient/lib/websocketpp/test/endpoint/CMakeLists.txt
deleted file mode 100644
index 1b253532..00000000
--- a/src/sioclient/lib/websocketpp/test/endpoint/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-if (OPENSSL_FOUND)
-
-init_target (test_endpoint)
-
-build_test (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-link_openssl ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-endif()
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/test/endpoint/SConscript b/src/sioclient/lib/websocketpp/test/endpoint/SConscript
deleted file mode 100644
index 5cb3ede9..00000000
--- a/src/sioclient/lib/websocketpp/test/endpoint/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-## endpoint unit tests
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-Import('tls_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + [tls_libs]
-
-objs = env.Object('endpoint_boost.o', ["endpoint.cpp"], LIBS = BOOST_LIBS)
-prgs = env.Program('test_endpoint_boost', ["endpoint_boost.o"], LIBS = BOOST_LIBS)
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   objs += env_cpp11.Object('endpoint_stl.o', ["endpoint.cpp"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_endpoint_stl', ["endpoint_stl.o"], LIBS = BOOST_LIBS_CPP11)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/test/endpoint/endpoint.cpp b/src/sioclient/lib/websocketpp/test/endpoint/endpoint.cpp
deleted file mode 100644
index b4c429eb..00000000
--- a/src/sioclient/lib/websocketpp/test/endpoint/endpoint.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE endpoint
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <sstream>
-
-#include <websocketpp/config/asio.hpp>
-#include <websocketpp/server.hpp>
-
-BOOST_AUTO_TEST_CASE( construct_server_iostream ) {
-    websocketpp::server<websocketpp::config::core> s;
-}
-
-BOOST_AUTO_TEST_CASE( construct_server_asio_plain ) {
-    websocketpp::server<websocketpp::config::asio> s;
-}
-
-BOOST_AUTO_TEST_CASE( construct_server_asio_tls ) {
-    websocketpp::server<websocketpp::config::asio_tls> s;
-}
-
-BOOST_AUTO_TEST_CASE( initialize_server_asio ) {
-    websocketpp::server<websocketpp::config::asio> s;
-    s.init_asio();
-}
-
-BOOST_AUTO_TEST_CASE( initialize_server_asio_external ) {
-    websocketpp::server<websocketpp::config::asio> s;
-    boost::asio::io_service ios;
-    s.init_asio(&ios);
-}
-
-#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
-BOOST_AUTO_TEST_CASE( move_construct_server_core ) {
-    websocketpp::server<websocketpp::config::core> s1;
-    
-    websocketpp::server<websocketpp::config::core> s2(std::move(s1));
-}
-
-/*
-// temporary disable because library doesn't pass
-BOOST_AUTO_TEST_CASE( emplace ) {
-    std::stringstream out1;
-    std::stringstream out2;
-    
-    std::vector<websocketpp::server<websocketpp::config::asio_tls>> v;
-    
-    v.emplace_back();
-    v.emplace_back();
-    
-    v[0].get_alog().set_ostream(&out1);
-    v[0].get_alog().set_ostream(&out2);
-    
-    v[0].get_alog().write(websocketpp::log::alevel::app,"devel0");
-    v[1].get_alog().write(websocketpp::log::alevel::app,"devel1");
-    BOOST_CHECK( out1.str().size() > 0 );
-    BOOST_CHECK( out2.str().size() > 0 );
-}*/
-
-#endif // _WEBSOCKETPP_MOVE_SEMANTICS_
-
-struct endpoint_extension {
-    endpoint_extension() : extension_value(5) {}
-
-    int extension_method() {
-        return extension_value;
-    }
-
-    bool is_server() const {
-        return false;
-    }
-
-    int extension_value;
-};
-
-struct stub_config : public websocketpp::config::core {
-    typedef core::concurrency_type concurrency_type;
-
-    typedef core::request_type request_type;
-    typedef core::response_type response_type;
-
-    typedef core::message_type message_type;
-    typedef core::con_msg_manager_type con_msg_manager_type;
-    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef core::alog_type alog_type;
-    typedef core::elog_type elog_type;
-
-    typedef core::rng_type rng_type;
-
-    typedef core::transport_type transport_type;
-
-    typedef endpoint_extension endpoint_base;
-};
-
-BOOST_AUTO_TEST_CASE( endpoint_extensions ) {
-    websocketpp::server<stub_config> s;
-
-    BOOST_CHECK_EQUAL( s.extension_value, 5 );
-    BOOST_CHECK_EQUAL( s.extension_method(), 5 );
-
-    BOOST_CHECK( s.is_server() );
-}
-
-BOOST_AUTO_TEST_CASE( listen_after_listen_failure ) {
-    using websocketpp::transport::asio::error::make_error_code;
-    using websocketpp::transport::asio::error::pass_through;
-
-    websocketpp::server<websocketpp::config::asio> server1;
-    websocketpp::server<websocketpp::config::asio> server2;
-
-    websocketpp::lib::error_code ec;
-
-    server1.init_asio();
-    server2.init_asio();
-
-    boost::asio::ip::tcp::endpoint ep1(boost::asio::ip::address::from_string("127.0.0.1"), 12345);
-    boost::asio::ip::tcp::endpoint ep2(boost::asio::ip::address::from_string("127.0.0.1"), 23456);
-
-    server1.listen(ep1, ec);
-    BOOST_CHECK(!ec);
-
-    // This should return some sort of problem. Usually either "pass through" or
-    // a more specific address in use error. It is hard to capture the full range
-    // of 'correctly wrong' values.
-    server2.listen(ep1, ec);
-    BOOST_REQUIRE(ec);
-
-    server2.listen(ep2, ec);
-    BOOST_CHECK(!ec);
-}
diff --git a/src/sioclient/lib/websocketpp/test/extension/CMakeLists.txt b/src/sioclient/lib/websocketpp/test/extension/CMakeLists.txt
deleted file mode 100644
index 9cb8f8a4..00000000
--- a/src/sioclient/lib/websocketpp/test/extension/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# Extension Tests
-file (GLOB SOURCE extension.cpp)
-
-init_target (test_extension)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-if ( ZLIB_FOUND )
-
-# Permessage-deflate tests
-file (GLOB SOURCE permessage_deflate.cpp)
-
-init_target (test_permessage_deflate)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_zlib()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-endif ( ZLIB_FOUND )
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/test/extension/SConscript b/src/sioclient/lib/websocketpp/test/extension/SConscript
deleted file mode 100644
index d8b425fd..00000000
--- a/src/sioclient/lib/websocketpp/test/extension/SConscript
+++ /dev/null
@@ -1,27 +0,0 @@
-## http unit tests
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + ['z']
-
-objs = env.Object('extension_boost.o', ["extension.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('permessage_deflate_boost.o', ["permessage_deflate.cpp"], LIBS = BOOST_LIBS)
-prgs = env.Program('test_extension_boost', ["extension_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_permessage_deflate_boost', ["permessage_deflate_boost.o"], LIBS = BOOST_LIBS)
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
-   objs += env_cpp11.Object('extension_stl.o', ["extension.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('permessage_deflate_stl.o', ["permessage_deflate.cpp"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_extension_stl', ["extension_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_permessage_deflate_stl', ["permessage_deflate_stl.o"], LIBS = BOOST_LIBS_CPP11)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/test/extension/extension.cpp b/src/sioclient/lib/websocketpp/test/extension/extension.cpp
deleted file mode 100644
index 5439c074..00000000
--- a/src/sioclient/lib/websocketpp/test/extension/extension.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE extension
-#include <boost/test/unit_test.hpp>
-
-#include <string>
-
-#include <websocketpp/extensions/extension.hpp>
-
-BOOST_AUTO_TEST_CASE( blank ) {
-    BOOST_CHECK( true );
-}
diff --git a/src/sioclient/lib/websocketpp/test/extension/permessage_deflate.cpp b/src/sioclient/lib/websocketpp/test/extension/permessage_deflate.cpp
deleted file mode 100644
index 805afcc3..00000000
--- a/src/sioclient/lib/websocketpp/test/extension/permessage_deflate.cpp
+++ /dev/null
@@ -1,752 +0,0 @@
-/*
- * Copyright (c) 2013, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE permessage_deflate
-#include <boost/test/unit_test.hpp>
-
-#include <websocketpp/error.hpp>
-
-#include <websocketpp/extensions/extension.hpp>
-#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
-
-#include <string>
-
-#include <websocketpp/utilities.hpp>
-#include <iostream>
-
-class config {};
-
-typedef websocketpp::extensions::permessage_deflate::enabled<config> enabled_type;
-typedef websocketpp::extensions::permessage_deflate::disabled<config> disabled_type;
-
-struct ext_vars {
-    enabled_type exts;
-    enabled_type extc;
-    websocketpp::lib::error_code ec;
-    websocketpp::err_str_pair esp;
-    websocketpp::http::attribute_list attr;
-};
-namespace pmde = websocketpp::extensions::permessage_deflate::error;
-namespace pmd_mode = websocketpp::extensions::permessage_deflate::mode;
-
-// Ensure the disabled extension behaves appropriately disabled
-
-BOOST_AUTO_TEST_CASE( disabled_is_disabled ) {
-    disabled_type exts;
-    BOOST_CHECK( !exts.is_implemented() );
-}
-
-BOOST_AUTO_TEST_CASE( disabled_is_off ) {
-    disabled_type exts;
-    BOOST_CHECK( !exts.is_enabled() );
-}
-
-// Ensure the enabled version actually works
-
-BOOST_AUTO_TEST_CASE( enabled_is_enabled ) {
-    ext_vars v;
-    BOOST_CHECK( v.exts.is_implemented() );
-    BOOST_CHECK( v.extc.is_implemented() );
-}
-
-
-BOOST_AUTO_TEST_CASE( enabled_starts_disabled ) {
-    ext_vars v;
-    BOOST_CHECK( !v.exts.is_enabled() );
-    BOOST_CHECK( !v.extc.is_enabled() );
-}
-
-BOOST_AUTO_TEST_CASE( negotiation_empty_attr ) {
-    ext_vars v;
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
-}
-
-BOOST_AUTO_TEST_CASE( negotiation_invalid_attr ) {
-    ext_vars v;
-    v.attr["foo"] = "bar";
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( !v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attributes) );
-    BOOST_CHECK_EQUAL( v.esp.second, "");
-}
-
-// Negotiate server_no_context_takeover
-BOOST_AUTO_TEST_CASE( negotiate_server_no_context_takeover_invalid ) {
-    ext_vars v;
-    v.attr["server_no_context_takeover"] = "foo";
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( !v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
-    BOOST_CHECK_EQUAL( v.esp.second, "");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_server_no_context_takeover ) {
-    ext_vars v;
-    v.attr["server_no_context_takeover"].clear();
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_server_no_context_takeover_server_initiated ) {
-    ext_vars v;
-
-    v.exts.enable_server_no_context_takeover();
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover");
-}
-
-// Negotiate client_no_context_takeover
-BOOST_AUTO_TEST_CASE( negotiate_client_no_context_takeover_invalid ) {
-    ext_vars v;
-    v.attr["client_no_context_takeover"] = "foo";
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( !v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
-    BOOST_CHECK_EQUAL( v.esp.second, "");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_client_no_context_takeover ) {
-    ext_vars v;
-    v.attr["client_no_context_takeover"].clear();
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_client_no_context_takeover_server_initiated ) {
-    ext_vars v;
-
-    v.exts.enable_client_no_context_takeover();
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover");
-}
-
-
-// Negotiate server_max_window_bits
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_invalid ) {
-    ext_vars v;
-
-    std::vector<std::string> values;
-    values.push_back("");
-    values.push_back("foo");
-    values.push_back("7");
-    values.push_back("16");
-
-    std::vector<std::string>::const_iterator it;
-    for (it = values.begin(); it != values.end(); ++it) {
-        v.attr["server_max_window_bits"] = *it;
-
-        v.esp = v.exts.negotiate(v.attr);
-        BOOST_CHECK( !v.exts.is_enabled() );
-        BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
-        BOOST_CHECK_EQUAL( v.esp.second, "");
-    }
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_valid ) {
-    ext_vars v;
-    
-    // confirm that a request for a value of 8 is interpreted as 9
-    v.attr["server_max_window_bits"] = "8";
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9");
-
-    v.attr["server_max_window_bits"] = "9";
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9");
-
-
-    v.attr["server_max_window_bits"] = "15";
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
-}
-
-BOOST_AUTO_TEST_CASE( invalid_set_server_max_window_bits ) {
-    ext_vars v;
-
-    v.ec = v.exts.set_server_max_window_bits(7,pmd_mode::decline);
-    BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
-
-    v.ec = v.exts.set_server_max_window_bits(16,pmd_mode::decline);
-    BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_decline ) {
-    ext_vars v;
-    v.attr["server_max_window_bits"] = "9";
-
-    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::decline);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept_8 ) {
-    ext_vars v;
-    v.attr["server_max_window_bits"] = "8";
-
-    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::accept);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) {
-    ext_vars v;
-    v.attr["server_max_window_bits"] = "9";
-
-    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::accept);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest_8 ) {
-    ext_vars v;
-    v.attr["server_max_window_bits"] = "8";
-
-    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::largest);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) {
-    ext_vars v;
-    v.attr["server_max_window_bits"] = "9";
-
-    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::largest);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest_8 ) {
-    ext_vars v;
-    v.attr["server_max_window_bits"] = "8";
-
-    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::smallest);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) {
-    ext_vars v;
-    v.attr["server_max_window_bits"] = "9";
-
-    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::smallest);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=9");
-}
-
-// Negotiate server_max_window_bits
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_invalid ) {
-    ext_vars v;
-
-    std::vector<std::string> values;
-    values.push_back("foo");
-    values.push_back("7");
-    values.push_back("16");
-
-    std::vector<std::string>::const_iterator it;
-    for (it = values.begin(); it != values.end(); ++it) {
-        v.attr["client_max_window_bits"] = *it;
-
-        v.esp = v.exts.negotiate(v.attr);
-        BOOST_CHECK( !v.exts.is_enabled() );
-        BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
-        BOOST_CHECK_EQUAL( v.esp.second, "");
-    }
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_valid ) {
-    ext_vars v;
-
-    v.attr["client_max_window_bits"].clear();
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
-
-    v.attr["client_max_window_bits"] = "8";
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9");
-
-    v.attr["client_max_window_bits"] = "9";
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9");
-
-    v.attr["client_max_window_bits"] = "15";
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
-}
-
-BOOST_AUTO_TEST_CASE( invalid_set_client_max_window_bits ) {
-    ext_vars v;
-
-    v.ec = v.exts.set_client_max_window_bits(7,pmd_mode::decline);
-    BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
-
-    v.ec = v.exts.set_client_max_window_bits(16,pmd_mode::decline);
-    BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline_8 ) {
-    ext_vars v;
-    v.attr["client_max_window_bits"] = "8";
-
-    v.ec = v.exts.set_client_max_window_bits(8,pmd_mode::decline);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) {
-    ext_vars v;
-    v.attr["client_max_window_bits"] = "9";
-
-    v.ec = v.exts.set_client_max_window_bits(9,pmd_mode::decline);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept_8 ) {
-    ext_vars v;
-    v.attr["client_max_window_bits"] = "8";
-
-    v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::accept);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) {
-    ext_vars v;
-    v.attr["client_max_window_bits"] = "9";
-
-    v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::accept);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest_8 ) {
-    ext_vars v;
-    v.attr["client_max_window_bits"] = "8";
-
-    v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::largest);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) {
-    ext_vars v;
-    v.attr["client_max_window_bits"] = "9";
-
-    v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::largest);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest_8 ) {
-    ext_vars v;
-    v.attr["client_max_window_bits"] = "8";
-
-    v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::smallest);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) {
-    ext_vars v;
-    v.attr["client_max_window_bits"] = "9";
-
-    v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::smallest);
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=9");
-}
-
-
-// Combinations with 2
-BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated1 ) {
-    ext_vars v;
-
-    v.attr["server_no_context_takeover"].clear();
-    v.attr["client_no_context_takeover"].clear();
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_no_context_takeover");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated2 ) {
-    ext_vars v;
-
-    v.attr["server_no_context_takeover"].clear();
-    v.attr["server_max_window_bits"] = "10";
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; server_max_window_bits=10");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated3 ) {
-    ext_vars v;
-
-    v.attr["server_no_context_takeover"].clear();
-    v.attr["client_max_window_bits"] = "10";
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_max_window_bits=10");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated4 ) {
-    ext_vars v;
-
-    v.attr["client_no_context_takeover"].clear();
-    v.attr["server_max_window_bits"] = "10";
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover; server_max_window_bits=10");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated5 ) {
-    ext_vars v;
-
-    v.attr["client_no_context_takeover"].clear();
-    v.attr["client_max_window_bits"] = "10";
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover; client_max_window_bits=10");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated6 ) {
-    ext_vars v;
-
-    v.attr["server_max_window_bits"] = "10";
-    v.attr["client_max_window_bits"] = "10";
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=10; client_max_window_bits=10");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated1 ) {
-    ext_vars v;
-
-    v.attr["server_no_context_takeover"].clear();
-    v.attr["client_no_context_takeover"].clear();
-    v.attr["server_max_window_bits"] = "10";
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_no_context_takeover; server_max_window_bits=10");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated2 ) {
-    ext_vars v;
-
-    v.attr["server_no_context_takeover"].clear();
-    v.attr["client_no_context_takeover"].clear();
-    v.attr["client_max_window_bits"] = "10";
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_no_context_takeover; client_max_window_bits=10");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated3 ) {
-    ext_vars v;
-
-    v.attr["server_no_context_takeover"].clear();
-    v.attr["server_max_window_bits"] = "10";
-    v.attr["client_max_window_bits"] = "10";
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; server_max_window_bits=10; client_max_window_bits=10");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated4 ) {
-    ext_vars v;
-
-    v.attr["client_no_context_takeover"].clear();
-    v.attr["server_max_window_bits"] = "10";
-    v.attr["client_max_window_bits"] = "10";
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover; server_max_window_bits=10; client_max_window_bits=10");
-}
-
-BOOST_AUTO_TEST_CASE( negotiate_four_client_initiated ) {
-    ext_vars v;
-
-    v.attr["server_no_context_takeover"].clear();
-    v.attr["client_no_context_takeover"].clear();
-    v.attr["server_max_window_bits"] = "10";
-    v.attr["client_max_window_bits"] = "10";
-
-    v.esp = v.exts.negotiate(v.attr);
-    BOOST_CHECK( v.exts.is_enabled() );
-    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_no_context_takeover; server_max_window_bits=10; client_max_window_bits=10");
-}
-
-// Compression
-BOOST_AUTO_TEST_CASE( compress_data ) {
-    ext_vars v;
-
-    std::string compress_in = "Hello";
-    std::string compress_out;
-    std::string decompress_out;
-
-    v.ec = v.exts.init(true);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.compress(compress_in,compress_out);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( compress_in, decompress_out );
-}
-
-BOOST_AUTO_TEST_CASE( compress_data_multiple ) {
-    ext_vars v;
-
-    v.ec = v.exts.init(true);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    for (int i = 0; i < 2; i++) {
-        std::string compress_in = "Hello";
-        std::string compress_out;
-        std::string decompress_out;
-
-        v.ec = v.exts.compress(compress_in,compress_out);
-        BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-        v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
-        BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-        BOOST_CHECK_EQUAL( compress_in, decompress_out );
-    }
-}
-
-BOOST_AUTO_TEST_CASE( compress_data_large ) {
-    ext_vars v;
-
-    std::string compress_in(600,'*');
-    std::string compress_out;
-    std::string decompress_out;
-
-    websocketpp::http::attribute_list alist;
-
-    alist["server_max_window_bits"] = "9";
-    v.exts.set_server_max_window_bits(9,websocketpp::extensions::permessage_deflate::mode::smallest);
-
-    v.exts.negotiate(alist);
-    v.ec = v.exts.init(true);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.compress(compress_in,compress_out);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( compress_in, decompress_out );
-}
-
-BOOST_AUTO_TEST_CASE( compress_data_no_context_takeover ) {
-    ext_vars v;
-
-    std::string compress_in = "Hello";
-    std::string compress_out1;
-    std::string compress_out2;
-    std::string decompress_out;
-
-    websocketpp::http::attribute_list alist;
-
-    alist["server_no_context_takeover"].clear();
-    v.exts.enable_server_no_context_takeover();
-
-    v.exts.negotiate(alist);
-    v.ec = v.exts.init(true);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.compress(compress_in,compress_out1);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.decompress(
-        reinterpret_cast<const uint8_t *>(compress_out1.data()),
-        compress_out1.size(),
-        decompress_out
-    );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( compress_in, decompress_out );
-
-    decompress_out.clear();
-
-    v.ec = v.exts.compress(compress_in,compress_out2);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.decompress(
-        reinterpret_cast<const uint8_t *>(compress_out2.data()),
-        compress_out2.size(),
-        decompress_out
-    );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( compress_in, decompress_out );
-
-    BOOST_CHECK_EQUAL( compress_out1, compress_out2 );
-}
-
-BOOST_AUTO_TEST_CASE( compress_empty ) {
-    ext_vars v;
-
-    std::string compress_in;
-    std::string compress_out;
-    std::string decompress_out;
-
-    v.ec = v.exts.init(true);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.compress(compress_in,compress_out);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
-
-    compress_out.clear();
-    decompress_out.clear();
-
-    v.ec = v.exts.compress(compress_in,compress_out);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( compress_in, decompress_out );
-}
-
-/// @todo: more compression tests
-/**
- * - compress at different compression levels
- */
-
-// Decompression
-BOOST_AUTO_TEST_CASE( decompress_data ) {
-    ext_vars v;
-
-    uint8_t in[11] = {0xf2, 0x48, 0xcd, 0xc9, 0xc9, 0x07, 0x00, 0x00, 0x00, 0xff, 0xff};
-    std::string out;
-    std::string reference = "Hello";
-
-    v.ec = v.exts.init(true);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.decompress(in,11,out);
-
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( out, reference );
-}
diff --git a/src/sioclient/lib/websocketpp/test/http/CMakeLists.txt b/src/sioclient/lib/websocketpp/test/http/CMakeLists.txt
deleted file mode 100644
index e005477e..00000000
--- a/src/sioclient/lib/websocketpp/test/http/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-file (GLOB SOURCE_FILES parser.cpp)
-
-init_target (test_http)
-
-build_test (${TARGET_NAME} ${SOURCE_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/src/sioclient/lib/websocketpp/test/http/SConscript b/src/sioclient/lib/websocketpp/test/http/SConscript
deleted file mode 100644
index 0a24a877..00000000
--- a/src/sioclient/lib/websocketpp/test/http/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## http unit tests
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-BOOST_LIBS = boostlibs(['unit_test_framework'],env) + [platform_libs]
-
-objs = env.Object('parser_boost.o', ["parser.cpp"], LIBS = BOOST_LIBS)
-prgs = env.Program('test_http_boost', ["parser_boost.o"], LIBS = BOOST_LIBS)
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   objs += env_cpp11.Object('parser_stl.o', ["parser.cpp"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_http_stl', ["parser_stl.o"], LIBS = BOOST_LIBS_CPP11)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/test/http/a.out b/src/sioclient/lib/websocketpp/test/http/a.out
deleted file mode 100755
index b2a20f1c..00000000
Binary files a/src/sioclient/lib/websocketpp/test/http/a.out and /dev/null differ
diff --git a/src/sioclient/lib/websocketpp/test/http/parser.cpp b/src/sioclient/lib/websocketpp/test/http/parser.cpp
deleted file mode 100644
index b6e0d377..00000000
--- a/src/sioclient/lib/websocketpp/test/http/parser.cpp
+++ /dev/null
@@ -1,1141 +0,0 @@
-/*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE http_parser
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/http/request.hpp>
-#include <websocketpp/http/response.hpp>
-
-BOOST_AUTO_TEST_CASE( is_token_char ) {
-    // Valid characters
-
-    // misc
-    BOOST_CHECK( websocketpp::http::is_token_char('!') );
-    BOOST_CHECK( websocketpp::http::is_token_char('#') );
-    BOOST_CHECK( websocketpp::http::is_token_char('$') );
-    BOOST_CHECK( websocketpp::http::is_token_char('%') );
-    BOOST_CHECK( websocketpp::http::is_token_char('&') );
-    BOOST_CHECK( websocketpp::http::is_token_char('\'') );
-    BOOST_CHECK( websocketpp::http::is_token_char('*') );
-    BOOST_CHECK( websocketpp::http::is_token_char('+') );
-    BOOST_CHECK( websocketpp::http::is_token_char('-') );
-    BOOST_CHECK( websocketpp::http::is_token_char('.') );
-    BOOST_CHECK( websocketpp::http::is_token_char('^') );
-    BOOST_CHECK( websocketpp::http::is_token_char('_') );
-    BOOST_CHECK( websocketpp::http::is_token_char('`') );
-    BOOST_CHECK( websocketpp::http::is_token_char('~') );
-
-    // numbers
-    for (int i = 0x30; i < 0x3a; i++) {
-        BOOST_CHECK( websocketpp::http::is_token_char((unsigned char)(i)) );
-    }
-
-    // upper
-    for (int i = 0x41; i < 0x5b; i++) {
-        BOOST_CHECK( websocketpp::http::is_token_char((unsigned char)(i)) );
-    }
-
-    // lower
-    for (int i = 0x61; i < 0x7b; i++) {
-        BOOST_CHECK( websocketpp::http::is_token_char((unsigned char)(i)) );
-    }
-
-    // invalid characters
-
-    // lower unprintable
-    for (int i = 0; i < 33; i++) {
-        BOOST_CHECK( !websocketpp::http::is_token_char((unsigned char)(i)) );
-    }
-
-    // misc
-    BOOST_CHECK( !websocketpp::http::is_token_char('(') );
-    BOOST_CHECK( !websocketpp::http::is_token_char(')') );
-    BOOST_CHECK( !websocketpp::http::is_token_char('<') );
-    BOOST_CHECK( !websocketpp::http::is_token_char('>') );
-    BOOST_CHECK( !websocketpp::http::is_token_char('@') );
-    BOOST_CHECK( !websocketpp::http::is_token_char(',') );
-    BOOST_CHECK( !websocketpp::http::is_token_char(';') );
-    BOOST_CHECK( !websocketpp::http::is_token_char(':') );
-    BOOST_CHECK( !websocketpp::http::is_token_char('\\') );
-    BOOST_CHECK( !websocketpp::http::is_token_char('"') );
-    BOOST_CHECK( !websocketpp::http::is_token_char('/') );
-    BOOST_CHECK( !websocketpp::http::is_token_char('[') );
-    BOOST_CHECK( !websocketpp::http::is_token_char(']') );
-    BOOST_CHECK( !websocketpp::http::is_token_char('?') );
-    BOOST_CHECK( !websocketpp::http::is_token_char('=') );
-    BOOST_CHECK( !websocketpp::http::is_token_char('{') );
-    BOOST_CHECK( !websocketpp::http::is_token_char('}') );
-
-    // upper unprintable and out of ascii range
-    for (int i = 127; i < 256; i++) {
-        BOOST_CHECK( !websocketpp::http::is_token_char((unsigned char)(i)) );
-    }
-
-    // is not
-    BOOST_CHECK( !websocketpp::http::is_not_token_char('!') );
-    BOOST_CHECK( websocketpp::http::is_not_token_char('(') );
-}
-
-BOOST_AUTO_TEST_CASE( extract_token ) {
-    std::string d1 = "foo";
-    std::string d2 = " foo ";
-
-    std::pair<std::string,std::string::const_iterator> ret;
-
-    ret = websocketpp::http::parser::extract_token(d1.begin(),d1.end());
-    BOOST_CHECK( ret.first == "foo" );
-    BOOST_CHECK( ret.second == d1.begin()+3 );
-
-    ret = websocketpp::http::parser::extract_token(d2.begin(),d2.end());
-    BOOST_CHECK( ret.first.empty() );
-    BOOST_CHECK( ret.second == d2.begin()+0 );
-
-    ret = websocketpp::http::parser::extract_token(d2.begin()+1,d2.end());
-    BOOST_CHECK( ret.first == "foo" );
-    BOOST_CHECK( ret.second == d2.begin()+4 );
-}
-
-BOOST_AUTO_TEST_CASE( extract_quoted_string ) {
-    std::string d1 = "\"foo\"";
-    std::string d2 = "\"foo\\\"bar\\\"baz\"";
-    std::string d3 = "\"foo\"     ";
-    std::string d4;
-    std::string d5 = "foo";
-
-    std::pair<std::string,std::string::const_iterator> ret;
-
-    using websocketpp::http::parser::extract_quoted_string;
-
-    ret = extract_quoted_string(d1.begin(),d1.end());
-    BOOST_CHECK( ret.first == "foo" );
-    BOOST_CHECK( ret.second == d1.end() );
-
-    ret = extract_quoted_string(d2.begin(),d2.end());
-    BOOST_CHECK( ret.first == "foo\"bar\"baz" );
-    BOOST_CHECK( ret.second == d2.end() );
-
-    ret = extract_quoted_string(d3.begin(),d3.end());
-    BOOST_CHECK( ret.first == "foo" );
-    BOOST_CHECK( ret.second == d3.begin()+5 );
-
-    ret = extract_quoted_string(d4.begin(),d4.end());
-    BOOST_CHECK( ret.first.empty() );
-    BOOST_CHECK( ret.second == d4.begin() );
-
-    ret = extract_quoted_string(d5.begin(),d5.end());
-    BOOST_CHECK( ret.first.empty() );
-    BOOST_CHECK( ret.second == d5.begin() );
-}
-
-BOOST_AUTO_TEST_CASE( extract_all_lws ) {
-    std::string d1 = " foo     bar";
-    d1.append(1,char(9));
-    d1.append("baz\r\n d\r\n  \r\n  e\r\nf");
-
-    std::string::const_iterator ret;
-
-    ret = websocketpp::http::parser::extract_all_lws(d1.begin(),d1.end());
-    BOOST_CHECK( ret == d1.begin()+1 );
-
-    ret = websocketpp::http::parser::extract_all_lws(d1.begin()+1,d1.end());
-    BOOST_CHECK( ret == d1.begin()+1 );
-
-    ret = websocketpp::http::parser::extract_all_lws(d1.begin()+4,d1.end());
-    BOOST_CHECK( ret == d1.begin()+9 );
-
-    ret = websocketpp::http::parser::extract_all_lws(d1.begin()+12,d1.end());
-    BOOST_CHECK( ret == d1.begin()+13 );
-
-    ret = websocketpp::http::parser::extract_all_lws(d1.begin()+16,d1.end());
-    BOOST_CHECK( ret == d1.begin()+19 );
-
-    ret = websocketpp::http::parser::extract_all_lws(d1.begin()+20,d1.end());
-    BOOST_CHECK( ret == d1.begin()+28 );
-
-    ret = websocketpp::http::parser::extract_all_lws(d1.begin()+29,d1.end());
-    BOOST_CHECK( ret == d1.begin()+29 );
-}
-
-BOOST_AUTO_TEST_CASE( extract_attributes_blank ) {
-    std::string s;
-
-    websocketpp::http::attribute_list a;
-    std::string::const_iterator it;
-
-    it = websocketpp::http::parser::extract_attributes(s.begin(),s.end(),a);
-    BOOST_CHECK( it == s.begin() );
-    BOOST_CHECK_EQUAL( a.size(), 0 );
-}
-
-BOOST_AUTO_TEST_CASE( extract_attributes_simple ) {
-    std::string s = "foo";
-
-    websocketpp::http::attribute_list a;
-    std::string::const_iterator it;
-
-    it = websocketpp::http::parser::extract_attributes(s.begin(),s.end(),a);
-    BOOST_CHECK( it == s.end() );
-    BOOST_CHECK_EQUAL( a.size(), 1 );
-    BOOST_CHECK( a.find("foo") != a.end() );
-    BOOST_CHECK_EQUAL( a.find("foo")->second, "" );
-}
-
-BOOST_AUTO_TEST_CASE( extract_parameters ) {
-    std::string s1;
-    std::string s2 = "foo";
-    std::string s3 = " foo \r\nAbc";
-    std::string s4 = "  \r\n   foo  ";
-    std::string s5 = "foo,bar";
-    std::string s6 = "foo;bar";
-    std::string s7 = "foo;baz,bar";
-    std::string s8 = "foo;bar;baz";
-    std::string s9 = "foo;bar=baz";
-    std::string s10 = "foo;bar=baz;boo";
-    std::string s11 = "foo;bar=baz;boo,bob";
-    std::string s12 = "foo;bar=\"a b c\"";
-    std::string s13 = "foo;bar=\"a \\\"b\\\" c\"";
-
-
-    std::string sx = "foo;bar=\"a \\\"b\\\" c\"";
-    websocketpp::http::parameter_list p;
-    websocketpp::http::attribute_list a;
-    std::string::const_iterator it;
-
-    using websocketpp::http::parser::extract_parameters;
-
-    it = extract_parameters(s1.begin(),s1.end(),p);
-    BOOST_CHECK( it == s1.begin() );
-
-    p.clear();
-    it = extract_parameters(s2.begin(),s2.end(),p);
-    BOOST_CHECK( it == s2.end() );
-    BOOST_CHECK_EQUAL( p.size(), 1 );
-    BOOST_CHECK( p[0].first == "foo" );
-    BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
-
-    p.clear();
-    it = extract_parameters(s3.begin(),s3.end(),p);
-    BOOST_CHECK( it == s3.begin()+5 );
-    BOOST_CHECK_EQUAL( p.size(), 1 );
-    BOOST_CHECK( p[0].first == "foo" );
-    BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
-
-    p.clear();
-    it = extract_parameters(s4.begin(),s4.end(),p);
-    BOOST_CHECK( it == s4.end() );
-    BOOST_CHECK_EQUAL( p.size(), 1 );
-    BOOST_CHECK( p[0].first == "foo" );
-    BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
-
-    p.clear();
-    it = extract_parameters(s5.begin(),s5.end(),p);
-    BOOST_CHECK( it == s5.end() );
-    BOOST_CHECK_EQUAL( p.size(), 2 );
-    BOOST_CHECK( p[0].first == "foo" );
-    BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
-    BOOST_CHECK( p[1].first == "bar" );
-    BOOST_CHECK_EQUAL( p[1].second.size(), 0 );
-
-    p.clear();
-    it = extract_parameters(s6.begin(),s6.end(),p);
-    BOOST_CHECK( it == s6.end() );
-    BOOST_CHECK_EQUAL( p.size(), 1 );
-    BOOST_CHECK( p[0].first == "foo" );
-    a = p[0].second;
-    BOOST_CHECK_EQUAL( a.size(), 1 );
-    BOOST_CHECK( a.find("bar") != a.end() );
-    BOOST_CHECK_EQUAL( a.find("bar")->second, "" );
-
-    p.clear();
-    it = extract_parameters(s7.begin(),s7.end(),p);
-    BOOST_CHECK( it == s7.end() );
-    BOOST_CHECK_EQUAL( p.size(), 2 );
-    BOOST_CHECK( p[0].first == "foo" );
-    a = p[0].second;
-    BOOST_CHECK_EQUAL( a.size(), 1 );
-    BOOST_CHECK( a.find("baz") != a.end() );
-    BOOST_CHECK_EQUAL( a.find("baz")->second, "" );
-    BOOST_CHECK( p[1].first == "bar" );
-    a = p[1].second;
-    BOOST_CHECK_EQUAL( a.size(), 0 );
-
-    p.clear();
-    it = extract_parameters(s8.begin(),s8.end(),p);
-    BOOST_CHECK( it == s8.end() );
-    BOOST_CHECK_EQUAL( p.size(), 1 );
-    BOOST_CHECK( p[0].first == "foo" );
-    a = p[0].second;
-    BOOST_CHECK_EQUAL( a.size(), 2 );
-    BOOST_CHECK( a.find("bar") != a.end() );
-    BOOST_CHECK_EQUAL( a.find("bar")->second, "" );
-    BOOST_CHECK( a.find("baz") != a.end() );
-    BOOST_CHECK_EQUAL( a.find("baz")->second, "" );
-
-    p.clear();
-    it = extract_parameters(s9.begin(),s9.end(),p);
-    BOOST_CHECK( it == s9.end() );
-    BOOST_CHECK_EQUAL( p.size(), 1 );
-    BOOST_CHECK( p[0].first == "foo" );
-    a = p[0].second;
-    BOOST_CHECK_EQUAL( a.size(), 1 );
-    BOOST_CHECK( a.find("bar") != a.end() );
-    BOOST_CHECK_EQUAL( a.find("bar")->second, "baz" );
-
-    p.clear();
-    it = extract_parameters(s10.begin(),s10.end(),p);
-    BOOST_CHECK( it == s10.end() );
-    BOOST_CHECK_EQUAL( p.size(), 1 );
-    BOOST_CHECK( p[0].first == "foo" );
-    a = p[0].second;
-    BOOST_CHECK_EQUAL( a.size(), 2 );
-    BOOST_CHECK( a.find("bar") != a.end() );
-    BOOST_CHECK_EQUAL( a.find("bar")->second, "baz" );
-    BOOST_CHECK( a.find("boo") != a.end() );
-    BOOST_CHECK_EQUAL( a.find("boo")->second, "" );
-
-    p.clear();
-    it = extract_parameters(s11.begin(),s11.end(),p);
-    BOOST_CHECK( it == s11.end() );
-    BOOST_CHECK_EQUAL( p.size(), 2 );
-    BOOST_CHECK( p[0].first == "foo" );
-    a = p[0].second;
-    BOOST_CHECK_EQUAL( a.size(), 2 );
-    BOOST_CHECK( a.find("bar") != a.end() );
-    BOOST_CHECK_EQUAL( a.find("bar")->second, "baz" );
-    BOOST_CHECK( a.find("boo") != a.end() );
-    BOOST_CHECK_EQUAL( a.find("boo")->second, "" );
-    a = p[1].second;
-    BOOST_CHECK_EQUAL( a.size(), 0 );
-
-    p.clear();
-    it = extract_parameters(s12.begin(),s12.end(),p);
-    BOOST_CHECK( it == s12.end() );
-    BOOST_CHECK_EQUAL( p.size(), 1 );
-    BOOST_CHECK( p[0].first == "foo" );
-    a = p[0].second;
-    BOOST_CHECK_EQUAL( a.size(), 1 );
-    BOOST_CHECK( a.find("bar") != a.end() );
-    BOOST_CHECK_EQUAL( a.find("bar")->second, "a b c" );
-
-    p.clear();
-    it = extract_parameters(s13.begin(),s13.end(),p);
-    BOOST_CHECK( it == s13.end() );
-    BOOST_CHECK_EQUAL( p.size(), 1 );
-    BOOST_CHECK( p[0].first == "foo" );
-    a = p[0].second;
-    BOOST_CHECK_EQUAL( a.size(), 1 );
-    BOOST_CHECK( a.find("bar") != a.end() );
-    BOOST_CHECK_EQUAL( a.find("bar")->second, "a \"b\" c" );
-}
-
-BOOST_AUTO_TEST_CASE( strip_lws ) {
-    std::string test1 = "foo";
-    std::string test2 = " foo ";
-    std::string test3 = "foo ";
-    std::string test4 = " foo";
-    std::string test5 = "    foo     ";
-    std::string test6 = "  \r\n  foo     ";
-    std::string test7 = "  \t  foo     ";
-    std::string test8 = "  \t       ";
-    std::string test9 = " \n\r";
-
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test1), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test2), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test3), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test4), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test5), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test6), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test7), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test8), "" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test9), "" );
-}
-
-BOOST_AUTO_TEST_CASE( case_insensitive_headers ) {
-    websocketpp::http::parser::parser r;
-
-    r.replace_header("foo","bar");
-
-    BOOST_CHECK_EQUAL( r.get_header("foo"), "bar" );
-    BOOST_CHECK_EQUAL( r.get_header("FOO"), "bar" );
-    BOOST_CHECK_EQUAL( r.get_header("Foo"), "bar" );
-}
-
-BOOST_AUTO_TEST_CASE( case_insensitive_headers_overwrite ) {
-    websocketpp::http::parser::parser r;
-
-    r.replace_header("foo","bar");
-
-    BOOST_CHECK_EQUAL( r.get_header("foo"), "bar" );
-    BOOST_CHECK_EQUAL( r.get_header("Foo"), "bar" );
-
-    r.replace_header("Foo","baz");
-
-    BOOST_CHECK_EQUAL( r.get_header("foo"), "baz" );
-    BOOST_CHECK_EQUAL( r.get_header("Foo"), "baz" );
-
-    r.remove_header("FoO");
-
-    BOOST_CHECK_EQUAL( r.get_header("foo"), "" );
-    BOOST_CHECK_EQUAL( r.get_header("Foo"), "" );
-}
-
-BOOST_AUTO_TEST_CASE( blank_consume ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw;
-
-    bool exception = false;
-
-    try {
-        r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK( r.ready() == false );
-}
-
-BOOST_AUTO_TEST_CASE( blank_request ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "\r\n\r\n";
-
-    bool exception = false;
-
-    try {
-        r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == true );
-    BOOST_CHECK( r.ready() == false );
-}
-
-BOOST_AUTO_TEST_CASE( bad_request_no_host ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\n\r\n";
-
-    bool exception = false;
-
-    try {
-        r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == true );
-    BOOST_CHECK( r.ready() == false );
-}
-
-BOOST_AUTO_TEST_CASE( basic_request ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos = r.consume(raw.c_str(),raw.size());
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 41 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
-    BOOST_CHECK( r.get_method() == "GET" );
-    BOOST_CHECK( r.get_uri() == "/" );
-    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
-}
-
-BOOST_AUTO_TEST_CASE( basic_request_with_body ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\nContent-Length: 5\r\n\r\nabcdef";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos = r.consume(raw.c_str(),raw.size());
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 65 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
-    BOOST_CHECK_EQUAL( r.get_header("Content-Length"), "5" );
-    BOOST_CHECK_EQUAL( r.get_body(), "abcde" );
-    
-    BOOST_CHECK_EQUAL( r.get_headers().size(), 2);
-    
-    websocketpp::http::parser::header_list::const_iterator it = r.get_headers().begin();
-    
-    BOOST_CHECK_EQUAL( it->first, "Content-Length");
-    BOOST_CHECK_EQUAL( it->second, "5");
-    
-    it++;
-    
-    BOOST_CHECK_EQUAL( it->first, "Host");
-    BOOST_CHECK_EQUAL( it->second, "www.example.com");
-}
-
-BOOST_AUTO_TEST_CASE( basic_request_with_body_split ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\nContent-Length: 6\r\n\r\nabc";
-    std::string raw2 = "def";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-        pos += r.consume(raw2.c_str(),raw2.size());
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 66 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
-    BOOST_CHECK_EQUAL( r.get_header("Content-Length"), "6" );
-    BOOST_CHECK_EQUAL( r.get_body(), "abcdef" );
-}
-
-
-
-BOOST_AUTO_TEST_CASE( trailing_body_characters ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\na";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos = r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 41 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
-    BOOST_CHECK( r.get_method() == "GET" );
-    BOOST_CHECK( r.get_uri() == "/" );
-    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
-}
-
-BOOST_AUTO_TEST_CASE( trailing_body_characters_beyond_max_lenth ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-    raw.append(websocketpp::http::max_header_size,'*');
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos = r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 41 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
-    BOOST_CHECK( r.get_method() == "GET" );
-    BOOST_CHECK( r.get_uri() == "/" );
-    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
-}
-
-BOOST_AUTO_TEST_CASE( basic_split1 ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\n";
-    std::string raw2 = "Host: www.example.com\r\n\r\na";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-        pos += r.consume(raw2.c_str(),raw2.size());
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 41 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
-    BOOST_CHECK( r.get_method() == "GET" );
-    BOOST_CHECK( r.get_uri() == "/" );
-    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
-}
-
-BOOST_AUTO_TEST_CASE( basic_split2 ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r";
-    std::string raw2 = "\n\r\na";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-        pos += r.consume(raw2.c_str(),raw2.size());
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 41 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
-    BOOST_CHECK( r.get_method() == "GET" );
-    BOOST_CHECK( r.get_uri() == "/" );
-    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
-}
-
-BOOST_AUTO_TEST_CASE( max_header_len ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw(websocketpp::http::max_header_size-1,'*');
-    raw += "\r\n";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-    } catch (const websocketpp::http::exception& e) {
-        if (e.m_error_code == websocketpp::http::status_code::request_header_fields_too_large) {
-            exception = true;
-        }
-    }
-
-    BOOST_CHECK( exception == true );
-}
-
-BOOST_AUTO_TEST_CASE( max_header_len_split ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw(websocketpp::http::max_header_size-1,'*');
-    std::string raw2(2,'*');
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-        pos += r.consume(raw2.c_str(),raw2.size());
-    } catch (const websocketpp::http::exception& e) {
-        if (e.m_error_code == websocketpp::http::status_code::request_header_fields_too_large) {
-            exception = true;
-        }
-    }
-
-    BOOST_CHECK( exception == true );
-}
-
-BOOST_AUTO_TEST_CASE( max_body_len ) {
-    websocketpp::http::parser::request r;
-    
-    r.set_max_body_size(5);
-
-    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\nContent-Length: 6\r\n\r\nabcdef";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-    } catch (websocketpp::http::exception const & e) {
-        exception = true;
-        BOOST_CHECK_EQUAL(e.m_error_code,websocketpp::http::status_code::request_entity_too_large);
-    }
-
-    BOOST_CHECK_EQUAL(r.get_max_body_size(),5);
-    BOOST_CHECK( exception == true );
-}
-
-BOOST_AUTO_TEST_CASE( firefox_full_request ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\nHost: localhost:5000\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\nAccept-Language: en-us,en;q=0.5\r\nAccept-Encoding: gzip, deflate\r\nConnection: keep-alive, Upgrade\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Origin: http://zaphoyd.com\r\nSec-WebSocket-Key: pFik//FxwFk0riN4ZiPFjQ==\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\n\r\n";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 482 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
-    BOOST_CHECK( r.get_method() == "GET" );
-    BOOST_CHECK( r.get_uri() == "/" );
-    BOOST_CHECK( r.get_header("Host") == "localhost:5000" );
-    BOOST_CHECK( r.get_header("User-Agent") == "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0" );
-    BOOST_CHECK( r.get_header("Accept") == "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" );
-    BOOST_CHECK( r.get_header("Accept-Language") == "en-us,en;q=0.5" );
-    BOOST_CHECK( r.get_header("Accept-Encoding") == "gzip, deflate" );
-    BOOST_CHECK( r.get_header("Connection") == "keep-alive, Upgrade" );
-    BOOST_CHECK( r.get_header("Sec-WebSocket-Version") == "8" );
-    BOOST_CHECK( r.get_header("Sec-WebSocket-Origin") == "http://zaphoyd.com" );
-    BOOST_CHECK( r.get_header("Sec-WebSocket-Key") == "pFik//FxwFk0riN4ZiPFjQ==" );
-    BOOST_CHECK( r.get_header("Pragma") == "no-cache" );
-    BOOST_CHECK( r.get_header("Cache-Control") == "no-cache" );
-    BOOST_CHECK( r.get_header("Upgrade") == "websocket" );
-}
-
-BOOST_AUTO_TEST_CASE( bad_method ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GE]T / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-
-    bool exception = false;
-
-    try {
-        r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == true );
-}
-
-BOOST_AUTO_TEST_CASE( bad_header_name ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\nHo]st: www.example.com\r\n\r\n";
-
-    bool exception = false;
-
-    try {
-        r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == true );
-}
-
-BOOST_AUTO_TEST_CASE( old_http_version ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.0\r\nHost: www.example.com\r\n\r\n";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos = r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 41 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.0" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
-}
-
-BOOST_AUTO_TEST_CASE( new_http_version1 ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.12\r\nHost: www.example.com\r\n\r\n";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos = r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 42 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.12" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
-}
-
-BOOST_AUTO_TEST_CASE( new_http_version2 ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/12.12\r\nHost: www.example.com\r\n\r\n";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos = r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 43 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/12.12" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
-}
-
-/* commented out due to not being implemented yet
-
-BOOST_AUTO_TEST_CASE( new_http_version3 ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTPS/12.12\r\nHost: www.example.com\r\n\r\n";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos = r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == true );
-}*/
-
-BOOST_AUTO_TEST_CASE( header_whitespace1 ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\nHost:  www.example.com \r\n\r\n";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos = r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 43 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
-}
-
-BOOST_AUTO_TEST_CASE( header_whitespace2 ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\nHost:www.example.com\r\n\r\n";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos = r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 40 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
-}
-
-BOOST_AUTO_TEST_CASE( header_aggregation ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\nFoo: bar\r\nFoo: bat\r\n\r\n";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos = r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 61 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Foo"), "bar, bat" );
-}
-
-BOOST_AUTO_TEST_CASE( wikipedia_example_response ) {
-    websocketpp::http::parser::response r;
-
-    std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 159 );
-    BOOST_CHECK( r.headers_ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
-    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
-    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
-    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
-}
-
-BOOST_AUTO_TEST_CASE( wikipedia_example_response_trailing ) {
-    websocketpp::http::parser::response r;
-
-    std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
-    raw += "a";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 159 );
-    BOOST_CHECK( r.headers_ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
-    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
-    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
-    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
-}
-
-BOOST_AUTO_TEST_CASE( wikipedia_example_response_trailing_large ) {
-    websocketpp::http::parser::response r;
-
-    std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
-    raw.append(websocketpp::http::max_header_size,'*');
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 159 );
-    BOOST_CHECK( r.headers_ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
-    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
-    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
-    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
-}
-
-BOOST_AUTO_TEST_CASE( response_with_non_standard_lws ) {
-    websocketpp::http::parser::response r;
-
-    std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept:HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 158 );
-    BOOST_CHECK( r.headers_ready() );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
-    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
-    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
-    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
-}
-
-BOOST_AUTO_TEST_CASE( plain_http_response ) {
-    websocketpp::http::parser::response r;
-
-    std::string raw = "HTTP/1.1 200 OK\r\nDate: Thu, 10 May 2012 11:59:25 GMT\r\nServer: Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch\r\nLast-Modified: Tue, 30 Mar 2010 17:41:28 GMT\r\nETag: \"16799d-55-4830823a78200\"\r\nAccept-Ranges: bytes\r\nContent-Length: 85\r\nVary: Accept-Encoding\r\nContent-Type: text/html\r\n\r\n<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 405 );
-    BOOST_CHECK( r.headers_ready() == true );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::ok );
-    BOOST_CHECK_EQUAL( r.get_status_msg(), "OK" );
-    BOOST_CHECK_EQUAL( r.get_header("Date"), "Thu, 10 May 2012 11:59:25 GMT" );
-    BOOST_CHECK_EQUAL( r.get_header("Server"), "Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch" );
-    BOOST_CHECK_EQUAL( r.get_header("Last-Modified"), "Tue, 30 Mar 2010 17:41:28 GMT" );
-    BOOST_CHECK_EQUAL( r.get_header("ETag"), "\"16799d-55-4830823a78200\"" );
-    BOOST_CHECK_EQUAL( r.get_header("Accept-Ranges"), "bytes" );
-    BOOST_CHECK_EQUAL( r.get_header("Content-Length"), "85" );
-    BOOST_CHECK_EQUAL( r.get_header("Vary"), "Accept-Encoding" );
-    BOOST_CHECK_EQUAL( r.get_header("Content-Type"), "text/html" );
-    BOOST_CHECK_EQUAL( r.get_body(), "<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>" );
-}
-
-BOOST_AUTO_TEST_CASE( parse_istream ) {
-    websocketpp::http::parser::response r;
-
-    std::stringstream s;
-
-    s << "HTTP/1.1 200 OK\r\nDate: Thu, 10 May 2012 11:59:25 GMT\r\nServer: Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch\r\nLast-Modified: Tue, 30 Mar 2010 17:41:28 GMT\r\nETag: \"16799d-55-4830823a78200\"\r\nAccept-Ranges: bytes\r\nContent-Length: 85\r\nVary: Accept-Encoding\r\nContent-Type: text/html\r\n\r\n<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(s);
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK_EQUAL( exception, false );
-    BOOST_CHECK_EQUAL( pos, 405 );
-    BOOST_CHECK_EQUAL( r.headers_ready(), true );
-    BOOST_CHECK_EQUAL( r.ready(), true );
-}
-
-BOOST_AUTO_TEST_CASE( write_request_basic ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\n\r\n";
-
-    r.set_version("HTTP/1.1");
-    r.set_method("GET");
-    r.set_uri("/");
-
-    BOOST_CHECK_EQUAL( r.raw(), raw );
-}
-
-BOOST_AUTO_TEST_CASE( write_request_with_header ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\nHost: http://example.com\r\n\r\n";
-
-    r.set_version("HTTP/1.1");
-    r.set_method("GET");
-    r.set_uri("/");
-    r.replace_header("Host","http://example.com");
-
-    BOOST_CHECK_EQUAL( r.raw(), raw );
-}
-
-BOOST_AUTO_TEST_CASE( write_request_with_body ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "POST / HTTP/1.1\r\nContent-Length: 48\r\nContent-Type: application/x-www-form-urlencoded\r\nHost: http://example.com\r\n\r\nlicenseID=string&content=string&paramsXML=string";
-
-    r.set_version("HTTP/1.1");
-    r.set_method("POST");
-    r.set_uri("/");
-    r.replace_header("Host","http://example.com");
-    r.replace_header("Content-Type","application/x-www-form-urlencoded");
-    r.set_body("licenseID=string&content=string&paramsXML=string");
-
-    BOOST_CHECK_EQUAL( r.raw(), raw );
-}
diff --git a/src/sioclient/lib/websocketpp/test/http/parser_perf.cpp b/src/sioclient/lib/websocketpp/test/http/parser_perf.cpp
deleted file mode 100644
index 0c76bc77..00000000
--- a/src/sioclient/lib/websocketpp/test/http/parser_perf.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <websocketpp/http/parser.hpp>
-
-#include <chrono>
-
-class scoped_timer {
-public:
-    scoped_timer(std::string i) : m_id(i),m_start(std::chrono::steady_clock::now()) {
-        std::cout << "Clock " << i << ": ";
-    }
-    ~scoped_timer() {
-        std::chrono::nanoseconds time_taken = std::chrono::steady_clock::now()-m_start;
-
-        //nanoseconds_per_test
-
-        //tests_per_second
-
-        //1000000000.0/(double(time_taken.count())/1000.0)
-
-        std::cout << 1000000000.0/(double(time_taken.count())/1000.0) << std::endl;
-
-        //std::cout << (1.0/double(time_taken.count())) * double(1000000000*1000) << std::endl;
-    }
-
-private:
-    std::string m_id;
-    std::chrono::steady_clock::time_point m_start;
-};
-
-int main() {
-    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-
-    std::string firefox = "GET / HTTP/1.1\r\nHost: localhost:5000\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\nAccept-Language: en-us,en;q=0.5\r\nAccept-Encoding: gzip, deflate\r\nConnection: keep-alive, Upgrade\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Origin: http://zaphoyd.com\r\nSec-WebSocket-Key: pFik//FxwFk0riN4ZiPFjQ==\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\n\r\n";
-
-    std::string firefox1 = "GET / HTTP/1.1\r\nHost: localhost:5000\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\nAccept-Language: en-us,en;q=0.5\r\n";
-
-    std::string firefox2 = "Accept-Encoding: gzip, deflate\r\nConnection: keep-alive, Upgrade\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Origin: http://zaphoyd.com\r\nSec-WebSocket-Key: pFik//FxwFk0riN4ZiPFjQ==\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\n\r\n";
-
-    {
-        scoped_timer timer("Simplest 1 chop");
-        for (int i = 0; i < 1000; i++) {
-            websocketpp::http::parser::request r;
-
-            try {
-                r.consume(raw.c_str(),raw.size());
-            } catch (...) {
-                std::cout << "exception" << std::endl;
-            }
-
-            if (!r.ready()) {
-                std::cout << "error" << std::endl;
-                break;
-            }
-        }
-    }
-
-    {
-        scoped_timer timer("FireFox, 1 chop, consume old");
-        for (int i = 0; i < 1000; i++) {
-            websocketpp::http::parser::request r;
-
-            try {
-                r.consume2(firefox.c_str(),firefox.size());
-            } catch (...) {
-                std::cout << "exception" << std::endl;
-            }
-
-            if (!r.ready()) {
-                std::cout << "error" << std::endl;
-                break;
-            }
-        }
-    }
-
-    {
-        scoped_timer timer("FireFox, 1 chop");
-        for (int i = 0; i < 1000; i++) {
-            websocketpp::http::parser::request r;
-
-            try {
-                r.consume(firefox.c_str(),firefox.size());
-            } catch (...) {
-                std::cout << "exception" << std::endl;
-            }
-
-            if (!r.ready()) {
-                std::cout << "error" << std::endl;
-                break;
-            }
-        }
-    }
-
-
-
-    {
-        scoped_timer timer("FireFox, 2 chop");
-        for (int i = 0; i < 1000; i++) {
-            websocketpp::http::parser::request r;
-
-            try {
-                r.consume(firefox1.c_str(),firefox1.size());
-                r.consume(firefox2.c_str(),firefox2.size());
-            } catch (...) {
-                std::cout << "exception" << std::endl;
-            }
-
-            if (!r.ready()) {
-                std::cout << "error" << std::endl;
-                break;
-            }
-        }
-    }
-
-    return 0;
-}
diff --git a/src/sioclient/lib/websocketpp/test/http/perf.out b/src/sioclient/lib/websocketpp/test/http/perf.out
deleted file mode 100755
index 587237cf..00000000
Binary files a/src/sioclient/lib/websocketpp/test/http/perf.out and /dev/null differ
diff --git a/src/sioclient/lib/websocketpp/test/http/test.out b/src/sioclient/lib/websocketpp/test/http/test.out
deleted file mode 100755
index 4d685e62..00000000
Binary files a/src/sioclient/lib/websocketpp/test/http/test.out and /dev/null differ
diff --git a/src/sioclient/lib/websocketpp/test/logger/CMakeLists.txt b/src/sioclient/lib/websocketpp/test/logger/CMakeLists.txt
deleted file mode 100644
index 42d8b7c8..00000000
--- a/src/sioclient/lib/websocketpp/test/logger/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (test_logger)
-
-build_test (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/src/sioclient/lib/websocketpp/test/logger/SConscript b/src/sioclient/lib/websocketpp/test/logger/SConscript
deleted file mode 100644
index 81d60760..00000000
--- a/src/sioclient/lib/websocketpp/test/logger/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## logger unit tests
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
-
-objs = env.Object('logger_basic_boost.o', ["basic.cpp"], LIBS = BOOST_LIBS)
-prgs = env.Program('logger_basic_boost', ["logger_basic_boost.o"], LIBS = BOOST_LIBS)
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   objs += env_cpp11.Object('logger_basic_stl.o', ["basic.cpp"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('logger_basic_stl', ["logger_basic_stl.o"], LIBS = BOOST_LIBS_CPP11)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/test/logger/basic.cpp b/src/sioclient/lib/websocketpp/test/logger/basic.cpp
deleted file mode 100644
index a7305357..00000000
--- a/src/sioclient/lib/websocketpp/test/logger/basic.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE basic_log
-#include <boost/test/unit_test.hpp>
-
-#include <string>
-
-#include <websocketpp/logger/basic.hpp>
-#include <websocketpp/concurrency/none.hpp>
-#include <websocketpp/concurrency/basic.hpp>
-
-typedef websocketpp::log::basic<websocketpp::concurrency::basic,websocketpp::log::alevel> basic_access_log_type;
-
-BOOST_AUTO_TEST_CASE( is_token_char ) {
-    typedef websocketpp::log::basic<websocketpp::concurrency::none,websocketpp::log::elevel> error_log;
-
-    error_log elog;
-
-    BOOST_CHECK( elog.static_test(websocketpp::log::elevel::info ) == true );
-    BOOST_CHECK( elog.static_test(websocketpp::log::elevel::warn ) == true );
-    BOOST_CHECK( elog.static_test(websocketpp::log::elevel::rerror ) == true );
-    BOOST_CHECK( elog.static_test(websocketpp::log::elevel::fatal ) == true );
-
-    elog.set_channels(websocketpp::log::elevel::info);
-
-    elog.write(websocketpp::log::elevel::info,"Information");
-    elog.write(websocketpp::log::elevel::warn,"A warning");
-    elog.write(websocketpp::log::elevel::rerror,"A error");
-    elog.write(websocketpp::log::elevel::fatal,"A critical error");
-}
-
-BOOST_AUTO_TEST_CASE( access_clear ) {
-    typedef websocketpp::log::basic<websocketpp::concurrency::none,websocketpp::log::alevel> access_log;
-
-    std::stringstream out;
-    access_log logger(0xffffffff,&out);
-
-    // clear all channels
-    logger.clear_channels(0xffffffff);
-
-    // writes shouldn't happen
-    logger.write(websocketpp::log::alevel::devel,"devel");
-    //std::cout << "|" << out.str() << "|" << std::endl;
-    BOOST_CHECK( out.str().size() == 0 );
-}
-
-BOOST_AUTO_TEST_CASE( basic_concurrency ) {
-    typedef websocketpp::log::basic<websocketpp::concurrency::basic,websocketpp::log::alevel> access_log;
-
-    std::stringstream out;
-    access_log logger(0xffffffff,&out);
-
-    logger.set_channels(0xffffffff);
-
-    logger.write(websocketpp::log::alevel::devel,"devel");
-    //std::cout << "|" << out.str() << "|" << std::endl;
-    BOOST_CHECK( out.str().size() > 0 );
-}
-
-
-BOOST_AUTO_TEST_CASE( copy_constructor ) {
-    std::stringstream out;
-
-    basic_access_log_type logger1(0xffffffff,&out);
-    basic_access_log_type logger2(logger1);
-
-    logger2.set_channels(0xffffffff);
-    logger2.write(websocketpp::log::alevel::devel,"devel");
-    BOOST_CHECK( out.str().size() > 0 );
-}
-
-#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
-BOOST_AUTO_TEST_CASE( move_constructor ) {
-    std::stringstream out;
-
-    basic_access_log_type logger1(0xffffffff,&out);
-    basic_access_log_type logger2(std::move(logger1));
-
-    logger2.set_channels(0xffffffff);
-    logger2.write(websocketpp::log::alevel::devel,"devel");
-    BOOST_CHECK( out.str().size() > 0 );
-}
-
-// Emplace requires move assignment, which logger doesn't support right now
-// due to const members. This is pretty irritating and will probably result in
-// the const members being removed. For now though this test will fail to
-// compile
-/*BOOST_AUTO_TEST_CASE( emplace ) {
-    std::stringstream out1;
-    std::stringstream out2;
-
-    std::vector<basic_access_log_type> v;
-
-    v.emplace_back(websocketpp::log::level(0xffffffff),&out1);
-    v.emplace_back(websocketpp::log::level(0xffffffff),&out2);
-
-    v[0].set_channels(0xffffffff);
-    v[1].set_channels(0xffffffff);
-    v[0].write(websocketpp::log::alevel::devel,"devel");
-    v[1].write(websocketpp::log::alevel::devel,"devel");
-    BOOST_CHECK( out1.str().size() > 0 );
-    BOOST_CHECK( out2.str().size() > 0 );
-}*/
-#endif // #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
-
-// As long as there are const member variables these can't exist
-// These remain commented as they are useful for testing the deleted operators
-/*BOOST_AUTO_TEST_CASE( copy_assign ) {
-    basic_access_log_type logger1;
-    basic_access_log_type logger2;
-
-    logger2 = logger1;
-}
-
-BOOST_AUTO_TEST_CASE( move_assign ) {
-    basic_access_log_type logger1;
-    basic_access_log_type logger2;
-
-    logger2 = std::move(logger1);
-}*/
diff --git a/src/sioclient/lib/websocketpp/test/message_buffer/CMakeLists.txt b/src/sioclient/lib/websocketpp/test/message_buffer/CMakeLists.txt
deleted file mode 100644
index cd17e556..00000000
--- a/src/sioclient/lib/websocketpp/test/message_buffer/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# Test alloc message buffer strategy
-file (GLOB SOURCE alloc.cpp)
-
-init_target (test_message_alloc)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test message buffers
-file (GLOB SOURCE message.cpp)
-
-init_target (test_message_buffer)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/src/sioclient/lib/websocketpp/test/message_buffer/SConscript b/src/sioclient/lib/websocketpp/test/message_buffer/SConscript
deleted file mode 100644
index 2ef6d71f..00000000
--- a/src/sioclient/lib/websocketpp/test/message_buffer/SConscript
+++ /dev/null
@@ -1,27 +0,0 @@
-## message_buffer unit tests
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
-
-objs = env.Object('message_boost.o', ["message.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('alloc_boost.o', ["alloc.cpp"], LIBS = BOOST_LIBS)
-prgs = env.Program('test_message_boost', ["message_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_alloc_boost', ["alloc_boost.o"], LIBS = BOOST_LIBS)
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   objs += env_cpp11.Object('message_stl.o', ["message.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('alloc_stl.o', ["alloc.cpp"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_message_stl', ["message_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_alloc_stl', ["alloc_stl.o"], LIBS = BOOST_LIBS_CPP11)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/test/message_buffer/alloc.cpp b/src/sioclient/lib/websocketpp/test/message_buffer/alloc.cpp
deleted file mode 100644
index 9f6ba2ab..00000000
--- a/src/sioclient/lib/websocketpp/test/message_buffer/alloc.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE message_buffer_alloc
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/message_buffer/alloc.hpp>
-
-template <template <class> class con_msg_manager>
-struct stub {
-    typedef websocketpp::lib::shared_ptr<stub> ptr;
-
-    typedef con_msg_manager<stub> con_msg_man_type;
-    typedef typename con_msg_man_type::ptr con_msg_man_ptr;
-    typedef typename con_msg_man_type::weak_ptr con_msg_man_weak_ptr;
-
-    stub(con_msg_man_ptr manager, websocketpp::frame::opcode::value op, size_t size = 128)
-      : m_opcode(op)
-      , m_manager(manager)
-      , m_size(size) {}
-
-    bool recycle() {
-        con_msg_man_ptr shared = m_manager.lock();
-
-        if (shared) {
-            return shared->recycle(this);
-        } else {
-            return false;
-        }
-    }
-
-    websocketpp::frame::opcode::value   m_opcode;
-    con_msg_man_weak_ptr                m_manager;
-    size_t                              m_size;
-};
-
-BOOST_AUTO_TEST_CASE( basic_get_message ) {
-    typedef stub<websocketpp::message_buffer::alloc::con_msg_manager>
-        message_type;
-    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
-        con_msg_man_type;
-
-    con_msg_man_type::ptr manager(new con_msg_man_type());
-    message_type::ptr msg = manager->get_message(websocketpp::frame::opcode::TEXT,512);
-
-    BOOST_CHECK(msg);
-    BOOST_CHECK(msg->m_opcode == websocketpp::frame::opcode::TEXT);
-    BOOST_CHECK(msg->m_manager.lock() == manager);
-    BOOST_CHECK(msg->m_size == 512);
-}
-
-BOOST_AUTO_TEST_CASE( basic_get_manager ) {
-    typedef stub<websocketpp::message_buffer::alloc::con_msg_manager>
-        message_type;
-    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
-        con_msg_man_type;
-    typedef websocketpp::message_buffer::alloc::endpoint_msg_manager
-        <con_msg_man_type> endpoint_manager_type;
-
-    endpoint_manager_type em;
-    con_msg_man_type::ptr manager = em.get_manager();
-    message_type::ptr msg = manager->get_message(websocketpp::frame::opcode::TEXT,512);
-
-    BOOST_CHECK(msg);
-    BOOST_CHECK(msg->m_opcode == websocketpp::frame::opcode::TEXT);
-    BOOST_CHECK(msg->m_manager.lock() == manager);
-    BOOST_CHECK(msg->m_size == 512);
-}
-
diff --git a/src/sioclient/lib/websocketpp/test/message_buffer/message.cpp b/src/sioclient/lib/websocketpp/test/message_buffer/message.cpp
deleted file mode 100644
index 1fb12d31..00000000
--- a/src/sioclient/lib/websocketpp/test/message_buffer/message.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE message
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/message_buffer/message.hpp>
-
-template <typename message>
-struct stub {
-    typedef websocketpp::lib::weak_ptr<stub> weak_ptr;
-    typedef websocketpp::lib::shared_ptr<stub> ptr;
-
-    stub() : recycled(false) {}
-
-    bool recycle(message *) {
-        this->recycled = true;
-        return false;
-    }
-
-    bool recycled;
-};
-
-BOOST_AUTO_TEST_CASE( basic_size_check ) {
-    typedef websocketpp::message_buffer::message<stub> message_type;
-    typedef stub<message_type> stub_type;
-
-    stub_type::ptr s(new stub_type());
-    message_type::ptr msg(new message_type(s,websocketpp::frame::opcode::TEXT,500));
-
-    BOOST_CHECK(msg->get_payload().capacity() >= 500);
-}
-
-BOOST_AUTO_TEST_CASE( recycle ) {
-    typedef websocketpp::message_buffer::message<stub> message_type;
-    typedef stub<message_type> stub_type;
-
-    stub_type::ptr s(new stub_type());
-    message_type::ptr msg(new message_type(s,websocketpp::frame::opcode::TEXT,500));
-
-    BOOST_CHECK(s->recycled == false);
-    BOOST_CHECK(msg->recycle() == false);
-    BOOST_CHECK(s->recycled == true);
-}
-
diff --git a/src/sioclient/lib/websocketpp/test/message_buffer/pool.cpp b/src/sioclient/lib/websocketpp/test/message_buffer/pool.cpp
deleted file mode 100644
index 2ecf8755..00000000
--- a/src/sioclient/lib/websocketpp/test/message_buffer/pool.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE hybi_00_processor
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/processors/hybi00.hpp>
-#include <websocketpp/http/request.hpp>
-#include <websocketpp/http/response.hpp>
-
-
-BOOST_AUTO_TEST_CASE( exact_match ) {
-    websocketpp::http::parser::request r;
-    websocketpp::http::parser::response response;
-    websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nOrigin: http://example.com\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-    r.replace_header("Sec-WebSocket-Key3","WjN}|M(6");
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    BOOST_CHECK(p.validate_handshake(r));
-
-    websocketpp::uri_ptr u;
-    bool exception;
-
-    try {
-        u = p.get_uri(r);
-    } catch (const websocketpp::uri_exception& e) {
-        exception = true;
-    }
-
-    BOOST_CHECK(exception == false);
-    BOOST_CHECK(u->get_secure() == false);
-    BOOST_CHECK(u->get_host() == "www.example.com");
-    BOOST_CHECK(u->get_resource() == "/");
-    BOOST_CHECK(u->get_port() == websocketpp::URI_DEFAULT_PORT);
-
-    p.process_handshake(r,response);
-
-    BOOST_CHECK(response.get_header("Connection") == "Upgrade");
-    BOOST_CHECK(response.get_header("Upgrade") == "websocket");
-    BOOST_CHECK(response.get_header("Sec-WebSocket-Origin") == "http://example.com");
-
-    BOOST_CHECK(response.get_header("Sec-WebSocket-Location") == "ws://www.example.com/");
-    BOOST_CHECK(response.get_header("Sec-WebSocket-Key3") == "n`9eBk9z$R8pOtVb");
-}
-
-BOOST_AUTO_TEST_CASE( non_get_method ) {
-    websocketpp::http::parser::request r;
-    websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-
-    std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-    r.replace_header("Sec-WebSocket-Key3","janelle!");
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    BOOST_CHECK(!p.validate_handshake(r));
-}
-
-BOOST_AUTO_TEST_CASE( old_http_version ) {
-    websocketpp::http::parser::request r;
-    websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-
-    std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-    r.replace_header("Sec-WebSocket-Key3","janelle!");
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    BOOST_CHECK(!p.validate_handshake(r));
-}
-
-BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
-    websocketpp::http::parser::request r;
-    websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-    r.replace_header("Sec-WebSocket-Key3","janelle!");
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    BOOST_CHECK(!p.validate_handshake(r));
-}
-
-BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
-    websocketpp::http::parser::request r;
-    websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-    r.replace_header("Sec-WebSocket-Key3","janelle!");
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    BOOST_CHECK(!p.validate_handshake(r));
-}
-
-BOOST_AUTO_TEST_CASE( bad_host ) {
-    websocketpp::http::parser::request r;
-    websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-    websocketpp::uri_ptr u;
-    bool exception = false;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-    r.replace_header("Sec-WebSocket-Key3","janelle!");
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    BOOST_CHECK(!p.validate_handshake(r));
-
-    try {
-        u = p.get_uri(r);
-    } catch (const websocketpp::uri_exception& e) {
-        exception = true;
-    }
-
-    BOOST_CHECK(exception == true);
-}
diff --git a/src/sioclient/lib/websocketpp/test/processors/CMakeLists.txt b/src/sioclient/lib/websocketpp/test/processors/CMakeLists.txt
deleted file mode 100644
index 42b04680..00000000
--- a/src/sioclient/lib/websocketpp/test/processors/CMakeLists.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-# Generic processor tests
-file (GLOB SOURCE processor.cpp)
-
-init_target (test_processor)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Hybi00 processor tests
-file (GLOB SOURCE hybi00.cpp)
-
-init_target (test_processor_hybi00)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Hybi07 processor tests
-file (GLOB SOURCE hybi07.cpp)
-
-init_target (test_processor_hybi07)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Hybi08 processor tests
-file (GLOB SOURCE hybi08.cpp)
-
-init_target (test_processor_hybi08)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-if (ZLIB_FOUND)
-
-# Hybi13 processor tests
-file (GLOB SOURCE hybi13.cpp)
-
-init_target (test_processor_hybi13)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_zlib()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Permessage compression extension processor tests
-file (GLOB SOURCE extension_permessage_compress.cpp)
-
-init_target (test_processor_extension_permessage_compress)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_zlib()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-endif ( ZLIB_FOUND )
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/test/processors/SConscript b/src/sioclient/lib/websocketpp/test/processors/SConscript
deleted file mode 100644
index 406a7edc..00000000
--- a/src/sioclient/lib/websocketpp/test/processors/SConscript
+++ /dev/null
@@ -1,47 +0,0 @@
-## processor unit tests
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + ['z']
-
-objs = env.Object('test_processor_boost.o', ["processor.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('test_hybi13_boost.o', ["hybi13.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('test_hybi08_boost.o', ["hybi08.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('test_hybi07_boost.o', ["hybi07.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('test_hybi00_boost.o', ["hybi00.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('test_extension_permessage_compress_boost.o', ["extension_permessage_compress.cpp"], LIBS = BOOST_LIBS)
-
-prgs = env.Program('test_processor_boost', ["test_processor_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_hybi13_boost', ["test_hybi13_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_hybi08_boost', ["test_hybi08_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_hybi07_boost', ["test_hybi07_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_hybi00_boost', ["test_hybi00_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_extension_permessage_compress_boost', ["test_extension_permessage_compress_boost.o"], LIBS = BOOST_LIBS + ['z'])
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
-   # no C++11 features are used in processor so there are no C++11 versions of
-   # these tests.
-   objs += env_cpp11.Object('test_processor_stl.o', ["processor.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('test_hybi13_stl.o', ["hybi13.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('test_hybi08_stl.o', ["hybi08.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('test_hybi07_stl.o', ["hybi07.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('test_hybi00_stl.o', ["hybi00.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('test_extension_permessage_compress_stl.o', ["extension_permessage_compress.cpp"], LIBS = BOOST_LIBS_CPP11 + ['z'])
-
-   prgs += env_cpp11.Program('test_processor_stl', ["test_processor_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_hybi13_stl', ["test_hybi13_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_hybi08_stl', ["test_hybi08_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_hybi07_stl', ["test_hybi07_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_hybi00_stl', ["test_hybi00_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_extension_permessage_compress_stl', ["test_extension_permessage_compress_stl.o"], LIBS = BOOST_LIBS_CPP11 + ['z'])
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/test/processors/extension_permessage_compress.cpp b/src/sioclient/lib/websocketpp/test/processors/extension_permessage_compress.cpp
deleted file mode 100644
index 7f26a9dd..00000000
--- a/src/sioclient/lib/websocketpp/test/processors/extension_permessage_compress.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE extension_permessage_deflate
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-#include <websocketpp/common/memory.hpp>
-
-#include <websocketpp/http/request.hpp>
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
-
-struct config {
-    typedef websocketpp::http::parser::request request_type;
-};
-typedef websocketpp::extensions::permessage_deflate::enabled<config>
-    compressor_type;
-
-using namespace websocketpp;
-
-BOOST_AUTO_TEST_CASE( deflate_init ) {
-    /*compressor_type compressor;
-    websocketpp::http::parser::attribute_list attributes;
-    std::pair<lib::error_code,std::string> neg_ret;
-
-    neg_ret = compressor.negotiate(attributes);
-
-    BOOST_CHECK_EQUAL( neg_ret.first,
-        extensions::permessage_deflate::error::invalid_parameters );*/
-
-    /**
-     * Window size is primarily controlled by the writer. A stream can only be
-     * read by a window size equal to or greater than the one use to compress
-     * it initially. The default windows size is also the maximum window size.
-     * Thus:
-     *
-     * Outbound window size can be limited unilaterally under the assumption
-     * that the opposite end will be using the default (maximum size which can
-     * read anything)
-     *
-     * Inbound window size must be limited by asking the remote endpoint to
-     * do so and it agreeing.
-     *
-     * Context takeover is also primarily controlled by the writer. If the
-     * compressor does not clear its context between messages then the reader
-     * can't either.
-     *
-     * Outbound messages may clear context between messages unilaterally.
-     * Inbound messages must retain state unless the remote endpoint signals
-     * otherwise.
-     *
-     * Negotiation options:
-     * Client must choose from the following options:
-     * - whether or not to request an inbound window limit
-     * - whether or not to signal that it will honor an outbound window limit
-     * - whether or not to request that the server disallow context takeover
-     *
-     * Server must answer in the following ways
-     * - If client requested a window size limit, is the window size limit
-     *   acceptable?
-     * - If client allows window limit requests, should we send one?
-     * - If client requested no context takeover, should we accept?
-     *
-     *
-     *
-     * All Defaults
-     * Req: permessage-compress; method=deflate
-     * Ans: permessage-compress; method=deflate
-     *
-     * # Client wants to limit the size of inbound windows from server
-     * permessage-compress; method="deflate; s2c_max_window_bits=8, deflate"
-     * Ans: permessage-compress; method="deflate; s2c_max_window_bits=8"
-     * OR
-     * Ans: permessage-compress; method=deflate
-     *
-     * # Server wants to limit the size of inbound windows from client
-     * Client:
-     * permessage-compress; method="deflate; c2s_max_window_bits, deflate"
-     *
-     * Server:
-     * permessage-compress; method="deflate; c2s_max_window_bits=8"
-     *
-     * # Client wants to
-     *
-     *
-     *
-     *
-     *
-     *
-     */
-
-
-
-
-   /* processor::extensions::deflate_method d(true);
-    http::parser::attribute_list attributes;
-    lib::error_code ec;
-
-    attributes.push_back(http::parser::attribute("foo","bar"));
-    ec = d.init(attributes);
-    BOOST_CHECK(ec == processor::extensions::error::unknown_method_parameter);
-
-    attributes.clear();
-    attributes.push_back(http::parser::attribute("s2c_max_window_bits","bar"));
-    ec = d.init(attributes);
-    BOOST_CHECK(ec == processor::extensions::error::invalid_algorithm_settings);
-
-    attributes.clear();
-    attributes.push_back(http::parser::attribute("s2c_max_window_bits","7"));
-    ec = d.init(attributes);
-    BOOST_CHECK(ec == processor::extensions::error::invalid_algorithm_settings);
-
-    attributes.clear();
-    attributes.push_back(http::parser::attribute("s2c_max_window_bits","16"));
-    ec = d.init(attributes);
-    BOOST_CHECK(ec == processor::extensions::error::invalid_algorithm_settings);
-
-    attributes.clear();
-    attributes.push_back(http::parser::attribute("s2c_max_window_bits","9"));
-    ec = d.init(attributes);
-    BOOST_CHECK( !ec);
-
-    attributes.clear();
-    ec = d.init(attributes);
-    BOOST_CHECK( !ec);
-
-    processor::extensions::deflate_engine de;
-
-    unsigned char test_in[] = "HelloHelloHelloHello";
-    unsigned char test_out[30];
-
-    uLongf test_out_size = 30;
-
-    int ret;
-
-    ret = compress(test_out, &test_out_size, test_in, 20);
-
-    std::cout << ret << std::endl
-              << websocketpp::utility::to_hex(test_in,20) << std::endl
-              << websocketpp::utility::to_hex(test_out,test_out_size) << std::endl;
-
-    std::string input = "Hello";
-    std::string output;
-    ec = de.compress(input,output);
-
-    BOOST_CHECK( ec == processor::extensions::error::uninitialized );
-
-    //std::cout << ec.message() << websocketpp::utility::to_hex(output) << std::endl;
-
-    ec = de.init(15,15,Z_DEFAULT_COMPRESSION,8,Z_FIXED);
-    //ec = de.init();
-    BOOST_CHECK( !ec );
-
-    ec = de.compress(input,output);
-    std::cout << ec.message() << std::endl
-              << websocketpp::utility::to_hex(input) << std::endl
-              << websocketpp::utility::to_hex(output) << std::endl;
-
-    output.clear();
-
-    ec = de.compress(input,output);
-    std::cout << ec.message() << std::endl
-              << websocketpp::utility::to_hex(input) << std::endl
-              << websocketpp::utility::to_hex(output) << std::endl;
-
-    input = output;
-    output.clear();
-    ec = de.decompress(input,output);
-    std::cout << ec.message() << std::endl
-              << websocketpp::utility::to_hex(input) << std::endl
-              << websocketpp::utility::to_hex(output) << std::endl;
-    */
-}
diff --git a/src/sioclient/lib/websocketpp/test/processors/hybi00.cpp b/src/sioclient/lib/websocketpp/test/processors/hybi00.cpp
deleted file mode 100644
index e6ad5301..00000000
--- a/src/sioclient/lib/websocketpp/test/processors/hybi00.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE hybi_00_processor
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/processors/hybi00.hpp>
-#include <websocketpp/http/request.hpp>
-#include <websocketpp/http/response.hpp>
-#include <websocketpp/message_buffer/message.hpp>
-#include <websocketpp/message_buffer/alloc.hpp>
-
-struct stub_config {
-    typedef websocketpp::http::parser::request request_type;
-    typedef websocketpp::http::parser::response response_type;
-
-    typedef websocketpp::message_buffer::message
-        <websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
-        con_msg_manager_type;
-        
-    static const size_t max_message_size = 16000000;
-};
-
-struct processor_setup {
-    processor_setup(bool server)
-      : msg_manager(new stub_config::con_msg_manager_type())
-      , p(false,server,msg_manager) {}
-
-    websocketpp::lib::error_code ec;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::request_type req;
-    stub_config::response_type res;
-    websocketpp::processor::hybi00<stub_config> p;
-};
-
-typedef stub_config::message_type::ptr message_ptr;
-
-BOOST_AUTO_TEST_CASE( exact_match ) {
-    processor_setup env(true);
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nOrigin: http://example.com\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-
-    env.req.consume(handshake.c_str(),handshake.size());
-    env.req.replace_header("Sec-WebSocket-Key3","WjN}|M(6");
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
-    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
-    env.ec = env.p.validate_handshake(env.req);
-    BOOST_CHECK(!env.ec);
-
-    websocketpp::uri_ptr u;
-
-    BOOST_CHECK_NO_THROW( u = env.p.get_uri(env.req) );
-
-    BOOST_CHECK_EQUAL(u->get_secure(), false);
-    BOOST_CHECK_EQUAL(u->get_host(), "www.example.com");
-    BOOST_CHECK_EQUAL(u->get_resource(), "/");
-    BOOST_CHECK_EQUAL(u->get_port(), websocketpp::uri_default_port);
-
-    env.p.process_handshake(env.req,"",env.res);
-
-    BOOST_CHECK_EQUAL(env.res.get_header("Connection"), "Upgrade");
-    BOOST_CHECK_EQUAL(env.res.get_header("Upgrade"), "WebSocket");
-    BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Origin"), "http://example.com");
-
-    BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Location"), "ws://www.example.com/");
-    BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Key3"), "n`9eBk9z$R8pOtVb");
-}
-
-BOOST_AUTO_TEST_CASE( non_get_method ) {
-    processor_setup env(true);
-
-    std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-
-    env.req.consume(handshake.c_str(),handshake.size());
-    env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
-    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
-    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::invalid_http_method );
-}
-
-BOOST_AUTO_TEST_CASE( old_http_version ) {
-    processor_setup env(true);
-
-    std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-
-    env.req.consume(handshake.c_str(),handshake.size());
-    env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
-    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
-    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::invalid_http_version );
-}
-
-BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
-    processor_setup env(true);
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\n\r\n";
-
-    env.req.consume(handshake.c_str(),handshake.size());
-    env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
-    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
-    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
-}
-
-BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
-    processor_setup env(true);
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-
-    env.req.consume(handshake.c_str(),handshake.size());
-    env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
-    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
-    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
-}
-
-BOOST_AUTO_TEST_CASE( bad_host ) {
-    processor_setup env(true);
-    websocketpp::uri_ptr u;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nOrigin: http://example.com\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-
-    env.req.consume(handshake.c_str(),handshake.size());
-    env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
-    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
-    BOOST_CHECK( !env.p.validate_handshake(env.req) );
-
-    BOOST_CHECK( !env.p.get_uri(env.req)->get_valid() );
-}
-
-BOOST_AUTO_TEST_CASE( extract_subprotocols ) {
-    processor_setup env(true);
-
-    std::vector<std::string> subps;
-
-    BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
-    BOOST_CHECK_EQUAL( subps.size(), 0 );
-}
-
-BOOST_AUTO_TEST_CASE( prepare_data_frame_null ) {
-    processor_setup env(true);
-
-    message_ptr in = env.msg_manager->get_message();
-    message_ptr out = env.msg_manager->get_message();
-    message_ptr invalid;
-
-
-    // empty pointers arguements should return sane error
-    BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,invalid), websocketpp::processor::error::invalid_arguments );
-
-    BOOST_CHECK_EQUAL( env.p.prepare_data_frame(in,invalid), websocketpp::processor::error::invalid_arguments );
-
-    BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,out), websocketpp::processor::error::invalid_arguments );
-
-    // test valid opcodes
-    // text (1) should be the only valid opcode
-    for (int i = 0; i < 0xF; i++) {
-        in->set_opcode(websocketpp::frame::opcode::value(i));
-
-        env.ec = env.p.prepare_data_frame(in,out);
-
-        if (i != 1) {
-            BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_opcode );
-        } else {
-            BOOST_CHECK_NE( env.ec, websocketpp::processor::error::invalid_opcode );
-        }
-    }
-
-    /*
-     * TODO: tests for invalid UTF8
-    char buf[2] = {0x00, 0x00};
-
-    in->set_opcode(websocketpp::frame::opcode::text);
-    in->set_payload("foo");
-
-    env.ec = env.p.prepare_data_frame(in,out);
-    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_payload );
-    */
-}
-
-BOOST_AUTO_TEST_CASE( prepare_data_frame ) {
-    processor_setup env(true);
-
-    message_ptr in = env.msg_manager->get_message();
-    message_ptr out = env.msg_manager->get_message();
-
-    in->set_opcode(websocketpp::frame::opcode::text);
-    in->set_payload("foo");
-
-    env.ec = env.p.prepare_data_frame(in,out);
-
-    unsigned char raw_header[1] = {0x00};
-    unsigned char raw_payload[4] = {0x66,0x6f,0x6f,0xff};
-
-    BOOST_CHECK( !env.ec );
-    BOOST_CHECK_EQUAL( out->get_header(), std::string(reinterpret_cast<char*>(raw_header),1) );
-    BOOST_CHECK_EQUAL( out->get_payload(), std::string(reinterpret_cast<char*>(raw_payload),4) );
-}
-
-
-BOOST_AUTO_TEST_CASE( empty_consume ) {
-    uint8_t frame[2] = {0x00,0x00};
-
-    processor_setup env(true);
-
-    size_t ret = env.p.consume(frame,0,env.ec);
-
-    BOOST_CHECK_EQUAL( ret, 0);
-    BOOST_CHECK( !env.ec );
-    BOOST_CHECK_EQUAL( env.p.ready(), false );
-}
-
-BOOST_AUTO_TEST_CASE( empty_frame ) {
-    uint8_t frame[2] = {0x00, 0xff};
-
-    processor_setup env(true);
-
-    size_t ret = env.p.consume(frame,2,env.ec);
-
-    BOOST_CHECK_EQUAL( ret, 2);
-    BOOST_CHECK( !env.ec );
-    BOOST_CHECK_EQUAL( env.p.ready(), true );
-    BOOST_CHECK_EQUAL( env.p.get_message()->get_payload(), "" );
-    BOOST_CHECK_EQUAL( env.p.ready(), false );
-}
-
-BOOST_AUTO_TEST_CASE( short_frame ) {
-    uint8_t frame[5] = {0x00, 0x66, 0x6f, 0x6f, 0xff};
-
-    processor_setup env(true);
-
-    size_t ret = env.p.consume(frame,5,env.ec);
-
-    BOOST_CHECK_EQUAL( ret, 5);
-    BOOST_CHECK( !env.ec );
-    BOOST_CHECK_EQUAL( env.p.ready(), true );
-    BOOST_CHECK_EQUAL( env.p.get_message()->get_payload(), "foo" );
-    BOOST_CHECK_EQUAL( env.p.ready(), false );
-}
diff --git a/src/sioclient/lib/websocketpp/test/processors/hybi07.cpp b/src/sioclient/lib/websocketpp/test/processors/hybi07.cpp
deleted file mode 100644
index fe2cb07a..00000000
--- a/src/sioclient/lib/websocketpp/test/processors/hybi07.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE hybi_07_processor
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/processors/hybi07.hpp>
-#include <websocketpp/http/request.hpp>
-#include <websocketpp/http/response.hpp>
-#include <websocketpp/message_buffer/message.hpp>
-#include <websocketpp/message_buffer/alloc.hpp>
-#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
-#include <websocketpp/random/none.hpp>
-
-struct stub_config {
-    typedef websocketpp::http::parser::request request_type;
-    typedef websocketpp::http::parser::response response_type;
-
-    typedef websocketpp::message_buffer::message
-        <websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
-        con_msg_manager_type;
-
-    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-
-    static const size_t max_message_size = 16000000;
-
-    /// Extension related config
-    static const bool enable_extensions = false;
-
-    /// Extension specific config
-
-    /// permessage_compress_config
-    struct permessage_deflate_config {
-        typedef stub_config::request_type request_type;
-    };
-
-    typedef websocketpp::extensions::permessage_deflate::disabled
-        <permessage_deflate_config> permessage_deflate_type;
-};
-
-BOOST_AUTO_TEST_CASE( exact_match ) {
-    stub_config::request_type r;
-    stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
-    websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
-    websocketpp::lib::error_code ec;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    ec = p.validate_handshake(r);
-    BOOST_CHECK(!ec);
-
-    websocketpp::uri_ptr u;
-
-    u = p.get_uri(r);
-
-    BOOST_CHECK(u->get_valid());
-    BOOST_CHECK(!u->get_secure());
-    BOOST_CHECK_EQUAL(u->get_host(), "www.example.com");
-    BOOST_CHECK_EQUAL(u->get_resource(), "/");
-    BOOST_CHECK_EQUAL(u->get_port(), websocketpp::uri_default_port);
-
-    p.process_handshake(r,"",response);
-
-    BOOST_CHECK_EQUAL(response.get_header("Connection"), "Upgrade");
-    BOOST_CHECK_EQUAL(response.get_header("Upgrade"), "websocket");
-    BOOST_CHECK_EQUAL(response.get_header("Sec-WebSocket-Accept"), "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
-}
-
-BOOST_AUTO_TEST_CASE( non_get_method ) {
-    stub_config::request_type r;
-    stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
-    websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
-    websocketpp::lib::error_code ec;
-
-    std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: foo\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    ec = p.validate_handshake(r);
-    BOOST_CHECK( ec == websocketpp::processor::error::invalid_http_method );
-}
-
-BOOST_AUTO_TEST_CASE( old_http_version ) {
-    stub_config::request_type r;
-    stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
-    websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
-    websocketpp::lib::error_code ec;
-
-    std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: foo\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    ec = p.validate_handshake(r);
-    BOOST_CHECK( ec == websocketpp::processor::error::invalid_http_version );
-}
-
-BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
-    stub_config::request_type r;
-    stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
-    websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
-    websocketpp::lib::error_code ec;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    ec = p.validate_handshake(r);
-    BOOST_CHECK( ec == websocketpp::processor::error::missing_required_header );
-}
-
-BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
-    stub_config::request_type r;
-    stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
-    websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
-    websocketpp::lib::error_code ec;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    ec = p.validate_handshake(r);
-    BOOST_CHECK( ec == websocketpp::processor::error::missing_required_header );
-}
-
-BOOST_AUTO_TEST_CASE( bad_host ) {
-    stub_config::request_type r;
-    stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
-    websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
-    websocketpp::lib::error_code ec;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: foo\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    ec = p.validate_handshake(r);
-    BOOST_CHECK( !ec );
-
-    BOOST_CHECK( !p.get_uri(r)->get_valid() );
-}
diff --git a/src/sioclient/lib/websocketpp/test/processors/hybi08.cpp b/src/sioclient/lib/websocketpp/test/processors/hybi08.cpp
deleted file mode 100644
index 5b0737fb..00000000
--- a/src/sioclient/lib/websocketpp/test/processors/hybi08.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE hybi_08_processor
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/processors/hybi08.hpp>
-#include <websocketpp/http/request.hpp>
-#include <websocketpp/http/response.hpp>
-#include <websocketpp/message_buffer/message.hpp>
-#include <websocketpp/message_buffer/alloc.hpp>
-#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
-#include <websocketpp/random/none.hpp>
-
-struct stub_config {
-    typedef websocketpp::http::parser::request request_type;
-    typedef websocketpp::http::parser::response response_type;
-
-    typedef websocketpp::message_buffer::message
-        <websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
-        con_msg_manager_type;
-
-    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-
-    static const size_t max_message_size = 16000000;
-
-    /// Extension related config
-    static const bool enable_extensions = false;
-
-    /// Extension specific config
-
-    /// permessage_deflate_config
-    struct permessage_deflate_config {
-        typedef stub_config::request_type request_type;
-    };
-
-    typedef websocketpp::extensions::permessage_deflate::disabled
-        <permessage_deflate_config> permessage_deflate_type;
-};
-
-BOOST_AUTO_TEST_CASE( exact_match ) {
-    stub_config::request_type r;
-    stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
-    websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
-    websocketpp::lib::error_code ec;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    ec = p.validate_handshake(r);
-    BOOST_CHECK(!ec);
-
-    websocketpp::uri_ptr u;
-
-    u = p.get_uri(r);
-
-    BOOST_CHECK(u->get_valid() == true);
-    BOOST_CHECK(u->get_secure() == false);
-    BOOST_CHECK(u->get_host() == "www.example.com");
-    BOOST_CHECK(u->get_resource() == "/");
-    BOOST_CHECK(u->get_port() == websocketpp::uri_default_port);
-
-    p.process_handshake(r,"",response);
-
-    BOOST_CHECK(response.get_header("Connection") == "Upgrade");
-    BOOST_CHECK(response.get_header("Upgrade") == "websocket");
-    BOOST_CHECK(response.get_header("Sec-WebSocket-Accept") == "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
-}
-
-BOOST_AUTO_TEST_CASE( non_get_method ) {
-    stub_config::request_type r;
-    stub_config::response_type response;
-    stub_config::rng_type rng;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
-    websocketpp::lib::error_code ec;
-
-    std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: foo\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    ec = p.validate_handshake(r);
-    BOOST_CHECK( ec == websocketpp::processor::error::invalid_http_method );
-}
-
-BOOST_AUTO_TEST_CASE( old_http_version ) {
-    stub_config::request_type r;
-    stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
-    websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
-    websocketpp::lib::error_code ec;
-
-    std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: foo\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    ec = p.validate_handshake(r);
-    BOOST_CHECK( ec == websocketpp::processor::error::invalid_http_version );
-}
-
-BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
-    stub_config::request_type r;
-    stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
-    websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
-    websocketpp::lib::error_code ec;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    ec = p.validate_handshake(r);
-    BOOST_CHECK( ec == websocketpp::processor::error::missing_required_header );
-}
-
-BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
-    stub_config::request_type r;
-    stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
-    websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
-    websocketpp::lib::error_code ec;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    ec = p.validate_handshake(r);
-    BOOST_CHECK( ec == websocketpp::processor::error::missing_required_header );
-}
-
-BOOST_AUTO_TEST_CASE( bad_host ) {
-    stub_config::request_type r;
-    stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
-    websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
-    websocketpp::uri_ptr u;
-    websocketpp::lib::error_code ec;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: foo\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
-    ec = p.validate_handshake(r);
-    BOOST_CHECK( !ec );
-
-    u = p.get_uri(r);
-
-    BOOST_CHECK( !u->get_valid() );
-}
-
diff --git a/src/sioclient/lib/websocketpp/test/processors/hybi13.cpp b/src/sioclient/lib/websocketpp/test/processors/hybi13.cpp
deleted file mode 100644
index 96d00be7..00000000
--- a/src/sioclient/lib/websocketpp/test/processors/hybi13.cpp
+++ /dev/null
@@ -1,693 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE hybi_13_processor
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/processors/hybi13.hpp>
-
-#include <websocketpp/http/request.hpp>
-#include <websocketpp/http/response.hpp>
-#include <websocketpp/message_buffer/message.hpp>
-#include <websocketpp/message_buffer/alloc.hpp>
-#include <websocketpp/random/none.hpp>
-
-#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
-
-struct stub_config {
-    typedef websocketpp::http::parser::request request_type;
-    typedef websocketpp::http::parser::response response_type;
-
-    typedef websocketpp::message_buffer::message
-        <websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
-        con_msg_manager_type;
-
-    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-
-    struct permessage_deflate_config {
-        typedef stub_config::request_type request_type;
-    };
-
-    typedef websocketpp::extensions::permessage_deflate::disabled
-        <permessage_deflate_config> permessage_deflate_type;
-
-    static const size_t max_message_size = 16000000;
-    static const bool enable_extensions = false;
-};
-
-struct stub_config_ext {
-    typedef websocketpp::http::parser::request request_type;
-    typedef websocketpp::http::parser::response response_type;
-
-    typedef websocketpp::message_buffer::message
-        <websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
-        con_msg_manager_type;
-
-    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-
-    struct permessage_deflate_config {
-        typedef stub_config_ext::request_type request_type;
-    };
-
-    typedef websocketpp::extensions::permessage_deflate::enabled
-        <permessage_deflate_config> permessage_deflate_type;
-
-    static const size_t max_message_size = 16000000;
-    static const bool enable_extensions = true;
-};
-
-typedef stub_config::con_msg_manager_type con_msg_manager_type;
-typedef stub_config::message_type::ptr message_ptr;
-
-// Set up a structure that constructs new copies of all of the support structure
-// for using connection processors
-struct processor_setup {
-    processor_setup(bool server)
-      : msg_manager(new con_msg_manager_type())
-      , p(false,server,msg_manager,rng) {}
-
-    websocketpp::lib::error_code ec;
-    con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
-    stub_config::request_type req;
-    stub_config::response_type res;
-    websocketpp::processor::hybi13<stub_config> p;
-};
-
-struct processor_setup_ext {
-    processor_setup_ext(bool server)
-      : msg_manager(new con_msg_manager_type())
-      , p(false,server,msg_manager,rng) {}
-
-    websocketpp::lib::error_code ec;
-    con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
-    stub_config::request_type req;
-    stub_config::response_type res;
-    websocketpp::processor::hybi13<stub_config_ext> p;
-};
-
-BOOST_AUTO_TEST_CASE( exact_match ) {
-    processor_setup env(true);
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
-
-    env.req.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
-    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
-    BOOST_CHECK(!env.p.validate_handshake(env.req));
-
-    websocketpp::uri_ptr u;
-
-    BOOST_CHECK_NO_THROW( u = env.p.get_uri(env.req) );
-
-    BOOST_CHECK_EQUAL(u->get_secure(), false);
-    BOOST_CHECK_EQUAL(u->get_host(), "www.example.com");
-    BOOST_CHECK_EQUAL(u->get_resource(), "/");
-    BOOST_CHECK_EQUAL(u->get_port(), websocketpp::uri_default_port);
-
-    env.p.process_handshake(env.req,"",env.res);
-
-    BOOST_CHECK_EQUAL(env.res.get_header("Connection"), "Upgrade");
-    BOOST_CHECK_EQUAL(env.res.get_header("Upgrade"), "websocket");
-    BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Accept"), "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
-}
-
-BOOST_AUTO_TEST_CASE( non_get_method ) {
-    processor_setup env(true);
-
-    std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: foo\r\n\r\n";
-
-    env.req.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
-    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
-    BOOST_CHECK( env.p.validate_handshake(env.req) == websocketpp::processor::error::invalid_http_method );
-}
-
-BOOST_AUTO_TEST_CASE( old_http_version ) {
-    processor_setup env(true);
-
-    std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: foo\r\n\r\n";
-
-    env.req.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
-    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
-    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::invalid_http_version );
-}
-
-BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
-    processor_setup env(true);
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\n\r\n";
-
-    env.req.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK( websocketpp::processor::is_websocket_handshake(env.req) );
-    BOOST_CHECK_EQUAL( websocketpp::processor::get_websocket_version(env.req), env.p.get_version() );
-    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
-}
-
-BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
-    processor_setup env(true);
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\n\r\n";
-
-    env.req.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK( websocketpp::processor::is_websocket_handshake(env.req) );
-    BOOST_CHECK_EQUAL( websocketpp::processor::get_websocket_version(env.req), env.p.get_version() );
-    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
-}
-
-BOOST_AUTO_TEST_CASE( bad_host ) {
-    processor_setup env(true);
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: foo\r\n\r\n";
-
-    env.req.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK( websocketpp::processor::is_websocket_handshake(env.req) );
-    BOOST_CHECK_EQUAL( websocketpp::processor::get_websocket_version(env.req), env.p.get_version() );
-    BOOST_CHECK( !env.p.validate_handshake(env.req) );
-    BOOST_CHECK( !env.p.get_uri(env.req)->get_valid() );
-}
-
-// FRAME TESTS TO DO
-//
-// unmasked, 0 length, binary
-// 0x82 0x00
-//
-// masked, 0 length, binary
-// 0x82 0x80
-//
-// unmasked, 0 length, text
-// 0x81 0x00
-//
-// masked, 0 length, text
-// 0x81 0x80
-
-BOOST_AUTO_TEST_CASE( frame_empty_binary_unmasked ) {
-    uint8_t frame[2] = {0x82, 0x00};
-
-    // all in one chunk
-    processor_setup env1(false);
-
-    size_t ret1 = env1.p.consume(frame,2,env1.ec);
-
-    BOOST_CHECK_EQUAL( ret1, 2 );
-    BOOST_CHECK( !env1.ec );
-    BOOST_CHECK_EQUAL( env1.p.ready(), true );
-
-    // two separate chunks
-    processor_setup env2(false);
-
-    BOOST_CHECK_EQUAL( env2.p.consume(frame,1,env2.ec), 1 );
-    BOOST_CHECK( !env2.ec );
-    BOOST_CHECK_EQUAL( env2.p.ready(), false );
-
-    BOOST_CHECK_EQUAL( env2.p.consume(frame+1,1,env2.ec), 1 );
-    BOOST_CHECK( !env2.ec );
-    BOOST_CHECK_EQUAL( env2.p.ready(), true );
-}
-
-BOOST_AUTO_TEST_CASE( frame_small_binary_unmasked ) {
-    processor_setup env(false);
-
-    uint8_t frame[4] = {0x82, 0x02, 0x2A, 0x2A};
-
-    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-    BOOST_CHECK_EQUAL( env.p.consume(frame,4,env.ec), 4 );
-    BOOST_CHECK( !env.ec );
-    BOOST_CHECK_EQUAL( env.p.ready(), true );
-
-    message_ptr foo = env.p.get_message();
-
-    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-    BOOST_CHECK_EQUAL( foo->get_payload(), "**" );
-
-}
-
-BOOST_AUTO_TEST_CASE( frame_extended_binary_unmasked ) {
-    processor_setup env(false);
-
-    uint8_t frame[130] = {0x82, 0x7E, 0x00, 0x7E};
-    frame[0] = 0x82;
-    frame[1] = 0x7E;
-    frame[2] = 0x00;
-    frame[3] = 0x7E;
-    std::fill_n(frame+4,126,0x2A);
-
-    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-    BOOST_CHECK_EQUAL( env.p.consume(frame,130,env.ec), 130 );
-    BOOST_CHECK( !env.ec );
-    BOOST_CHECK_EQUAL( env.p.ready(), true );
-
-    message_ptr foo = env.p.get_message();
-
-    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-    BOOST_CHECK_EQUAL( foo->get_payload().size(), 126 );
-}
-
-BOOST_AUTO_TEST_CASE( frame_jumbo_binary_unmasked ) {
-    processor_setup env(false);
-
-    uint8_t frame[130] = {0x82, 0x7E, 0x00, 0x7E};
-    std::fill_n(frame+4,126,0x2A);
-
-    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-    BOOST_CHECK_EQUAL( env.p.consume(frame,130,env.ec), 130 );
-    BOOST_CHECK( !env.ec );
-    BOOST_CHECK_EQUAL( env.p.ready(), true );
-
-    message_ptr foo = env.p.get_message();
-
-    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-    BOOST_CHECK_EQUAL( foo->get_payload().size(), 126 );
-}
-
-BOOST_AUTO_TEST_CASE( control_frame_too_large ) {
-    processor_setup env(false);
-
-    uint8_t frame[130] = {0x88, 0x7E, 0x00, 0x7E};
-    std::fill_n(frame+4,126,0x2A);
-
-    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-    BOOST_CHECK_GT( env.p.consume(frame,130,env.ec), 0 );
-    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::control_too_big  );
-    BOOST_CHECK_EQUAL( env.p.ready(), false );
-}
-
-BOOST_AUTO_TEST_CASE( rsv_bits_used ) {
-    uint8_t frame[3][2] = {{0x90, 0x00},
-                           {0xA0, 0x00},
-                           {0xC0, 0x00}};
-
-    for (int i = 0; i < 3; i++) {
-        processor_setup env(false);
-
-        BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-        BOOST_CHECK_GT( env.p.consume(frame[i],2,env.ec), 0 );
-        BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_rsv_bit  );
-        BOOST_CHECK_EQUAL( env.p.ready(), false );
-    }
-}
-
-
-BOOST_AUTO_TEST_CASE( reserved_opcode_used ) {
-    uint8_t frame[10][2] = {{0x83, 0x00},
-                            {0x84, 0x00},
-                            {0x85, 0x00},
-                            {0x86, 0x00},
-                            {0x87, 0x00},
-                            {0x8B, 0x00},
-                            {0x8C, 0x00},
-                            {0x8D, 0x00},
-                            {0x8E, 0x00},
-                            {0x8F, 0x00}};
-
-    for (int i = 0; i < 10; i++) {
-        processor_setup env(false);
-
-        BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-        BOOST_CHECK_GT( env.p.consume(frame[i],2,env.ec), 0 );
-        BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_opcode  );
-        BOOST_CHECK_EQUAL( env.p.ready(), false );
-    }
-}
-
-BOOST_AUTO_TEST_CASE( fragmented_control_message ) {
-    processor_setup env(false);
-
-    uint8_t frame[2] = {0x08, 0x00};
-
-    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-    BOOST_CHECK_GT( env.p.consume(frame,2,env.ec), 0 );
-    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::fragmented_control );
-    BOOST_CHECK_EQUAL( env.p.ready(), false );
-}
-
-BOOST_AUTO_TEST_CASE( fragmented_binary_message ) {
-    processor_setup env0(false);
-    processor_setup env1(false);
-
-    uint8_t frame0[6] = {0x02, 0x01, 0x2A, 0x80, 0x01, 0x2A};
-    uint8_t frame1[8] = {0x02, 0x01, 0x2A, 0x89, 0x00, 0x80, 0x01, 0x2A};
-
-    // read fragmented message in one chunk
-    BOOST_CHECK_EQUAL( env0.p.get_message(), message_ptr() );
-    BOOST_CHECK_EQUAL( env0.p.consume(frame0,6,env0.ec), 6 );
-    BOOST_CHECK( !env0.ec );
-    BOOST_CHECK_EQUAL( env0.p.ready(), true );
-    BOOST_CHECK_EQUAL( env0.p.get_message()->get_payload(), "**" );
-
-    // read fragmented message in two chunks
-    BOOST_CHECK_EQUAL( env0.p.get_message(), message_ptr() );
-    BOOST_CHECK_EQUAL( env0.p.consume(frame0,3,env0.ec), 3 );
-    BOOST_CHECK( !env0.ec );
-    BOOST_CHECK_EQUAL( env0.p.ready(), false );
-    BOOST_CHECK_EQUAL( env0.p.consume(frame0+3,3,env0.ec), 3 );
-    BOOST_CHECK( !env0.ec );
-    BOOST_CHECK_EQUAL( env0.p.ready(), true );
-    BOOST_CHECK_EQUAL( env0.p.get_message()->get_payload(), "**" );
-
-    // read fragmented message with control message in between
-    BOOST_CHECK_EQUAL( env0.p.get_message(), message_ptr() );
-    BOOST_CHECK_EQUAL( env0.p.consume(frame1,8,env0.ec), 5 );
-    BOOST_CHECK( !env0.ec );
-    BOOST_CHECK_EQUAL( env0.p.ready(), true );
-    BOOST_CHECK_EQUAL( env0.p.get_message()->get_opcode(), websocketpp::frame::opcode::PING);
-    BOOST_CHECK_EQUAL( env0.p.consume(frame1+5,3,env0.ec), 3 );
-    BOOST_CHECK( !env0.ec );
-    BOOST_CHECK_EQUAL( env0.p.ready(), true );
-    BOOST_CHECK_EQUAL( env0.p.get_message()->get_payload(), "**" );
-
-    // read lone continuation frame
-    BOOST_CHECK_EQUAL( env0.p.get_message(), message_ptr() );
-    BOOST_CHECK_GT( env0.p.consume(frame0+3,3,env0.ec), 0);
-    BOOST_CHECK_EQUAL( env0.ec, websocketpp::processor::error::invalid_continuation );
-
-    // read two start frames in a row
-    BOOST_CHECK_EQUAL( env1.p.get_message(), message_ptr() );
-    BOOST_CHECK_EQUAL( env1.p.consume(frame0,3,env1.ec), 3);
-    BOOST_CHECK( !env1.ec );
-    BOOST_CHECK_GT( env1.p.consume(frame0,3,env1.ec), 0);
-    BOOST_CHECK_EQUAL( env1.ec, websocketpp::processor::error::invalid_continuation );
-}
-
-BOOST_AUTO_TEST_CASE( unmasked_client_frame ) {
-    processor_setup env(true);
-
-    uint8_t frame[2] = {0x82, 0x00};
-
-    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-    BOOST_CHECK_GT( env.p.consume(frame,2,env.ec), 0 );
-    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::masking_required );
-    BOOST_CHECK_EQUAL( env.p.ready(), false );
-}
-
-BOOST_AUTO_TEST_CASE( masked_server_frame ) {
-    processor_setup env(false);
-
-    uint8_t frame[8] = {0x82, 0x82, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0xD5};
-
-    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-    BOOST_CHECK_GT( env.p.consume(frame,8,env.ec), 0 );
-    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::masking_forbidden );
-    BOOST_CHECK_EQUAL( env.p.ready(), false );
-}
-
-BOOST_AUTO_TEST_CASE( frame_small_binary_masked ) {
-    processor_setup env(true);
-
-    uint8_t frame[8] = {0x82, 0x82, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0xD5};
-
-    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-    BOOST_CHECK_EQUAL( env.p.consume(frame,8,env.ec), 8 );
-    BOOST_CHECK( !env.ec );
-    BOOST_CHECK_EQUAL( env.p.ready(), true );
-    BOOST_CHECK_EQUAL( env.p.get_message()->get_payload(), "**" );
-}
-
-BOOST_AUTO_TEST_CASE( masked_fragmented_binary_message ) {
-    processor_setup env(true);
-
-    uint8_t frame0[14] = {0x02, 0x81, 0xAB, 0x23, 0x98, 0x45, 0x81,
-                         0x80, 0x81, 0xB8, 0x34, 0x12, 0xFF, 0x92};
-
-    // read fragmented message in one chunk
-    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-    BOOST_CHECK_EQUAL( env.p.consume(frame0,14,env.ec), 14 );
-    BOOST_CHECK( !env.ec );
-    BOOST_CHECK_EQUAL( env.p.ready(), true );
-    BOOST_CHECK_EQUAL( env.p.get_message()->get_payload(), "**" );
-}
-
-BOOST_AUTO_TEST_CASE( prepare_data_frame ) {
-    processor_setup env(true);
-
-    message_ptr in = env.msg_manager->get_message();
-    message_ptr out = env.msg_manager->get_message();
-    message_ptr invalid;
-
-    // empty pointers arguements should return sane error
-    BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,invalid), websocketpp::processor::error::invalid_arguments );
-
-    BOOST_CHECK_EQUAL( env.p.prepare_data_frame(in,invalid), websocketpp::processor::error::invalid_arguments );
-
-    BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,out), websocketpp::processor::error::invalid_arguments );
-
-    // test valid opcodes
-    // control opcodes should return an error, data ones shouldn't
-    for (int i = 0; i < 0xF; i++) {
-        in->set_opcode(websocketpp::frame::opcode::value(i));
-
-        env.ec = env.p.prepare_data_frame(in,out);
-
-        if (websocketpp::frame::opcode::is_control(in->get_opcode())) {
-            BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_opcode );
-        } else {
-            BOOST_CHECK_NE( env.ec, websocketpp::processor::error::invalid_opcode );
-        }
-    }
-
-
-    //in.set_payload("foo");
-
-    //e = prepare_data_frame(in,out);
-
-
-}
-
-BOOST_AUTO_TEST_CASE( single_frame_message_too_large ) {
-    processor_setup env(true);
-    
-    env.p.set_max_message_size(3);
-    
-    uint8_t frame0[10] = {0x82, 0x84, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01};
-
-    // read message that is one byte too large
-    BOOST_CHECK_EQUAL( env.p.consume(frame0,10,env.ec), 6 );
-    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::message_too_big );
-}
-
-BOOST_AUTO_TEST_CASE( multiple_frame_message_too_large ) {
-    processor_setup env(true);
-    
-    env.p.set_max_message_size(4);
-    
-    uint8_t frame0[8] = {0x02, 0x82, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01};
-    uint8_t frame1[9] = {0x80, 0x83, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01};
-
-    // read first message frame with size under the limit
-    BOOST_CHECK_EQUAL( env.p.consume(frame0,8,env.ec), 8 );
-    BOOST_CHECK( !env.ec );
-    
-    // read second message frame that puts the size over the limit
-    BOOST_CHECK_EQUAL( env.p.consume(frame1,9,env.ec), 6 );
-    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::message_too_big );
-}
-
-
-
-BOOST_AUTO_TEST_CASE( client_handshake_request ) {
-    processor_setup env(false);
-
-    websocketpp::uri_ptr u(new websocketpp::uri("ws://localhost/"));
-
-    env.p.client_handshake_request(env.req,u, std::vector<std::string>());
-
-    BOOST_CHECK_EQUAL( env.req.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( env.req.get_version(), "HTTP/1.1");
-    BOOST_CHECK_EQUAL( env.req.get_uri(), "/");
-
-    BOOST_CHECK_EQUAL( env.req.get_header("Host"), "localhost");
-    BOOST_CHECK_EQUAL( env.req.get_header("Sec-WebSocket-Version"), "13");
-    BOOST_CHECK_EQUAL( env.req.get_header("Connection"), "Upgrade");
-    BOOST_CHECK_EQUAL( env.req.get_header("Upgrade"), "websocket");
-}
-
-// TODO:
-// test cases
-// - adding headers
-// - adding Upgrade header
-// - adding Connection header
-// - adding Sec-WebSocket-Version, Sec-WebSocket-Key, or Host header
-// - other Sec* headers?
-// - User Agent header?
-
-// Origin support
-// Subprotocol requests
-
-//websocketpp::uri_ptr u(new websocketpp::uri("ws://localhost/"));
-    //env.p.client_handshake_request(env.req,u);
-
-BOOST_AUTO_TEST_CASE( client_handshake_response_404 ) {
-    processor_setup env(false);
-
-    std::string res = "HTTP/1.1 404 Not Found\r\n\r\n";
-    env.res.consume(res.data(),res.size());
-
-    BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::invalid_http_status );
-}
-
-BOOST_AUTO_TEST_CASE( client_handshake_response_no_upgrade ) {
-    processor_setup env(false);
-
-    std::string res = "HTTP/1.1 101 Switching Protocols\r\n\r\n";
-    env.res.consume(res.data(),res.size());
-
-    BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::missing_required_header );
-}
-
-BOOST_AUTO_TEST_CASE( client_handshake_response_no_connection ) {
-    processor_setup env(false);
-
-    std::string res = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: foo, wEbsOckEt\r\n\r\n";
-    env.res.consume(res.data(),res.size());
-
-    BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::missing_required_header );
-}
-
-BOOST_AUTO_TEST_CASE( client_handshake_response_no_accept ) {
-    processor_setup env(false);
-
-    std::string res = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: foo, wEbsOckEt\r\nConnection: bar, UpGrAdE\r\n\r\n";
-    env.res.consume(res.data(),res.size());
-
-    BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::missing_required_header );
-}
-
-BOOST_AUTO_TEST_CASE( client_handshake_response ) {
-    processor_setup env(false);
-
-    env.req.append_header("Sec-WebSocket-Key", "dGhlIHNhbXBsZSBub25jZQ==");
-
-    std::string res = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: foo, wEbsOckEt\r\nConnection: bar, UpGrAdE\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n\r\n";
-    env.res.consume(res.data(),res.size());
-
-    BOOST_CHECK( !env.p.validate_server_handshake_response(env.req,env.res) );
-}
-
-BOOST_AUTO_TEST_CASE( extensions_disabled ) {
-    processor_setup env(true);
-
-    env.req.replace_header("Sec-WebSocket-Extensions","");
-
-    std::pair<websocketpp::lib::error_code,std::string> neg_results;
-    neg_results = env.p.negotiate_extensions(env.req);
-
-    BOOST_CHECK_EQUAL( neg_results.first, websocketpp::processor::error::extensions_disabled );
-    BOOST_CHECK_EQUAL( neg_results.second, "" );
-}
-
-BOOST_AUTO_TEST_CASE( extension_negotiation_blank ) {
-    processor_setup_ext env(true);
-
-    env.req.replace_header("Sec-WebSocket-Extensions","");
-
-    std::pair<websocketpp::lib::error_code,std::string> neg_results;
-    neg_results = env.p.negotiate_extensions(env.req);
-
-    BOOST_CHECK( !neg_results.first );
-    BOOST_CHECK_EQUAL( neg_results.second, "" );
-}
-
-BOOST_AUTO_TEST_CASE( extension_negotiation_unknown ) {
-    processor_setup_ext env(true);
-
-    env.req.replace_header("Sec-WebSocket-Extensions","foo");
-
-    std::pair<websocketpp::lib::error_code,std::string> neg_results;
-    neg_results = env.p.negotiate_extensions(env.req);
-
-    BOOST_CHECK( !neg_results.first );
-    BOOST_CHECK_EQUAL( neg_results.second, "" );
-}
-
-BOOST_AUTO_TEST_CASE( extract_subprotocols_empty ) {
-    processor_setup env(true);
-    std::vector<std::string> subps;
-
-    BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
-    BOOST_CHECK_EQUAL( subps.size(), 0 );
-}
-
-BOOST_AUTO_TEST_CASE( extract_subprotocols_one ) {
-    processor_setup env(true);
-    std::vector<std::string> subps;
-
-    env.req.replace_header("Sec-WebSocket-Protocol","foo");
-
-    BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
-    BOOST_REQUIRE_EQUAL( subps.size(), 1 );
-    BOOST_CHECK_EQUAL( subps[0], "foo" );
-}
-
-BOOST_AUTO_TEST_CASE( extract_subprotocols_multiple ) {
-    processor_setup env(true);
-    std::vector<std::string> subps;
-
-    env.req.replace_header("Sec-WebSocket-Protocol","foo,bar");
-
-    BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
-    BOOST_REQUIRE_EQUAL( subps.size(), 2 );
-    BOOST_CHECK_EQUAL( subps[0], "foo" );
-    BOOST_CHECK_EQUAL( subps[1], "bar" );
-}
-
-BOOST_AUTO_TEST_CASE( extract_subprotocols_invalid) {
-    processor_setup env(true);
-    std::vector<std::string> subps;
-
-    env.req.replace_header("Sec-WebSocket-Protocol","foo,bar,,,,");
-
-    BOOST_CHECK_EQUAL( env.p.extract_subprotocols(env.req,subps), websocketpp::processor::error::make_error_code(websocketpp::processor::error::subprotocol_parse_error) );
-    BOOST_CHECK_EQUAL( subps.size(), 0 );
-}
-
-BOOST_AUTO_TEST_CASE( extension_negotiation_permessage_deflate ) {
-    processor_setup_ext env(true);
-
-    env.req.replace_header("Sec-WebSocket-Extensions",
-        "permessage-deflate; client_max_window_bits");
-
-    std::pair<websocketpp::lib::error_code,std::string> neg_results;
-    neg_results = env.p.negotiate_extensions(env.req);
-
-    BOOST_CHECK( !neg_results.first );
-    BOOST_CHECK_EQUAL( neg_results.second, "permessage-deflate" );
-}
-
diff --git a/src/sioclient/lib/websocketpp/test/processors/processor.cpp b/src/sioclient/lib/websocketpp/test/processors/processor.cpp
deleted file mode 100644
index 2c4e7061..00000000
--- a/src/sioclient/lib/websocketpp/test/processors/processor.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE processors
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/processors/processor.hpp>
-#include <websocketpp/http/request.hpp>
-
-BOOST_AUTO_TEST_CASE( exact_match ) {
-    websocketpp::http::parser::request r;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-}
-
-BOOST_AUTO_TEST_CASE( non_match ) {
-    websocketpp::http::parser::request r;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(!websocketpp::processor::is_websocket_handshake(r));
-}
-
-BOOST_AUTO_TEST_CASE( ci_exact_match ) {
-    websocketpp::http::parser::request r;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: UpGrAde\r\nUpgrade: WebSocket\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-}
-
-BOOST_AUTO_TEST_CASE( non_exact_match1 ) {
-    websocketpp::http::parser::request r;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade,foo\r\nUpgrade: websocket,foo\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-}
-
-BOOST_AUTO_TEST_CASE( non_exact_match2 ) {
-    websocketpp::http::parser::request r;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: keep-alive,Upgrade,foo\r\nUpgrade: foo,websocket,bar\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
-}
-
-BOOST_AUTO_TEST_CASE( version_blank ) {
-    websocketpp::http::parser::request r;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 0);
-}
-
-BOOST_AUTO_TEST_CASE( version_7 ) {
-    websocketpp::http::parser::request r;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 7);
-}
-
-BOOST_AUTO_TEST_CASE( version_8 ) {
-    websocketpp::http::parser::request r;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 8);
-}
-
-BOOST_AUTO_TEST_CASE( version_13 ) {
-    websocketpp::http::parser::request r;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 13);
-}
-
-BOOST_AUTO_TEST_CASE( version_non_numeric ) {
-    websocketpp::http::parser::request r;
-
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: abc\r\n\r\n";
-
-    r.consume(handshake.c_str(),handshake.size());
-
-    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == -1);
-}
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/test/random/CMakeLists.txt b/src/sioclient/lib/websocketpp/test/random/CMakeLists.txt
deleted file mode 100644
index 1fd459d5..00000000
--- a/src/sioclient/lib/websocketpp/test/random/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# Test RNG policy none
-file (GLOB SOURCE none.cpp)
-
-init_target (test_random_none)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test RNG policy random_device
-file (GLOB SOURCE random_device.cpp)
-
-init_target (test_random_random_device)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/src/sioclient/lib/websocketpp/test/random/SConscript b/src/sioclient/lib/websocketpp/test/random/SConscript
deleted file mode 100644
index 3cadc9e9..00000000
--- a/src/sioclient/lib/websocketpp/test/random/SConscript
+++ /dev/null
@@ -1,27 +0,0 @@
-## random number generation unit tests
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-BOOST_LIBS = boostlibs(['unit_test_framework','random','system'],env) + [platform_libs]
-
-objs = env.Object('random_none_boost.o', ["none.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('random_device_boost.o', ["random_device.cpp"], LIBS = BOOST_LIBS)
-prgs = env.Program('test_random_none_boost', ["random_none_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_random_device_boost', ["random_device_boost.o"], LIBS = BOOST_LIBS)
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   objs += env_cpp11.Object('random_none_stl.o', ["none.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('random_device_stl.o', ["random_device.cpp"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_random_none_stl', ["random_none_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_random_device_stl', ["random_device_stl.o"], LIBS = BOOST_LIBS_CPP11)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/test/random/none.cpp b/src/sioclient/lib/websocketpp/test/random/none.cpp
deleted file mode 100644
index b27b2392..00000000
--- a/src/sioclient/lib/websocketpp/test/random/none.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE random_none
-#include <boost/test/unit_test.hpp>
-
-#include <websocketpp/common/stdint.hpp>
-#include <websocketpp/random/none.hpp>
-
-BOOST_AUTO_TEST_CASE( does_it_compile ) {
-    websocketpp::random::none::int_generator<int32_t> rng;
-
-    int32_t foo = rng();
-
-    BOOST_CHECK( foo == 0 );
-}
diff --git a/src/sioclient/lib/websocketpp/test/random/random_device.cpp b/src/sioclient/lib/websocketpp/test/random/random_device.cpp
deleted file mode 100644
index b3ce3a5d..00000000
--- a/src/sioclient/lib/websocketpp/test/random/random_device.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE random_device
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-
-#include <websocketpp/common/stdint.hpp>
-#include <websocketpp/random/random_device.hpp>
-#include <websocketpp/concurrency/none.hpp>
-
-BOOST_AUTO_TEST_CASE( compiles ) {
-    websocketpp::random::random_device::int_generator<int32_t,websocketpp::concurrency::none> rng;
-
-    bool e = false;
-
-    try {
-        int32_t foo = rng();
-        std::cout << foo << std::endl;
-    } catch (...) {
-        e = true;
-    }
-
-    BOOST_CHECK( e == false );
-}
diff --git a/src/sioclient/lib/websocketpp/test/roles/CMakeLists.txt b/src/sioclient/lib/websocketpp/test/roles/CMakeLists.txt
deleted file mode 100644
index 5d411370..00000000
--- a/src/sioclient/lib/websocketpp/test/roles/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# Test client role
-file (GLOB SOURCE client.cpp)
-
-init_target (test_roles_client)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test server role
-file (GLOB SOURCE server.cpp)
-
-init_target (test_roles_server)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/src/sioclient/lib/websocketpp/test/roles/SConscript b/src/sioclient/lib/websocketpp/test/roles/SConscript
deleted file mode 100644
index e86107ec..00000000
--- a/src/sioclient/lib/websocketpp/test/roles/SConscript
+++ /dev/null
@@ -1,27 +0,0 @@
-## role unit tests
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-BOOST_LIBS = boostlibs(['unit_test_framework','system','random'],env) + [platform_libs]
-
-objs = env.Object('client_boost.o', ["client.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('server_boost.o', ["server.cpp"], LIBS = BOOST_LIBS)
-prgs = env.Program('test_client_boost', ["client_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_server_boost', ["server_boost.o"], LIBS = BOOST_LIBS)
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   objs += env_cpp11.Object('client_stl.o', ["client.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('server_stl.o', ["server.cpp"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_client_stl', ["client_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_server_stl', ["server_stl.o"], LIBS = BOOST_LIBS_CPP11)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/test/roles/client.cpp b/src/sioclient/lib/websocketpp/test/roles/client.cpp
deleted file mode 100644
index 9aab3eeb..00000000
--- a/src/sioclient/lib/websocketpp/test/roles/client.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE client
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-
-#include <websocketpp/random/random_device.hpp>
-
-#include <websocketpp/config/core.hpp>
-#include <websocketpp/client.hpp>
-
-#include <websocketpp/http/request.hpp>
-
-struct stub_config : public websocketpp::config::core {
-    typedef core::concurrency_type concurrency_type;
-
-    typedef core::request_type request_type;
-    typedef core::response_type response_type;
-
-    typedef core::message_type message_type;
-    typedef core::con_msg_manager_type con_msg_manager_type;
-    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef core::alog_type alog_type;
-    typedef core::elog_type elog_type;
-
-    //typedef core::rng_type rng_type;
-    typedef websocketpp::random::random_device::int_generator<uint32_t,concurrency_type> rng_type;
-
-    typedef core::transport_type transport_type;
-
-    typedef core::endpoint_base endpoint_base;
-
-    static const websocketpp::log::level elog_level = websocketpp::log::elevel::none;
-    static const websocketpp::log::level alog_level = websocketpp::log::alevel::none;
-};
-
-typedef websocketpp::client<stub_config> client;
-typedef client::connection_ptr connection_ptr;
-
-BOOST_AUTO_TEST_CASE( invalid_uri ) {
-    client c;
-    websocketpp::lib::error_code ec;
-
-    connection_ptr con = c.get_connection("foo", ec);
-
-    BOOST_CHECK_EQUAL( ec , websocketpp::error::make_error_code(websocketpp::error::invalid_uri) );
-}
-
-BOOST_AUTO_TEST_CASE( unsecure_endpoint ) {
-    client c;
-    websocketpp::lib::error_code ec;
-
-    connection_ptr con = c.get_connection("wss://localhost/", ec);
-
-    BOOST_CHECK_EQUAL( ec , websocketpp::error::make_error_code(websocketpp::error::endpoint_not_secure) );
-}
-
-BOOST_AUTO_TEST_CASE( get_connection ) {
-    client c;
-    websocketpp::lib::error_code ec;
-
-    connection_ptr con = c.get_connection("ws://localhost/", ec);
-
-    BOOST_CHECK( con );
-    BOOST_CHECK_EQUAL( con->get_host() , "localhost" );
-    BOOST_CHECK_EQUAL( con->get_port() , 80 );
-    BOOST_CHECK_EQUAL( con->get_secure() , false );
-    BOOST_CHECK_EQUAL( con->get_resource() , "/" );
-}
-
-BOOST_AUTO_TEST_CASE( connect_con ) {
-    client c;
-    websocketpp::lib::error_code ec;
-    std::stringstream out;
-    std::string o;
-
-    c.register_ostream(&out);
-
-    connection_ptr con = c.get_connection("ws://localhost/", ec);
-    c.connect(con);
-
-    o = out.str();
-    websocketpp::http::parser::request r;
-    r.consume(o.data(),o.size());
-
-    BOOST_CHECK( r.ready() );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET");
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1");
-    BOOST_CHECK_EQUAL( r.get_uri(), "/");
-
-    BOOST_CHECK_EQUAL( r.get_header("Host"), "localhost");
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Version"), "13");
-    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade");
-    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket");
-
-    // Key is randomly generated & User-Agent will change so just check that
-    // they are not empty.
-    BOOST_CHECK_NE( r.get_header("Sec-WebSocket-Key"), "");
-    BOOST_CHECK_NE( r.get_header("User-Agent"), "" );
-
-    // connection should have written out an opening handshake request and be in
-    // the read response internal state
-
-    // TODO: more tests related to reading the HTTP response
-    std::stringstream channel2;
-    channel2 << "e\r\n\r\n";
-    channel2 >> *con;
-}
-
-BOOST_AUTO_TEST_CASE( select_subprotocol ) {
-    client c;
-    websocketpp::lib::error_code ec;
-    using websocketpp::error::make_error_code;
-
-    connection_ptr con = c.get_connection("ws://localhost/", ec);
-
-    BOOST_CHECK( con );
-
-    con->select_subprotocol("foo",ec);
-    BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::server_only) );
-    BOOST_CHECK_THROW( con->select_subprotocol("foo") , websocketpp::exception );
-}
-
-BOOST_AUTO_TEST_CASE( add_subprotocols_invalid ) {
-    client c;
-    websocketpp::lib::error_code ec;
-    using websocketpp::error::make_error_code;
-
-    connection_ptr con = c.get_connection("ws://localhost/", ec);
-    BOOST_CHECK( con );
-
-    con->add_subprotocol("",ec);
-    BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::invalid_subprotocol) );
-    BOOST_CHECK_THROW( con->add_subprotocol("") , websocketpp::exception );
-
-    con->add_subprotocol("foo,bar",ec);
-    BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::invalid_subprotocol) );
-    BOOST_CHECK_THROW( con->add_subprotocol("foo,bar") , websocketpp::exception );
-}
-
-BOOST_AUTO_TEST_CASE( add_subprotocols ) {
-    client c;
-    websocketpp::lib::error_code ec;
-    std::stringstream out;
-    std::string o;
-
-    c.register_ostream(&out);
-
-    connection_ptr con = c.get_connection("ws://localhost/", ec);
-    BOOST_CHECK( con );
-
-    con->add_subprotocol("foo",ec);
-    BOOST_CHECK( !ec );
-
-    BOOST_CHECK_NO_THROW( con->add_subprotocol("bar") );
-
-    c.connect(con);
-
-    o = out.str();
-    websocketpp::http::parser::request r;
-    r.consume(o.data(),o.size());
-
-    BOOST_CHECK( r.ready() );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "foo, bar");
-}
-
-
diff --git a/src/sioclient/lib/websocketpp/test/roles/server.cpp b/src/sioclient/lib/websocketpp/test/roles/server.cpp
deleted file mode 100644
index 5f3d4360..00000000
--- a/src/sioclient/lib/websocketpp/test/roles/server.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE server
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-
-// Test Environment:
-// server, no TLS, no locks, iostream based transport
-#include <websocketpp/config/core.hpp>
-#include <websocketpp/server.hpp>
-
-typedef websocketpp::server<websocketpp::config::core> server;
-typedef websocketpp::config::core::message_type::ptr message_ptr;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-/*struct stub_config : public websocketpp::config::core {
-    typedef core::concurrency_type concurrency_type;
-
-    typedef core::request_type request_type;
-    typedef core::response_type response_type;
-
-    typedef core::message_type message_type;
-    typedef core::con_msg_manager_type con_msg_manager_type;
-    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef core::alog_type alog_type;
-    typedef core::elog_type elog_type;
-
-    typedef core::rng_type rng_type;
-
-    typedef core::transport_type transport_type;
-
-    typedef core::endpoint_base endpoint_base;
-};*/
-
-/* Run server and return output test rig */
-std::string run_server_test(server& s, std::string input) {
-    server::connection_ptr con;
-    std::stringstream output;
-
-    s.register_ostream(&output);
-    s.clear_access_channels(websocketpp::log::alevel::all);
-    s.clear_error_channels(websocketpp::log::elevel::all);
-
-    con = s.get_connection();
-    con->start();
-
-    std::stringstream channel;
-
-    channel << input;
-    channel >> *con;
-
-    return output.str();
-}
-
-/* handler library*/
-void echo_func(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    s->send(hdl, msg->get_payload(), msg->get_opcode());
-}
-
-bool validate_func_subprotocol(server* s, std::string* out, std::string accept,
-    websocketpp::connection_hdl hdl)
-{
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-
-    std::stringstream o;
-
-    const std::vector<std::string> & protocols = con->get_requested_subprotocols();
-    std::vector<std::string>::const_iterator it;
-
-    for (it = protocols.begin(); it != protocols.end(); ++it) {
-        o << *it << ",";
-    }
-
-    *out = o.str();
-
-    if (!accept.empty()) {
-        con->select_subprotocol(accept);
-    }
-
-    return true;
-}
-
-void open_func_subprotocol(server* s, std::string* out, websocketpp::connection_hdl hdl) {
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-
-    *out = con->get_subprotocol();
-}
-
-/* Tests */
-BOOST_AUTO_TEST_CASE( basic_websocket_request ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-
-    server s;
-    s.set_user_agent("test");
-
-    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
-}
-
-BOOST_AUTO_TEST_CASE( invalid_websocket_version ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: a\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-    std::string output = "HTTP/1.1 400 Bad Request\r\nServer: test\r\n\r\n";
-
-    server s;
-    s.set_user_agent("test");
-    //s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
-
-    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
-}
-
-BOOST_AUTO_TEST_CASE( unimplemented_websocket_version ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 14\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-
-    std::string output = "HTTP/1.1 400 Bad Request\r\nSec-WebSocket-Version: 0,7,8,13\r\nServer: test\r\n\r\n";
-
-    server s;
-    s.set_user_agent("test");
-
-    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
-}
-
-BOOST_AUTO_TEST_CASE( list_subprotocol_empty ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
-
-    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-
-    std::string subprotocol;
-
-    server s;
-    s.set_user_agent("test");
-    s.set_open_handler(bind(&open_func_subprotocol,&s,&subprotocol,::_1));
-
-    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
-    BOOST_CHECK_EQUAL(subprotocol, "");
-}
-
-BOOST_AUTO_TEST_CASE( list_subprotocol_one ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
-
-    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-
-    std::string validate;
-    std::string open;
-
-    server s;
-    s.set_user_agent("test");
-    s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"",::_1));
-    s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
-
-    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
-    BOOST_CHECK_EQUAL(validate, "foo,");
-    BOOST_CHECK_EQUAL(open, "");
-}
-
-BOOST_AUTO_TEST_CASE( accept_subprotocol_one ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
-
-    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nSec-WebSocket-Protocol: foo\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-
-    std::string validate;
-    std::string open;
-
-    server s;
-    s.set_user_agent("test");
-    s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"foo",::_1));
-    s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
-
-    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
-    BOOST_CHECK_EQUAL(validate, "foo,");
-    BOOST_CHECK_EQUAL(open, "foo");
-}
-
-BOOST_AUTO_TEST_CASE( accept_subprotocol_invalid ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
-
-    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nSec-WebSocket-Protocol: foo\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-
-    std::string validate;
-    std::string open;
-
-    server s;
-    s.set_user_agent("test");
-    s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"foo2",::_1));
-    s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
-
-    std::string o;
-
-    BOOST_CHECK_THROW(o = run_server_test(s,input), websocketpp::exception);
-}
-
-BOOST_AUTO_TEST_CASE( accept_subprotocol_two ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo, bar\r\n\r\n";
-
-    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nSec-WebSocket-Protocol: bar\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-
-    std::string validate;
-    std::string open;
-
-    server s;
-    s.set_user_agent("test");
-    s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"bar",::_1));
-    s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
-
-    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
-    BOOST_CHECK_EQUAL(validate, "foo,bar,");
-    BOOST_CHECK_EQUAL(open, "bar");
-}
-
-/*BOOST_AUTO_TEST_CASE( user_reject_origin ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example2.com\r\n\r\n";
-    std::string output = "HTTP/1.1 403 Forbidden\r\nServer: test\r\n\r\n";
-
-    server s;
-    s.set_user_agent("test");
-
-    BOOST_CHECK(run_server_test(s,input) == output);
-}*/
diff --git a/src/sioclient/lib/websocketpp/test/transport/CMakeLists.txt b/src/sioclient/lib/websocketpp/test/transport/CMakeLists.txt
deleted file mode 100644
index 6b44d98f..00000000
--- a/src/sioclient/lib/websocketpp/test/transport/CMakeLists.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-if (OPENSSL_FOUND)
-
-# Test transport integration
-file (GLOB SOURCE integration.cpp)
-
-init_target (test_transport)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_openssl()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test transport asio timers
-file (GLOB SOURCE asio/timers.cpp)
-
-init_target (test_transport_asio_timers)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_openssl()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test transport asio security
-file (GLOB SOURCE asio/security.cpp)
-
-init_target (test_transport_asio_security)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_openssl()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-endif()
-
-# Test transport iostream base
-file (GLOB SOURCE iostream/base.cpp)
-
-init_target (test_transport_iostream_base)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test transport iostream endpoint
-file (GLOB SOURCE iostream/endpoint.cpp)
-
-init_target (test_transport_iostream_endpoint)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test transport iostream connection
-file (GLOB SOURCE iostream/connection.cpp)
-
-init_target (test_transport_iostream_connection)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test transport asio base
-file (GLOB SOURCE asio/base.cpp)
-
-init_target (test_transport_asio_base)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-
diff --git a/src/sioclient/lib/websocketpp/test/transport/SConscript b/src/sioclient/lib/websocketpp/test/transport/SConscript
deleted file mode 100644
index 71b31b6c..00000000
--- a/src/sioclient/lib/websocketpp/test/transport/SConscript
+++ /dev/null
@@ -1,24 +0,0 @@
-## transport integration tests
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-Import('tls_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','random','chrono'],env) + [platform_libs] + [tls_libs]
-
-objs = env.Object('boost_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS)
-prgs = env.Program('test_boost_integration', ["boost_integration.o"], LIBS = BOOST_LIBS)
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   objs += env_cpp11.Object('stl_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_stl_integration', ["stl_integration.o"], LIBS = BOOST_LIBS_CPP11)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/test/transport/asio/SConscript b/src/sioclient/lib/websocketpp/test/transport/asio/SConscript
deleted file mode 100644
index f8185e57..00000000
--- a/src/sioclient/lib/websocketpp/test/transport/asio/SConscript
+++ /dev/null
@@ -1,32 +0,0 @@
-## asio transport unit tests
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-Import('tls_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','chrono'],env) + [platform_libs] + [tls_libs]
-
-objs = env.Object('base_boost.o', ["base.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('timers_boost.o', ["timers.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('security_boost.o', ["security.cpp"], LIBS = BOOST_LIBS)
-prgs = env.Program('test_base_boost', ["base_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_timers_boost', ["timers_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_security_boost', ["security_boost.o"], LIBS = BOOST_LIBS)
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   objs += env_cpp11.Object('base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('timers_stl.o', ["timers.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('security_stl.o', ["security.cpp"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_base_stl', ["base_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_timers_stl', ["timers_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_security_stl', ["security_stl.o"], LIBS = BOOST_LIBS_CPP11)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/test/transport/asio/base.cpp b/src/sioclient/lib/websocketpp/test/transport/asio/base.cpp
deleted file mode 100644
index e9f96ae3..00000000
--- a/src/sioclient/lib/websocketpp/test/transport/asio/base.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE transport_asio_base
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-
-#include <websocketpp/transport/asio/base.hpp>
-
-BOOST_AUTO_TEST_CASE( blank_error ) {
-    websocketpp::lib::error_code ec;
-
-    BOOST_CHECK( !ec );
-}
-
-BOOST_AUTO_TEST_CASE( asio_error ) {
-    using websocketpp::transport::asio::error::make_error_code;
-    using websocketpp::transport::asio::error::general;
-
-    websocketpp::lib::error_code ec = make_error_code(general);
-
-    BOOST_CHECK( ec == general );
-    BOOST_CHECK( ec.value() == 1 );
-}
diff --git a/src/sioclient/lib/websocketpp/test/transport/asio/security.cpp b/src/sioclient/lib/websocketpp/test/transport/asio/security.cpp
deleted file mode 100644
index a75e2a88..00000000
--- a/src/sioclient/lib/websocketpp/test/transport/asio/security.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE transport_asio_base
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-
-#include <websocketpp/common/type_traits.hpp>
-
-#include <websocketpp/transport/asio/security/none.hpp>
-#include <websocketpp/transport/asio/security/tls.hpp>
-
-template <typename base>
-struct dummy_con : public base {
-	websocketpp::lib::error_code test() {
-		return this->translate_ec(websocketpp::lib::asio::error_code());
-	}
-};
-
-BOOST_AUTO_TEST_CASE( translated_ec_none ) {
-    dummy_con<websocketpp::transport::asio::basic_socket::connection> tscon;
-
-	// If the current configuration settings result in the library error type and the asio
-	// error type being the same, then the code should pass through natively. Otherwise
-	// we should get a generic pass through error.
-	if(websocketpp::lib::is_same<websocketpp::lib::error_code,websocketpp::lib::asio::error_code>::value) {
-    	BOOST_CHECK_EQUAL( tscon.test(), websocketpp::lib::error_code() );
-    } else {
-    	BOOST_CHECK_EQUAL( tscon.test(), websocketpp::transport::error::make_error_code(websocketpp::transport::error::pass_through) );
-    }
-}
-
-BOOST_AUTO_TEST_CASE( translated_ec_tls ) {
-    dummy_con<websocketpp::transport::asio::tls_socket::connection> tscon;
-
-	// If the current configuration settings result in the library error type and the asio
-	// error type being the same, then the code should pass through natively. Otherwise
-	// we should get a generic pass through error.
-	if(websocketpp::lib::is_same<websocketpp::lib::error_code,websocketpp::lib::asio::error_code>::value) {
-    	BOOST_CHECK_EQUAL( tscon.test(), websocketpp::lib::error_code() );
-    } else {
-    	BOOST_CHECK_EQUAL( tscon.test(), websocketpp::transport::error::make_error_code(websocketpp::transport::error::pass_through) );
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/test/transport/asio/timers.cpp b/src/sioclient/lib/websocketpp/test/transport/asio/timers.cpp
deleted file mode 100644
index aa03d618..00000000
--- a/src/sioclient/lib/websocketpp/test/transport/asio/timers.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE transport_asio_timers
-#include <boost/test/unit_test.hpp>
-
-#include <exception>
-#include <iostream>
-
-#include <websocketpp/common/thread.hpp>
-
-#include <websocketpp/transport/asio/endpoint.hpp>
-#include <websocketpp/transport/asio/security/tls.hpp>
-
-// Concurrency
-#include <websocketpp/concurrency/none.hpp>
-
-// HTTP
-#include <websocketpp/http/request.hpp>
-#include <websocketpp/http/response.hpp>
-
-// Loggers
-#include <websocketpp/logger/stub.hpp>
-//#include <websocketpp/logger/basic.hpp>
-
-#include <boost/asio.hpp>
-
-// Accept a connection, read data, and discard until EOF
-void run_dummy_server(int port) {
-    using boost::asio::ip::tcp;
-
-    try {
-        boost::asio::io_service io_service;
-        tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v6(), port));
-        tcp::socket socket(io_service);
-
-        acceptor.accept(socket);
-        for (;;) {
-            char data[512];
-            boost::system::error_code ec;
-            socket.read_some(boost::asio::buffer(data), ec);
-            if (ec == boost::asio::error::eof) {
-                break;
-            } else if (ec) {
-                // other error
-                throw ec;
-            }
-        }
-    } catch (std::exception & e) {
-        std::cout << e.what() << std::endl;
-    } catch (boost::system::error_code & ec) {
-        std::cout << ec.message() << std::endl;
-    }
-}
-
-// Wait for the specified time period then fail the test
-void run_test_timer(long value) {
-    boost::asio::io_service ios;
-    boost::asio::deadline_timer t(ios,boost::posix_time::milliseconds(value));
-    boost::system::error_code ec;
-    t.wait(ec);
-    BOOST_FAIL( "Test timed out" );
-}
-
-struct config {
-    typedef websocketpp::concurrency::none concurrency_type;
-    //typedef websocketpp::log::basic<concurrency_type,websocketpp::log::alevel> alog_type;
-    typedef websocketpp::log::stub alog_type;
-    typedef websocketpp::log::stub elog_type;
-    typedef websocketpp::http::parser::request request_type;
-    typedef websocketpp::http::parser::response response_type;
-    typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
-
-    static const bool enable_multithreading = true;
-
-    static const long timeout_socket_pre_init = 1000;
-    static const long timeout_proxy = 1000;
-    static const long timeout_socket_post_init = 1000;
-    static const long timeout_dns_resolve = 1000;
-    static const long timeout_connect = 1000;
-    static const long timeout_socket_shutdown = 1000;
-};
-
-// Mock context that does no validation
-typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
-context_ptr on_tls_init(websocketpp::connection_hdl) {
-    return context_ptr(new boost::asio::ssl::context(boost::asio::ssl::context::sslv23));
-}
-
-// Mock connection
-struct mock_con: public websocketpp::transport::asio::connection<config> {
-    typedef websocketpp::transport::asio::connection<config> base;
-
-    mock_con(bool a, const websocketpp::lib::shared_ptr<config::alog_type>& b,
-             const websocketpp::lib::shared_ptr<config::elog_type>& c)
-            : base(a,b,c) {}
-
-    void start() {
-        base::init(websocketpp::lib::bind(&mock_con::handle_start,this,
-            websocketpp::lib::placeholders::_1));
-    }
-
-    void handle_start(const websocketpp::lib::error_code& ec) {
-        using websocketpp::transport::asio::socket::make_error_code;
-        using websocketpp::transport::asio::socket::error::tls_handshake_timeout;
-
-        BOOST_CHECK_EQUAL( ec, make_error_code(tls_handshake_timeout) );
-
-        base::cancel_socket();
-    }
-};
-
-typedef websocketpp::transport::asio::connection<config> con_type;
-typedef websocketpp::lib::shared_ptr<mock_con> connection_ptr;
-
-struct mock_endpoint : public websocketpp::transport::asio::endpoint<config> {
-    typedef websocketpp::transport::asio::endpoint<config> base;
-
-    mock_endpoint()
-        : alog(websocketpp::lib::make_shared<config::alog_type>())
-        , elog(websocketpp::lib::make_shared<config::elog_type>())
-    {
-        alog->set_channels(websocketpp::log::alevel::all);
-        base::init_logging(alog,elog);
-        init_asio();
-    }
-
-    void connect(std::string u) {
-        m_con.reset(new mock_con(false,alog,elog));
-        websocketpp::uri_ptr uri(new websocketpp::uri(u));
-
-        BOOST_CHECK( uri->get_valid() );
-        BOOST_CHECK_EQUAL( base::init(m_con), websocketpp::lib::error_code() );
-
-        base::async_connect(
-            m_con,
-            uri,
-            websocketpp::lib::bind(
-                &mock_endpoint::handle_connect,
-                this,
-                m_con,
-                websocketpp::lib::placeholders::_1
-            )
-        );
-    }
-
-    void handle_connect(connection_ptr con, websocketpp::lib::error_code const & ec)
-    {
-        BOOST_CHECK( !ec );
-        con->start();
-    }
-
-    connection_ptr m_con;
-    websocketpp::lib::shared_ptr<config::alog_type> alog;
-    websocketpp::lib::shared_ptr<config::elog_type> elog;
-};
-
-BOOST_AUTO_TEST_CASE( tls_handshake_timeout ) {
-    websocketpp::lib::thread dummy_server(websocketpp::lib::bind(&run_dummy_server,9005));
-    websocketpp::lib::thread timer(websocketpp::lib::bind(&run_test_timer,5000));
-    dummy_server.detach();
-    timer.detach();
-
-    sleep(1); // give the server thread some time to start
-
-    mock_endpoint endpoint;
-    endpoint.set_tls_init_handler(&on_tls_init);
-    endpoint.connect("wss://localhost:9005");
-    endpoint.run();
-}
diff --git a/src/sioclient/lib/websocketpp/test/transport/hybi_util.cpp b/src/sioclient/lib/websocketpp/test/transport/hybi_util.cpp
deleted file mode 100644
index 309bf377..00000000
--- a/src/sioclient/lib/websocketpp/test/transport/hybi_util.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE hybi_util
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-
-#include "../../src/processors/hybi_util.hpp"
-#include "../../src/network_utilities.hpp"
-
-BOOST_AUTO_TEST_CASE( circshift_0 ) {
-    if (sizeof(size_t) == 8) {
-        size_t test = 0x0123456789abcdef;
-
-        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,0);
-
-        BOOST_CHECK( test == 0x0123456789abcdef);
-    } else {
-        size_t test = 0x01234567;
-
-        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,0);
-
-        BOOST_CHECK( test == 0x01234567);
-    }
-}
-
-BOOST_AUTO_TEST_CASE( circshift_1 ) {
-    if (sizeof(size_t) == 8) {
-        size_t test = 0x0123456789abcdef;
-
-        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,1);
-
-        BOOST_CHECK( test == 0xef0123456789abcd);
-    } else {
-        size_t test = 0x01234567;
-
-        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,1);
-
-        BOOST_CHECK( test == 0x67012345);
-    }
-}
-
-BOOST_AUTO_TEST_CASE( circshift_2 ) {
-    if (sizeof(size_t) == 8) {
-        size_t test = 0x0123456789abcdef;
-
-        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,2);
-
-        BOOST_CHECK( test == 0xcdef0123456789ab);
-    } else {
-        size_t test = 0x01234567;
-
-        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,2);
-
-        BOOST_CHECK( test == 0x45670123);
-    }
-}
-
-BOOST_AUTO_TEST_CASE( circshift_3 ) {
-    if (sizeof(size_t) == 8) {
-        size_t test = 0x0123456789abcdef;
-
-        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,3);
-
-        BOOST_CHECK( test == 0xabcdef0123456789);
-    } else {
-        size_t test = 0x01234567;
-
-        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,3);
-
-        BOOST_CHECK( test == 0x23456701);
-    }
-}
diff --git a/src/sioclient/lib/websocketpp/test/transport/integration.cpp b/src/sioclient/lib/websocketpp/test/transport/integration.cpp
deleted file mode 100644
index c083cfd0..00000000
--- a/src/sioclient/lib/websocketpp/test/transport/integration.cpp
+++ /dev/null
@@ -1,651 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE transport_integration
-#include <boost/test/unit_test.hpp>
-
-#include <websocketpp/common/thread.hpp>
-
-#include <websocketpp/config/core.hpp>
-#include <websocketpp/config/core_client.hpp>
-#include <websocketpp/config/asio.hpp>
-#include <websocketpp/config/asio_client.hpp>
-#include <websocketpp/config/debug_asio.hpp>
-#include <websocketpp/server.hpp>
-#include <websocketpp/client.hpp>
-
-struct config : public websocketpp::config::asio_client {
-    typedef config type;
-    typedef websocketpp::config::asio base;
-
-    typedef base::concurrency_type concurrency_type;
-
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-
-    typedef base::rng_type rng_type;
-
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint
-            socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config>
-        transport_type;
-
-    //static const websocketpp::log::level elog_level = websocketpp::log::elevel::all;
-    //static const websocketpp::log::level alog_level = websocketpp::log::alevel::all;
-
-    /// Length of time before an opening handshake is aborted
-    static const long timeout_open_handshake = 500;
-    /// Length of time before a closing handshake is aborted
-    static const long timeout_close_handshake = 500;
-    /// Length of time to wait for a pong after a ping
-    static const long timeout_pong = 500;
-};
-
-struct config_tls : public websocketpp::config::asio_tls_client {
-    typedef config type;
-    typedef websocketpp::config::asio base;
-
-    typedef base::concurrency_type concurrency_type;
-
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-
-    typedef base::rng_type rng_type;
-
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint
-            socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config>
-        transport_type;
-
-    //static const websocketpp::log::level elog_level = websocketpp::log::elevel::all;
-    //static const websocketpp::log::level alog_level = websocketpp::log::alevel::all;
-
-    /// Length of time before an opening handshake is aborted
-    static const long timeout_open_handshake = 500;
-    /// Length of time before a closing handshake is aborted
-    static const long timeout_close_handshake = 500;
-    /// Length of time to wait for a pong after a ping
-    static const long timeout_pong = 500;
-};
-
-typedef websocketpp::server<config> server;
-typedef websocketpp::client<config> client;
-
-typedef websocketpp::server<config_tls> server_tls;
-typedef websocketpp::client<config_tls> client_tls;
-
-typedef websocketpp::server<websocketpp::config::core> iostream_server;
-typedef websocketpp::client<websocketpp::config::core_client> iostream_client;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-template <typename T>
-void close_after_timeout(T & e, websocketpp::connection_hdl hdl, long timeout) {
-    sleep(timeout);
-
-    websocketpp::lib::error_code ec;
-    e.close(hdl,websocketpp::close::status::normal,"",ec);
-    BOOST_CHECK(!ec);
-}
-
-void run_server(server * s, int port, bool log = false) {
-    if (log) {
-        s->set_access_channels(websocketpp::log::alevel::all);
-        s->set_error_channels(websocketpp::log::elevel::all);
-    } else {
-        s->clear_access_channels(websocketpp::log::alevel::all);
-        s->clear_error_channels(websocketpp::log::elevel::all);
-    }
-
-    s->init_asio();
-    s->set_reuse_addr(true);
-
-    s->listen(port);
-    s->start_accept();
-    s->run();
-}
-
-void run_client(client & c, std::string uri, bool log = false) {
-    if (log) {
-        c.set_access_channels(websocketpp::log::alevel::all);
-        c.set_error_channels(websocketpp::log::elevel::all);
-    } else {
-        c.clear_access_channels(websocketpp::log::alevel::all);
-        c.clear_error_channels(websocketpp::log::elevel::all);
-    }
-    websocketpp::lib::error_code ec;
-    c.init_asio(ec);
-    c.set_reuse_addr(true);
-    BOOST_CHECK(!ec);
-
-    client::connection_ptr con = c.get_connection(uri,ec);
-    BOOST_CHECK( !ec );
-    c.connect(con);
-
-    c.run();
-}
-
-void run_client_and_mark(client * c, bool * flag, websocketpp::lib::mutex * mutex) {
-    c->run();
-    BOOST_CHECK( true );
-    websocketpp::lib::lock_guard<websocketpp::lib::mutex> lock(*mutex);
-    *flag = true;
-    BOOST_CHECK( true );
-}
-
-void run_time_limited_client(client & c, std::string uri, long timeout,
-    bool log)
-{
-    if (log) {
-        c.set_access_channels(websocketpp::log::alevel::all);
-        c.set_error_channels(websocketpp::log::elevel::all);
-    } else {
-        c.clear_access_channels(websocketpp::log::alevel::all);
-        c.clear_error_channels(websocketpp::log::elevel::all);
-    }
-    c.init_asio();
-
-    websocketpp::lib::error_code ec;
-    client::connection_ptr con = c.get_connection(uri,ec);
-    BOOST_CHECK( !ec );
-    c.connect(con);
-
-    websocketpp::lib::thread tthread(websocketpp::lib::bind(
-        &close_after_timeout<client>,
-        websocketpp::lib::ref(c),
-        con->get_handle(),
-        timeout
-    ));
-    tthread.detach();
-
-    c.run();
-}
-
-void run_dummy_server(int port) {
-    using boost::asio::ip::tcp;
-
-    try {
-        boost::asio::io_service io_service;
-        tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v6(), port));
-        tcp::socket socket(io_service);
-
-        acceptor.accept(socket);
-        for (;;) {
-            char data[512];
-            boost::system::error_code ec;
-            socket.read_some(boost::asio::buffer(data), ec);
-            if (ec == boost::asio::error::eof) {
-                break;
-            } else if (ec) {
-                // other error
-                throw ec;
-            }
-        }
-    } catch (std::exception & e) {
-        std::cout << e.what() << std::endl;
-    } catch (boost::system::error_code & ec) {
-        std::cout << ec.message() << std::endl;
-    }
-}
-
-void run_dummy_client(std::string port) {
-    using boost::asio::ip::tcp;
-
-    try {
-        boost::asio::io_service io_service;
-        tcp::resolver resolver(io_service);
-        tcp::resolver::query query("localhost", port);
-        tcp::resolver::iterator iterator = resolver.resolve(query);
-        tcp::socket socket(io_service);
-
-        boost::asio::connect(socket, iterator);
-        for (;;) {
-            char data[512];
-            boost::system::error_code ec;
-            socket.read_some(boost::asio::buffer(data), ec);
-            if (ec == boost::asio::error::eof) {
-                break;
-            } else if (ec) {
-                // other error
-                throw ec;
-            }
-        }
-    } catch (std::exception & e) {
-        std::cout << e.what() << std::endl;
-    } catch (boost::system::error_code & ec) {
-        std::cout << ec.message() << std::endl;
-    }
-}
-
-bool on_ping(server * s, websocketpp::connection_hdl, std::string) {
-    s->get_alog().write(websocketpp::log::alevel::app,"got ping");
-    return false;
-}
-
-void cancel_on_open(server * s, websocketpp::connection_hdl) {
-    s->stop_listening();
-}
-
-void stop_on_close(server * s, websocketpp::connection_hdl hdl) {
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-    //BOOST_CHECK_EQUAL( con->get_local_close_code(), websocketpp::close::status::normal );
-    //BOOST_CHECK_EQUAL( con->get_remote_close_code(), websocketpp::close::status::normal );
-    s->stop();
-}
-
-template <typename T>
-void ping_on_open(T * c, std::string payload, websocketpp::connection_hdl hdl) {
-    typename T::connection_ptr con = c->get_con_from_hdl(hdl);
-    websocketpp::lib::error_code ec;
-    con->ping(payload,ec);
-    BOOST_CHECK_EQUAL(ec, websocketpp::lib::error_code());
-}
-
-void fail_on_pong(websocketpp::connection_hdl, std::string) {
-    BOOST_FAIL( "expected no pong handler" );
-}
-
-void fail_on_pong_timeout(websocketpp::connection_hdl, std::string) {
-    BOOST_FAIL( "expected no pong timeout" );
-}
-
-void req_pong(std::string expected_payload, websocketpp::connection_hdl,
-    std::string payload)
-{
-    BOOST_CHECK_EQUAL( expected_payload, payload );
-}
-
-void fail_on_open(websocketpp::connection_hdl) {
-    BOOST_FAIL( "expected no open handler" );
-}
-
-void delay(websocketpp::connection_hdl, long duration) {
-    sleep(duration);
-}
-
-template <typename T>
-void check_ec(T * c, websocketpp::lib::error_code ec,
-    websocketpp::connection_hdl hdl)
-{
-    typename T::connection_ptr con = c->get_con_from_hdl(hdl);
-    BOOST_CHECK_EQUAL( con->get_ec(), ec );
-    //BOOST_CHECK_EQUAL( con->get_local_close_code(), websocketpp::close::status::normal );
-    //BOOST_CHECK_EQUAL( con->get_remote_close_code(), websocketpp::close::status::normal );
-}
-
-template <typename T>
-void check_ec_and_stop(T * e, websocketpp::lib::error_code ec,
-    websocketpp::connection_hdl hdl)
-{
-    typename T::connection_ptr con = e->get_con_from_hdl(hdl);
-    BOOST_CHECK_EQUAL( con->get_ec(), ec );
-    //BOOST_CHECK_EQUAL( con->get_local_close_code(), websocketpp::close::status::normal );
-    //BOOST_CHECK_EQUAL( con->get_remote_close_code(), websocketpp::close::status::normal );
-    e->stop();
-}
-
-template <typename T>
-void req_pong_timeout(T * c, std::string expected_payload,
-    websocketpp::connection_hdl hdl, std::string payload)
-{
-    typename T::connection_ptr con = c->get_con_from_hdl(hdl);
-    BOOST_CHECK_EQUAL( payload, expected_payload );
-    con->close(websocketpp::close::status::normal,"");
-}
-
-template <typename T>
-void close(T * e, websocketpp::connection_hdl hdl) {
-    e->get_con_from_hdl(hdl)->close(websocketpp::close::status::normal,"");
-}
-
-class test_deadline_timer
-{
-public:
-    test_deadline_timer(int seconds)
-    : m_timer(m_io_service, boost::posix_time::seconds(seconds))
-    {
-        m_timer.async_wait(bind(&test_deadline_timer::expired, this, ::_1));
-        std::size_t (boost::asio::io_service::*run)() = &boost::asio::io_service::run;
-        m_timer_thread = websocketpp::lib::thread(websocketpp::lib::bind(run, &m_io_service));
-    }
-    ~test_deadline_timer()
-    {
-        m_timer.cancel();
-        m_timer_thread.join();
-    }
-
-  private:
-    void expired(const boost::system::error_code & ec)
-    {
-        if (ec == boost::asio::error::operation_aborted)
-            return;
-        BOOST_CHECK(!ec);
-        BOOST_FAIL("Test timed out");
-    }
-
-    boost::asio::io_service m_io_service;
-    boost::asio::deadline_timer m_timer;
-    websocketpp::lib::thread m_timer_thread;
-};
-
-BOOST_AUTO_TEST_CASE( pong_no_timeout ) {
-    server s;
-    client c;
-
-    s.set_close_handler(bind(&stop_on_close,&s,::_1));
-
-    // send a ping when the connection is open
-    c.set_open_handler(bind(&ping_on_open<client>,&c,"foo",::_1));
-    // require that a pong with matching payload is received
-    c.set_pong_handler(bind(&req_pong,"foo",::_1,::_2));
-    // require that a pong timeout is NOT received
-    c.set_pong_timeout_handler(bind(&fail_on_pong_timeout,::_1,::_2));
-
-    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
-
-    sleep(1); // give the server thread some time to start
-
-    // Run a client that closes the connection after 1 seconds
-    run_time_limited_client(c, "http://localhost:9005", 1, false);
-
-    sthread.join();
-}
-
-BOOST_AUTO_TEST_CASE( pong_timeout ) {
-    server s;
-    client c;
-
-    s.set_ping_handler(bind(&on_ping, &s,::_1,::_2));
-    s.set_close_handler(bind(&stop_on_close,&s,::_1));
-
-    c.set_fail_handler(bind(&check_ec<client>,&c,
-        websocketpp::lib::error_code(),::_1));
-
-    c.set_pong_handler(bind(&fail_on_pong,::_1,::_2));
-    c.set_open_handler(bind(&ping_on_open<client>,&c,"foo",::_1));
-    c.set_pong_timeout_handler(bind(&req_pong_timeout<client>,&c,"foo",::_1,::_2));
-    c.set_close_handler(bind(&check_ec<client>,&c,
-        websocketpp::lib::error_code(),::_1));
-
-    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
-    sleep(1); // give the server thread some time to start
-
-    test_deadline_timer deadline(10);
-
-    run_client(c, "http://localhost:9005",false);
-
-    sthread.join();
-}
-
-BOOST_AUTO_TEST_CASE( client_open_handshake_timeout ) {
-    client c;
-
-    // set open handler to fail test
-    c.set_open_handler(bind(&fail_on_open,::_1));
-    // set fail hander to test for the right fail error code
-    c.set_fail_handler(bind(&check_ec<client>,&c,
-        websocketpp::error::open_handshake_timeout,::_1));
-
-    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_dummy_server,9005));
-    sthread.detach();
-
-    sleep(1); // give the server thread some time to start
-
-    test_deadline_timer deadline(10);
-
-    run_client(c, "http://localhost:9005");
-}
-
-BOOST_AUTO_TEST_CASE( server_open_handshake_timeout ) {
-    server s;
-
-    // set open handler to fail test
-    s.set_open_handler(bind(&fail_on_open,::_1));
-    // set fail hander to test for the right fail error code
-    s.set_fail_handler(bind(&check_ec_and_stop<server>,&s,
-        websocketpp::error::open_handshake_timeout,::_1));
-
-    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
-
-    test_deadline_timer deadline(10);
-
-    sleep(1); // give the server thread some time to start
-
-    run_dummy_client("9005");
-
-    sthread.join();
-}
-
-BOOST_AUTO_TEST_CASE( client_self_initiated_close_handshake_timeout ) {
-    server s;
-    client c;
-
-    // on open server sleeps for longer than the timeout
-    // on open client sends close handshake
-    // client handshake timer should be triggered
-    s.set_open_handler(bind(&delay,::_1,1));
-    s.set_close_handler(bind(&stop_on_close,&s,::_1));
-
-    c.set_open_handler(bind(&close<client>,&c,::_1));
-    c.set_close_handler(bind(&check_ec<client>,&c,
-        websocketpp::error::close_handshake_timeout,::_1));
-
-    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
-
-    test_deadline_timer deadline(10);
-
-    sleep(1); // give the server thread some time to start
-
-    run_client(c, "http://localhost:9005", false);
-
-    sthread.join();
-}
-
-BOOST_AUTO_TEST_CASE( client_peer_initiated_close_handshake_timeout ) {
-    // on open server sends close
-    // client should ack normally and then wait
-    // server leaves TCP connection open
-    // client handshake timer should be triggered
-
-    // TODO: how to make a mock server that leaves the TCP connection open?
-}
-
-BOOST_AUTO_TEST_CASE( server_self_initiated_close_handshake_timeout ) {
-    server s;
-    client c;
-
-    // on open server sends close
-    // on open client sleeps for longer than the timeout
-    // server handshake timer should be triggered
-
-    s.set_open_handler(bind(&close<server>,&s,::_1));
-    s.set_close_handler(bind(&check_ec_and_stop<server>,&s,
-        websocketpp::error::close_handshake_timeout,::_1));
-
-    c.set_open_handler(bind(&delay,::_1,1));
-
-    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
-    test_deadline_timer deadline(10);
-
-    sleep(1); // give the server thread some time to start
-
-    run_client(c, "http://localhost:9005", false);
-
-    sthread.join();
-}
-
-BOOST_AUTO_TEST_CASE( client_runs_out_of_work ) {
-    client c;
-
-    test_deadline_timer deadline(3);
-
-    websocketpp::lib::error_code ec;
-    c.init_asio(ec);
-    BOOST_CHECK(!ec);
-
-    c.run();
-
-    // This test checks that an io_service with no work ends immediately.
-    BOOST_CHECK(true);
-}
-
-
-
-
-BOOST_AUTO_TEST_CASE( client_is_perpetual ) {
-    client c;
-    bool flag = false;
-    websocketpp::lib::mutex mutex;
-
-    websocketpp::lib::error_code ec;
-    c.init_asio(ec);
-    BOOST_CHECK(!ec);
-
-    c.start_perpetual();
-
-    websocketpp::lib::thread cthread(websocketpp::lib::bind(&run_client_and_mark,&c,&flag,&mutex));
-
-    sleep(1);
-
-    {
-        // Checks that the thread hasn't exited yet
-        websocketpp::lib::lock_guard<websocketpp::lib::mutex> lock(mutex);
-        BOOST_CHECK( !flag );
-    }
-
-    c.stop_perpetual();
-
-    sleep(1);
-
-    {
-        // Checks that the thread has exited
-        websocketpp::lib::lock_guard<websocketpp::lib::mutex> lock(mutex);
-        BOOST_CHECK( flag );
-    }
-
-    cthread.join();
-}
-
-BOOST_AUTO_TEST_CASE( client_failed_connection ) {
-    client c;
-
-    run_time_limited_client(c,"http://localhost:9005", 5, false);
-}
-
-BOOST_AUTO_TEST_CASE( stop_listening ) {
-    server s;
-    client c;
-
-    // the first connection stops the server from listening
-    s.set_open_handler(bind(&cancel_on_open,&s,::_1));
-
-    // client immediately closes after opening a connection
-    c.set_open_handler(bind(&close<client>,&c,::_1));
-
-    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
-    test_deadline_timer deadline(5);
-
-    sleep(1); // give the server thread some time to start
-
-    run_client(c, "http://localhost:9005", false);
-
-    sthread.join();
-}
-
-BOOST_AUTO_TEST_CASE( pause_reading ) {
-    iostream_server s;
-    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
-    char buffer[2] = { char(0x81), char(0x80) };
-
-    // suppress output (it needs a place to go to avoid error but we don't care what it is)
-    std::stringstream null_output;
-    s.register_ostream(&null_output);
-
-    iostream_server::connection_ptr con = s.get_connection();
-    con->start();
-
-    // read handshake, should work
-    BOOST_CHECK_EQUAL( con->read_some(handshake.data(), handshake.length()), handshake.length());
-
-    // pause reading and try again. The first read should work, the second should return 0
-    // the first read was queued already after the handshake so it will go through because
-    // reading wasn't paused when it was queued. The byte it reads wont be enough to
-    // complete the frame so another read will be requested. This one wont actually happen
-    // because the connection is paused now.
-    con->pause_reading();
-    BOOST_CHECK_EQUAL( con->read_some(buffer, 1), 1);
-    BOOST_CHECK_EQUAL( con->read_some(buffer+1, 1), 0);
-    // resume reading and try again. Should work this time because the resume should have
-    // re-queued a read.
-    con->resume_reading();
-    BOOST_CHECK_EQUAL( con->read_some(buffer+1, 1), 1);
-}
-
-
-BOOST_AUTO_TEST_CASE( server_connection_cleanup ) {
-    server_tls s;
-}
-
-#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
-BOOST_AUTO_TEST_CASE( move_construct_transport ) {
-    server s1;
-    
-    server s2(std::move(s1));
-}
-#endif // _WEBSOCKETPP_MOVE_SEMANTICS_
diff --git a/src/sioclient/lib/websocketpp/test/transport/iostream/SConscript b/src/sioclient/lib/websocketpp/test/transport/iostream/SConscript
deleted file mode 100644
index 9e74c2f1..00000000
--- a/src/sioclient/lib/websocketpp/test/transport/iostream/SConscript
+++ /dev/null
@@ -1,31 +0,0 @@
-## iostream transport unit tests
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
-
-objs = env.Object('iostream_base_boost.o', ["base.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('iostream_connection_boost.o', ["connection.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('iostream_endpoint_boost.o', ["endpoint.cpp"], LIBS = BOOST_LIBS)
-prgs = env.Program('test_iostream_base_boost', ["iostream_base_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_iostream_connection_boost', ["iostream_connection_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_iostream_endpoint_boost', ["iostream_endpoint_boost.o"], LIBS = BOOST_LIBS)
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   objs += env_cpp11.Object('iostream_base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('iostream_connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('iostream_endpoint_stl.o', ["endpoint.cpp"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_iostream_base_stl', ["iostream_base_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_iostream_connection_stl', ["iostream_connection_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_iostream_endpoint_stl', ["iostream_endpoint_stl.o"], LIBS = BOOST_LIBS_CPP11)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/test/transport/iostream/base.cpp b/src/sioclient/lib/websocketpp/test/transport/iostream/base.cpp
deleted file mode 100644
index a7eefc21..00000000
--- a/src/sioclient/lib/websocketpp/test/transport/iostream/base.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE transport_iostream_base
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-
-BOOST_AUTO_TEST_CASE( placeholder ) {}
diff --git a/src/sioclient/lib/websocketpp/test/transport/iostream/connection.cpp b/src/sioclient/lib/websocketpp/test/transport/iostream/connection.cpp
deleted file mode 100644
index f2aaff96..00000000
--- a/src/sioclient/lib/websocketpp/test/transport/iostream/connection.cpp
+++ /dev/null
@@ -1,619 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE transport_iostream_connection
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <cstring>
-#include <string>
-
-#include <websocketpp/common/memory.hpp>
-
-#include <websocketpp/error.hpp>
-#include <websocketpp/transport/iostream/connection.hpp>
-
-// Policies
-#include <websocketpp/concurrency/basic.hpp>
-#include <websocketpp/logger/basic.hpp>
-
-struct config {
-    typedef websocketpp::concurrency::basic concurrency_type;
-    typedef websocketpp::log::basic<concurrency_type,
-        websocketpp::log::elevel> elog_type;
-    typedef websocketpp::log::basic<concurrency_type,
-        websocketpp::log::alevel> alog_type;
-};
-
-typedef websocketpp::transport::iostream::connection<config> iostream_con;
-
-using websocketpp::transport::iostream::error::make_error_code;
-
-struct stub_con : public iostream_con {
-    typedef stub_con type;
-    typedef websocketpp::lib::shared_ptr<type> ptr;
-    typedef iostream_con::timer_ptr timer_ptr;
-
-    stub_con(bool is_server, const websocketpp::lib::shared_ptr<config::alog_type>& a, const websocketpp::lib::shared_ptr<config::elog_type>& e)
-        : iostream_con(is_server,a,e)
-        // Set the error to a known code that is unused by the library
-        // This way we can easily confirm that the handler was run at all.
-        , ec(websocketpp::error::make_error_code(websocketpp::error::test))
-        , indef_read_total(0)
-    {}
-
-    /// Get a shared pointer to this component
-    ptr get_shared() {
-        return websocketpp::lib::static_pointer_cast<type>(iostream_con::get_shared());
-    }
-
-    void write(std::string msg) {
-        iostream_con::async_write(
-            msg.data(),
-            msg.size(),
-            websocketpp::lib::bind(
-                &stub_con::handle_op,
-                type::get_shared(),
-                websocketpp::lib::placeholders::_1
-            )
-        );
-    }
-
-    void write(std::vector<websocketpp::transport::buffer> & bufs) {
-        iostream_con::async_write(
-            bufs,
-            websocketpp::lib::bind(
-                &stub_con::handle_op,
-                type::get_shared(),
-                websocketpp::lib::placeholders::_1
-            )
-        );
-    }
-
-    void async_read_at_least(size_t num_bytes, char *buf, size_t len)
-    {
-        iostream_con::async_read_at_least(
-            num_bytes,
-            buf,
-            len,
-            websocketpp::lib::bind(
-                &stub_con::handle_op,
-                type::get_shared(),
-                websocketpp::lib::placeholders::_1
-            )
-        );
-    }
-
-    void handle_op(websocketpp::lib::error_code const & e) {
-        ec = e;
-    }
-
-    void async_read_indef(size_t num_bytes, char *buf, size_t len)
-    {
-        indef_read_size = num_bytes;
-        indef_read_buf = buf;
-        indef_read_len = len;
-
-        indef_read();
-    }
-
-    void indef_read() {
-        iostream_con::async_read_at_least(
-            indef_read_size,
-            indef_read_buf,
-            indef_read_len,
-            websocketpp::lib::bind(
-                &stub_con::handle_indef,
-                type::get_shared(),
-                websocketpp::lib::placeholders::_1,
-                websocketpp::lib::placeholders::_2
-            )
-        );
-    }
-
-    void handle_indef(websocketpp::lib::error_code const & e, size_t amt_read) {
-        ec = e;
-        indef_read_total += amt_read;
-
-        indef_read();
-    }
-
-    void shutdown() {
-        iostream_con::async_shutdown(
-            websocketpp::lib::bind(
-                &stub_con::handle_async_shutdown,
-                type::get_shared(),
-                websocketpp::lib::placeholders::_1
-            )
-        );
-    }
-
-    void handle_async_shutdown(websocketpp::lib::error_code const & e) {
-        ec = e;
-    }
-
-    websocketpp::lib::error_code ec;
-    size_t indef_read_size;
-    char * indef_read_buf;
-    size_t indef_read_len;
-    size_t indef_read_total;
-};
-
-// Stubs
-websocketpp::lib::shared_ptr<config::alog_type> alogger = websocketpp::lib::make_shared<config::alog_type>();
-websocketpp::lib::shared_ptr<config::elog_type> elogger = websocketpp::lib::make_shared<config::elog_type>();
-
-BOOST_AUTO_TEST_CASE( const_methods ) {
-    iostream_con::ptr con(new iostream_con(true,alogger,elogger));
-
-    BOOST_CHECK( !con->is_secure() );
-    BOOST_CHECK_EQUAL( con->get_remote_endpoint(), "iostream transport" );
-}
-
-BOOST_AUTO_TEST_CASE( write_before_output_method_set ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    con->write("foo");
-    BOOST_CHECK( con->ec == make_error_code(websocketpp::transport::iostream::error::output_stream_required) );
-
-    std::vector<websocketpp::transport::buffer> bufs;
-    con->write(bufs);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::iostream::error::output_stream_required) );
-}
-
-BOOST_AUTO_TEST_CASE( async_write_ostream ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    std::stringstream output;
-
-    con->register_ostream(&output);
-
-    con->write("foo");
-
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( output.str(), "foo" );
-}
-
-websocketpp::lib::error_code write_handler(std::string & o, websocketpp::connection_hdl, char const * buf, size_t len) {
-    o += std::string(buf,len);
-    return websocketpp::lib::error_code();
-}
-
-websocketpp::lib::error_code vector_write_handler(std::string & o, websocketpp::connection_hdl, std::vector<websocketpp::transport::buffer> const & bufs) {
-    std::vector<websocketpp::transport::buffer>::const_iterator it;
-    for (it = bufs.begin(); it != bufs.end(); it++) {
-        o += std::string((*it).buf, (*it).len);
-    }
-
-    return websocketpp::lib::error_code();
-}
-
-websocketpp::lib::error_code write_handler_error(websocketpp::connection_hdl, char const *, size_t) {
-    return make_error_code(websocketpp::transport::error::general);
-}
-
-BOOST_AUTO_TEST_CASE( async_write_handler ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-    std::string output;
-
-    con->set_write_handler(websocketpp::lib::bind(
-        &write_handler,
-        websocketpp::lib::ref(output),
-        websocketpp::lib::placeholders::_1,
-        websocketpp::lib::placeholders::_2,
-        websocketpp::lib::placeholders::_3
-    ));
-    con->write("foo");
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL(output, "foo");
-}
-
-BOOST_AUTO_TEST_CASE( async_write_handler_error ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    con->set_write_handler(&write_handler_error);
-    con->write("foo");
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::general) );
-}
-
-BOOST_AUTO_TEST_CASE( async_write_vector_0_ostream ) {
-    std::stringstream output;
-
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-    con->register_ostream(&output);
-
-    std::vector<websocketpp::transport::buffer> bufs;
-
-    con->write(bufs);
-
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( output.str(), "" );
-}
-
-BOOST_AUTO_TEST_CASE( async_write_vector_0_write_handler ) {
-    std::string output;
-
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    con->set_write_handler(websocketpp::lib::bind(
-        &write_handler,
-        websocketpp::lib::ref(output),
-        websocketpp::lib::placeholders::_1,
-        websocketpp::lib::placeholders::_2,
-        websocketpp::lib::placeholders::_3
-    ));
-
-    std::vector<websocketpp::transport::buffer> bufs;
-
-    con->write(bufs);
-
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( output, "" );
-}
-
-BOOST_AUTO_TEST_CASE( async_write_vector_1_ostream ) {
-    std::stringstream output;
-
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-    con->register_ostream(&output);
-
-    std::vector<websocketpp::transport::buffer> bufs;
-
-    std::string foo = "foo";
-
-    bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
-
-    con->write(bufs);
-
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( output.str(), "foo" );
-}
-
-BOOST_AUTO_TEST_CASE( async_write_vector_1_write_handler ) {
-    std::string output;
-
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-    con->set_write_handler(websocketpp::lib::bind(
-        &write_handler,
-        websocketpp::lib::ref(output),
-        websocketpp::lib::placeholders::_1,
-        websocketpp::lib::placeholders::_2,
-        websocketpp::lib::placeholders::_3
-    ));
-
-    std::vector<websocketpp::transport::buffer> bufs;
-
-    std::string foo = "foo";
-
-    bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
-
-    con->write(bufs);
-
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( output, "foo" );
-}
-
-BOOST_AUTO_TEST_CASE( async_write_vector_2_ostream ) {
-    std::stringstream output;
-
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-    con->register_ostream(&output);
-
-    std::vector<websocketpp::transport::buffer> bufs;
-
-    std::string foo = "foo";
-    std::string bar = "bar";
-
-    bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
-    bufs.push_back(websocketpp::transport::buffer(bar.data(),bar.size()));
-
-    con->write(bufs);
-
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( output.str(), "foobar" );
-}
-
-BOOST_AUTO_TEST_CASE( async_write_vector_2_write_handler ) {
-    std::string output;
-
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-    con->set_write_handler(websocketpp::lib::bind(
-        &write_handler,
-        websocketpp::lib::ref(output),
-        websocketpp::lib::placeholders::_1,
-        websocketpp::lib::placeholders::_2,
-        websocketpp::lib::placeholders::_3
-    ));
-
-    std::vector<websocketpp::transport::buffer> bufs;
-
-    std::string foo = "foo";
-    std::string bar = "bar";
-
-    bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
-    bufs.push_back(websocketpp::transport::buffer(bar.data(),bar.size()));
-
-    con->write(bufs);
-
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( output, "foobar" );
-}
-
-BOOST_AUTO_TEST_CASE( async_write_vector_2_vector_write_handler ) {
-    std::string output;
-
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-    con->set_vector_write_handler(websocketpp::lib::bind(
-        &vector_write_handler,
-        websocketpp::lib::ref(output),
-        websocketpp::lib::placeholders::_1,
-        websocketpp::lib::placeholders::_2
-    ));
-
-    std::vector<websocketpp::transport::buffer> bufs;
-
-    std::string foo = "foo";
-    std::string bar = "bar";
-
-    bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
-    bufs.push_back(websocketpp::transport::buffer(bar.data(),bar.size()));
-
-    con->write(bufs);
-
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( output, "foobar" );
-}
-
-BOOST_AUTO_TEST_CASE( async_read_at_least_too_much ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    char buf[10];
-
-    con->async_read_at_least(11,buf,10);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::iostream::error::invalid_num_bytes) );
-}
-
-BOOST_AUTO_TEST_CASE( async_read_at_least_double_read ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    char buf[10];
-
-    con->async_read_at_least(5,buf,10);
-    con->async_read_at_least(5,buf,10);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::iostream::error::double_read) );
-}
-
-BOOST_AUTO_TEST_CASE( async_read_at_least ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    char buf[10];
-
-    memset(buf,'x',10);
-
-    con->async_read_at_least(5,buf,10);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
-
-    std::stringstream channel;
-    channel << "abcd";
-    channel >> *con;
-    BOOST_CHECK_EQUAL( channel.tellg(), -1 );
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
-
-    std::stringstream channel2;
-    channel2 << "e";
-    channel2 >> *con;
-    BOOST_CHECK_EQUAL( channel2.tellg(), -1 );
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
-
-    std::stringstream channel3;
-    channel3 << "f";
-    channel3 >> *con;
-    BOOST_CHECK_EQUAL( channel3.tellg(), 0 );
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
-    con->async_read_at_least(1,buf+5,5);
-    channel3 >> *con;
-    BOOST_CHECK_EQUAL( channel3.tellg(), -1 );
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdefxxxx" );
-}
-
-BOOST_AUTO_TEST_CASE( async_read_at_least2 ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    char buf[10];
-
-    memset(buf,'x',10);
-
-    con->async_read_at_least(5,buf,5);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
-
-    std::stringstream channel;
-    channel << "abcdefg";
-    channel >> *con;
-    BOOST_CHECK_EQUAL( channel.tellg(), 5 );
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
-
-    con->async_read_at_least(1,buf+5,5);
-    channel >> *con;
-    BOOST_CHECK_EQUAL( channel.tellg(), -1 );
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdefgxxx" );
-}
-
-void timer_callback_stub(websocketpp::lib::error_code const &) {}
-
-BOOST_AUTO_TEST_CASE( set_timer ) {
-   stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    stub_con::timer_ptr tp = con->set_timer(1000,timer_callback_stub);
-
-    BOOST_CHECK( !tp );
-}
-
-BOOST_AUTO_TEST_CASE( async_read_at_least_read_some ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    char buf[10];
-    memset(buf,'x',10);
-
-    con->async_read_at_least(5,buf,5);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
-
-    char input[10] = "abcdefg";
-    BOOST_CHECK_EQUAL(con->read_some(input,5), 5);
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
-
-    BOOST_CHECK_EQUAL(con->read_some(input+5,2), 0);
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
-
-    con->async_read_at_least(1,buf+5,5);
-    BOOST_CHECK_EQUAL(con->read_some(input+5,2), 2);
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdefgxxx" );
-}
-
-BOOST_AUTO_TEST_CASE( async_read_at_least_read_some_indef ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    char buf[20];
-    memset(buf,'x',20);
-
-    con->async_read_indef(5,buf,5);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
-
-    // here we expect to return early from read some because the outstanding
-    // read was for 5 bytes and we were called with 10.
-    char input[11] = "aaaaabbbbb";
-    BOOST_CHECK_EQUAL(con->read_some(input,10), 5);
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "aaaaaxxxxx" );
-    BOOST_CHECK_EQUAL( con->indef_read_total, 5 );
-
-    // A subsequent read should read 5 more because the indef read refreshes
-    // itself. The new read will start again at the beginning of the buffer.
-    BOOST_CHECK_EQUAL(con->read_some(input+5,5), 5);
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "bbbbbxxxxx" );
-    BOOST_CHECK_EQUAL( con->indef_read_total, 10 );
-}
-
-BOOST_AUTO_TEST_CASE( async_read_at_least_read_all ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    char buf[20];
-    memset(buf,'x',20);
-
-    con->async_read_indef(5,buf,5);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
-
-    char input[11] = "aaaaabbbbb";
-    BOOST_CHECK_EQUAL(con->read_all(input,10), 10);
-    BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "bbbbbxxxxx" );
-    BOOST_CHECK_EQUAL( con->indef_read_total, 10 );
-}
-
-BOOST_AUTO_TEST_CASE( eof_flag ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-    char buf[10];
-    con->async_read_at_least(5,buf,5);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
-    con->eof();
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::eof) );
-}
-
-BOOST_AUTO_TEST_CASE( fatal_error_flag ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-    char buf[10];
-    con->async_read_at_least(5,buf,5);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
-    con->fatal_error();
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::pass_through) );
-}
-
-BOOST_AUTO_TEST_CASE( shutdown ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
-    con->shutdown();
-    BOOST_CHECK_EQUAL( con->ec, websocketpp::lib::error_code() );
-}
-
-websocketpp::lib::error_code sd_handler(websocketpp::connection_hdl) {
-    return make_error_code(websocketpp::transport::error::general);
-}
-
-BOOST_AUTO_TEST_CASE( shutdown_handler ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    con->set_shutdown_handler(&sd_handler);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
-    con->shutdown();
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::general) );
-}
-
-BOOST_AUTO_TEST_CASE( clear_handler ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    con->set_shutdown_handler(&sd_handler);
-    con->set_shutdown_handler(NULL);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
-    con->shutdown();
-    BOOST_CHECK_EQUAL( con->ec, websocketpp::lib::error_code() );
-}
-
-BOOST_AUTO_TEST_CASE( shared_pointer_memory_cleanup ) {
-    stub_con::ptr con(new stub_con(true,alogger,elogger));
-
-    BOOST_CHECK_EQUAL(con.use_count(), 1);
-
-    char buf[10];
-    memset(buf,'x',10);
-    con->async_read_at_least(5,buf,5);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
-    BOOST_CHECK_EQUAL(con.use_count(), 2);
-
-    char input[10] = "foo";
-    con->read_some(input,3);
-    BOOST_CHECK_EQUAL(con.use_count(), 2);
-
-    con->read_some(input,2);
-    BOOST_CHECK_EQUAL( std::string(buf,10), "foofoxxxxx" );
-    BOOST_CHECK_EQUAL(con.use_count(), 1);
-
-    con->async_read_at_least(5,buf,5);
-    BOOST_CHECK_EQUAL(con.use_count(), 2);
-
-    con->eof();
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::eof) );
-    BOOST_CHECK_EQUAL(con.use_count(), 1);
-}
-
diff --git a/src/sioclient/lib/websocketpp/test/transport/iostream/endpoint.cpp b/src/sioclient/lib/websocketpp/test/transport/iostream/endpoint.cpp
deleted file mode 100644
index ded99678..00000000
--- a/src/sioclient/lib/websocketpp/test/transport/iostream/endpoint.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE transport_iostream_endpoint
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-
-#include <websocketpp/transport/iostream/endpoint.hpp>
-
-BOOST_AUTO_TEST_CASE( placeholder ) {}
-
-/*BOOST_AUTO_TEST_CASE( blank_error ) {
-    websocketpp::lib::error_code ec;
-
-    BOOST_CHECK( !ec );
-}*/
diff --git a/src/sioclient/lib/websocketpp/test/utility/CMakeLists.txt b/src/sioclient/lib/websocketpp/test/utility/CMakeLists.txt
deleted file mode 100644
index 3903f131..00000000
--- a/src/sioclient/lib/websocketpp/test/utility/CMakeLists.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-# Test close utilities
-file (GLOB SOURCE close.cpp)
-
-init_target (test_close)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test error utilities
-file (GLOB SOURCE error.cpp)
-
-init_target (test_error)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test frame utilities
-file (GLOB SOURCE frame.cpp)
-
-init_target (test_frame)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test sha1 utilities
-file (GLOB SOURCE sha1.cpp)
-
-init_target (test_sha1)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test uri utilities
-file (GLOB SOURCE uri.cpp)
-
-init_target (test_uri)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test misc utilities
-file (GLOB SOURCE utilities.cpp)
-
-init_target (test_utilities)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/src/sioclient/lib/websocketpp/test/utility/SConscript b/src/sioclient/lib/websocketpp/test/utility/SConscript
deleted file mode 100644
index 80e9ef6c..00000000
--- a/src/sioclient/lib/websocketpp/test/utility/SConscript
+++ /dev/null
@@ -1,40 +0,0 @@
-## utility unit tests
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
-
-objs = env.Object('uri_boost.o', ["uri.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('utilities_boost.o', ["utilities.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('close_boost.o', ["close.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('sha1_boost.o', ["sha1.cpp"], LIBS = BOOST_LIBS)
-objs += env.Object('error_boost.o', ["error.cpp"], LIBS = BOOST_LIBS)
-prgs = env.Program('test_uri_boost', ["uri_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_utility_boost', ["utilities_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_frame', ["frame.cpp"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_close_boost', ["close_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_sha1_boost', ["sha1_boost.o"], LIBS = BOOST_LIBS)
-prgs += env.Program('test_error_boost', ["error_boost.o"], LIBS = BOOST_LIBS)
-
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   objs += env_cpp11.Object('utilities_stl.o', ["utilities.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('uri_stl.o', ["uri.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('close_stl.o', ["close.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('sha1_stl.o', ["sha1.cpp"], LIBS = BOOST_LIBS_CPP11)
-   objs += env_cpp11.Object('error_stl.o', ["error.cpp"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_utility_stl', ["utilities_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_uri_stl', ["uri_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_close_stl', ["close_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_sha1_stl', ["sha1_stl.o"], LIBS = BOOST_LIBS_CPP11)
-   prgs += env_cpp11.Program('test_error_stl', ["error_stl.o"], LIBS = BOOST_LIBS_CPP11)
-
-Return('prgs')
diff --git a/src/sioclient/lib/websocketpp/test/utility/close.cpp b/src/sioclient/lib/websocketpp/test/utility/close.cpp
deleted file mode 100644
index 50f9f780..00000000
--- a/src/sioclient/lib/websocketpp/test/utility/close.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE close
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/close.hpp>
-#include <websocketpp/utilities.hpp>
-
-using namespace websocketpp;
-
-BOOST_AUTO_TEST_CASE( reserved_values ) {
-    BOOST_CHECK( !close::status::reserved(999) );
-    BOOST_CHECK( close::status::reserved(1004) );
-    BOOST_CHECK( close::status::reserved(1016) );
-    BOOST_CHECK( close::status::reserved(2999) );
-    BOOST_CHECK( !close::status::reserved(1000) );
-}
-
-BOOST_AUTO_TEST_CASE( invalid_values ) {
-    BOOST_CHECK( close::status::invalid(0) );
-    BOOST_CHECK( close::status::invalid(999) );
-    BOOST_CHECK( !close::status::invalid(1000) );
-    BOOST_CHECK( close::status::invalid(1005) );
-    BOOST_CHECK( close::status::invalid(1006) );
-    BOOST_CHECK( close::status::invalid(1015) );
-    BOOST_CHECK( !close::status::invalid(2999) );
-    BOOST_CHECK( !close::status::invalid(3000) );
-    BOOST_CHECK( close::status::invalid(5000) );
-}
-
-BOOST_AUTO_TEST_CASE( value_extraction ) {
-    lib::error_code ec;
-    std::string payload = "oo";
-
-    // Value = 1000
-    payload[0] = 0x03;
-    payload[1] = char(0xe8);
-    BOOST_CHECK( close::extract_code(payload,ec) == close::status::normal );
-    BOOST_CHECK( !ec );
-
-    // Value = 1004
-    payload[0] = 0x03;
-    payload[1] = char(0xec);
-    BOOST_CHECK( close::extract_code(payload,ec) == 1004 );
-    BOOST_CHECK( ec == error::reserved_close_code );
-
-    // Value = 1005
-    payload[0] = 0x03;
-    payload[1] = char(0xed);
-    BOOST_CHECK( close::extract_code(payload,ec) == close::status::no_status );
-    BOOST_CHECK( ec == error::invalid_close_code );
-
-    // Value = 3000
-    payload[0] = 0x0b;
-    payload[1] = char(0xb8);
-    BOOST_CHECK( close::extract_code(payload,ec) == 3000 );
-    BOOST_CHECK( !ec );
-}
-
-BOOST_AUTO_TEST_CASE( extract_empty ) {
-    lib::error_code ec;
-    std::string payload;
-
-    BOOST_CHECK( close::extract_code(payload,ec) == close::status::no_status );
-    BOOST_CHECK( !ec );
-}
-
-BOOST_AUTO_TEST_CASE( extract_short ) {
-    lib::error_code ec;
-    std::string payload = "0";
-
-    BOOST_CHECK( close::extract_code(payload,ec) == close::status::protocol_error );
-    BOOST_CHECK( ec == error::bad_close_code );
-}
-
-BOOST_AUTO_TEST_CASE( extract_reason ) {
-    lib::error_code ec;
-    std::string payload = "00Foo";
-
-    BOOST_CHECK( close::extract_reason(payload,ec) == "Foo" );
-    BOOST_CHECK( !ec );
-
-    payload.clear();
-    BOOST_CHECK( close::extract_reason(payload,ec).empty() );
-    BOOST_CHECK( !ec );
-
-    payload = "00";
-    BOOST_CHECK( close::extract_reason(payload,ec).empty() );
-    BOOST_CHECK( !ec );
-
-    payload = "000";
-    payload[2] = char(0xFF);
-
-    close::extract_reason(payload,ec);
-    BOOST_CHECK( ec == error::invalid_utf8 );
-}
diff --git a/src/sioclient/lib/websocketpp/test/utility/error.cpp b/src/sioclient/lib/websocketpp/test/utility/error.cpp
deleted file mode 100644
index 1379a95f..00000000
--- a/src/sioclient/lib/websocketpp/test/utility/error.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE error
-#include <boost/test/unit_test.hpp>
-
-#include <websocketpp/error.hpp>
-
-BOOST_AUTO_TEST_CASE( constructing_exceptions ) {
-    websocketpp::lib::error_code test_ec = websocketpp::error::make_error_code(websocketpp::error::test);
-    websocketpp::lib::error_code general_ec = websocketpp::error::make_error_code(websocketpp::error::general);
-
-    websocketpp::exception b("foo");
-    websocketpp::exception c("foo",test_ec);
-    websocketpp::exception d("");
-    websocketpp::exception e("",test_ec);
-
-    BOOST_CHECK_EQUAL(b.what(),"foo");
-    BOOST_CHECK_EQUAL(b.code(),general_ec);
-
-    BOOST_CHECK_EQUAL(c.what(),"foo");
-    BOOST_CHECK_EQUAL(c.code(),test_ec);
-
-    BOOST_CHECK_EQUAL(d.what(),"Generic error");
-    BOOST_CHECK_EQUAL(d.code(),general_ec);
-
-    BOOST_CHECK_EQUAL(e.what(),"Test Error");
-    BOOST_CHECK_EQUAL(e.code(),test_ec);
-}
-
diff --git a/src/sioclient/lib/websocketpp/test/utility/frame.cpp b/src/sioclient/lib/websocketpp/test/utility/frame.cpp
deleted file mode 100644
index 879c2ef4..00000000
--- a/src/sioclient/lib/websocketpp/test/utility/frame.cpp
+++ /dev/null
@@ -1,538 +0,0 @@
-/*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE frame
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/frame.hpp>
-#include <websocketpp/utilities.hpp>
-
-using namespace websocketpp;
-
-BOOST_AUTO_TEST_CASE( basic_bits ) {
-    frame::basic_header h1(0x00,0x00); // all false
-    frame::basic_header h2(0xF0,0x80); // all true
-
-    // Read Values
-    BOOST_CHECK( frame::get_fin(h1) == false );
-    BOOST_CHECK( frame::get_rsv1(h1) == false );
-    BOOST_CHECK( frame::get_rsv2(h1) == false );
-    BOOST_CHECK( frame::get_rsv3(h1) == false );
-    BOOST_CHECK( frame::get_masked(h1) == false );
-
-    BOOST_CHECK( frame::get_fin(h2) == true );
-    BOOST_CHECK( frame::get_rsv1(h2) == true );
-    BOOST_CHECK( frame::get_rsv2(h2) == true );
-    BOOST_CHECK( frame::get_rsv3(h2) == true );
-    BOOST_CHECK( frame::get_masked(h2) == true );
-
-    // Set Values
-    frame::set_fin(h1,true);
-    BOOST_CHECK( h1.b0 == 0x80 );
-
-    frame::set_rsv1(h1,true);
-    BOOST_CHECK( h1.b0 == 0xC0 );
-
-    frame::set_rsv2(h1,true);
-    BOOST_CHECK( h1.b0 == 0xE0 );
-
-    frame::set_rsv3(h1,true);
-    BOOST_CHECK( h1.b0 == 0xF0 );
-
-    frame::set_masked(h1,true);
-    BOOST_CHECK( h1.b1 == 0x80 );
-}
-
-BOOST_AUTO_TEST_CASE( basic_constructors ) {
-    // Read Values
-    frame::basic_header h1(frame::opcode::TEXT,12,true,false);
-    BOOST_CHECK( frame::get_opcode(h1) == frame::opcode::TEXT );
-    BOOST_CHECK( frame::get_basic_size(h1) == 12 );
-    BOOST_CHECK( frame::get_fin(h1) == true );
-    BOOST_CHECK( frame::get_rsv1(h1) == false );
-    BOOST_CHECK( frame::get_rsv2(h1) == false );
-    BOOST_CHECK( frame::get_rsv3(h1) == false );
-    BOOST_CHECK( frame::get_masked(h1) == false );
-
-    frame::basic_header h2(frame::opcode::BINARY,0,false,false,false,true);
-    BOOST_CHECK( frame::get_opcode(h2) == frame::opcode::BINARY );
-    BOOST_CHECK( frame::get_basic_size(h2) == 0 );
-    BOOST_CHECK( frame::get_fin(h2) == false );
-    BOOST_CHECK( frame::get_rsv1(h2) == false );
-    BOOST_CHECK( frame::get_rsv2(h2) == true );
-    BOOST_CHECK( frame::get_rsv3(h2) == false );
-    BOOST_CHECK( frame::get_masked(h2) == false );
-}
-
-BOOST_AUTO_TEST_CASE( basic_size ) {
-    frame::basic_header h1(0x00,0x00); // length 0
-    frame::basic_header h2(0x00,0x01); // length 1
-    frame::basic_header h3(0x00,0x7D); // length 125
-    frame::basic_header h4(0x00,0x7E); // length 126
-    frame::basic_header h5(0x00,0x7F); // length 127
-    frame::basic_header h6(0x00,0x80); // length 0, mask bit set
-
-    BOOST_CHECK( frame::get_basic_size(h1) == 0 );
-    BOOST_CHECK( frame::get_basic_size(h2) == 1 );
-    BOOST_CHECK( frame::get_basic_size(h3) == 125 );
-    BOOST_CHECK( frame::get_basic_size(h4) == 126 );
-    BOOST_CHECK( frame::get_basic_size(h5) == 127 );
-    BOOST_CHECK( frame::get_basic_size(h6) == 0 );
-
-    /*frame::set_basic_size(h1,1);
-    BOOST_CHECK( h1.b1 == 0x01 );
-
-    frame::set_basic_size(h1,125);
-    BOOST_CHECK( h1.b1 == 0x7D );
-
-    frame::set_basic_size(h1,126);
-    BOOST_CHECK( h1.b1 == 0x7E );
-
-    frame::set_basic_size(h1,127);
-    BOOST_CHECK( h1.b1 == 0x7F );
-
-    frame::set_basic_size(h1,0);
-    BOOST_CHECK( h1.b1 == 0x00 );*/
-}
-
-BOOST_AUTO_TEST_CASE( basic_header_length ) {
-    frame::basic_header h1(0x82,0x00); // short binary frame, unmasked
-    frame::basic_header h2(0x82,0x80); // short binary frame, masked
-    frame::basic_header h3(0x82,0x7E); // medium binary frame, unmasked
-    frame::basic_header h4(0x82,0xFE); // medium binary frame, masked
-    frame::basic_header h5(0x82,0x7F); // jumbo binary frame, unmasked
-    frame::basic_header h6(0x82,0xFF); // jumbo binary frame, masked
-
-    BOOST_CHECK( frame::get_header_len(h1) == 2);
-    BOOST_CHECK( frame::get_header_len(h2) == 6);
-    BOOST_CHECK( frame::get_header_len(h3) == 4);
-    BOOST_CHECK( frame::get_header_len(h4) == 8);
-    BOOST_CHECK( frame::get_header_len(h5) == 10);
-    BOOST_CHECK( frame::get_header_len(h6) == 14);
-}
-
-BOOST_AUTO_TEST_CASE( basic_opcode ) {
-    frame::basic_header h1(0x00,0x00);
-
-    BOOST_CHECK( is_control(frame::opcode::CONTINUATION) == false);
-    BOOST_CHECK( is_control(frame::opcode::TEXT) == false);
-    BOOST_CHECK( is_control(frame::opcode::BINARY) == false);
-    BOOST_CHECK( is_control(frame::opcode::CLOSE) == true);
-    BOOST_CHECK( is_control(frame::opcode::PING) == true);
-    BOOST_CHECK( is_control(frame::opcode::PONG) == true);
-
-    BOOST_CHECK( frame::get_opcode(h1) == frame::opcode::CONTINUATION );
-}
-
-BOOST_AUTO_TEST_CASE( extended_header_basics ) {
-    frame::extended_header h1;
-    uint8_t h1_solution[12] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-    frame::extended_header h2(uint16_t(255));
-    uint8_t h2_solution[12] = {0x00, 0xFF, 0x00, 0x00, 0x00, 0x00,
-                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-    frame::extended_header h3(uint16_t(256),htonl(0x8040201));
-    uint8_t h3_solution[12] = {0x01, 0x00, 0x08, 0x04, 0x02, 0x01,
-                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-    frame::extended_header h4(uint64_t(0x0807060504030201LL));
-    uint8_t h4_solution[12] = {0x08, 0x07, 0x06, 0x05, 0x04, 0x03,
-                               0x02, 0x01, 0x00, 0x00, 0x00, 0x00};
-
-    frame::extended_header h5(uint64_t(0x0807060504030201LL),htonl(0x8040201));
-    uint8_t h5_solution[12] = {0x08, 0x07, 0x06, 0x05, 0x04, 0x03,
-                               0x02, 0x01, 0x08, 0x04, 0x02, 0x01};
-
-    BOOST_CHECK( std::equal(h1_solution,h1_solution+12,h1.bytes) );
-    BOOST_CHECK( std::equal(h2_solution,h2_solution+12,h2.bytes) );
-    BOOST_CHECK( std::equal(h3_solution,h3_solution+12,h3.bytes) );
-    BOOST_CHECK( std::equal(h4_solution,h4_solution+12,h4.bytes) );
-    BOOST_CHECK( std::equal(h5_solution,h5_solution+12,h5.bytes) );
-}
-
-BOOST_AUTO_TEST_CASE( extended_header_extractors ) {
-    frame::basic_header h1(0x00,0x7E);
-    frame::extended_header e1(uint16_t(255));
-    BOOST_CHECK( get_extended_size(e1) == 255 );
-    BOOST_CHECK( get_payload_size(h1,e1) == 255 );
-    BOOST_CHECK( get_masking_key_offset(h1) == 2 );
-    BOOST_CHECK( get_masking_key(h1,e1).i == 0 );
-
-    frame::basic_header h2(0x00,0x7F);
-    frame::extended_header e2(uint64_t(0x0807060504030201LL));
-    BOOST_CHECK( get_jumbo_size(e2) == 0x0807060504030201LL );
-    BOOST_CHECK( get_payload_size(h2,e2) == 0x0807060504030201LL );
-    BOOST_CHECK( get_masking_key_offset(h2) == 8 );
-    BOOST_CHECK( get_masking_key(h2,e2).i == 0 );
-
-    frame::basic_header h3(0x00,0xFE);
-    frame::extended_header e3(uint16_t(255),0x08040201);
-    BOOST_CHECK( get_extended_size(e3) == 255 );
-    BOOST_CHECK( get_payload_size(h3,e3) == 255 );
-    BOOST_CHECK( get_masking_key_offset(h3) == 2 );
-    BOOST_CHECK( get_masking_key(h3,e3).i == 0x08040201 );
-
-    frame::basic_header h4(0x00,0xFF);
-    frame::extended_header e4(uint64_t(0x0807060504030201LL),0x08040201);
-    BOOST_CHECK( get_jumbo_size(e4) == 0x0807060504030201LL );
-    BOOST_CHECK( get_payload_size(h4,e4) == 0x0807060504030201LL );
-    BOOST_CHECK( get_masking_key_offset(h4) == 8 );
-    BOOST_CHECK( get_masking_key(h4,e4).i == 0x08040201 );
-
-    frame::basic_header h5(0x00,0x7D);
-    frame::extended_header e5;
-    BOOST_CHECK( get_payload_size(h5,e5) == 125 );
-}
-
-BOOST_AUTO_TEST_CASE( header_preparation ) {
-    frame::basic_header h1(0x81,0xFF); //
-    frame::extended_header e1(uint64_t(0xFFFFFLL),htonl(0xD5FB70EE));
-    std::string p1 = prepare_header(h1, e1);
-    uint8_t s1[14] = {0x81, 0xFF,
-                     0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFF,
-                     0xD5, 0xFB, 0x70, 0xEE};
-
-    BOOST_CHECK( p1.size() == 14);
-    BOOST_CHECK( std::equal(p1.begin(),p1.end(),reinterpret_cast<char*>(s1)) );
-
-    frame::basic_header h2(0x81,0x7E); //
-    frame::extended_header e2(uint16_t(255));
-    std::string p2 = prepare_header(h2, e2);
-    uint8_t s2[4] = {0x81, 0x7E, 0x00, 0xFF};
-
-    BOOST_CHECK( p2.size() == 4);
-    BOOST_CHECK( std::equal(p2.begin(),p2.end(),reinterpret_cast<char*>(s2)) );
-}
-
-BOOST_AUTO_TEST_CASE( prepare_masking_key ) {
-    frame::masking_key_type key;
-
-    key.i = htonl(0x12345678);
-
-    if (sizeof(size_t) == 8) {
-        BOOST_CHECK(
-            frame::prepare_masking_key(key) == lib::net::_htonll(0x1234567812345678LL)
-        );
-    } else {
-        BOOST_CHECK( frame::prepare_masking_key(key) == htonl(0x12345678) );
-    }
-}
-
-BOOST_AUTO_TEST_CASE( prepare_masking_key2 ) {
-    frame::masking_key_type key;
-
-    key.i = htonl(0xD5FB70EE);
-
-    // One call
-    if (sizeof(size_t) == 8) {
-        BOOST_CHECK(
-            frame::prepare_masking_key(key) == lib::net::_htonll(0xD5FB70EED5FB70EELL)
-        );
-    } else {
-        BOOST_CHECK( frame::prepare_masking_key(key) == htonl(0xD5FB70EE) );
-    }
-}
-
-// TODO: figure out a way to run/test both 4 and 8 byte versions.
-BOOST_AUTO_TEST_CASE( circshift ) {
-    /*if (sizeof(size_t) == 8) {
-        size_t test = 0x0123456789abcdef;
-
-        BOOST_CHECK( frame::circshift_prepared_key(test,0) == 0x0123456789abcdef);
-        BOOST_CHECK( frame::circshift_prepared_key(test,1) == 0xef0123456789abcd);
-        BOOST_CHECK( frame::circshift_prepared_key(test,2) == 0xcdef0123456789ab);
-        BOOST_CHECK( frame::circshift_prepared_key(test,3) == 0xabcdef0123456789);
-    } else {
-        size_t test = 0x01234567;
-
-        BOOST_CHECK( frame::circshift_prepared_key(test,0) == 0x01234567);
-        BOOST_CHECK( frame::circshift_prepared_key(test,1) == 0x67012345);
-        BOOST_CHECK( frame::circshift_prepared_key(test,2) == 0x45670123);
-        BOOST_CHECK( frame::circshift_prepared_key(test,3) == 0x23456701);
-    }*/
-}
-
-BOOST_AUTO_TEST_CASE( block_byte_mask ) {
-    uint8_t input[15] = {0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00};
-
-    uint8_t output[15];
-
-    uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02};
-
-    frame::masking_key_type key;
-    key.c[0] = 0x00;
-    key.c[1] = 0x01;
-    key.c[2] = 0x02;
-    key.c[3] = 0x03;
-
-    byte_mask(input,input+15,output,key);
-
-    BOOST_CHECK( std::equal(output,output+15,masked) );
-}
-
-BOOST_AUTO_TEST_CASE( block_byte_mask_inplace ) {
-    uint8_t buffer[15] = {0x00, 0x00, 0x00, 0x00,
-                          0x00, 0x00, 0x00, 0x00,
-                          0x00, 0x00, 0x00, 0x00,
-                          0x00, 0x00, 0x00};
-
-    uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02};
-
-    frame::masking_key_type key;
-    key.c[0] = 0x00;
-    key.c[1] = 0x01;
-    key.c[2] = 0x02;
-    key.c[3] = 0x03;
-
-    byte_mask(buffer,buffer+15,key);
-
-    BOOST_CHECK( std::equal(buffer,buffer+15,masked) );
-}
-
-BOOST_AUTO_TEST_CASE( block_word_mask ) {
-    uint8_t input[15] =  {0x00, 0x00, 0x00, 0x00,
-                          0x00, 0x00, 0x00, 0x00,
-                          0x00, 0x00, 0x00, 0x00,
-                          0x00, 0x00, 0x00};
-
-    uint8_t output[15];
-
-    uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02};
-
-    frame::masking_key_type key;
-    key.c[0] = 0x00;
-    key.c[1] = 0x01;
-    key.c[2] = 0x02;
-    key.c[3] = 0x03;
-
-    word_mask_exact(input,output,15,key);
-
-    BOOST_CHECK( std::equal(output,output+15,masked) );
-}
-
-BOOST_AUTO_TEST_CASE( block_word_mask_inplace ) {
-    uint8_t buffer[15] = {0x00, 0x00, 0x00, 0x00,
-                          0x00, 0x00, 0x00, 0x00,
-                          0x00, 0x00, 0x00, 0x00,
-                          0x00, 0x00, 0x00};
-
-    uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02};
-
-    frame::masking_key_type key;
-    key.c[0] = 0x00;
-    key.c[1] = 0x01;
-    key.c[2] = 0x02;
-    key.c[3] = 0x03;
-
-    word_mask_exact(buffer,15,key);
-
-    BOOST_CHECK( std::equal(buffer,buffer+15,masked) );
-}
-
-BOOST_AUTO_TEST_CASE( continuous_word_mask ) {
-    uint8_t input[16];
-    uint8_t output[16];
-
-    uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x00};
-
-    frame::masking_key_type key;
-    key.c[0] = 0x00;
-    key.c[1] = 0x01;
-    key.c[2] = 0x02;
-    key.c[3] = 0x03;
-
-    // One call
-    size_t pkey,pkey_temp;
-    pkey = frame::prepare_masking_key(key);
-    std::fill_n(input,16,0x00);
-    std::fill_n(output,16,0x00);
-    frame::word_mask_circ(input,output,15,pkey);
-    BOOST_CHECK( std::equal(output,output+16,masked) );
-
-    // calls not split on word boundaries
-    pkey = frame::prepare_masking_key(key);
-    std::fill_n(input,16,0x00);
-    std::fill_n(output,16,0x00);
-
-    pkey_temp = frame::word_mask_circ(input,output,7,pkey);
-    BOOST_CHECK( std::equal(output,output+7,masked) );
-    BOOST_CHECK( pkey_temp == frame::circshift_prepared_key(pkey,3) );
-
-    pkey_temp = frame::word_mask_circ(input+7,output+7,8,pkey_temp);
-    BOOST_CHECK( std::equal(output,output+16,masked) );
-    BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
-}
-
-BOOST_AUTO_TEST_CASE( continuous_byte_mask ) {
-    uint8_t input[16];
-    uint8_t output[16];
-
-    uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x00};
-
-    frame::masking_key_type key;
-    key.c[0] = 0x00;
-    key.c[1] = 0x01;
-    key.c[2] = 0x02;
-    key.c[3] = 0x03;
-
-    // One call
-    size_t pkey,pkey_temp;
-    pkey = frame::prepare_masking_key(key);
-    std::fill_n(input,16,0x00);
-    std::fill_n(output,16,0x00);
-    frame::byte_mask_circ(input,output,15,pkey);
-    BOOST_CHECK( std::equal(output,output+16,masked) );
-
-    // calls not split on word boundaries
-    pkey = frame::prepare_masking_key(key);
-    std::fill_n(input,16,0x00);
-    std::fill_n(output,16,0x00);
-
-    pkey_temp = frame::byte_mask_circ(input,output,7,pkey);
-    BOOST_CHECK( std::equal(output,output+7,masked) );
-    BOOST_CHECK( pkey_temp == frame::circshift_prepared_key(pkey,3) );
-
-    pkey_temp = frame::byte_mask_circ(input+7,output+7,8,pkey_temp);
-    BOOST_CHECK( std::equal(output,output+16,masked) );
-    BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
-}
-
-BOOST_AUTO_TEST_CASE( continuous_word_mask_inplace ) {
-    uint8_t buffer[16];
-
-    uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x00};
-
-    frame::masking_key_type key;
-    key.c[0] = 0x00;
-    key.c[1] = 0x01;
-    key.c[2] = 0x02;
-    key.c[3] = 0x03;
-
-    // One call
-    size_t pkey,pkey_temp;
-    pkey = frame::prepare_masking_key(key);
-    std::fill_n(buffer,16,0x00);
-    frame::word_mask_circ(buffer,15,pkey);
-    BOOST_CHECK( std::equal(buffer,buffer+16,masked) );
-
-    // calls not split on word boundaries
-    pkey = frame::prepare_masking_key(key);
-    std::fill_n(buffer,16,0x00);
-
-    pkey_temp = frame::word_mask_circ(buffer,7,pkey);
-    BOOST_CHECK( std::equal(buffer,buffer+7,masked) );
-    BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
-
-    pkey_temp = frame::word_mask_circ(buffer+7,8,pkey_temp);
-    BOOST_CHECK( std::equal(buffer,buffer+16,masked) );
-    BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
-}
-
-BOOST_AUTO_TEST_CASE( continuous_byte_mask_inplace ) {
-    uint8_t buffer[16];
-
-    uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x03,
-                          0x00, 0x01, 0x02, 0x00};
-
-    frame::masking_key_type key;
-    key.c[0] = 0x00;
-    key.c[1] = 0x01;
-    key.c[2] = 0x02;
-    key.c[3] = 0x03;
-
-    // One call
-    size_t pkey,pkey_temp;
-    pkey = frame::prepare_masking_key(key);
-    std::fill_n(buffer,16,0x00);
-    frame::byte_mask_circ(buffer,15,pkey);
-    BOOST_CHECK( std::equal(buffer,buffer+16,masked) );
-
-    // calls not split on word boundaries
-    pkey = frame::prepare_masking_key(key);
-    std::fill_n(buffer,16,0x00);
-
-    pkey_temp = frame::byte_mask_circ(buffer,7,pkey);
-    BOOST_CHECK( std::equal(buffer,buffer+7,masked) );
-    BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
-
-    pkey_temp = frame::byte_mask_circ(buffer+7,8,pkey_temp);
-    BOOST_CHECK( std::equal(buffer,buffer+16,masked) );
-    BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
-}
-
-BOOST_AUTO_TEST_CASE( continuous_word_mask2 ) {
-    uint8_t buffer[12] = {0xA6, 0x15, 0x97, 0xB9,
-                          0x81, 0x50, 0xAC, 0xBA,
-                          0x9C, 0x1C, 0x9F, 0xF4};
-
-    uint8_t unmasked[12] = {0x48, 0x65, 0x6C, 0x6C,
-                            0x6F, 0x20, 0x57, 0x6F,
-                            0x72, 0x6C, 0x64, 0x21};
-
-    frame::masking_key_type key;
-    key.c[0] = 0xEE;
-    key.c[1] = 0x70;
-    key.c[2] = 0xFB;
-    key.c[3] = 0xD5;
-
-    // One call
-    size_t pkey;
-    pkey = frame::prepare_masking_key(key);
-    frame::word_mask_circ(buffer,12,pkey);
-    BOOST_CHECK( std::equal(buffer,buffer+12,unmasked) );
-}
diff --git a/src/sioclient/lib/websocketpp/test/utility/sha1.cpp b/src/sioclient/lib/websocketpp/test/utility/sha1.cpp
deleted file mode 100644
index ab25f970..00000000
--- a/src/sioclient/lib/websocketpp/test/utility/sha1.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE sha1
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/sha1/sha1.hpp>
-#include <websocketpp/utilities.hpp>
-
-BOOST_AUTO_TEST_SUITE ( sha1 )
-
-BOOST_AUTO_TEST_CASE( sha1_test_a ) {
-    unsigned char hash[20];
-    unsigned char reference[20] = {0xa9, 0x99, 0x3e, 0x36, 0x47,
-                                   0x06, 0x81, 0x6a, 0xba, 0x3e,
-                                   0x25, 0x71, 0x78, 0x50, 0xc2,
-                                   0x6c, 0x9c, 0xd0, 0xd8, 0x9d};
-
-    websocketpp::sha1::calc("abc",3,hash);
-
-    BOOST_CHECK_EQUAL_COLLECTIONS(hash, hash+20, reference, reference+20);
-}
-
-BOOST_AUTO_TEST_CASE( sha1_test_b ) {
-    unsigned char hash[20];
-    unsigned char reference[20] = {0x84, 0x98, 0x3e, 0x44, 0x1c,
-                                   0x3b, 0xd2, 0x6e, 0xba, 0xae,
-                                   0x4a, 0xa1, 0xf9, 0x51, 0x29,
-                                   0xe5, 0xe5, 0x46, 0x70, 0xf1};
-
-    websocketpp::sha1::calc(
-        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",56,hash);
-
-    BOOST_CHECK_EQUAL_COLLECTIONS(hash, hash+20, reference, reference+20);
-}
-
-BOOST_AUTO_TEST_CASE( sha1_test_c ) {
-    std::string input;
-    unsigned char hash[20];
-    unsigned char reference[20] = {0x34, 0xaa, 0x97, 0x3c, 0xd4,
-                                   0xc4, 0xda, 0xa4, 0xf6, 0x1e,
-                                   0xeb, 0x2b, 0xdb, 0xad, 0x27,
-                                   0x31, 0x65, 0x34, 0x01, 0x6f};
-
-    for (int i = 0; i < 1000000; i++) {
-        input += 'a';
-    }
-
-    websocketpp::sha1::calc(input.c_str(),input.size(),hash);
-
-    BOOST_CHECK_EQUAL_COLLECTIONS(hash, hash+20, reference, reference+20);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/sioclient/lib/websocketpp/test/utility/uri.cpp b/src/sioclient/lib/websocketpp/test/utility/uri.cpp
deleted file mode 100644
index 2b0c8863..00000000
--- a/src/sioclient/lib/websocketpp/test/utility/uri.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE uri
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/uri.hpp>
-
-// Test a regular valid ws URI
-BOOST_AUTO_TEST_CASE( uri_valid ) {
-    websocketpp::uri uri("ws://localhost:9000/chat");
-
-    BOOST_CHECK( uri.get_valid() );
-    BOOST_CHECK( !uri.get_secure() );
-    BOOST_CHECK_EQUAL( uri.get_scheme(), "ws");
-    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
-    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
-    BOOST_CHECK_EQUAL( uri.get_query(), "" );
-}
-
-// Test a regular valid ws URI
-BOOST_AUTO_TEST_CASE( uri_valid_no_port_unsecure ) {
-    websocketpp::uri uri("ws://localhost/chat");
-
-    BOOST_CHECK( uri.get_valid() );
-    BOOST_CHECK( !uri.get_secure() );
-    BOOST_CHECK_EQUAL( uri.get_scheme(), "ws");
-    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
-    BOOST_CHECK_EQUAL( uri.get_port(), 80 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
-}
-
-// Valid URI with no port (secure)
-BOOST_AUTO_TEST_CASE( uri_valid_no_port_secure ) {
-    websocketpp::uri uri("wss://localhost/chat");
-
-    BOOST_CHECK( uri.get_valid() );
-    BOOST_CHECK( uri.get_secure() );
-    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
-    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
-    BOOST_CHECK_EQUAL( uri.get_port(), 443 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
-}
-
-// Valid URI with no resource
-BOOST_AUTO_TEST_CASE( uri_valid_no_resource ) {
-    websocketpp::uri uri("wss://localhost:9000");
-
-    BOOST_CHECK( uri.get_valid() );
-    BOOST_CHECK( uri.get_secure() );
-    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
-    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
-    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
-}
-
-// Valid URI IPv6 Literal
-BOOST_AUTO_TEST_CASE( uri_valid_ipv6_literal ) {
-    websocketpp::uri uri("wss://[::1]:9000/chat");
-
-    BOOST_CHECK( uri.get_valid() );
-    BOOST_CHECK( uri.get_secure() );
-    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
-    BOOST_CHECK_EQUAL( uri.get_host(), "::1");
-    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
-}
-
-// Valid URI with more complicated host
-BOOST_AUTO_TEST_CASE( uri_valid_2 ) {
-    websocketpp::uri uri("wss://thor-websocket.zaphoyd.net:88/");
-
-    BOOST_CHECK( uri.get_valid() );
-    BOOST_CHECK( uri.get_secure() );
-    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
-    BOOST_CHECK_EQUAL( uri.get_host(), "thor-websocket.zaphoyd.net");
-    BOOST_CHECK_EQUAL( uri.get_port(), 88 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
-}
-
-
-// Invalid URI (port too long)
-BOOST_AUTO_TEST_CASE( uri_invalid_long_port ) {
-    websocketpp::uri uri("wss://localhost:900000/chat");
-
-    BOOST_CHECK( !uri.get_valid() );
-}
-
-// Invalid URI (bogus scheme method)
-BOOST_AUTO_TEST_CASE( uri_invalid_scheme ) {
-    websocketpp::uri uri("foo://localhost:9000/chat");
-
-    BOOST_CHECK( !uri.get_valid() );
-}
-
-// Valid URI (http method)
-BOOST_AUTO_TEST_CASE( uri_http_scheme ) {
-    websocketpp::uri uri("http://localhost:9000/chat");
-
-    BOOST_CHECK( uri.get_valid() );
-    BOOST_CHECK( !uri.get_secure() );
-    BOOST_CHECK_EQUAL( uri.get_scheme(), "http");
-    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
-    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
-}
-
-// Valid URI IPv4 literal
-BOOST_AUTO_TEST_CASE( uri_valid_ipv4_literal ) {
-    websocketpp::uri uri("wss://127.0.0.1:9000/chat");
-
-    BOOST_CHECK( uri.get_valid() );
-    BOOST_CHECK( uri.get_secure() );
-    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
-    BOOST_CHECK_EQUAL( uri.get_host(), "127.0.0.1");
-    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
-}
-
-// Valid URI complicated resource path
-BOOST_AUTO_TEST_CASE( uri_valid_3 ) {
-    websocketpp::uri uri("wss://localhost:9000/chat/foo/bar");
-
-    BOOST_CHECK( uri.get_valid() );
-    BOOST_CHECK( uri.get_secure() );
-    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
-    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
-    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat/foo/bar" );
-}
-
-// Invalid URI broken method separator
-BOOST_AUTO_TEST_CASE( uri_invalid_method_separator ) {
-    websocketpp::uri uri("wss:/localhost:9000/chat");
-
-    BOOST_CHECK( !uri.get_valid() );
-}
-
-// Invalid URI port > 65535
-BOOST_AUTO_TEST_CASE( uri_invalid_gt_16_bit_port ) {
-    websocketpp::uri uri("wss:/localhost:70000/chat");
-
-    BOOST_CHECK( !uri.get_valid() );
-}
-
-// Invalid URI includes uri fragment
-BOOST_AUTO_TEST_CASE( uri_invalid_fragment ) {
-    websocketpp::uri uri("wss:/localhost:70000/chat#foo");
-
-    BOOST_CHECK( !uri.get_valid() );
-}
-
-// Invalid URI with no brackets around IPv6 literal
-BOOST_AUTO_TEST_CASE( uri_invalid_bad_v6_literal_1 ) {
-    websocketpp::uri uri("wss://::1/chat");
-
-    BOOST_CHECK( !uri.get_valid() );
-}
-
-// Invalid URI with port and no brackets around IPv6 literal
-BOOST_AUTO_TEST_CASE( uri_invalid_bad_v6_literal_2 ) {
-    websocketpp::uri uri("wss://::1:2009/chat");
-
-    BOOST_CHECK( !uri.get_valid() );
-}
-
-// Valid URI complicated resource path with query
-BOOST_AUTO_TEST_CASE( uri_valid_4 ) {
-    websocketpp::uri uri("wss://localhost:9000/chat/foo/bar?foo=bar");
-
-    BOOST_CHECK( uri.get_valid() );
-    BOOST_CHECK( uri.get_secure() );
-    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss" );
-    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
-    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat/foo/bar?foo=bar" );
-    BOOST_CHECK_EQUAL( uri.get_query(), "foo=bar" );
-}
-
-// Valid URI with a mapped v4 ipv6 literal
-BOOST_AUTO_TEST_CASE( uri_valid_v4_mapped ) {
-    websocketpp::uri uri("wss://[0000:0000:0000:0000:0000:0000:192.168.1.1]:9000/");
-
-    BOOST_CHECK( uri.get_valid() );
-    BOOST_CHECK( uri.get_secure() );
-    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss" );
-    BOOST_CHECK_EQUAL( uri.get_host(), "0000:0000:0000:0000:0000:0000:192.168.1.1");
-    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
-}
-
-// Valid URI with a v6 address with mixed case
-BOOST_AUTO_TEST_CASE( uri_valid_v6_mixed_case ) {
-    websocketpp::uri uri("wss://[::10aB]:9000/");
-
-    BOOST_CHECK( uri.get_valid() == true );
-    BOOST_CHECK( uri.get_secure() == true );
-    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss" );
-    BOOST_CHECK_EQUAL( uri.get_host(), "::10aB");
-    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
-}
-
-// Valid URI with a v6 address with mixed case
-BOOST_AUTO_TEST_CASE( uri_invalid_no_scheme ) {
-    websocketpp::uri uri("myserver.com");
-
-    BOOST_CHECK( !uri.get_valid() );
-}
-
-// Invalid IPv6 literal
-/*BOOST_AUTO_TEST_CASE( uri_invalid_v6_nonhex ) {
-    websocketpp::uri uri("wss://[g::1]:9000/");
-
-    BOOST_CHECK( uri.get_valid() == false );
-}*/
-
-// TODO: tests for the other two constructors
diff --git a/src/sioclient/lib/websocketpp/test/utility/utilities.cpp b/src/sioclient/lib/websocketpp/test/utility/utilities.cpp
deleted file mode 100644
index 8cbb8c3c..00000000
--- a/src/sioclient/lib/websocketpp/test/utility/utilities.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2011, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-//#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE utility
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/utilities.hpp>
-
-BOOST_AUTO_TEST_SUITE ( utility )
-
-BOOST_AUTO_TEST_CASE( substr_found ) {
-    std::string haystack = "abc123";
-    std::string needle = "abc";
-
-    BOOST_CHECK(websocketpp::utility::ci_find_substr(haystack,needle) ==haystack.begin());
-}
-
-BOOST_AUTO_TEST_CASE( substr_found_ci ) {
-    std::string haystack = "abc123";
-    std::string needle = "aBc";
-
-    BOOST_CHECK(websocketpp::utility::ci_find_substr(haystack,needle) ==haystack.begin());
-}
-
-BOOST_AUTO_TEST_CASE( substr_not_found ) {
-    std::string haystack = "abd123";
-    std::string needle = "abcd";
-
-    BOOST_CHECK(websocketpp::utility::ci_find_substr(haystack,needle) == haystack.end());
-}
-
-BOOST_AUTO_TEST_CASE( to_lower ) {
-    std::string in = "AbCd";
-
-    BOOST_CHECK_EQUAL(websocketpp::utility::to_lower(in), "abcd");
-}
-
-BOOST_AUTO_TEST_CASE( string_replace_all ) {
-    std::string source = "foo \"bar\" baz";
-    std::string dest = "foo \\\"bar\\\" baz";
-
-    using websocketpp::utility::string_replace_all;
-    BOOST_CHECK_EQUAL(string_replace_all(source,"\"","\\\""),dest);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/sioclient/lib/websocketpp/tutorials/broadcast_tutorial/broadcast_tutorial.md b/src/sioclient/lib/websocketpp/tutorials/broadcast_tutorial/broadcast_tutorial.md
deleted file mode 100644
index 02e50016..00000000
--- a/src/sioclient/lib/websocketpp/tutorials/broadcast_tutorial/broadcast_tutorial.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Broadcast Tutorial
-==================
-
-This tutorial will dig into some more nitty gritty details on how to build high
-scalability, high performance websocket servers for broadcast like workflows.
-
-Will go into features like:
-- minimizing work done in handlers
-- using asio thread pool mode
-- teaming multiple endpoints
-- setting accept queue depth
-- tuning compile time buffer sizes
-- prepared messages
-- flow control
-- basic operating system level tuning, particularly increasing file descriptor limits.
-- measuring performance with wsperf / autobahn
-- tuning permessage-deflate compression settings
\ No newline at end of file
diff --git a/src/sioclient/lib/websocketpp/tutorials/chat_tutorial/chat_tutorial.md b/src/sioclient/lib/websocketpp/tutorials/chat_tutorial/chat_tutorial.md
deleted file mode 100644
index 042837c6..00000000
--- a/src/sioclient/lib/websocketpp/tutorials/chat_tutorial/chat_tutorial.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Chat Tutorial
-=============
-
-Goals of this tutorial:
-- Implement a realtime websocket chat server
-
-
-Server
-- Nicknames
-- Channels
-- Subprotocol
-- Origin restrictions
-- HTTP statistics page
diff --git a/src/sioclient/lib/websocketpp/tutorials/utility_client/step1.cpp b/src/sioclient/lib/websocketpp/tutorials/utility_client/step1.cpp
deleted file mode 100644
index 9c8fad9e..00000000
--- a/src/sioclient/lib/websocketpp/tutorials/utility_client/step1.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
-// Additional related material can be found in the tutorials/utility_client
-// directory of the WebSocket++ repository.
-
-#include <iostream>
-#include <string>
-
-int main() {
-    bool done = false;
-    std::string input;
-
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
-
-        if (input == "quit") {
-            done = true;
-        } else if (input == "help") {
-            std::cout 
-                << "\nCommand List:\n"
-                << "help: Display this help text\n"
-                << "quit: Exit the program\n"
-                << std::endl;
-        } else {
-            std::cout << "Unrecognized Command" << std::endl;
-        }
-    }
-
-    return 0;
-}
diff --git a/src/sioclient/lib/websocketpp/tutorials/utility_client/step2.cpp b/src/sioclient/lib/websocketpp/tutorials/utility_client/step2.cpp
deleted file mode 100644
index a1e57966..00000000
--- a/src/sioclient/lib/websocketpp/tutorials/utility_client/step2.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
-// Additional related material can be found in the tutorials/utility_client
-// directory of the WebSocket++ repository.
-
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-
-#include <iostream>
-#include <string>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-int main() {
-    bool done = false;
-    std::string input;
-
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
-
-        if (input == "quit") {
-            done = true;
-        } else if (input == "help") {
-            std::cout
-                << "\nCommand List:\n"
-                << "help: Display this help text\n"
-                << "quit: Exit the program\n"
-                << std::endl;
-        } else {
-            std::cout << "Unrecognized Command" << std::endl;
-        }
-    }
-
-    return 0;
-}
diff --git a/src/sioclient/lib/websocketpp/tutorials/utility_client/step3.cpp b/src/sioclient/lib/websocketpp/tutorials/utility_client/step3.cpp
deleted file mode 100644
index 82e652f1..00000000
--- a/src/sioclient/lib/websocketpp/tutorials/utility_client/step3.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
-// Additional related material can be found in the tutorials/utility_client
-// directory of the WebSocket++ repository.
-
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-
-#include <websocketpp/common/thread.hpp>
-#include <websocketpp/common/memory.hpp>
-
-#include <iostream>
-#include <string>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-class websocket_endpoint {
-public:
-    websocket_endpoint () {
-        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
-        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
-
-        m_endpoint.init_asio();
-        m_endpoint.start_perpetual();
-
-        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
-    }
-private:
-    client m_endpoint;
-    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
-};
-
-int main() {
-    bool done = false;
-    std::string input;
-    websocket_endpoint endpoint;
-
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
-
-        if (input == "quit") {
-            done = true;
-        } else if (input == "help") {
-            std::cout 
-                << "\nCommand List:\n"
-                << "help: Display this help text\n"
-                << "quit: Exit the program\n"
-                << std::endl;
-        } else {
-            std::cout << "Unrecognized Command" << std::endl;
-        }
-    }
-
-    return 0;
-}
diff --git a/src/sioclient/lib/websocketpp/tutorials/utility_client/step4.cpp b/src/sioclient/lib/websocketpp/tutorials/utility_client/step4.cpp
deleted file mode 100644
index 73aee65a..00000000
--- a/src/sioclient/lib/websocketpp/tutorials/utility_client/step4.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
-// Additional related material can be found in the tutorials/utility_client
-// directory of the WebSocket++ repository.
-
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-
-#include <websocketpp/common/thread.hpp>
-#include <websocketpp/common/memory.hpp>
-
-#include <cstdlib>
-#include <iostream>
-#include <map>
-#include <string>
-#include <sstream>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-class connection_metadata {
-public:
-    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
-
-    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
-      : m_id(id)
-      , m_hdl(hdl)
-      , m_status("Connecting")
-      , m_uri(uri)
-      , m_server("N/A")
-    {}
-
-    void on_open(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Open";
-
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        m_server = con->get_response_header("Server");
-    }
-
-    void on_fail(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Failed";
-
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        m_server = con->get_response_header("Server");
-        m_error_reason = con->get_ec().message();
-    }
-
-    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
-private:
-    int m_id;
-    websocketpp::connection_hdl m_hdl;
-    std::string m_status;
-    std::string m_uri;
-    std::string m_server;
-    std::string m_error_reason;
-};
-
-std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
-    out << "> URI: " << data.m_uri << "\n"
-        << "> Status: " << data.m_status << "\n"
-        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
-        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason);
-
-    return out;
-}
-
-class websocket_endpoint {
-public:
-    websocket_endpoint () : m_next_id(0) {
-        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
-        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
-
-        m_endpoint.init_asio();
-        m_endpoint.start_perpetual();
-
-        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
-    }
-
-    int connect(std::string const & uri) {
-        websocketpp::lib::error_code ec;
-
-        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
-
-        if (ec) {
-            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
-            return -1;
-        }
-
-        int new_id = m_next_id++;
-        connection_metadata::ptr metadata_ptr = websocketpp::lib::make_shared<connection_metadata>(new_id, con->get_handle(), uri);
-        m_connection_list[new_id] = metadata_ptr;
-
-        con->set_open_handler(websocketpp::lib::bind(
-            &connection_metadata::on_open,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_fail_handler(websocketpp::lib::bind(
-            &connection_metadata::on_fail,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-
-        m_endpoint.connect(con);
-
-        return new_id;
-    }
-
-    connection_metadata::ptr get_metadata(int id) const {
-        con_list::const_iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            return connection_metadata::ptr();
-        } else {
-            return metadata_it->second;
-        }
-    }
-private:
-    typedef std::map<int,connection_metadata::ptr> con_list;
-
-    client m_endpoint;
-    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
-
-    con_list m_connection_list;
-    int m_next_id;
-};
-
-int main() {
-    bool done = false;
-    std::string input;
-    websocket_endpoint endpoint;
-
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
-
-        if (input == "quit") {
-            done = true;
-        } else if (input == "help") {
-            std::cout
-                << "\nCommand List:\n"
-                << "connect <ws uri>\n"
-                << "show <connection id>\n"
-                << "help: Display this help text\n"
-                << "quit: Exit the program\n"
-                << std::endl;
-        } else if (input.substr(0,7) == "connect") {
-            int id = endpoint.connect(input.substr(8));
-            if (id != -1) {
-                std::cout << "> Created connection with id " << id << std::endl;
-            }
-        } else if (input.substr(0,4) == "show") {
-            int id = atoi(input.substr(5).c_str());
-
-            connection_metadata::ptr metadata = endpoint.get_metadata(id);
-            if (metadata) {
-                std::cout << *metadata << std::endl;
-            } else {
-                std::cout << "> Unknown connection id " << id << std::endl;
-            }
-        } else {
-            std::cout << "> Unrecognized Command" << std::endl;
-        }
-    }
-
-    return 0;
-}
-
-/*
-
-clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a
-
-clang++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_thread.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_random.a
-
-clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/Documents/websocketpp/ -I/Users/zaphoyd/Documents/boost_1_53_0_libcpp/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/Documents/boost_1_53_0_libcpp/stage/lib/libboost_system.a
-
-*/
diff --git a/src/sioclient/lib/websocketpp/tutorials/utility_client/step5.cpp b/src/sioclient/lib/websocketpp/tutorials/utility_client/step5.cpp
deleted file mode 100644
index 3e57b3c2..00000000
--- a/src/sioclient/lib/websocketpp/tutorials/utility_client/step5.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
-// Additional related material can be found in the tutorials/utility_client
-// directory of the WebSocket++ repository.
-
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-
-#include <websocketpp/common/thread.hpp>
-#include <websocketpp/common/memory.hpp>
-
-#include <cstdlib>
-#include <iostream>
-#include <map>
-#include <string>
-#include <sstream>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-class connection_metadata {
-public:
-    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
-
-    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
-      : m_id(id)
-      , m_hdl(hdl)
-      , m_status("Connecting")
-      , m_uri(uri)
-      , m_server("N/A")
-    {}
-
-    void on_open(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Open";
-
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        m_server = con->get_response_header("Server");
-    }
-
-    void on_fail(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Failed";
-
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        m_server = con->get_response_header("Server");
-        m_error_reason = con->get_ec().message();
-    }
-    
-    void on_close(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Closed";
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        std::stringstream s;
-        s << "close code: " << con->get_remote_close_code() << " (" 
-          << websocketpp::close::status::get_string(con->get_remote_close_code()) 
-          << "), close reason: " << con->get_remote_close_reason();
-        m_error_reason = s.str();
-    }
-
-    websocketpp::connection_hdl get_hdl() const {
-        return m_hdl;
-    }
-    
-    int get_id() const {
-        return m_id;
-    }
-    
-    std::string get_status() const {
-        return m_status;
-    }
-
-    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
-private:
-    int m_id;
-    websocketpp::connection_hdl m_hdl;
-    std::string m_status;
-    std::string m_uri;
-    std::string m_server;
-    std::string m_error_reason;
-};
-
-std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
-    out << "> URI: " << data.m_uri << "\n"
-        << "> Status: " << data.m_status << "\n"
-        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
-        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason);
-
-    return out;
-}
-
-class websocket_endpoint {
-public:
-    websocket_endpoint () : m_next_id(0) {
-        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
-        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
-
-        m_endpoint.init_asio();
-        m_endpoint.start_perpetual();
-
-        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
-    }
-
-    ~websocket_endpoint() {
-        m_endpoint.stop_perpetual();
-        
-        for (con_list::const_iterator it = m_connection_list.begin(); it != m_connection_list.end(); ++it) {
-            if (it->second->get_status() != "Open") {
-                // Only close open connections
-                continue;
-            }
-            
-            std::cout << "> Closing connection " << it->second->get_id() << std::endl;
-            
-            websocketpp::lib::error_code ec;
-            m_endpoint.close(it->second->get_hdl(), websocketpp::close::status::going_away, "", ec);
-            if (ec) {
-                std::cout << "> Error closing connection " << it->second->get_id() << ": "  
-                          << ec.message() << std::endl;
-            }
-        }
-        
-        m_thread->join();
-    }
-
-    int connect(std::string const & uri) {
-        websocketpp::lib::error_code ec;
-
-        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
-
-        if (ec) {
-            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
-            return -1;
-        }
-
-        int new_id = m_next_id++;
-        connection_metadata::ptr metadata_ptr = websocketpp::lib::make_shared<connection_metadata>(new_id, con->get_handle(), uri);
-        m_connection_list[new_id] = metadata_ptr;
-
-        con->set_open_handler(websocketpp::lib::bind(
-            &connection_metadata::on_open,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_fail_handler(websocketpp::lib::bind(
-            &connection_metadata::on_fail,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_close_handler(websocketpp::lib::bind(
-            &connection_metadata::on_close,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-
-        m_endpoint.connect(con);
-
-        return new_id;
-    }
-
-    void close(int id, websocketpp::close::status::value code, std::string reason) {
-        websocketpp::lib::error_code ec;
-        
-        con_list::iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            std::cout << "> No connection found with id " << id << std::endl;
-            return;
-        }
-        
-        m_endpoint.close(metadata_it->second->get_hdl(), code, reason, ec);
-        if (ec) {
-            std::cout << "> Error initiating close: " << ec.message() << std::endl;
-        }
-    }
-
-    connection_metadata::ptr get_metadata(int id) const {
-        con_list::const_iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            return connection_metadata::ptr();
-        } else {
-            return metadata_it->second;
-        }
-    }
-private:
-    typedef std::map<int,connection_metadata::ptr> con_list;
-
-    client m_endpoint;
-    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
-
-    con_list m_connection_list;
-    int m_next_id;
-};
-
-int main() {
-    bool done = false;
-    std::string input;
-    websocket_endpoint endpoint;
-
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
-
-        if (input == "quit") {
-            done = true;
-        } else if (input == "help") {
-            std::cout
-                << "\nCommand List:\n"
-                << "connect <ws uri>\n"
-                << "close <connection id> [<close code:default=1000>] [<close reason>]\n"
-                << "show <connection id>\n"
-                << "help: Display this help text\n"
-                << "quit: Exit the program\n"
-                << std::endl;
-        } else if (input.substr(0,7) == "connect") {
-            int id = endpoint.connect(input.substr(8));
-            if (id != -1) {
-                std::cout << "> Created connection with id " << id << std::endl;
-            }
-        } else if (input.substr(0,5) == "close") {
-            std::stringstream ss(input);
-            
-            std::string cmd;
-            int id;
-            int close_code = websocketpp::close::status::normal;
-            std::string reason;
-            
-            ss >> cmd >> id >> close_code;
-            std::getline(ss,reason);
-            
-            endpoint.close(id, close_code, reason);
-        }  else if (input.substr(0,4) == "show") {
-            int id = atoi(input.substr(5).c_str());
-
-            connection_metadata::ptr metadata = endpoint.get_metadata(id);
-            if (metadata) {
-                std::cout << *metadata << std::endl;
-            } else {
-                std::cout << "> Unknown connection id " << id << std::endl;
-            }
-        } else {
-            std::cout << "> Unrecognized Command" << std::endl;
-        }
-    }
-
-    return 0;
-}
-
-/*
-
-clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a
-
-clang++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_thread.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_random.a
-
-clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/Documents/websocketpp/ -I/Users/zaphoyd/Documents/boost_1_53_0_libcpp/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/Documents/boost_1_53_0_libcpp/stage/lib/libboost_system.a
-
-*/
diff --git a/src/sioclient/lib/websocketpp/tutorials/utility_client/step6.cpp b/src/sioclient/lib/websocketpp/tutorials/utility_client/step6.cpp
deleted file mode 100644
index 208b95db..00000000
--- a/src/sioclient/lib/websocketpp/tutorials/utility_client/step6.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
-// Additional related material can be found in the tutorials/utility_client
-// directory of the WebSocket++ repository.
-
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-
-#include <websocketpp/common/thread.hpp>
-#include <websocketpp/common/memory.hpp>
-
-#include <cstdlib>
-#include <iostream>
-#include <map>
-#include <string>
-#include <sstream>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-class connection_metadata {
-public:
-    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
-
-    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
-      : m_id(id)
-      , m_hdl(hdl)
-      , m_status("Connecting")
-      , m_uri(uri)
-      , m_server("N/A")
-    {}
-
-    void on_open(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Open";
-
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        m_server = con->get_response_header("Server");
-    }
-
-    void on_fail(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Failed";
-
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        m_server = con->get_response_header("Server");
-        m_error_reason = con->get_ec().message();
-    }
-    
-    void on_close(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Closed";
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        std::stringstream s;
-        s << "close code: " << con->get_remote_close_code() << " (" 
-          << websocketpp::close::status::get_string(con->get_remote_close_code()) 
-          << "), close reason: " << con->get_remote_close_reason();
-        m_error_reason = s.str();
-    }
-
-    void on_message(websocketpp::connection_hdl, client::message_ptr msg) {
-        if (msg->get_opcode() == websocketpp::frame::opcode::text) {
-            m_messages.push_back("<< " + msg->get_payload());
-        } else {
-            m_messages.push_back("<< " + websocketpp::utility::to_hex(msg->get_payload()));
-        }
-    }
-
-    websocketpp::connection_hdl get_hdl() const {
-        return m_hdl;
-    }
-    
-    int get_id() const {
-        return m_id;
-    }
-    
-    std::string get_status() const {
-        return m_status;
-    }
-
-    void record_sent_message(std::string message) {
-        m_messages.push_back(">> " + message);
-    }
-
-    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
-private:
-    int m_id;
-    websocketpp::connection_hdl m_hdl;
-    std::string m_status;
-    std::string m_uri;
-    std::string m_server;
-    std::string m_error_reason;
-    std::vector<std::string> m_messages;
-};
-
-std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
-    out << "> URI: " << data.m_uri << "\n"
-        << "> Status: " << data.m_status << "\n"
-        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
-        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason) << "\n";
-    out << "> Messages Processed: (" << data.m_messages.size() << ") \n";
-
-    std::vector<std::string>::const_iterator it;
-    for (it = data.m_messages.begin(); it != data.m_messages.end(); ++it) {
-        out << *it << "\n";
-    }
-
-    return out;
-}
-
-class websocket_endpoint {
-public:
-    websocket_endpoint () : m_next_id(0) {
-        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
-        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
-
-        m_endpoint.init_asio();
-        m_endpoint.start_perpetual();
-
-        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
-    }
-
-    ~websocket_endpoint() {
-        m_endpoint.stop_perpetual();
-        
-        for (con_list::const_iterator it = m_connection_list.begin(); it != m_connection_list.end(); ++it) {
-            if (it->second->get_status() != "Open") {
-                // Only close open connections
-                continue;
-            }
-            
-            std::cout << "> Closing connection " << it->second->get_id() << std::endl;
-            
-            websocketpp::lib::error_code ec;
-            m_endpoint.close(it->second->get_hdl(), websocketpp::close::status::going_away, "", ec);
-            if (ec) {
-                std::cout << "> Error closing connection " << it->second->get_id() << ": "  
-                          << ec.message() << std::endl;
-            }
-        }
-        
-        m_thread->join();
-    }
-
-    int connect(std::string const & uri) {
-        websocketpp::lib::error_code ec;
-
-        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
-
-        if (ec) {
-            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
-            return -1;
-        }
-
-        int new_id = m_next_id++;
-        connection_metadata::ptr metadata_ptr = websocketpp::lib::make_shared<connection_metadata>(new_id, con->get_handle(), uri);
-        m_connection_list[new_id] = metadata_ptr;
-
-        con->set_open_handler(websocketpp::lib::bind(
-            &connection_metadata::on_open,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_fail_handler(websocketpp::lib::bind(
-            &connection_metadata::on_fail,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_close_handler(websocketpp::lib::bind(
-            &connection_metadata::on_close,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_message_handler(websocketpp::lib::bind(
-            &connection_metadata::on_message,
-            metadata_ptr,
-            websocketpp::lib::placeholders::_1,
-            websocketpp::lib::placeholders::_2
-        ));
-
-        m_endpoint.connect(con);
-
-        return new_id;
-    }
-
-    void close(int id, websocketpp::close::status::value code, std::string reason) {
-        websocketpp::lib::error_code ec;
-        
-        con_list::iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            std::cout << "> No connection found with id " << id << std::endl;
-            return;
-        }
-        
-        m_endpoint.close(metadata_it->second->get_hdl(), code, reason, ec);
-        if (ec) {
-            std::cout << "> Error initiating close: " << ec.message() << std::endl;
-        }
-    }
-
-    void send(int id, std::string message) {
-        websocketpp::lib::error_code ec;
-        
-        con_list::iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            std::cout << "> No connection found with id " << id << std::endl;
-            return;
-        }
-        
-        m_endpoint.send(metadata_it->second->get_hdl(), message, websocketpp::frame::opcode::text, ec);
-        if (ec) {
-            std::cout << "> Error sending message: " << ec.message() << std::endl;
-            return;
-        }
-        
-        metadata_it->second->record_sent_message(message);
-    }
-
-    connection_metadata::ptr get_metadata(int id) const {
-        con_list::const_iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            return connection_metadata::ptr();
-        } else {
-            return metadata_it->second;
-        }
-    }
-private:
-    typedef std::map<int,connection_metadata::ptr> con_list;
-
-    client m_endpoint;
-    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
-
-    con_list m_connection_list;
-    int m_next_id;
-};
-
-int main() {
-    bool done = false;
-    std::string input;
-    websocket_endpoint endpoint;
-
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
-
-        if (input == "quit") {
-            done = true;
-        } else if (input == "help") {
-            std::cout
-                << "\nCommand List:\n"
-                << "connect <ws uri>\n"
-                << "send <connection id> <message>\n"
-                << "close <connection id> [<close code:default=1000>] [<close reason>]\n"
-                << "show <connection id>\n"
-                << "help: Display this help text\n"
-                << "quit: Exit the program\n"
-                << std::endl;
-        } else if (input.substr(0,7) == "connect") {
-            int id = endpoint.connect(input.substr(8));
-            if (id != -1) {
-                std::cout << "> Created connection with id " << id << std::endl;
-            }
-        } else if (input.substr(0,4) == "send") {
-            std::stringstream ss(input);
-            
-            std::string cmd;
-            int id;
-            std::string message;
-            
-            ss >> cmd >> id;
-            std::getline(ss,message);
-            
-            endpoint.send(id, message);
-        } else if (input.substr(0,5) == "close") {
-            std::stringstream ss(input);
-            
-            std::string cmd;
-            int id;
-            int close_code = websocketpp::close::status::normal;
-            std::string reason;
-            
-            ss >> cmd >> id >> close_code;
-            std::getline(ss,reason);
-            
-            endpoint.close(id, close_code, reason);
-        } else if (input.substr(0,4) == "show") {
-            int id = atoi(input.substr(5).c_str());
-
-            connection_metadata::ptr metadata = endpoint.get_metadata(id);
-            if (metadata) {
-                std::cout << *metadata << std::endl;
-            } else {
-                std::cout << "> Unknown connection id " << id << std::endl;
-            }
-        } else {
-            std::cout << "> Unrecognized Command" << std::endl;
-        }
-    }
-
-    return 0;
-}
-
-/*
-
-clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a
-
-clang++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_thread.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_random.a
-
-clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/Documents/websocketpp/ -I/Users/zaphoyd/Documents/boost_1_53_0_libcpp/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/Documents/boost_1_53_0_libcpp/stage/lib/libboost_system.a
-
-*/
diff --git a/src/sioclient/lib/websocketpp/tutorials/utility_client/utility_client.md b/src/sioclient/lib/websocketpp/tutorials/utility_client/utility_client.md
deleted file mode 100644
index 696113df..00000000
--- a/src/sioclient/lib/websocketpp/tutorials/utility_client/utility_client.md
+++ /dev/null
@@ -1,862 +0,0 @@
-Utility Client Example Application Tutorial
-===========================================
-
-Chapter 1: Initial Setup & Basics
----------------------------------
-
-Setting up the basic types, opening and closing connections, sending and receiving messages.
-
-### Step 1
-
-A basic program loop that prompts the user for a command and then processes it. In this tutorial we will modify this program to perform tasks and retrieve data from a remote server over a WebSocket connection.
-
-#### Build
-`clang++ step1.cpp`
-
-#### Code so far
-
-*note* A code snapshot for each step is present next to this tutorial file in the git repository.
-
-~~~{.cpp}
-#include <iostream>
-#include <string>
-
-int main() {
-    bool done = false;
-    std::string input;
-
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
-
-        if (input == "quit") {
-            done = true;
-        } else if (input == "help") {
-            std::cout
-                << "\nCommand List:\n"
-                << "help: Display this help text\n"
-                << "quit: Exit the program\n"
-                << std::endl;
-        } else {
-            std::cout << "Unrecognized Command" << std::endl;
-        }
-    }
-
-    return 0;
-}
-~~~
-
-### Step 2
-
-_Add WebSocket++ includes and set up an endpoint type._
-
-WebSocket++ includes two major object types. The endpoint and the connection. The
-endpoint creates and launches new connections and maintains default settings for
-those connections. Endpoints also manage any shared network resources.
-
-The connection stores information specific to each WebSocket session.
-
-> **Note:** Once a connection is launched, there is no link between the endpoint and the connection. All default settings are copied into the new connection by the endpoint. Changing default settings on an endpoint will only affect future connections.
-Connections do not maintain a link back to their associated endpoint. Endpoints do not maintain a list of outstanding connections. If your application needs to iterate over all connections it will need to maintain a list of them itself.
-
-WebSocket++ endpoints are built by combining an endpoint role with an endpoint config. There are two different types of endpoint roles, one each for the client and server roles in a WebSocket session. This is a client tutorial so we will use the client role `websocketpp::client` which is provided by the `<websocketpp/client.hpp>` header.
-
-> ##### Terminology: Endpoint Config
-> WebSocket++ endpoints have a group of settings that may be configured at compile time via the `config` template parameter. A config is a struct that contains types and static constants that are used to produce an endpoint with specific properties. Depending on which config is being used the endpoint will have different methods available and may have additional third party dependencies.
-
-The endpoint role takes a template parameter called `config` that is used to configure the behavior of endpoint at compile time. For this example we are going to use a default config provided by the library called `asio_client`, provided by `<websocketpp/config/asio_no_tls_client.hpp>`. This is a client config that uses boost::asio to provide network transport and does not support TLS based security. Later on we will discuss how to introduce TLS based security into a WebSocket++ application, more about the other stock configs, and how to build your own custom configs.
-
-Combine a config with an endpoint role to produce a fully configured endpoint. This type will be used frequently so I would recommend a typedef here.
-
-`typedef websocketpp::client<websocketpp::config::asio_client> client`
-
-#### Build
-Adding WebSocket++ has added a few dependencies to our program that must be addressed in the build system. Firstly, the WebSocket++ and Boost library headers must be in the include search path of your build system. How exactly this is done depends on where you have the WebSocket++ headers installed and what build system you are using.
-
-In addition to the new headers, boost::asio depends on the `boost_system` shared library. This will need to be added (either as a static or dynamic) to the linker. Refer to your build environment documentation for instructions on linking to shared libraries.
-
-`clang++ step2.cpp -lboost_system`
-
-#### Code so far
-~~~{.cpp}
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-
-#include <iostream>
-#include <string>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-int main() {
-    bool done = false;
-    std::string input;
-
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
-
-        if (input == "quit") {
-            done = true;
-        } else if (input == "help") {
-            std::cout
-                << "\nCommand List:\n"
-                << "help: Display this help text\n"
-                << "quit: Exit the program\n"
-                << std::endl;
-        } else {
-            std::cout << "Unrecognized Command" << std::endl;
-        }
-    }
-
-    return 0;
-}
-~~~
-
-### Step 3
-
-_Create endpoint wrapper object that handles initialization and setting up the background thread._
-
-In order to process user input while network processing occurs in the background we are going to use a separate thread for the WebSocket++ processing loop. This leaves the main thread free to process foreground user input. In order to enable simple RAII style resource management for our thread and endpoint we will use a wrapper object that configures them both in its constructor.
-
-> ##### Terminology: websocketpp::lib namespace
-> WebSocket++ is designed to be used with a C++11 standard library. As this is not universally available in popular build systems the Boost libraries may be used as polyfills for the C++11 standard library in C++98 build environments. The `websocketpp::lib` namespace is used by the library and its associated examples to abstract away the distinctions between the two. `websocketpp::lib::shared_ptr` will evaluate to `std::shared_ptr` in a C++11 environment and `boost::shared_ptr` otherwise.
->
-> This tutorial uses the `websocketpp::lib` wrappers because it doesn't know what the build environment of the reader is. For your applications, unless you are interested in similar portability, are free to use the boost or std versions of these types directly.
->
->[TODO: link to more information about websocketpp::lib namespace and C++11 setup]
-
-Within the `websocket_endpoint` constructor several things happen:
-
-First, we set the endpoint logging behavior to silent by clearing all of the access and error logging channels. [TODO: link to more information about logging]
-~~~{.cpp}
-m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
-m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
-~~~
-
-Next, we initialize the transport system underlying the endpoint and set it to perpetual mode. In perpetual mode the endpoint's processing loop will not exit automatically when it has no connections. This is important because we want this endpoint to remain active while our application is running and process requests for new WebSocket connections on demand as we need them. Both of these methods are specific to the asio transport. They will not be  necessary or present in endpoints that use a non-asio config.
-~~~{.cpp}
-m_endpoint.init_asio();
-m_endpoint.start_perpetual();
-~~~
-
-Finally, we launch a thread to run the `run` method of our client endpoint. While the endpoint is running it will process connection tasks (read and deliver incoming messages, frame and send outgoing messages, etc). Because it is running in perpetual mode, when there are no connections active it will wait for a new connection.
-~~~{.cpp}
-m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
-~~~
-
-#### Build
-
-Now that our client endpoint template is actually instantiated a few more linker dependencies will show up. In particular, WebSocket clients require a cryptographically secure random number generator. WebSocket++ is able to use either `boost_random` or the C++11 standard library <random> for this purpose. Because this example also uses threads, if we do not have C++11 std::thread available we will need to include `boost_thread`.
-
-##### Clang (C++98 & boost)
-`clang++ step3.cpp -lboost_system -lboost_random -lboost_thread`
-
-##### Clang (C++11)
-`clang++ -std=c++0x -stdlib=libc++ step3.cpp -lboost_system -D_WEBSOCKETPP_CPP11_STL_`
-
-##### G++ (C++98 & Boost)
-`g++ step3.cpp -lboost_system -lboost_random -lboost_thread`
-
-##### G++ v4.6+ (C++11)
-`g++ -std=c++0x step3.cpp -lboost_system -D_WEBSOCKETPP_CPP11_STL_`
-
-#### Code so far
-
-~~~{.cpp}
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-
-#include <websocketpp/common/thread.hpp>
-#include <websocketpp/common/memory.hpp>
-
-#include <iostream>
-#include <string>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-class websocket_endpoint {
-public:
-    websocket_endpoint () {
-        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
-        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
-
-        m_endpoint.init_asio();
-        m_endpoint.start_perpetual();
-
-        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
-    }
-private:
-    client m_endpoint;
-    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
-};
-
-int main() {
-    bool done = false;
-    std::string input;
-    websocket_endpoint endpoint;
-
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
-
-        if (input == "quit") {
-            done = true;
-        } else if (input == "help") {
-            std::cout
-                << "\nCommand List:\n"
-                << "help: Display this help text\n"
-                << "quit: Exit the program\n"
-                << std::endl;
-        } else {
-            std::cout << "Unrecognized Command" << std::endl;
-        }
-    }
-
-    return 0;
-}
-~~~
-
-### Step 4
-
-_Opening WebSocket connections_
-
-This step adds two new commands to utility_client. The ability to open a new connection and the ability to view information about a previously opened connection. Every connection that gets opened will be assigned an integer connection id that the user of the program can use to interact with that connection.
-
-#### New Connection Metadata Object
-
-In order to track information about each connection a `connection_metadata` object is defined. This object stores the numeric connection id and a number of fields that will be filled in as the connection is processed. Initially this includes the state of the connection (opening, open, failed, closed, etc), the original URI connected to, an identifying value from the server, and a description of the reason for connection failure/closure. Future steps will add more information to this metadata object.
-
-#### Update `websocket_endpoint`
-
-The `websocket_endpoint` object has gained some new data members and methods. It now tracks a mapping between connection IDs and their associated metadata as well as the next sequential ID number to hand out. The `connect()` method initiates a new connection. The `get_metadata` method retrieves metadata given an ID.
-
-#### The connect method
-A new WebSocket connection is initiated via a three step process. First, a connection request is created by `endpoint::get_connection(uri)`. Next, the connection request is configured. Lastly, the connection request is submitted back to the endpoint via `endpoint::connect()` which adds it to the queue of new connections to make.
-
-> ##### Terminology `connection_ptr`
-> WebSocket++ keeps track of connection related resources using a reference counted shared pointer. The type of this pointer is `endpoint::connection_ptr`. A `connection_ptr` allows direct access to information about the connection and allows changing connection settings. Because of this direct access and their internal resource management role within the library it is not safe for end applications to use `connection_ptr` except in the specific circumstances detailed below.
->
-> **When is it safe to use `connection_ptr`?**
-> - After `endpoint::get_connection(...)` and before `endpoint::connect()`: `get_connection` returns a `connection_ptr`. It is safe to use this pointer to configure your new connection. Once you submit the connection to `connect` you may no longer use the `connection_ptr` and should discard it immediately for optimal memory management.
-> - During a handler: WebSocket++ allows you to register hooks / callbacks / event handlers for specific events that happen during a connection's lifetime. During the invocation of one of these handlers the library guarantees that it is safe to use a `connection_ptr` for the connection associated with the currently running handler.
-
-> ##### Terminology `connection_hdl`
-> Because of the limited thread safety of the `connection_ptr` the library also provides a more flexible connection identifier, the `connection_hdl`. The `connection_hdl` has type `websocketpp::connection_hdl` and it is defined in `<websocketpp/common/connection_hdl.hpp>`. Note that unlike `connection_ptr` this is not dependent on the type or config of the endpoint. Code that simply stores or transmits `connection_hdl` but does not use them can include only the header above and can treat its hdls like values.
->
-> Connection handles are not used directly. They are used by endpoint methods to identify the target of the desired action. For example, the endpoint method that sends a new message will take as a parameter the hdl of the connection to send the message to.
->
-> **When is it safe to use `connection_hdl`?**
-> `connection_hdl`s may be used at any time from any thread. They may be copied and stored in containers. Deleting a hdl will not affect the connection in any way. Handles may be upgraded to a `connection_ptr` during a handler call by using `endpoint::get_con_from_hdl()`. The resulting `connection_ptr` is safe to use for the duration of that handler invocation.
->
-> **`connection_hdl` FAQs**
-> - `connection_hdl`s are guaranteed to be unique within a program. Multiple endpoints in a single program will always create connections with unique handles.
-> - Using a `connection_hdl` with a different endpoint than the one that created its associated connection will result in undefined behavior.
-> - Using a `connection_hdl` whose associated connection has been closed or deleted is safe. The endpoint will return a specific error saying the operation couldn't be completed because the associated connection doesn't exist.
-> [TODO: more here? link to a connection_hdl FAQ elsewhere?]
-
-`websocket_endpoint::connect()` begins by calling `endpoint::get_connection()` using a uri passed as a parameter. Additionally, an error output value is passed to capture any errors that might occur during. If an error does occur an error notice is printed along with a descriptive message and the -1 / 'invalid' value is returned as the new ID.
-
-> ###### Terminology: `error handling: exceptions vs error_code`
-> WebSocket++ uses the error code system defined by the C++11 `<system_error>` library. It can optionally fall back to a similar system provided by the Boost libraries. All user facing endpoint methods that can fail take an `error_code` in an output parameter and store the error that occured there before returning. An empty/default constructed value is returned in the case of success.
->
-> **Exception throwing varients**
-> All user facing endpoint methods that take and use an `error_code` parameter have a version that throws an exception instead. These methods are identical in function and signature except for the lack of the final ec parameter. The type of the exception thrown is `websocketpp::exception`. This type derives from `std::exception` so it can be caught by catch blocks grabbing generic `std::exception`s. The `websocketpp::exception::code()` method may be used to extract the machine readable `error_code` value from an exception.
->
-> For clarity about error handling the utility_client example uses exclusively the exception free varients of these methods. Your application may choose to use either.
-
-If connection creation succeeds, the next sequential connection ID is generated and a `connection_metadata` object is inserted into the connection list under that ID. Initially the metadata object stores the connection ID, the `connection_hdl`, and the URI the connection was opened to.
-
-~~~{.cpp}
-int new_id = m_next_id++;
-metadata_ptr metadata(new connection_metadata(new_id, con->get_handle(), uri));
-m_connection_list[new_id] = metadata;
-~~~
-
-Next, the connection request is configured. For this step the only configuration we will do is setting up a few default handlers. Later on we will return and demonstrate some more detailed configuration that can happen here (setting user agents, origin, proxies, custom headers, subprotocols, etc).
-
-> ##### Terminology: Registering handlers
-> WebSocket++ provides a number of execution points where you can register to have a handler run. Which of these points are available to your endpoint will depend on its config. TLS handlers will not exist on non-TLS endpoints for example. A complete list of handlers can be found at  http://www.zaphoyd.com/websocketpp/manual/reference/handler-list.
->
-> Handlers can be registered at the endpoint level and at the connection level. Endpoint handlers are copied into new connections as they are created. Changing an endpoint handler will affect only future connections. Handlers registered at the connection level will be bound to that specific connection only.
->
-> The signature of handler binding methods is the same for endpoints and connections. The format is: `set_*_handler(...)`. Where * is the name of the handler. For example, `set_open_handler(...)` will set the handler to be called when a new connection is open. `set_fail_handler(...)` will set the handler to be called when a connection fails to connect.
->
-> All handlers take one argument, a callable type that can be converted to a `std::function` with the correct count and type of arguments. You can pass free functions, functors, and Lambdas with matching argument lists as handlers. In addition, you can use `std::bind` (or `boost::bind`) to register functions with non-matching argument lists. This is useful for passing additional parameters not present in the handler signature or member functions that need to carry a 'this' pointer.
->
-> The function signature of each handler can be looked up in the list above in the manual. In general, all handlers include the `connection_hdl` identifying which connection this even is associated with as the first parameter. Some handlers (such as the message handler) include additional parameters. Most handlers have a void return value but some (`validate`, `ping`, `tls_init`) do not. The specific meanings of the return values are documented in the handler list linked above.
-
-`utility_client` registers an open and a fail handler. We will use these to track whether each connection was successfully opened or failed. If it successfully opens, we will gather some information from the opening handshake and store it with our connection metadata.
-
-In this example we are going to set connection specific handlers that are bound directly to the metadata object associated with our connection. This allows us to avoid performing a lookup in each handler to find the metadata object we plan to update which is a bit more efficient.
-
-Lets look at the parameters being sent to bind in detail:
-
-~~~{.cpp}
-con->set_open_handler(websocketpp::lib::bind(
-    &connection_metadata::on_open,
-    metadata,
-    &m_endpoint,
-    websocketpp::lib::placeholders::_1
-));
-~~~
-
-`&connection_metadata::on_open` is the address of the `on_open` member function of the `connection_metadata` class. `metadata_ptr` is a pointer to the `connection_metadata` object associated with this class. It will be used as the object on which the `on_open` member function will be called. `&m_endpoint` is the address of the endpoint in use. This parameter will be passed as-is to the `on_open` method. Lastly, `websocketpp::lib::placeholders::_1` is a placeholder indicating that the bound function should take one additional argument to be filled in at a later time. WebSocket++ will fill in this placeholder with the `connection_hdl` when it invokes the handler.
-
-Finally, we call `endpoint::connect()` on our configured connection request and return the new connection ID.
-
-#### Handler Member Functions
-
-The open handler we registered, `connection_metadata::on_open`, sets the status metadata field to "Open" and retrieves the value of the "Server" header from the remote endpoint's HTTP response and stores it in the metadata object. Servers often set an identifying string in this header.
-
-The fail handler we registered, `connection_metadata::on_fail`, sets the status metadata field to "Failed", the server field similarly to `on_open`, and retrieves the error code describing why the connection failed. The human readable message associated with that error code is saved to the metadata object.
-
-#### New Commands
-
-Two new commands have been set up. "connect [uri]" will pass the URI to the `websocket_endpoint` connect method and report an error or the connection ID of the new connection. "show [connection id]" will retrieve and print out the metadata associated with that connection. The help text has been updated accordingly.
-
-~~~{.cpp}
-} else if (input.substr(0,7) == "connect") {
-    int id = endpoint.connect(input.substr(8));
-    if (id != -1) {
-        std::cout << "> Created connection with id " << id << std::endl;
-    }
-} else if (input.substr(0,4) == "show") {
-    int id = atoi(input.substr(5).c_str());
-
-    connection_metadata::ptr metadata = endpoint.get_metadata(id);
-    if (metadata) {
-        std::cout << *metadata << std::endl;
-    } else {
-        std::cout << "> Unknown connection id " << id << std::endl;
-    }
-}
-~~~
-
-#### Build
-
-There are no changes to the build instructions from step 3
-
-#### Run
-
-~~~
-Enter Command: connect not a websocket uri
-> Connect initialization error: invalid uri
-Enter Command: show 0
-> Unknown connection id 0
-Enter Command: connect ws://echo.websocket.org
-> Created connection with id 0
-Enter Command: show 0
-> URI: ws://echo.websocket.org
-> Status: Open
-> Remote Server: Kaazing Gateway
-> Error/close reason: N/A
-Enter Command: connect ws://wikipedia.org
-> Created connection with id 1
-Enter Command: show 1
-> URI: ws://wikipedia.org
-> Status: Failed
-> Remote Server: Apache
-> Error/close reason: Invalid HTTP status.
-~~~
-
-#### Code so far
-
-~~~{.cpp}
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/client.hpp>
-
-#include <websocketpp/common/thread.hpp>
-#include <websocketpp/common/memory.hpp>
-
-#include <cstdlib>
-#include <iostream>
-#include <map>
-#include <string>
-#include <sstream>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-class connection_metadata {
-public:
-    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
-
-    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
-      : m_id(id)
-      , m_hdl(hdl)
-      , m_status("Connecting")
-      , m_uri(uri)
-      , m_server("N/A")
-    {}
-
-    void on_open(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Open";
-
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        m_server = con->get_response_header("Server");
-    }
-
-    void on_fail(client * c, websocketpp::connection_hdl hdl) {
-        m_status = "Failed";
-
-        client::connection_ptr con = c->get_con_from_hdl(hdl);
-        m_server = con->get_response_header("Server");
-        m_error_reason = con->get_ec().message();
-    }
-
-    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
-private:
-    int m_id;
-    websocketpp::connection_hdl m_hdl;
-    std::string m_status;
-    std::string m_uri;
-    std::string m_server;
-    std::string m_error_reason;
-};
-
-std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
-    out << "> URI: " << data.m_uri << "\n"
-        << "> Status: " << data.m_status << "\n"
-        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
-        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason);
-
-    return out;
-}
-
-class websocket_endpoint {
-public:
-    websocket_endpoint () : m_next_id(0) {
-        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
-        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
-
-        m_endpoint.init_asio();
-        m_endpoint.start_perpetual();
-
-        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
-    }
-
-    int connect(std::string const & uri) {
-        websocketpp::lib::error_code ec;
-
-        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
-
-        if (ec) {
-            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
-            return -1;
-        }
-
-        int new_id = m_next_id++;
-        connection_metadata::ptr metadata_ptr(new connection_metadata(new_id, con->get_handle(), uri));
-        m_connection_list[new_id] = metadata_ptr;
-
-        con->set_open_handler(websocketpp::lib::bind(
-            &connection_metadata::on_open,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_fail_handler(websocketpp::lib::bind(
-            &connection_metadata::on_fail,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-
-        m_endpoint.connect(con);
-
-        return new_id;
-    }
-
-    connection_metadata::ptr get_metadata(int id) const {
-        con_list::const_iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            return connection_metadata::ptr();
-        } else {
-            return metadata_it->second;
-        }
-    }
-private:
-    typedef std::map<int,connection_metadata::ptr> con_list;
-
-    client m_endpoint;
-    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
-
-    con_list m_connection_list;
-    int m_next_id;
-};
-
-int main() {
-    bool done = false;
-    std::string input;
-    websocket_endpoint endpoint;
-
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
-
-        if (input == "quit") {
-            done = true;
-        } else if (input == "help") {
-            std::cout
-                << "\nCommand List:\n"
-                << "connect <ws uri>\n"
-                << "show <connection id>\n"
-                << "help: Display this help text\n"
-                << "quit: Exit the program\n"
-                << std::endl;
-        } else if (input.substr(0,7) == "connect") {
-            int id = endpoint.connect(input.substr(8));
-            if (id != -1) {
-                std::cout << "> Created connection with id " << id << std::endl;
-            }
-        } else if (input.substr(0,4) == "show") {
-            int id = atoi(input.substr(5).c_str());
-
-            connection_metadata::ptr metadata = endpoint.get_metadata(id);
-            if (metadata) {
-                std::cout << *metadata << std::endl;
-            } else {
-                std::cout << "> Unknown connection id " << id << std::endl;
-            }
-        } else {
-            std::cout << "> Unrecognized Command" << std::endl;
-        }
-    }
-
-    return 0;
-}
-~~~
-
-### Step 5
-
-_Closing connections_
-
-This step adds a command that allows you to close a WebSocket connection and adjusts the quit command so that it cleanly closes all outstanding connections before quitting.
-
-#### Getting connection close information out of WebSocket++
-
-> ##### Terminology: WebSocket close codes & reasons
-> The WebSocket close handshake involves an exchange of optional machine readable close codes and human readable reason strings. Each endpoint sends independent close details. The codes are short integers. The reasons are UTF8 text strings of at most 125 characters. More details about valid close code ranges and the meaning of each code can be found at https://tools.ietf.org/html/rfc6455#section-7.4
-
-The `websocketpp::close::status` namespace contains named constants for all of the IANA defined close codes. It also includes free functions to determine whether a value is reserved or invalid and to convert a code to a human readable text representation.
-
-During the close handler call WebSocket++ connections offer the following methods for accessing close handshake information:
-
-- `connection::get_remote_close_code()`: Get the close code as reported by the remote endpoint
-- `connection::get_remote_close_reason()`: Get the close reason as reported by the remote endpoint
-- `connection::get_local_close_code()`: Get the close code that this endpoint sent.
-- `connection::get_local_close_reason()`: Get the close reason that this endpoint sent.
-- `connection::get_ec()`: Get a more detailed/specific WebSocket++ `error_code` indicating what library error (if any) ultimately resulted in the connection closure.
-
-*Note:* there are some special close codes that will report a code that was not actually sent on the wire. For example 1005/"no close code" indicates that the endpoint omitted a close code entirely and 1006/"abnormal close" indicates that there was a problem that resulted in the connection closing without having performed a close handshake.
-
-#### Add close handler
-
-The `connection_metadata::on_close` method is added. This method retrieves the close code and reason from the closing handshake and stores it in the local error reason field.
-
-~~~{.cpp}
-void on_close(client * c, websocketpp::connection_hdl hdl) {
-    m_status = "Closed";
-    client::connection_ptr con = c->get_con_from_hdl(hdl);
-    std::stringstream s;
-    s << "close code: " << con->get_remote_close_code() << " (" 
-      << websocketpp::close::status::get_string(con->get_remote_close_code()) 
-      << "), close reason: " << con->get_remote_close_reason();
-    m_error_reason = s.str();
-}
-~~~
-
-Similarly to `on_open` and `on_fail`, `websocket_endpoint::connect` registers this close handler when a new connection is made.
-
-#### Add close method to `websocket_endpoint`
-
-This method starts by looking up the given connection ID in the connection list.  Next a close request is sent to the connection's handle with the specified WebSocket close code. This is done by calling `endpoint::close`. This is a thread safe method that is used to asynchronously dispatch a close signal to the connection with the given handle. When the operation is complete the connection's close handler will be triggered.
-
-~~~{.cpp}
-void close(int id, websocketpp::close::status::value code) {
-    websocketpp::lib::error_code ec;
-    
-    con_list::iterator metadata_it = m_connection_list.find(id);
-    if (metadata_it == m_connection_list.end()) {
-        std::cout << "> No connection found with id " << id << std::endl;
-        return;
-    }
-    
-    m_endpoint.close(metadata_it->second->get_hdl(), code, "", ec);
-    if (ec) {
-        std::cout << "> Error initiating close: " << ec.message() << std::endl;
-    }
-}
-~~~
-
-#### Add close option to the command loop and help message
-
-A close option is added to the command loop. It takes a connection ID and optionally a close code and a close reason. If no code is specified the default of 1000/Normal is used. If no reason is specified, none is sent. The `endpoint::close` method will do some error checking and abort the close request if you try and send an invalid code or a reason with invalid UTF8 formatting. Reason strings longer than 125 characters will be truncated.
-
-An entry is also added to the help system to describe how the new command may be used.
-
-~~~{.cpp}
-else if (input.substr(0,5) == "close") {
-    std::stringstream ss(input);
-    
-    std::string cmd;
-    int id;
-    int close_code = websocketpp::close::status::normal;
-    std::string reason;
-    
-    ss >> cmd >> id >> close_code;
-    std::getline(ss,reason);
-    
-    endpoint.close(id, close_code, reason);
-}
-~~~
-
-#### Close all outstanding connections in `websocket_endpoint` destructor
-
-Until now quitting the program left outstanding connections and the WebSocket++ network thread in a lurch. Now that we have a method of closing connections we can clean this up properly.
-
-The destructor for `websocket_endpoint` now stops perpetual mode (so the run thread exits after the last connection is closed) and iterates through the list of open connections and requests a clean close for each. Finally, the run thread is joined which causes the program to wait until those connection closes complete.
-
-~~~{.cpp}
-~websocket_endpoint() {
-    m_endpoint.stop_perpetual();
-    
-    for (con_list::const_iterator it = m_connection_list.begin(); it != m_connection_list.end(); ++it) {
-        if (it->second->get_status() != "Open") {
-            // Only close open connections
-            continue;
-        }
-        
-        std::cout << "> Closing connection " << it->second->get_id() << std::endl;
-        
-        websocketpp::lib::error_code ec;
-        m_endpoint.close(it->second->get_hdl(), websocketpp::close::status::going_away, "", ec);
-        if (ec) {
-            std::cout << "> Error closing connection " << it->second->get_id() << ": "  
-                      << ec.message() << std::endl;
-        }
-    }
-    
-    m_thread->join();
-}
-~~~
-
-#### Build
-
-There are no changes to the build instructions from step 4
-
-#### Run
-
-~~~
-Enter Command: connect ws://localhost:9002
-> Created connection with id 0
-Enter Command: close 0 1001 example message
-Enter Command: show 0
-> URI: ws://localhost:9002
-> Status: Closed
-> Remote Server: WebSocket++/0.4.0
-> Error/close reason: close code: 1001 (Going away), close reason:  example message
-Enter Command: connect ws://localhost:9002
-> Created connection with id 1
-Enter Command: close 1 1006
-> Error initiating close: Invalid close code used
-Enter Command: quit
-> Closing connection 1
-~~~
-
-### Step 6
-
-_Sending and receiving messages_
-
-This step adds a command to send a message on a given connection and updates the show command to print a transcript of all sent and received messages for that connection.
-
-> ##### Terminology: WebSocket message types (opcodes)
-> WebSocket messages have types indicated by their opcode. The protocol currently specifies two different opcodes for data messages, text and binary. Text messages represent UTF8 text and will be validated as such. Binary messages represent raw binary bytes and are passed through directly with no validation. 
->
-> WebSocket++ provides the values `websocketpp::frame::opcode::text` and `websocketpp::frame::opcode::binary` that can be used to direct how outgoing messages should be sent and to check how incoming messages are formatted.
-
-#### Sending Messages
-
-Messages are sent using `endpoint::send`. This is a thread safe method that may be called from anywhere to queue a message for sending on the specified connection. There are three send overloads for use with different scenarios. 
-
-Each method takes a `connection_hdl` to indicate which connection to send the message on as well as a `frame::opcode::value` to indicate which opcode to label the message as. All overloads are also available with an exception free varient that fills in a a status/error code instead of throwing.
-
-The first overload, `connection_hdl hdl, std::string const & payload, frame::opcode::value op`, takes a `std::string`. The string contents are copied into an internal buffer and can be safely modified after calling send.
-
-The second overload, `connection_hdl hdl, void const * payload, size_t len, frame::opcode::value op`, takes a void * buffer and length. The buffer contents are copied and can be safely modified after calling send.
-
-The third overload, `connection_hdl hdl, message_ptr msg`, takes a WebSocket++ `message_ptr`. This overload allows a message to be constructed in place before the call to send. It also may allow a single message buffer to be sent multiple times, including to multiple connections, without copying. Whether or not this actually happens depends on other factors such as whether compression is enabled. The contents of the message buffer may not be safely modified after being sent.
-
-> ###### Terminology: Outgoing WebSocket message queueing & flow control
-> In many configurations, such as when the Asio based transport is in use, WebSocket++ is an asynchronous system. As such the `endpoint::send` method may return before any bytes are actually written to the outgoing socket. In cases where send is called multiple times in quick succession messages may be coalesced and sent in the same operation or even the same TCP packet. When this happens the message boundaries are preserved (each call to send will produce a separate message).
->
-> In the case of applications that call send from inside a handler this means that no messages will be written to the socket until that handler returns. If you are planning to send many messages in this manor or need a message to be written on the wire before continuing you should look into using multiple threads or the built in timer/interrupt handler functionality.
->
-> If the outgoing socket link is slow messages may build up in this queue. You can use `connection::get_buffered_amount` to query the current size of the written message queue to decide if you want to change your sending behavior.
-
-#### Add send method to `websocket_endpoint`
-
-Like the close method, send will start by looking up the given connection ID in the connection list.  Next a send request is sent to the connection's handle with the specified WebSocket message and the text opcode. Finally, we record the sent message with our connection metadata object so later our show connection command can print a list of messages sent.
-
-~~~{.cpp}
-void send(int id, std::string message) {
-    websocketpp::lib::error_code ec;
-    
-    con_list::iterator metadata_it = m_connection_list.find(id);
-    if (metadata_it == m_connection_list.end()) {
-        std::cout << "> No connection found with id " << id << std::endl;
-        return;
-    }
-    
-    m_endpoint.send(metadata_it->second->get_hdl(), message, websocketpp::frame::opcode::text, ec);
-    if (ec) {
-        std::cout << "> Error sending message: " << ec.message() << std::endl;
-        return;
-    }
-    
-    metadata_it->second->record_sent_message(message);
-}
-~~~
-
-#### Add send option to the command loop and help message
-
-A send option is added to the command loop. It takes a connection ID and a text message to send. An entry is also added to the help system to describe how the new command may be used.
-
-~~~{.cpp}
-else if (input.substr(0,4) == "send") {
-    std::stringstream ss(input);
-        
-        std::string cmd;
-        int id;
-        std::string message = "";
-        
-        ss >> cmd >> id;
-        std::getline(ss,message);
-        
-        endpoint.send(id, message);
-}
-~~~
-
-#### Add glue to `connection_metadata` for storing sent messages
-
-In order to store messages sent on this connection some code is added to `connection_metadata`. This includes a new data member `std::vector<std::string> m_messages` to keep track of all messages sent and received as well as a method for adding a sent message in that list:
-
-~~~{.cpp}
-void record_sent_message(std::string message) {
-    m_messages.push_back(">> " + message);
-}
-~~~
-
-Finally the connection metadata output operator is updated to also print a list of processed messages:
-
-~~~{.cpp}
-out << "> Messages Processed: (" << data.m_messages.size() << ") \n";
-
-std::vector<std::string>::const_iterator it;
-for (it = data.m_messages.begin(); it != data.m_messages.end(); ++it) {
-    out << *it << "\n";
-}
-~~~
-
-#### Receiving Messages
-
-Messages are received by registering a message handler. This handler will be called once per message received and its signature is `void on_message(websocketpp::connection_hdl hdl, endpoint::message_ptr msg)`. The `connection_hdl`, like the similar parameter from the other handlers is a handle for the connection that the message was received on. The `message_ptr` is a pointer to an object that can be queried for the message payload, opcode, and other metadata. Note that the message_ptr type, as well as its underlying message type, is dependent on how your endpoint is configured and may be different for different configs.
-
-#### Add a message handler to method to `connection_metadata`
-
-The message receiving behave that we are implementing will be to collect all messages sent and received and to print them in order when the show connection command is run. The sent messages are already being added to that list. Now we add a message handler that pushes received messages to the list as well. Text messages are pushed as-is. Binary messages are first converted to printable hexadecimal format.
-
-~~~{.cpp}
-void on_message(websocketpp::connection_hdl hdl, client::message_ptr msg) {
-    if (msg->get_opcode() == websocketpp::frame::opcode::text) {
-        m_messages.push_back(msg->get_payload());
-    } else {
-        m_messages.push_back(websocketpp::utility::to_hex(msg->get_payload()));
-    }
-}
-~~~
-
-In order to have this handler called when new messages are received we also register it with our connection. Note that unlike most other handlers, the message handler has two parameters and thus needs two placeholders.
-
-~~~{.cpp}
-con->set_message_handler(websocketpp::lib::bind(
-    &connection_metadata::on_message,
-    metadata_ptr,
-    websocketpp::lib::placeholders::_1,
-    websocketpp::lib::placeholders::_2
-));
-~~~
-
-#### Build
-
-There are no changes to the build instructions from step 5
-
-#### Run
-
-In this example run we are connecting to the WebSocket++ example echo_server. This server will repeat any message we send back to it. You can also try testing this with the echo server at `ws://echo.websocket.org` with similar results.
-
-~~~
-Enter Command: connect ws://localhost:9002
-> Created connection with id 0
-Enter Command: send 0 example message
-Enter Command: show 0
-> URI: ws://localhost:9002
-> Status: Open
-> Remote Server: WebSocket++/0.4.0
-> Error/close reason: N/A
-> Messages Processed: (2)
->>  example message
-<<  example message
-~~~
-
-### Step 7
-
-_Using TLS / Secure WebSockets_
-
-- Change the includes
-- link to the new library dependencies
-- Switch the config
-- add the `tls_init_handler`
-- configure the SSL context for desired security level
-- mixing secure and non-secure connections in one application.
-
-Chapter 2: Intermediate Features
---------------------------------
-
-### Step 8
-
-_Intermediate level features_
-
-- Subprotocol negotiation
-- Setting and reading custom headers
-- Ping and Pong
-- Proxies?
-- Setting user agent
-- Setting Origin
-- Timers and security
-- Close behavior
-- Send one message to all connections
-
-
-### Misc stuff not sure if it should be included here or elsewhere?
-
-core websocket++ control flow.
-A handshake, followed by a split into 2 independent control strands
-- Handshake
--- use information specified before the call to endpoint::connect to construct a WebSocket handshake request.
--- Pass the WebSocket handshake request to the transport policy. The transport policy determines how to get these bytes to the endpoint playing the server role. Depending on which transport policy your endpoint uses this method will be different.
--- Receive a handshake response from the underlying transport. This is parsed and checked for conformance to RFC6455. If the validation fails, the fail handler is called. Otherwise the open handler is called.
-- At this point control splits into two separate strands. One that reads new bytes from the transport policy on the incoming channle, the other that accepts new messages from the local application for framing and writing to the outgoing transport channel.
-- Read strand
--- Read and process new bytes from transport
--- If the bytes contain at least one complete message dispatch each message by calling the appropriate handler. This is either the message handler for data messages, or ping/pong/close handlers for each respective control message. If no handler is registered for a particular message it is ignored.
--- Ask the transport layer for more bytes
-- Write strand
--- Wait for messages from the application
--- Perform error checking on message input,
--- Frame message per RFC6455
--- Queue message for sending
--- Pass all outstanding messages to the transport policy for output
--- When there are no messages left to send, return to waiting
-
-Important observations
-Handlers run in line with library processing which has several implications applications should be aware of:
diff --git a/src/sioclient/lib/websocketpp/tutorials/utility_server/step1.cpp b/src/sioclient/lib/websocketpp/tutorials/utility_server/step1.cpp
deleted file mode 100644
index c0e46438..00000000
--- a/src/sioclient/lib/websocketpp/tutorials/utility_server/step1.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// **NOTE:** This file is a snapshot of the WebSocket++ utility server tutorial.
-// Additional related material can be found in the tutorials/utility_server
-// directory of the WebSocket++ repository.
-
-// The ASIO_STANDALONE define is necessary to use the standalone version of Asio.
-// Remove if you are using Boost Asio.
-#define ASIO_STANDALONE
-
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-#include <functional>
-
-typedef websocketpp::server<websocketpp::config::asio> server;
-
-class utility_server {
-public:
-    utility_server() {
-         // Set logging settings
-        m_endpoint.set_error_channels(websocketpp::log::elevel::all);
-        m_endpoint.set_access_channels(websocketpp::log::alevel::all ^ websocketpp::log::alevel::frame_payload);
-
-        // Initialize Asio
-        m_endpoint.init_asio();
-    }
-
-    void run() {
-        // Listen on port 9002
-        m_endpoint.listen(9002);
-
-        // Queues a connection accept operation
-        m_endpoint.start_accept();
-
-        // Start the Asio io_service run loop
-        m_endpoint.run();
-    }
-private:
-    server m_endpoint;
-};
-
-int main() {
-    utility_server s;
-    s.run();
-    return 0;
-}
diff --git a/src/sioclient/lib/websocketpp/tutorials/utility_server/step2.cpp b/src/sioclient/lib/websocketpp/tutorials/utility_server/step2.cpp
deleted file mode 100644
index a2815bbb..00000000
--- a/src/sioclient/lib/websocketpp/tutorials/utility_server/step2.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// **NOTE:** This file is a snapshot of the WebSocket++ utility server tutorial.
-// Additional related material can be found in the tutorials/utility_server
-// directory of the WebSocket++ repository.
-
-// The ASIO_STANDALONE define is necessary to use the standalone version of Asio.
-// Remove if you are using Boost Asio.
-#define ASIO_STANDALONE
-
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-#include <functional>
-
-typedef websocketpp::server<websocketpp::config::asio> server;
-
-class utility_server {
-public:
-    utility_server() {
-         // Set logging settings
-        m_endpoint.set_error_channels(websocketpp::log::elevel::all);
-        m_endpoint.set_access_channels(websocketpp::log::alevel::all ^ websocketpp::log::alevel::frame_payload);
-
-        // Initialize Asio
-        m_endpoint.init_asio();
-
-        // Set the default message handler to the echo handler
-        m_endpoint.set_message_handler(std::bind(
-            &utility_server::echo_handler, this,
-            std::placeholders::_1, std::placeholders::_2
-        ));
-    }
-
-    void echo_handler(websocketpp::connection_hdl hdl, server::message_ptr msg) {
-        // write a new message
-        m_endpoint.send(hdl, msg->get_payload(), msg->get_opcode());
-    }
-
-    void run() {
-        // Listen on port 9002
-        m_endpoint.listen(9002);
-
-        // Queues a connection accept operation
-        m_endpoint.start_accept();
-
-        // Start the Asio io_service run loop
-        m_endpoint.run();
-    }
-private:
-    server m_endpoint;
-};
-
-int main() {
-    utility_server s;
-    s.run();
-    return 0;
-}
diff --git a/src/sioclient/lib/websocketpp/tutorials/utility_server/utility_server.md b/src/sioclient/lib/websocketpp/tutorials/utility_server/utility_server.md
deleted file mode 100644
index 1c7ee3fc..00000000
--- a/src/sioclient/lib/websocketpp/tutorials/utility_server/utility_server.md
+++ /dev/null
@@ -1,181 +0,0 @@
-Utility Server Example Application Tutorial
-===========================================
-
-Introduction
-------------
-
-This tutorial provides a step by step discussion of building a basic WebSocket++ server. The final product of this tutorial is the utility_server example application from the example section. This server demonstrates the following features:
-
-- Use Asio Transport for networking
-- Accept multiple WebSocket connections at once
-- Read incoming messages and perform a few basic actions (echo, broadcast, telemetry, server commands) based on the path
-- Use validate handler to reject connections to invalid paths
-- Serve basic HTTP responses with the http handler
-- Gracefully exit the server
-- Encrypt connections with TLS
-
-This tutorial is current as of the 0.6.x version of the library.
-
-Chapter 1: Initial Setup & Basics
----------------------------------
-
-### Step 1
-
-_Add WebSocket++ includes and set up a a server endpoint type._
-
-WebSocket++ includes two major object types. The endpoint and the connection. The
-endpoint creates and launches new connections and maintains default settings for
-those connections. Endpoints also manage any shared network resources.
-
-The connection stores information specific to each WebSocket session.
-
-> **Note:** Once a connection is launched, there is no link between the endpoint and the connection. All default settings are copied into the new connection by the endpoint. Changing default settings on an endpoint will only affect future connections.
-Connections do not maintain a link back to their associated endpoint. Endpoints do not maintain a list of outstanding connections. If your application needs to iterate over all connections it will need to maintain a list of them itself.
-
-WebSocket++ endpoints are built by combining an endpoint role with an endpoint config. There are two different types of endpoint roles, one each for the client and server roles in a WebSocket session. This is a server tutorial so we will use the server role `websocketpp::server` which is provided by the `<websocketpp/server.hpp>` header.
-
-> #### Terminology: Endpoint Config
-> WebSocket++ endpoints have a group of settings that may be configured at compile time via the `config` template parameter. A config is a struct that contains types and static constants that are used to produce an endpoint with specific properties. Depending on which config is being used the endpoint will have different methods available and may have additional third party dependencies.
-
-The endpoint role takes a template parameter called `config` that is used to configure the behavior of endpoint at compile time. For this example we are going to use a default config provided by the library called `asio`, provided by `<websocketpp/config/asio_no_tls.hpp>`. This is a server config that uses the Asio library to provide network transport and does not support TLS based security. Later on we will discuss how to introduce TLS based security into a WebSocket++ application, more about the other stock configs, and how to build your own custom configs.
-
-Combine a config with an endpoint role to produce a fully configured endpoint. This type will be used frequently so I would recommend a typedef here.
-
-`typedef websocketpp::server<websocketpp::config::asio> server`
-
-#### `utility_server` constructor
-
-This endpoint type will be the base of the utility_server object that will keep track of the state of the server. Within the `utility_server` constructor several things happen:
-
-First, we adjust the endpoint logging behavior to include all error logging channels and all access logging channels except the frame payload, which is particularly noisy and generally useful only for debugging. [TODO: link to more information about logging]
-
-~~~{.cpp}
-m_endpoint.set_error_channels(websocketpp::log::elevel::all);
-m_endpoint.set_access_channels(websocketpp::log::alevel::all ^ websocketpp::log::alevel::frame_payload);
-~~~
-
-Next, we initialize the transport system underlying the endpoint. This method is specific to the Asio transport not WebSocket++ core. It will not be necessary or present in endpoints that use a non-asio config.
-
-> **Note:** This example uses an internal Asio `io_service` that is managed by the endpoint itself. This is a simple arrangement suitable for programs where WebSocket++ is the only code using Asio. If you have an existing program that already manages an `io_service` object or want to build a new program where WebSocket++ handlers share an io_service with other handlers you can pass the `io_service` you want WebSocket++ to register its handlers on to the `init_asio()` method and it will use it instead of generating and managing its own. [TODO: FAQ link instead?]
-
-~~~{.cpp}
-m_endpoint.init_asio();
-~~~
-
-#### `utility_server::run` method
-
-In addition to the constructor, we also add a run method that sets up the listening socket, begins accepting connections, starts the Asio io_service event loop.
-
-~~~{.cpp}
-// Listen on port 9002
-m_endpoint.listen(9002);
-
-// Queues a connection accept operation
-m_endpoint.start_accept();
-
-// Start the Asio io_service run loop
-m_endpoint.run();
-~~~
-
-The final line, `m_endpoint.run();`, will block until the endpoint is instructed to stop listening for new connections. While running it will listen for and process new connections as well as accept and process new data and control messages for existing connections. WebSocket++ uses Asio in an asyncronous mode where multiple connections can be similtaneously serviced efficiently within a single thread.
-
-#### Build
-Adding WebSocket++ has added a few dependencies to our program that must be addressed in the build system. Firstly, the WebSocket++ library headers need must be in the include search path of your build system. How exactly this is done depends on where you have the WebSocket++ headers installed what build system you are using.
-
-For the rest of this tutorial we are going to assume a C++11 build environment. WebSocket++ will work with pre-C++11 systems if your build system has access to a recent version of the Boost library headers.
-
-Finally, to use the Asio transport config we need to bring in the Asio library. There are two options here. If you have access to a C++11 build environment the standalone version from http://think-async.com is a good option. This header only library does not bring in any special dependencies and ensures you have the latest version of Asio. If you do not have a C++11 build environment or already have brought in the Boost libraries you can also use the version of Asio bundled with Boost.
-
-To use standalone Asio, make sure the Asio headers are in your include path and define ASIO_STANDALONE. To use Boost Asio, make sure the Boost headers are in your include path and that you are linking to the boost_system library.
-
-`c++ -std=c++11 step1.cpp` (Asio Standalone)
-OR
-`c++ -std=c++11 step1.cpp -lboost_system` (Boost Asio)
-
-#### Code so far
-```cpp
-// The ASIO_STANDALONE define is necessary to use the standalone version of Asio.
-// Remove if you are using Boost Asio.
-#define ASIO_STANDALONE
-
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-#include <functional>
-
-typedef websocketpp::server<websocketpp::config::asio> server;
-
-class utility_server {
-public:
-    utility_server() {
-         // Set logging settings
-        m_endpoint.set_error_channels(websocketpp::log::elevel::all);
-        m_endpoint.set_access_channels(websocketpp::log::alevel::all ^ websocketpp::log::alevel::frame_payload);
-
-        // Initialize Asio
-        m_endpoint.init_asio();
-    }
-
-    void run() {
-        // Listen on port 9002
-        m_endpoint.listen(9002);
-
-        // Queues a connection accept operation
-        m_endpoint.start_accept();
-
-        // Start the Asio io_service run loop
-        m_endpoint.run();
-    }
-private:
-    server m_endpoint;
-};
-
-int main() {
-    utility_server s;
-    s.run();
-    return 0;
-}
-```
-
-### Step 2
-
-_Set up a message handler to echo all replies back to the original user_
-
-#### Setting a message handler
-
-> ###### Terminology: Registering handlers
-> WebSocket++ provides a number of execution points where you can register to have a handler run. Which of these points are available to your endpoint will depend on its config. TLS handlers will not exist on non-TLS endpoints for example. A complete list of handlers can be found at  http://www.zaphoyd.com/websocketpp/manual/reference/handler-list.
->
-> Handlers can be registered at the endpoint level and at the connection level. Endpoint handlers are copied into new connections as they are created. Changing an endpoint handler will affect only future connections. Handlers registered at the connection level will be bound to that specific connection only.
->
-> The signature of handler binding methods is the same for endpoints and connections. The format is: `set_*_handler(...)`. Where * is the name of the handler. For example, `set_open_handler(...)` will set the handler to be called when a new connection is open. `set_fail_handler(...)` will set the handler to be called when a connection fails to connect.
->
-> All handlers take one argument, a callable type that can be converted to a `std::function` with the correct count and type of arguments. You can pass free functions, functors, and Lambdas with matching argument lists as handlers. In addition, you can use `std::bind` (or `boost::bind`) to register functions with non-matching argument lists. This is useful for passing additional parameters not present in the handler signature or member functions that need to carry a 'this' pointer.
->
-> The function signature of each handler can be looked up in the list above in the manual. In general, all handlers include the `connection_hdl` identifying which connection this even is associated with as the first parameter. Some handlers (such as the message handler) include additional parameters. Most handlers have a void return value but some (`validate`, `ping`, `tls_init`) do not. The specific meanings of the return values are documented in the handler list linked above.
-
-
-### Step 3
-
-_error handling_
-
-
-### Step 4
-
-_Set up open and close handlers and a connection data structure_
-
-### Step 5
-
-_Change the message handler for connections based on URI and add a validate handler to reject invalid URIs_
-
-### Step 6
-
-_Add some Admin commands (report total clients, cleanly shut down server)_
-
-### Step 7
-
-_Add some Broadcast commands_
-
-### Step 8
-
-_Add TLS_
diff --git a/src/sioclient/lib/websocketpp/websocketpp-config.cmake.in b/src/sioclient/lib/websocketpp/websocketpp-config.cmake.in
deleted file mode 100644
index 3fbce3b2..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp-config.cmake.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# - Config file for the websocketpp package
-# It defines the following variables
-#  WEBSOCKETPP_FOUND - indicates that the module was found
-#  WEBSOCKETPP_INCLUDE_DIR - include directories
-
-@PACKAGE_INIT@
-set_and_check(WEBSOCKETPP_INCLUDE_DIR "@PACKAGE_INSTALL_INCLUDE_DIR@")
-set(WEBSOCKETPP_FOUND TRUE)
-
-#This is a bit of a hack, but it works well. It also allows continued support of CMake 2.8
-if(${CMAKE_VERSION} VERSION_GREATER 3.0.0 OR ${CMAKE_VERSION} VERSION_EQUAL 3.0.0)
-  add_library(websocketpp::websocketpp INTERFACE IMPORTED)
-  set_target_properties(websocketpp::websocketpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${WEBSOCKETPP_INCLUDE_DIR}")
-endif()
diff --git a/src/sioclient/lib/websocketpp/websocketpp/CMakeLists.txt b/src/sioclient/lib/websocketpp/websocketpp/CMakeLists.txt
deleted file mode 100644
index 3ea8cc1c..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-init_target("websocketpp")
-final_target ()
diff --git a/src/sioclient/lib/websocketpp/websocketpp/base64/base64.hpp b/src/sioclient/lib/websocketpp/websocketpp/base64/base64.hpp
deleted file mode 100644
index ff1561d1..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/base64/base64.hpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-    ******
-    base64.hpp is a repackaging of the base64.cpp and base64.h files into a
-    single header suitable for use as a header only library. This conversion was
-    done by Peter Thorson (webmaster@zaphoyd.com) in 2012. All modifications to
-    the code are redistributed under the same license as the original, which is
-    listed below.
-    ******
-
-   base64.cpp and base64.h
-
-   Copyright (C) 2004-2008 René Nyffenegger
-
-   This source code is provided 'as-is', without any express or implied
-   warranty. In no event will the author be held liable for any damages
-   arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any purpose,
-   including commercial applications, and to alter it and redistribute it
-   freely, subject to the following restrictions:
-
-   1. The origin of this source code must not be misrepresented; you must not
-      claim that you wrote the original source code. If you use this source code
-      in a product, an acknowledgment in the product documentation would be
-      appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and must not be
-      misrepresented as being the original source code.
-
-   3. This notice may not be removed or altered from any source distribution.
-
-   René Nyffenegger rene.nyffenegger@adp-gmbh.ch
-
-*/
-
-#ifndef _BASE64_HPP_
-#define _BASE64_HPP_
-
-#include <string>
-
-namespace websocketpp {
-
-static std::string const base64_chars =
-             "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-             "abcdefghijklmnopqrstuvwxyz"
-             "0123456789+/";
-
-/// Test whether a character is a valid base64 character
-/**
- * @param c The character to test
- * @return true if c is a valid base64 character
- */
-static inline bool is_base64(unsigned char c) {
-    return (c == 43 || // +
-           (c >= 47 && c <= 57) || // /-9
-           (c >= 65 && c <= 90) || // A-Z
-           (c >= 97 && c <= 122)); // a-z
-}
-
-/// Encode a char buffer into a base64 string
-/**
- * @param input The input data
- * @param len The length of input in bytes
- * @return A base64 encoded string representing input
- */
-inline std::string base64_encode(unsigned char const * input, size_t len) {
-    std::string ret;
-    int i = 0;
-    int j = 0;
-    unsigned char char_array_3[3];
-    unsigned char char_array_4[4];
-
-    while (len--) {
-        char_array_3[i++] = *(input++);
-        if (i == 3) {
-            char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
-            char_array_4[1] = ((char_array_3[0] & 0x03) << 4) +
-                              ((char_array_3[1] & 0xf0) >> 4);
-            char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) +
-                              ((char_array_3[2] & 0xc0) >> 6);
-            char_array_4[3] = char_array_3[2] & 0x3f;
-
-            for(i = 0; (i <4) ; i++) {
-                ret += base64_chars[char_array_4[i]];
-            }
-            i = 0;
-        }
-    }
-
-    if (i) {
-        for(j = i; j < 3; j++) {
-            char_array_3[j] = '\0';
-        }
-
-        char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
-        char_array_4[1] = ((char_array_3[0] & 0x03) << 4) +
-                          ((char_array_3[1] & 0xf0) >> 4);
-        char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) +
-                          ((char_array_3[2] & 0xc0) >> 6);
-        char_array_4[3] = char_array_3[2] & 0x3f;
-
-        for (j = 0; (j < i + 1); j++) {
-            ret += base64_chars[char_array_4[j]];
-        }
-
-        while((i++ < 3)) {
-            ret += '=';
-        }
-    }
-
-    return ret;
-}
-
-/// Encode a string into a base64 string
-/**
- * @param input The input data
- * @return A base64 encoded string representing input
- */
-inline std::string base64_encode(std::string const & input) {
-    return base64_encode(
-        reinterpret_cast<const unsigned char *>(input.data()),
-        input.size()
-    );
-}
-
-/// Decode a base64 encoded string into a string of raw bytes
-/**
- * @param input The base64 encoded input data
- * @return A string representing the decoded raw bytes
- */
-inline std::string base64_decode(std::string const & input) {
-    size_t in_len = input.size();
-    int i = 0;
-    int j = 0;
-    int in_ = 0;
-    unsigned char char_array_4[4], char_array_3[3];
-    std::string ret;
-
-    while (in_len-- && ( input[in_] != '=') && is_base64(input[in_])) {
-        char_array_4[i++] = input[in_]; in_++;
-        if (i ==4) {
-            for (i = 0; i <4; i++) {
-                char_array_4[i] = static_cast<unsigned char>(base64_chars.find(char_array_4[i]));
-            }
-
-            char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
-            char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
-            char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
-
-            for (i = 0; (i < 3); i++) {
-                ret += char_array_3[i];
-            }
-            i = 0;
-        }
-    }
-
-    if (i) {
-        for (j = i; j <4; j++)
-            char_array_4[j] = 0;
-
-        for (j = 0; j <4; j++)
-            char_array_4[j] = static_cast<unsigned char>(base64_chars.find(char_array_4[j]));
-
-        char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
-        char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
-        char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
-
-        for (j = 0; (j < i - 1); j++) {
-            ret += static_cast<std::string::value_type>(char_array_3[j]);
-        }
-    }
-
-    return ret;
-}
-
-} // namespace websocketpp
-
-#endif // _BASE64_HPP_
diff --git a/src/sioclient/lib/websocketpp/websocketpp/client.hpp b/src/sioclient/lib/websocketpp/websocketpp/client.hpp
deleted file mode 100644
index 8782d7e4..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/client.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CLIENT_HPP
-#define WEBSOCKETPP_CLIENT_HPP
-
-#include <websocketpp/roles/client_endpoint.hpp>
-
-#endif //WEBSOCKETPP_CLIENT_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/close.hpp b/src/sioclient/lib/websocketpp/websocketpp/close.hpp
deleted file mode 100644
index 276498e6..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/close.hpp
+++ /dev/null
@@ -1,353 +0,0 @@
-
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CLOSE_HPP
-#define WEBSOCKETPP_CLOSE_HPP
-
-/** \file
- * A package of types and methods for manipulating WebSocket close codes.
- */
-
-#include <websocketpp/error.hpp>
-#include <websocketpp/common/network.hpp>
-#include <websocketpp/common/stdint.hpp>
-#include <websocketpp/utf8_validator.hpp>
-
-#include <string>
-
-namespace websocketpp {
-/// A package of types and methods for manipulating WebSocket close codes.
-namespace close {
-/// A package of types and methods for manipulating WebSocket close status'
-namespace status {
-    /// The type of a close code value.
-    typedef uint16_t value;
-
-    /// A blank value for internal use.
-    static value const blank = 0;
-
-    /// Close the connection without a WebSocket close handshake.
-    /**
-     * This special value requests that the WebSocket connection be closed
-     * without performing the WebSocket closing handshake. This does not comply
-     * with RFC6455, but should be safe to do if necessary. This could be useful
-     * for clients that need to disconnect quickly and cannot afford the
-     * complete handshake.
-     */
-    static value const omit_handshake = 1;
-
-    /// Close the connection with a forced TCP drop.
-    /**
-     * This special value requests that the WebSocket connection be closed by
-     * forcibly dropping the TCP connection. This will leave the other side of
-     * the connection with a broken connection and some expensive timeouts. this
-     * should not be done except in extreme cases or in cases of malicious
-     * remote endpoints.
-     */
-    static value const force_tcp_drop = 2;
-
-    /// Normal closure, meaning that the purpose for which the connection was
-    /// established has been fulfilled.
-    static value const normal = 1000;
-
-    /// The endpoint was "going away", such as a server going down or a browser
-    /// navigating away from a page.
-    static value const going_away = 1001;
-
-    /// A protocol error occurred.
-    static value const protocol_error = 1002;
-
-    /// The connection was terminated because an endpoint received a type of
-    /// data it cannot accept.
-    /**
-     * (e.g., an endpoint that understands only text data MAY send this if it
-     * receives a binary message).
-     */
-    static value const unsupported_data = 1003;
-
-    /// A dummy value to indicate that no status code was received.
-    /**
-     * This value is illegal on the wire.
-     */
-    static value const no_status = 1005;
-
-    /// A dummy value to indicate that the connection was closed abnormally.
-    /**
-     * In such a case there was no close frame to extract a value from. This
-     * value is illegal on the wire.
-     */
-    static value const abnormal_close = 1006;
-
-    /// An endpoint received message data inconsistent with its type.
-    /**
-     * For example: Invalid UTF8 bytes in a text message.
-     */
-    static value const invalid_payload = 1007;
-
-    /// An endpoint received a message that violated its policy.
-    /**
-     * This is a generic status code that can be returned when there is no other
-     * more suitable status code (e.g., 1003 or 1009) or if there is a need to
-     * hide specific details about the policy.
-     */
-    static value const policy_violation = 1008;
-
-    /// An endpoint received a message too large to process.
-    static value const message_too_big = 1009;
-
-    /// A client expected the server to accept a required extension request
-    /**
-     * The list of extensions that are needed SHOULD appear in the /reason/ part
-     * of the Close frame. Note that this status code is not used by the server,
-     * because it can fail the WebSocket handshake instead.
-     */
-    static value const extension_required = 1010;
-
-    /// An endpoint encountered an unexpected condition that prevented it from
-    /// fulfilling the request.
-    static value const internal_endpoint_error = 1011;
-
-    /// Indicates that the service is restarted. A client may reconnect and if
-    /// if it chooses to do so, should reconnect using a randomized delay of
-    /// 5-30s
-    static value const service_restart = 1012;
-
-    /// Indicates that the service is experiencing overload. A client should
-    /// only connect to a different IP (when there are multiple for the target)
-    /// or reconnect to the same IP upon user action.
-    static value const try_again_later = 1013;
-
-    /// Indicates that the server was acting as a gateway or proxy and received
-    /// an invalid response from the upstream server. This is similar to 502
-    /// HTTP Status Code.
-    static value const bad_gateway = 1014;
-
-    /// An endpoint failed to perform a TLS handshake
-    /**
-     * Designated for use in applications expecting a status code to indicate
-     * that the connection was closed due to a failure to perform a TLS
-     * handshake (e.g., the server certificate can't be verified). This value is
-     * illegal on the wire.
-     */
-    static value const tls_handshake = 1015;
-    
-    /// A generic subprotocol error
-    /**
-     * Indicates that a subprotocol error occurred. Typically this involves
-     * receiving a message that is not formatted as a valid message for the
-     * subprotocol in use.
-     */
-    static value const subprotocol_error = 3000;
-    
-    /// A invalid subprotocol data
-    /**
-     * Indicates that data was received that violated the specification of the
-     * subprotocol in use.
-     */
-    static value const invalid_subprotocol_data = 3001;
-
-    /// First value in range reserved for future protocol use
-    static value const rsv_start = 1016;
-    /// Last value in range reserved for future protocol use
-    static value const rsv_end = 2999;
-
-    /// Test whether a close code is in a reserved range
-    /**
-     * @param [in] code The code to test
-     * @return Whether or not code is reserved
-     */
-    inline bool reserved(value code) {
-        return ((code >= rsv_start && code <= rsv_end) ||
-                code == 1004);
-    }
-
-    /// First value in range that is always invalid on the wire
-    static value const invalid_low = 999;
-    /// Last value in range that is always invalid on the wire
-    static value const invalid_high = 5000;
-
-    /// Test whether a close code is invalid on the wire
-    /**
-     * @param [in] code The code to test
-     * @return Whether or not code is invalid on the wire
-     */
-    inline bool invalid(value code) {
-        return (code <= invalid_low || code >= invalid_high ||
-                code == no_status || code == abnormal_close ||
-                code == tls_handshake);
-    }
-
-    /// Determine if the code represents an unrecoverable error
-    /**
-     * There is a class of errors for which once they are discovered normal
-     * WebSocket functionality can no longer occur. This function determines
-     * if a given code is one of these values. This information is used to
-     * determine if the system has the capability of waiting for a close
-     * acknowledgement or if it should drop the TCP connection immediately
-     * after sending its close frame.
-     *
-     * @param [in] code The value to test.
-     * @return True if the code represents an unrecoverable error
-     */
-    inline bool terminal(value code) {
-        return (code == protocol_error || code == invalid_payload ||
-                code == policy_violation || code == message_too_big ||
-                 code == internal_endpoint_error);
-    }
-    
-    /// Return a human readable interpretation of a WebSocket close code
-    /**
-     * See https://tools.ietf.org/html/rfc6455#section-7.4 for more details.
-     *
-     * @since 0.3.0
-     *
-     * @param [in] code The code to look up.
-     * @return A human readable interpretation of the code.
-     */
-    inline std::string get_string(value code) {
-        switch (code) {
-            case normal:
-                return "Normal close";
-            case going_away:
-                return "Going away";
-            case protocol_error:
-                return "Protocol error";
-            case unsupported_data:
-                return "Unsupported data";
-            case no_status:
-                return "No status set";
-            case abnormal_close:
-                return "Abnormal close";
-            case invalid_payload:
-                return "Invalid payload";
-            case policy_violation:
-                return "Policy violoation";
-            case message_too_big:
-                return "Message too big";
-            case extension_required:
-                return "Extension required";
-            case internal_endpoint_error:
-                return "Internal endpoint error";
-            case service_restart:
-                return "Service restart";
-            case try_again_later:
-                return "Try again later";
-            case bad_gateway:
-                return "Bad gateway";
-            case tls_handshake:
-                return "TLS handshake failure";
-            case subprotocol_error:
-                return "Generic subprotocol error";
-            case invalid_subprotocol_data:
-                return "Invalid subprotocol data";
-            default:
-                return "Unknown";
-        }
-    }
-} // namespace status
-
-/// Type used to convert close statuses between integer and wire representations
-union code_converter {
-    uint16_t i;
-    char c[2];
-};
-
-/// Extract a close code value from a close payload
-/**
- * If there is no close value (ie string is empty) status::no_status is
- * returned. If a code couldn't be extracted (usually do to a short or
- * otherwise mangled payload) status::protocol_error is returned and the ec
- * value is flagged as an error. Note that this case is different than the case
- * where protocol error is received over the wire.
- *
- * If the value is in an invalid or reserved range ec is set accordingly.
- *
- * @param [in] payload Close frame payload value received over the wire.
- * @param [out] ec Set to indicate what error occurred, if any.
- * @return The extracted value
- */
-inline status::value extract_code(std::string const & payload, lib::error_code
-    & ec)
-{
-    ec = lib::error_code();
-
-    if (payload.size() == 0) {
-        return status::no_status;
-    } else if (payload.size() == 1) {
-        ec = make_error_code(error::bad_close_code);
-        return status::protocol_error;
-    }
-
-    code_converter val;
-
-    val.c[0] = payload[0];
-    val.c[1] = payload[1];
-
-    status::value code(ntohs(val.i));
-
-    if (status::invalid(code)) {
-        ec = make_error_code(error::invalid_close_code);
-    }
-
-    if (status::reserved(code)) {
-        ec = make_error_code(error::reserved_close_code);
-    }
-
-    return code;
-}
-
-/// Extract the reason string from a close payload
-/**
- * The string should be a valid UTF8 message. error::invalid_utf8 will be set if
- * the function extracts a reason that is not valid UTF8.
- *
- * @param [in] payload The payload string to extract a reason from.
- * @param [out] ec Set to indicate what error occurred, if any.
- * @return The reason string.
- */
-inline std::string extract_reason(std::string const & payload, lib::error_code
-    & ec)
-{
-    std::string reason;
-    ec = lib::error_code();
-
-    if (payload.size() > 2) {
-        reason.append(payload.begin()+2,payload.end());
-    }
-
-    if (!websocketpp::utf8_validator::validate(reason)) {
-        ec = make_error_code(error::invalid_utf8);
-    }
-
-    return reason;
-}
-
-} // namespace close
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CLOSE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/asio.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/asio.hpp
deleted file mode 100644
index 3c8fa13e..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/asio.hpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_ASIO_HPP
-#define WEBSOCKETPP_COMMON_ASIO_HPP
-
-// This file goes to some length to preserve compatibility with versions of 
-// boost older than 1.49 (where the first modern steady_timer timer based on 
-// boost/std chrono was introduced.
-//
-// For the versions older than 1.49, the deadline_timer is used instead. this
-// brings in dependencies on boost date_time and it has a different interface
-// that is normalized by the `lib::asio::is_neg` and `lib::asio::milliseconds`
-// wrappers provided by this file.
-//
-// The primary reason for this continued support is that boost 1.48 is the
-// default and not easily changeable version of boost supplied by the package
-// manager of popular Linux distributions like Ubuntu 12.04 LTS. Once the need
-// for this has passed this should be cleaned up and simplified.
-
-#ifdef ASIO_STANDALONE
-    #include <asio/version.hpp>
-    
-    #if (ASIO_VERSION/100000) == 1 && ((ASIO_VERSION/100)%1000) < 8
-        static_assert(false, "The minimum version of standalone Asio is 1.8.0");
-    #endif
-    
-    #include <asio.hpp>
-    #include <asio/steady_timer.hpp>
-    #include <websocketpp/common/chrono.hpp> 
-#else
-    #include <boost/version.hpp>
-    
-    // See note above about boost <1.49 compatibility. If we are running on 
-    // boost > 1.48 pull in the steady timer and chrono library
-    #if (BOOST_VERSION/100000) == 1 && ((BOOST_VERSION/100)%1000) > 48
-        #include <boost/asio/steady_timer.hpp>
-        #include <websocketpp/common/chrono.hpp>
-    #endif
-    
-    #include <boost/asio.hpp>
-    #include <boost/system/error_code.hpp>
-#endif
-
-namespace websocketpp {
-namespace lib {
-
-#ifdef ASIO_STANDALONE
-    namespace asio {
-        using namespace ::asio;
-        // Here we assume that we will be using std::error_code with standalone
-        // Asio. This is probably a good assumption, but it is possible in rare
-        // cases that local Asio versions would be used.
-        using std::errc;
-        
-        // See note above about boost <1.49 compatibility. Because we require
-        // a standalone Asio version of 1.8+ we are guaranteed to have 
-        // steady_timer available. By convention we require the chrono library
-        // (either boost or std) for use with standalone Asio.
-        template <typename T>
-        bool is_neg(T duration) {
-            return duration.count() < 0;
-        }
-        inline lib::chrono::milliseconds milliseconds(long duration) {
-            return lib::chrono::milliseconds(duration);
-        }
-    } // namespace asio
-    
-#else
-    namespace asio {
-        using namespace boost::asio;
-        
-        // See note above about boost <1.49 compatibility
-        #if (BOOST_VERSION/100000) == 1 && ((BOOST_VERSION/100)%1000) > 48
-            // Using boost::asio >=1.49 so we use chrono and steady_timer
-            template <typename T>
-            bool is_neg(T duration) {
-                return duration.count() < 0;
-            }
-
-            // If boost believes it has std::chrono available it will use it
-            // so we should also use it for things that relate to boost, even
-            // if the library would otherwise use boost::chrono.
-            #if defined(BOOST_ASIO_HAS_STD_CHRONO)
-                inline std::chrono::milliseconds milliseconds(long duration) {
-                    return std::chrono::milliseconds(duration);
-                }
-            #else
-                inline lib::chrono::milliseconds milliseconds(long duration) {
-                    return lib::chrono::milliseconds(duration);
-                }
-            #endif
-        #else
-            // Using boost::asio <1.49 we pretend a deadline timer is a steady
-            // timer and wrap the negative detection and duration conversion
-            // appropriately.
-            typedef boost::asio::deadline_timer steady_timer;
-            
-            template <typename T>
-            bool is_neg(T duration) {
-                return duration.is_negative();
-            }
-            inline boost::posix_time::time_duration milliseconds(long duration) {
-                return boost::posix_time::milliseconds(duration);
-            }
-        #endif
-        
-        using boost::system::error_code;
-        namespace errc = boost::system::errc;
-    } // namespace asio
-#endif
-
-
-} // namespace lib
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_COMMON_ASIO_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/asio_ssl.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/asio_ssl.hpp
deleted file mode 100644
index 69892832..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/asio_ssl.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_ASIO_SSL_HPP
-#define WEBSOCKETPP_COMMON_ASIO_SSL_HPP
-
-// NOTE: This file must be included before common/asio.hpp
-
-#ifdef ASIO_STANDALONE
-    #include <asio/ssl.hpp>
-#else
-    #include <boost/asio/ssl.hpp>
-#endif
-
-#endif // WEBSOCKETPP_COMMON_ASIO_SSL_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/chrono.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/chrono.hpp
deleted file mode 100644
index 975ee043..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/chrono.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_CHRONO_HPP
-#define WEBSOCKETPP_COMMON_CHRONO_HPP
-
-#include <websocketpp/common/cpp11.hpp>
-
-// If we've determined that we're in full C++11 mode and the user hasn't
-// explicitly disabled the use of C++11 functional header, then prefer it to
-// boost.
-#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_CHRONO_
-    #ifndef _WEBSOCKETPP_CPP11_CHRONO_
-        #define _WEBSOCKETPP_CPP11_CHRONO_
-    #endif
-#endif
-
-// If we're on Visual Studio 2012 or higher and haven't explicitly disabled
-// the use of C++11 chrono header then prefer it to boost.
-#if defined(_MSC_VER) && _MSC_VER >= 1700 && !defined _WEBSOCKETPP_NO_CPP11_CHRONO_
-    #ifndef _WEBSOCKETPP_CPP11_CHRONO_
-        #define _WEBSOCKETPP_CPP11_CHRONO_
-    #endif
-#endif
-
-#ifdef _WEBSOCKETPP_CPP11_CHRONO_
-    #include <chrono>
-#else
-    #include <boost/chrono.hpp>
-#endif
-
-namespace websocketpp {
-namespace lib {
-
-#ifdef _WEBSOCKETPP_CPP11_CHRONO_
-    namespace chrono = std::chrono;
-#else
-    namespace chrono = boost::chrono;
-#endif
-
-} // namespace lib
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_COMMON_CHRONO_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/connection_hdl.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/connection_hdl.hpp
deleted file mode 100644
index 1044c88e..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/connection_hdl.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_CONNECTION_HDL_HPP
-#define WEBSOCKETPP_COMMON_CONNECTION_HDL_HPP
-
-#include <websocketpp/common/memory.hpp>
-
-namespace websocketpp {
-
-/// A handle to uniquely identify a connection.
-/**
- * This type uniquely identifies a connection. It is implemented as a weak
- * pointer to the connection in question. This provides uniqueness across
- * multiple endpoints and ensures that IDs never conflict or run out.
- *
- * It is safe to make copies of this handle, store those copies in containers,
- * and use them from other threads.
- *
- * This handle can be upgraded to a full shared_ptr using
- * `endpoint::get_con_from_hdl()` from within a handler fired by the connection
- * that owns the handler.
- */
-typedef lib::weak_ptr<void> connection_hdl;
-
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_COMMON_CONNECTION_HDL_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/cpp11.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/cpp11.hpp
deleted file mode 100644
index 492a3b8f..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/cpp11.hpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_CPP11_HPP
-#define WEBSOCKETPP_COMMON_CPP11_HPP
-
-/**
- * This header sets up some constants based on the state of C++11 support
- */
-
-// Hide clang feature detection from other compilers
-#ifndef __has_feature         // Optional of course.
-  #define __has_feature(x) 0  // Compatibility with non-clang compilers.
-#endif
-#ifndef __has_extension
-  #define __has_extension __has_feature // Compatibility with pre-3.0 compilers.
-#endif
-
-// The code below attempts to use information provided by the build system or
-// user supplied defines to selectively enable C++11 language and library
-// features. In most cases features that are targeted individually may also be
-// selectively disabled via an associated _WEBSOCKETPP_NOXXX_ define.
-
-#if defined(_WEBSOCKETPP_CPP11_STL_) || __cplusplus >= 201103L || defined(_WEBSOCKETPP_CPP11_STRICT_)
-    // This check tests for blanket c++11 coverage. It can be activated in one
-    // of three ways. Either the compiler itself reports that it is a full 
-    // C++11 compiler via the __cplusplus macro or the user/build system
-    // supplies one of the two preprocessor defines below:
-    
-    // This is defined to allow other WebSocket++ common headers to enable
-    // C++11 features when they are detected by this file rather than
-    // duplicating the above logic in every common header.
-    #define _WEBSOCKETPP_CPP11_INTERNAL_
-    
-    // _WEBSOCKETPP_CPP11_STRICT_
-    //
-    // This define reports to WebSocket++ that 100% of the language and library
-    // features of C++11 are available. Using this define on a non-C++11
-    // compiler will result in problems.
-    
-    // _WEBSOCKETPP_CPP11_STL_ 
-    //
-    // This define enables *most* C++11 options that were implemented early on
-    // by compilers. It is typically used for compilers that have many, but not
-    // all C++11 features. It should be safe to use on GCC 4.7-4.8 and perhaps
-    // earlier. 
-    #ifndef _WEBSOCKETPP_NOEXCEPT_TOKEN_
-        #define _WEBSOCKETPP_NOEXCEPT_TOKEN_ noexcept
-    #endif
-    #ifndef _WEBSOCKETPP_CONSTEXPR_TOKEN_
-        #define _WEBSOCKETPP_CONSTEXPR_TOKEN_ constexpr
-    #endif
-    #ifndef _WEBSOCKETPP_INITIALIZER_LISTS_
-        #define _WEBSOCKETPP_INITIALIZER_LISTS_
-    #endif
-    #ifndef _WEBSOCKETPP_NULLPTR_TOKEN_
-        #define _WEBSOCKETPP_NULLPTR_TOKEN_ nullptr
-    #endif
-    #ifndef _WEBSOCKETPP_MOVE_SEMANTICS_
-        #define _WEBSOCKETPP_MOVE_SEMANTICS_
-    #endif
-    #ifndef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-        #define _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-    #endif
-    
-    #ifndef __GNUC__
-        // GCC as of version 4.9 (latest) does not support std::put_time yet.
-        // so ignore it
-        #define _WEBSOCKETPP_PUTTIME_
-    #endif
-#else
-    // In the absence of a blanket define, try to use compiler versions or
-    // feature testing macros to selectively enable what we can.
-
-    // Test for noexcept
-    #ifndef _WEBSOCKETPP_NOEXCEPT_TOKEN_
-        #ifdef _WEBSOCKETPP_NOEXCEPT_
-            // build system says we have noexcept
-            #define _WEBSOCKETPP_NOEXCEPT_TOKEN_ noexcept
-        #else
-            #if __has_feature(cxx_noexcept)
-                // clang feature detect says we have noexcept
-                #define _WEBSOCKETPP_NOEXCEPT_TOKEN_ noexcept
-            #elif defined(_MSC_VER) && _MSC_VER >= 1900
-            	// Visual Studio 2015+ has noexcept
-                #define _WEBSOCKETPP_NOEXCEPT_TOKEN_ noexcept
-            #else
-                // assume we don't have noexcept
-                #define _WEBSOCKETPP_NOEXCEPT_TOKEN_
-            #endif
-        #endif
-    #endif
-
-    // Test for constexpr
-    #ifndef _WEBSOCKETPP_CONSTEXPR_TOKEN_
-        #ifdef _WEBSOCKETPP_CONSTEXPR_
-            // build system says we have constexpr
-            #define _WEBSOCKETPP_CONSTEXPR_TOKEN_ constexpr
-        #else
-            #if __has_feature(cxx_constexpr)
-                // clang feature detect says we have constexpr
-                #define _WEBSOCKETPP_CONSTEXPR_TOKEN_ constexpr
-            #elif defined(_MSC_VER) && _MSC_VER >= 1900
-            	// Visual Studio 2015+ has constexpr
-                #define _WEBSOCKETPP_CONSTEXPR_TOKEN_ constexpr
-            #else
-                // assume we don't have constexpr
-                #define _WEBSOCKETPP_CONSTEXPR_TOKEN_
-            #endif
-        #endif
-    #endif
-
-    // Enable initializer lists on clang when available.
-    #if __has_feature(cxx_generalized_initializers) && !defined(_WEBSOCKETPP_INITIALIZER_LISTS_)
-        #define _WEBSOCKETPP_INITIALIZER_LISTS_
-    #endif
-    
-    // Test for nullptr
-    #ifndef _WEBSOCKETPP_NULLPTR_TOKEN_
-        #ifdef _WEBSOCKETPP_NULLPTR_
-            // build system says we have nullptr
-            #define _WEBSOCKETPP_NULLPTR_TOKEN_ nullptr
-        #else
-            #if __has_feature(cxx_nullptr)
-                // clang feature detect says we have nullptr
-                #define _WEBSOCKETPP_NULLPTR_TOKEN_ nullptr
-            #elif defined(_MSC_VER) &&_MSC_VER >= 1600
-                // Visual Studio version that has nullptr
-                #define _WEBSOCKETPP_NULLPTR_TOKEN_ nullptr
-            #else
-                // assume we don't have nullptr
-                #define _WEBSOCKETPP_NULLPTR_TOKEN_ 0
-            #endif
-        #endif
-    #endif
-#endif
-
-#endif // WEBSOCKETPP_COMMON_CPP11_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/functional.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/functional.hpp
deleted file mode 100644
index d332dd15..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/functional.hpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_FUNCTIONAL_HPP
-#define WEBSOCKETPP_COMMON_FUNCTIONAL_HPP
-
-#include <websocketpp/common/cpp11.hpp>
-
-// If we've determined that we're in full C++11 mode and the user hasn't
-// explicitly disabled the use of C++11 functional header, then prefer it to
-// boost.
-#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_FUNCTIONAL_
-    #ifndef _WEBSOCKETPP_CPP11_FUNCTIONAL_
-        #define _WEBSOCKETPP_CPP11_FUNCTIONAL_
-    #endif
-#endif
-
-// If we're on Visual Studio 2010 or higher and haven't explicitly disabled
-// the use of C++11 functional header then prefer it to boost.
-#if defined(_MSC_VER) && _MSC_VER >= 1600 && !defined _WEBSOCKETPP_NO_CPP11_FUNCTIONAL_
-    #ifndef _WEBSOCKETPP_CPP11_FUNCTIONAL_
-        #define _WEBSOCKETPP_CPP11_FUNCTIONAL_
-    #endif
-#endif
-
-
-
-#ifdef _WEBSOCKETPP_CPP11_FUNCTIONAL_
-    #include <functional>
-#else
-    #include <boost/bind.hpp>
-    #include <boost/function.hpp>
-    #include <boost/ref.hpp>
-#endif
-
-
-
-namespace websocketpp {
-namespace lib {
-
-#ifdef _WEBSOCKETPP_CPP11_FUNCTIONAL_
-    using std::function;
-    using std::bind;
-    using std::ref;
-    namespace placeholders = std::placeholders;
-
-    // There are some cases where a C++11 compiler balks at using std::ref
-    // but a C++03 compiler using boost function requires boost::ref. As such
-    // lib::ref is not useful in these cases. Instead this macro allows the use
-    // of boost::ref in the case of a boost compile or no reference wrapper at
-    // all in the case of a C++11 compile
-    #define _WEBSOCKETPP_REF(x) x
-
-    template <typename T>
-    void clear_function(T & x) {
-        x = nullptr;
-    }
-#else
-    using boost::function;
-    using boost::bind;
-    using boost::ref;
-    namespace placeholders {
-        /// \todo this feels hacky, is there a better way?
-        using ::_1;
-        using ::_2;
-        using ::_3;
-    }
-
-    // See above definition for more details on what this is and why it exists
-    #define _WEBSOCKETPP_REF(x) boost::ref(x)
-
-    template <typename T>
-    void clear_function(T & x) {
-        x.clear();
-    }
-#endif
-
-} // namespace lib
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_COMMON_FUNCTIONAL_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/md5.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/md5.hpp
deleted file mode 100644
index 279725f4..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/md5.hpp
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
-  md5.hpp is a reformulation of the md5.h and md5.c code from
-  http://www.opensource.apple.com/source/cups/cups-59/cups/md5.c to allow it to
-  function as a component of a header only library. This conversion was done by
-  Peter Thorson (webmaster@zaphoyd.com) in 2012 for the WebSocket++ project. The
-  changes are released under the same license as the original (listed below)
-*/
-/*
-  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
-/*
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321, whose
-  text is available at
-    http://www.ietf.org/rfc/rfc1321.txt
-  The code is derived from the text of the RFC, including the test suite
-  (section A.5) but excluding the rest of Appendix A.  It does not include
-  any code or documentation that is identified in the RFC as being
-  copyrighted.
-
-  The original and principal author of md5.h is L. Peter Deutsch
-  <ghost@aladdin.com>.  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  2002-04-13 lpd Removed support for non-ANSI compilers; removed
-    references to Ghostscript; clarified derivation from RFC 1321;
-    now handles byte order either statically or dynamically.
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
-    added conditionalization for C++ compilation from Martin
-    Purschke <purschke@bnl.gov>.
-  1999-05-03 lpd Original version.
- */
-
-#ifndef WEBSOCKETPP_COMMON_MD5_HPP
-#define WEBSOCKETPP_COMMON_MD5_HPP
-
-/*
- * This package supports both compile-time and run-time determination of CPU
- * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
- * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
- * defined as non-zero, the code will be compiled to run only on big-endian
- * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
- * run on either big- or little-endian CPUs, but will run slightly less
- * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
- */
-
-#include <stddef.h>
-#include <string>
-#include <cstring>
-
-namespace websocketpp {
-/// Provides MD5 hashing functionality
-namespace md5 {
-
-typedef unsigned char md5_byte_t; /* 8-bit byte */
-typedef unsigned int md5_word_t; /* 32-bit word */
-
-/* Define the state of the MD5 Algorithm. */
-typedef struct md5_state_s {
-    md5_word_t count[2];    /* message length in bits, lsw first */
-    md5_word_t abcd[4];     /* digest buffer */
-    md5_byte_t buf[64];     /* accumulate block */
-} md5_state_t;
-
-/* Initialize the algorithm. */
-inline void md5_init(md5_state_t *pms);
-
-/* Append a string to the message. */
-inline void md5_append(md5_state_t *pms, md5_byte_t const * data, size_t nbytes);
-
-/* Finish the message and return the digest. */
-inline void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
-
-#undef ZSW_MD5_BYTE_ORDER   /* 1 = big-endian, -1 = little-endian, 0 = unknown */
-#ifdef ARCH_IS_BIG_ENDIAN
-#  define ZSW_MD5_BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
-#else
-#  define ZSW_MD5_BYTE_ORDER 0
-#endif
-
-#define ZSW_MD5_T_MASK ((md5_word_t)~0)
-#define ZSW_MD5_T1 /* 0xd76aa478 */ (ZSW_MD5_T_MASK ^ 0x28955b87)
-#define ZSW_MD5_T2 /* 0xe8c7b756 */ (ZSW_MD5_T_MASK ^ 0x173848a9)
-#define ZSW_MD5_T3    0x242070db
-#define ZSW_MD5_T4 /* 0xc1bdceee */ (ZSW_MD5_T_MASK ^ 0x3e423111)
-#define ZSW_MD5_T5 /* 0xf57c0faf */ (ZSW_MD5_T_MASK ^ 0x0a83f050)
-#define ZSW_MD5_T6    0x4787c62a
-#define ZSW_MD5_T7 /* 0xa8304613 */ (ZSW_MD5_T_MASK ^ 0x57cfb9ec)
-#define ZSW_MD5_T8 /* 0xfd469501 */ (ZSW_MD5_T_MASK ^ 0x02b96afe)
-#define ZSW_MD5_T9    0x698098d8
-#define ZSW_MD5_T10 /* 0x8b44f7af */ (ZSW_MD5_T_MASK ^ 0x74bb0850)
-#define ZSW_MD5_T11 /* 0xffff5bb1 */ (ZSW_MD5_T_MASK ^ 0x0000a44e)
-#define ZSW_MD5_T12 /* 0x895cd7be */ (ZSW_MD5_T_MASK ^ 0x76a32841)
-#define ZSW_MD5_T13    0x6b901122
-#define ZSW_MD5_T14 /* 0xfd987193 */ (ZSW_MD5_T_MASK ^ 0x02678e6c)
-#define ZSW_MD5_T15 /* 0xa679438e */ (ZSW_MD5_T_MASK ^ 0x5986bc71)
-#define ZSW_MD5_T16    0x49b40821
-#define ZSW_MD5_T17 /* 0xf61e2562 */ (ZSW_MD5_T_MASK ^ 0x09e1da9d)
-#define ZSW_MD5_T18 /* 0xc040b340 */ (ZSW_MD5_T_MASK ^ 0x3fbf4cbf)
-#define ZSW_MD5_T19    0x265e5a51
-#define ZSW_MD5_T20 /* 0xe9b6c7aa */ (ZSW_MD5_T_MASK ^ 0x16493855)
-#define ZSW_MD5_T21 /* 0xd62f105d */ (ZSW_MD5_T_MASK ^ 0x29d0efa2)
-#define ZSW_MD5_T22    0x02441453
-#define ZSW_MD5_T23 /* 0xd8a1e681 */ (ZSW_MD5_T_MASK ^ 0x275e197e)
-#define ZSW_MD5_T24 /* 0xe7d3fbc8 */ (ZSW_MD5_T_MASK ^ 0x182c0437)
-#define ZSW_MD5_T25    0x21e1cde6
-#define ZSW_MD5_T26 /* 0xc33707d6 */ (ZSW_MD5_T_MASK ^ 0x3cc8f829)
-#define ZSW_MD5_T27 /* 0xf4d50d87 */ (ZSW_MD5_T_MASK ^ 0x0b2af278)
-#define ZSW_MD5_T28    0x455a14ed
-#define ZSW_MD5_T29 /* 0xa9e3e905 */ (ZSW_MD5_T_MASK ^ 0x561c16fa)
-#define ZSW_MD5_T30 /* 0xfcefa3f8 */ (ZSW_MD5_T_MASK ^ 0x03105c07)
-#define ZSW_MD5_T31    0x676f02d9
-#define ZSW_MD5_T32 /* 0x8d2a4c8a */ (ZSW_MD5_T_MASK ^ 0x72d5b375)
-#define ZSW_MD5_T33 /* 0xfffa3942 */ (ZSW_MD5_T_MASK ^ 0x0005c6bd)
-#define ZSW_MD5_T34 /* 0x8771f681 */ (ZSW_MD5_T_MASK ^ 0x788e097e)
-#define ZSW_MD5_T35    0x6d9d6122
-#define ZSW_MD5_T36 /* 0xfde5380c */ (ZSW_MD5_T_MASK ^ 0x021ac7f3)
-#define ZSW_MD5_T37 /* 0xa4beea44 */ (ZSW_MD5_T_MASK ^ 0x5b4115bb)
-#define ZSW_MD5_T38    0x4bdecfa9
-#define ZSW_MD5_T39 /* 0xf6bb4b60 */ (ZSW_MD5_T_MASK ^ 0x0944b49f)
-#define ZSW_MD5_T40 /* 0xbebfbc70 */ (ZSW_MD5_T_MASK ^ 0x4140438f)
-#define ZSW_MD5_T41    0x289b7ec6
-#define ZSW_MD5_T42 /* 0xeaa127fa */ (ZSW_MD5_T_MASK ^ 0x155ed805)
-#define ZSW_MD5_T43 /* 0xd4ef3085 */ (ZSW_MD5_T_MASK ^ 0x2b10cf7a)
-#define ZSW_MD5_T44    0x04881d05
-#define ZSW_MD5_T45 /* 0xd9d4d039 */ (ZSW_MD5_T_MASK ^ 0x262b2fc6)
-#define ZSW_MD5_T46 /* 0xe6db99e5 */ (ZSW_MD5_T_MASK ^ 0x1924661a)
-#define ZSW_MD5_T47    0x1fa27cf8
-#define ZSW_MD5_T48 /* 0xc4ac5665 */ (ZSW_MD5_T_MASK ^ 0x3b53a99a)
-#define ZSW_MD5_T49 /* 0xf4292244 */ (ZSW_MD5_T_MASK ^ 0x0bd6ddbb)
-#define ZSW_MD5_T50    0x432aff97
-#define ZSW_MD5_T51 /* 0xab9423a7 */ (ZSW_MD5_T_MASK ^ 0x546bdc58)
-#define ZSW_MD5_T52 /* 0xfc93a039 */ (ZSW_MD5_T_MASK ^ 0x036c5fc6)
-#define ZSW_MD5_T53    0x655b59c3
-#define ZSW_MD5_T54 /* 0x8f0ccc92 */ (ZSW_MD5_T_MASK ^ 0x70f3336d)
-#define ZSW_MD5_T55 /* 0xffeff47d */ (ZSW_MD5_T_MASK ^ 0x00100b82)
-#define ZSW_MD5_T56 /* 0x85845dd1 */ (ZSW_MD5_T_MASK ^ 0x7a7ba22e)
-#define ZSW_MD5_T57    0x6fa87e4f
-#define ZSW_MD5_T58 /* 0xfe2ce6e0 */ (ZSW_MD5_T_MASK ^ 0x01d3191f)
-#define ZSW_MD5_T59 /* 0xa3014314 */ (ZSW_MD5_T_MASK ^ 0x5cfebceb)
-#define ZSW_MD5_T60    0x4e0811a1
-#define ZSW_MD5_T61 /* 0xf7537e82 */ (ZSW_MD5_T_MASK ^ 0x08ac817d)
-#define ZSW_MD5_T62 /* 0xbd3af235 */ (ZSW_MD5_T_MASK ^ 0x42c50dca)
-#define ZSW_MD5_T63    0x2ad7d2bb
-#define ZSW_MD5_T64 /* 0xeb86d391 */ (ZSW_MD5_T_MASK ^ 0x14792c6e)
-
-static void md5_process(md5_state_t *pms, md5_byte_t const * data /*[64]*/) {
-    md5_word_t
-    a = pms->abcd[0], b = pms->abcd[1],
-    c = pms->abcd[2], d = pms->abcd[3];
-    md5_word_t t;
-#if ZSW_MD5_BYTE_ORDER > 0
-    /* Define storage only for big-endian CPUs. */
-    md5_word_t X[16];
-#else
-    /* Define storage for little-endian or both types of CPUs. */
-    md5_word_t xbuf[16];
-    md5_word_t const * X;
-#endif
-
-    {
-#if ZSW_MD5_BYTE_ORDER == 0
-    /*
-     * Determine dynamically whether this is a big-endian or
-     * little-endian machine, since we can use a more efficient
-     * algorithm on the latter.
-     */
-    static int const w = 1;
-
-    if (*((md5_byte_t const *)&w)) /* dynamic little-endian */
-#endif
-#if ZSW_MD5_BYTE_ORDER <= 0     /* little-endian */
-    {
-        /*
-         * On little-endian machines, we can process properly aligned
-         * data without copying it.
-         */
-        if (!((data - (md5_byte_t const *)0) & 3)) {
-        /* data are properly aligned */
-        X = (md5_word_t const *)data;
-        } else {
-        /* not aligned */
-        std::memcpy(xbuf, data, 64);
-        X = xbuf;
-        }
-    }
-#endif
-#if ZSW_MD5_BYTE_ORDER == 0
-    else            /* dynamic big-endian */
-#endif
-#if ZSW_MD5_BYTE_ORDER >= 0     /* big-endian */
-    {
-        /*
-         * On big-endian machines, we must arrange the bytes in the
-         * right order.
-         */
-        const md5_byte_t *xp = data;
-        int i;
-
-#  if ZSW_MD5_BYTE_ORDER == 0
-        X = xbuf;       /* (dynamic only) */
-#  else
-#    define xbuf X      /* (static only) */
-#  endif
-        for (i = 0; i < 16; ++i, xp += 4)
-        xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
-    }
-#endif
-    }
-
-#define ZSW_MD5_ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
-
-    /* Round 1. */
-    /* Let [abcd k s i] denote the operation
-       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
-#define ZSW_MD5_F(x, y, z) (((x) & (y)) | (~(x) & (z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + ZSW_MD5_F(b,c,d) + X[k] + Ti;\
-  a = ZSW_MD5_ROTATE_LEFT(t, s) + b
-    /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  7,  ZSW_MD5_T1);
-    SET(d, a, b, c,  1, 12,  ZSW_MD5_T2);
-    SET(c, d, a, b,  2, 17,  ZSW_MD5_T3);
-    SET(b, c, d, a,  3, 22,  ZSW_MD5_T4);
-    SET(a, b, c, d,  4,  7,  ZSW_MD5_T5);
-    SET(d, a, b, c,  5, 12,  ZSW_MD5_T6);
-    SET(c, d, a, b,  6, 17,  ZSW_MD5_T7);
-    SET(b, c, d, a,  7, 22,  ZSW_MD5_T8);
-    SET(a, b, c, d,  8,  7,  ZSW_MD5_T9);
-    SET(d, a, b, c,  9, 12, ZSW_MD5_T10);
-    SET(c, d, a, b, 10, 17, ZSW_MD5_T11);
-    SET(b, c, d, a, 11, 22, ZSW_MD5_T12);
-    SET(a, b, c, d, 12,  7, ZSW_MD5_T13);
-    SET(d, a, b, c, 13, 12, ZSW_MD5_T14);
-    SET(c, d, a, b, 14, 17, ZSW_MD5_T15);
-    SET(b, c, d, a, 15, 22, ZSW_MD5_T16);
-#undef SET
-
-     /* Round 2. */
-     /* Let [abcd k s i] denote the operation
-          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
-#define ZSW_MD5_G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + ZSW_MD5_G(b,c,d) + X[k] + Ti;\
-  a = ZSW_MD5_ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  1,  5, ZSW_MD5_T17);
-    SET(d, a, b, c,  6,  9, ZSW_MD5_T18);
-    SET(c, d, a, b, 11, 14, ZSW_MD5_T19);
-    SET(b, c, d, a,  0, 20, ZSW_MD5_T20);
-    SET(a, b, c, d,  5,  5, ZSW_MD5_T21);
-    SET(d, a, b, c, 10,  9, ZSW_MD5_T22);
-    SET(c, d, a, b, 15, 14, ZSW_MD5_T23);
-    SET(b, c, d, a,  4, 20, ZSW_MD5_T24);
-    SET(a, b, c, d,  9,  5, ZSW_MD5_T25);
-    SET(d, a, b, c, 14,  9, ZSW_MD5_T26);
-    SET(c, d, a, b,  3, 14, ZSW_MD5_T27);
-    SET(b, c, d, a,  8, 20, ZSW_MD5_T28);
-    SET(a, b, c, d, 13,  5, ZSW_MD5_T29);
-    SET(d, a, b, c,  2,  9, ZSW_MD5_T30);
-    SET(c, d, a, b,  7, 14, ZSW_MD5_T31);
-    SET(b, c, d, a, 12, 20, ZSW_MD5_T32);
-#undef SET
-
-     /* Round 3. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
-#define ZSW_MD5_H(x, y, z) ((x) ^ (y) ^ (z))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + ZSW_MD5_H(b,c,d) + X[k] + Ti;\
-  a = ZSW_MD5_ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  5,  4, ZSW_MD5_T33);
-    SET(d, a, b, c,  8, 11, ZSW_MD5_T34);
-    SET(c, d, a, b, 11, 16, ZSW_MD5_T35);
-    SET(b, c, d, a, 14, 23, ZSW_MD5_T36);
-    SET(a, b, c, d,  1,  4, ZSW_MD5_T37);
-    SET(d, a, b, c,  4, 11, ZSW_MD5_T38);
-    SET(c, d, a, b,  7, 16, ZSW_MD5_T39);
-    SET(b, c, d, a, 10, 23, ZSW_MD5_T40);
-    SET(a, b, c, d, 13,  4, ZSW_MD5_T41);
-    SET(d, a, b, c,  0, 11, ZSW_MD5_T42);
-    SET(c, d, a, b,  3, 16, ZSW_MD5_T43);
-    SET(b, c, d, a,  6, 23, ZSW_MD5_T44);
-    SET(a, b, c, d,  9,  4, ZSW_MD5_T45);
-    SET(d, a, b, c, 12, 11, ZSW_MD5_T46);
-    SET(c, d, a, b, 15, 16, ZSW_MD5_T47);
-    SET(b, c, d, a,  2, 23, ZSW_MD5_T48);
-#undef SET
-
-     /* Round 4. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
-#define ZSW_MD5_I(x, y, z) ((y) ^ ((x) | ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + ZSW_MD5_I(b,c,d) + X[k] + Ti;\
-  a = ZSW_MD5_ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  6, ZSW_MD5_T49);
-    SET(d, a, b, c,  7, 10, ZSW_MD5_T50);
-    SET(c, d, a, b, 14, 15, ZSW_MD5_T51);
-    SET(b, c, d, a,  5, 21, ZSW_MD5_T52);
-    SET(a, b, c, d, 12,  6, ZSW_MD5_T53);
-    SET(d, a, b, c,  3, 10, ZSW_MD5_T54);
-    SET(c, d, a, b, 10, 15, ZSW_MD5_T55);
-    SET(b, c, d, a,  1, 21, ZSW_MD5_T56);
-    SET(a, b, c, d,  8,  6, ZSW_MD5_T57);
-    SET(d, a, b, c, 15, 10, ZSW_MD5_T58);
-    SET(c, d, a, b,  6, 15, ZSW_MD5_T59);
-    SET(b, c, d, a, 13, 21, ZSW_MD5_T60);
-    SET(a, b, c, d,  4,  6, ZSW_MD5_T61);
-    SET(d, a, b, c, 11, 10, ZSW_MD5_T62);
-    SET(c, d, a, b,  2, 15, ZSW_MD5_T63);
-    SET(b, c, d, a,  9, 21, ZSW_MD5_T64);
-#undef SET
-
-     /* Then perform the following additions. (That is increment each
-        of the four registers by the value it had before this block
-        was started.) */
-    pms->abcd[0] += a;
-    pms->abcd[1] += b;
-    pms->abcd[2] += c;
-    pms->abcd[3] += d;
-}
-
-void md5_init(md5_state_t *pms) {
-    pms->count[0] = pms->count[1] = 0;
-    pms->abcd[0] = 0x67452301;
-    pms->abcd[1] = /*0xefcdab89*/ ZSW_MD5_T_MASK ^ 0x10325476;
-    pms->abcd[2] = /*0x98badcfe*/ ZSW_MD5_T_MASK ^ 0x67452301;
-    pms->abcd[3] = 0x10325476;
-}
-
-void md5_append(md5_state_t *pms, md5_byte_t const * data, size_t nbytes) {
-    md5_byte_t const * p = data;
-    size_t left = nbytes;
-    int offset = (pms->count[0] >> 3) & 63;
-    md5_word_t nbits = (md5_word_t)(nbytes << 3);
-
-    if (nbytes <= 0)
-    return;
-
-    /* Update the message length. */
-    pms->count[1] += nbytes >> 29;
-    pms->count[0] += nbits;
-    if (pms->count[0] < nbits)
-    pms->count[1]++;
-
-    /* Process an initial partial block. */
-    if (offset) {
-    int copy = (offset + nbytes > 64 ? 64 - offset : static_cast<int>(nbytes));
-
-    std::memcpy(pms->buf + offset, p, copy);
-    if (offset + copy < 64)
-        return;
-    p += copy;
-    left -= copy;
-    md5_process(pms, pms->buf);
-    }
-
-    /* Process full blocks. */
-    for (; left >= 64; p += 64, left -= 64)
-    md5_process(pms, p);
-
-    /* Process a final partial block. */
-    if (left)
-    std::memcpy(pms->buf, p, left);
-}
-
-void md5_finish(md5_state_t *pms, md5_byte_t digest[16]) {
-    static md5_byte_t const pad[64] = {
-    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    md5_byte_t data[8];
-    int i;
-
-    /* Save the length before padding. */
-    for (i = 0; i < 8; ++i)
-    data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
-    /* Pad to 56 bytes mod 64. */
-    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
-    /* Append the length. */
-    md5_append(pms, data, 8);
-    for (i = 0; i < 16; ++i)
-    digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
-}
-
-// some convenience c++ functions
-inline std::string md5_hash_string(std::string const & s) {
-    char digest[16];
-
-    md5_state_t state;
-
-    md5_init(&state);
-    md5_append(&state, (md5_byte_t const *)s.c_str(), s.size());
-    md5_finish(&state, (md5_byte_t *)digest);
-
-    std::string ret;
-    ret.resize(16);
-    std::copy(digest,digest+16,ret.begin());
-
-    return ret;
-}
-
-const char hexval[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
-inline std::string md5_hash_hex(std::string const & input) {
-    std::string hash = md5_hash_string(input);
-    std::string hex;
-
-    for (size_t i = 0; i < hash.size(); i++) {
-        hex.push_back(hexval[((hash[i] >> 4) & 0xF)]);
-        hex.push_back(hexval[(hash[i]) & 0x0F]);
-    }
-
-    return hex;
-}
-
-} // md5
-} // websocketpp
-
-#endif // WEBSOCKETPP_COMMON_MD5_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/memory.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/memory.hpp
deleted file mode 100644
index 42048e33..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/memory.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_MEMORY_HPP
-#define WEBSOCKETPP_COMMON_MEMORY_HPP
-
-#include <websocketpp/common/cpp11.hpp>
-
-// If we've determined that we're in full C++11 mode and the user hasn't
-// explicitly disabled the use of C++11 memory header, then prefer it to
-// boost.
-#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_MEMORY_
-    #ifndef _WEBSOCKETPP_CPP11_MEMORY_
-        #define _WEBSOCKETPP_CPP11_MEMORY_
-    #endif
-#endif
-
-// If we're on Visual Studio 2010 or higher and haven't explicitly disabled
-// the use of C++11 functional header then prefer it to boost.
-#if defined(_MSC_VER) && _MSC_VER >= 1600 && !defined _WEBSOCKETPP_NO_CPP11_MEMORY_
-    #ifndef _WEBSOCKETPP_CPP11_MEMORY_
-        #define _WEBSOCKETPP_CPP11_MEMORY_
-    #endif
-#endif
-
-
-
-#ifdef _WEBSOCKETPP_CPP11_MEMORY_
-    #include <memory>
-#else
-    #include <boost/shared_ptr.hpp>
-	#include <boost/make_shared.hpp>
-    #include <boost/scoped_array.hpp>
-    #include <boost/enable_shared_from_this.hpp>
-    #include <boost/pointer_cast.hpp>
-#endif
-
-namespace websocketpp {
-namespace lib {
-
-#ifdef _WEBSOCKETPP_CPP11_MEMORY_
-    using std::shared_ptr;
-    using std::weak_ptr;
-    using std::enable_shared_from_this;
-    using std::static_pointer_cast;
-    using std::make_shared;
-    using std::unique_ptr;
-
-    typedef std::unique_ptr<unsigned char[]> unique_ptr_uchar_array;
-#else
-    using boost::shared_ptr;
-    using boost::weak_ptr;
-    using std::auto_ptr;
-    using boost::enable_shared_from_this;
-    using boost::static_pointer_cast;
-    using boost::make_shared;
-
-    typedef boost::scoped_array<unsigned char> unique_ptr_uchar_array;
-#endif
-
-} // namespace lib
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_COMMON_MEMORY_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/network.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/network.hpp
deleted file mode 100644
index 26a4cb9e..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/network.hpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_NETWORK_HPP
-#define WEBSOCKETPP_COMMON_NETWORK_HPP
-
-// For ntohs and htons
-#if defined(_WIN32)
-    #include <winsock2.h>
-#else
-    //#include <arpa/inet.h>
-    #include <netinet/in.h>
-#endif
-
-#include <websocketpp/common/stdint.hpp>
-
-namespace websocketpp {
-namespace lib {
-namespace net {
-
-inline bool is_little_endian() {
-    short int val = 0x1;
-    char *ptr = reinterpret_cast<char *>(&val);
-    return (ptr[0] == 1);
-}
-
-#define TYP_INIT 0
-#define TYP_SMLE 1
-#define TYP_BIGE 2
-
-/// Convert 64 bit value to network byte order
-/**
- * This method is prefixed to avoid conflicts with operating system level
- * macros for this functionality.
- *
- * TODO: figure out if it would be beneficial to use operating system level
- * macros for this.
- *
- * @param src The integer in host byte order
- * @return src converted to network byte order
- */
-inline uint64_t _htonll(uint64_t src) {
-    static int typ = TYP_INIT;
-    unsigned char c;
-    union {
-        uint64_t ull;
-        unsigned char c[8];
-    } x;
-    if (typ == TYP_INIT) {
-        x.ull = 0x01;
-        typ = (x.c[7] == 0x01ULL) ? TYP_BIGE : TYP_SMLE;
-    }
-    if (typ == TYP_BIGE)
-        return src;
-    x.ull = src;
-    c = x.c[0]; x.c[0] = x.c[7]; x.c[7] = c;
-    c = x.c[1]; x.c[1] = x.c[6]; x.c[6] = c;
-    c = x.c[2]; x.c[2] = x.c[5]; x.c[5] = c;
-    c = x.c[3]; x.c[3] = x.c[4]; x.c[4] = c;
-    return x.ull;
-}
-
-/// Convert 64 bit value to host byte order
-/**
- * This method is prefixed to avoid conflicts with operating system level
- * macros for this functionality.
- *
- * TODO: figure out if it would be beneficial to use operating system level
- * macros for this.
- *
- * @param src The integer in network byte order
- * @return src converted to host byte order
- */
-inline uint64_t _ntohll(uint64_t src) {
-    return _htonll(src);
-}
-
-} // net
-} // lib
-} // websocketpp
-
-#endif // WEBSOCKETPP_COMMON_NETWORK_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/platforms.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/platforms.hpp
deleted file mode 100644
index 87798577..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/platforms.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_PLATFORMS_HPP
-#define WEBSOCKETPP_COMMON_PLATFORMS_HPP
-
-/**
- * This header contains any platform specific preprocessor adjustments that
- * don't fit somewhere else better.
- */
-
-#if defined(_WIN32) && !defined(NOMINMAX)
-    // don't define min and max macros that conflict with std::min and std::max
-    #define NOMINMAX
-#endif
-
-// Bump up the variadic parameter max for Visual Studio 2012
-#if defined(_MSC_VER) && _MSC_VER == 1700
-    #define _VARIADIC_MAX 8
-#endif
-
-#endif // WEBSOCKETPP_COMMON_PLATFORMS_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/random.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/random.hpp
deleted file mode 100644
index ddf99694..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/random.hpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_RANDOM_DEVICE_HPP
-#define WEBSOCKETPP_COMMON_RANDOM_DEVICE_HPP
-
-#include <websocketpp/common/cpp11.hpp>
-
-// If we've determined that we're in full C++11 mode and the user hasn't
-// explicitly disabled the use of C++11 random header, then prefer it to
-// boost.
-#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_RANDOM_DEVICE_
-    #ifndef _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
-        #define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
-    #endif
-#endif
-
-
-// If we're on Visual Studio 2010 or higher and haven't explicitly disabled
-// the use of C++11 random header then prefer it to boost.
-#if defined(_MSC_VER) && _MSC_VER >= 1600 && !defined _WEBSOCKETPP_NO_CPP11_MEMORY_
-    #ifndef _WEBSOCKETPP_CPP11_MEMORY_
-        #define _WEBSOCKETPP_CPP11_MEMORY_
-    #endif
-#endif
-
-
-
-#ifdef _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
-    #include <random>
-#else
-    #include <boost/version.hpp>
-
-    #if (BOOST_VERSION/100000) == 1 && ((BOOST_VERSION/100)%1000) > 46
-        #include <boost/random/uniform_int_distribution.hpp>
-        #include <boost/random/random_device.hpp>
-    #elif (BOOST_VERSION/100000) == 1 && ((BOOST_VERSION/100)%1000) >= 43
-        #include <boost/nondet_random.hpp>
-    #else
-        // TODO: static_assert(false, "Could not find a suitable random_device")
-    #endif
-#endif
-
-namespace websocketpp {
-namespace lib {
-
-#ifdef _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
-    using std::random_device;
-    using std::uniform_int_distribution;
-#else
-    using boost::random::random_device;
-    using boost::random::uniform_int_distribution;
-#endif
-
-} // namespace lib
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_COMMON_RANDOM_DEVICE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/regex.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/regex.hpp
deleted file mode 100644
index 326635de..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/regex.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_REGEX_HPP
-#define WEBSOCKETPP_COMMON_REGEX_HPP
-
-#if defined _WEBSOCKETPP_CPP11_STL_ && !defined _WEBSOCKETPP_NO_CPP11_REGEX_
-    #ifndef _WEBSOCKETPP_CPP11_REGEX_
-        #define _WEBSOCKETPP_CPP11_REGEX_
-    #endif
-#endif
-
-#ifdef _WEBSOCKETPP_CPP11_REGEX_
-    #include <regex>
-#else
-    #include <boost/regex.hpp>
-#endif
-
-namespace websocketpp {
-namespace lib {
-
-#ifdef _WEBSOCKETPP_CPP11_REGEX_
-    using std::cmatch;
-    using std::regex;
-    using std::regex_match;
-#else
-    using boost::cmatch;
-    using boost::regex;
-    using boost::regex_match;
-#endif
-
-} // namespace lib
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_COMMON_REGEX_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/stdint.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/stdint.hpp
deleted file mode 100644
index ec48ea75..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/stdint.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_STDINT_HPP
-#define WEBSOCKETPP_COMMON_STDINT_HPP
-
-#ifndef __STDC_LIMIT_MACROS
-    #define __STDC_LIMIT_MACROS 1
-#endif
-
-#if defined (_WIN32) && defined (_MSC_VER) && (_MSC_VER < 1600)
-    #include <boost/cstdint.hpp>
-
-    using boost::int8_t;
-    using boost::int_least8_t;
-    using boost::int_fast8_t;
-    using boost::uint8_t;
-    using boost::uint_least8_t;
-    using boost::uint_fast8_t;
-
-    using boost::int16_t;
-    using boost::int_least16_t;
-    using boost::int_fast16_t;
-    using boost::uint16_t;
-    using boost::uint_least16_t;
-    using boost::uint_fast16_t;
-
-    using boost::int32_t;
-    using boost::int_least32_t;
-    using boost::int_fast32_t;
-    using boost::uint32_t;
-    using boost::uint_least32_t;
-    using boost::uint_fast32_t;
-
-    #ifndef BOOST_NO_INT64_T
-    using boost::int64_t;
-    using boost::int_least64_t;
-    using boost::int_fast64_t;
-    using boost::uint64_t;
-    using boost::uint_least64_t;
-    using boost::uint_fast64_t;
-    #endif
-    using boost::intmax_t;
-    using boost::uintmax_t;
-#else
-    #include <stdint.h>
-#endif
-
-#endif // WEBSOCKETPP_COMMON_STDINT_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/system_error.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/system_error.hpp
deleted file mode 100644
index e5aea254..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/system_error.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_SYSTEM_ERROR_HPP
-#define WEBSOCKETPP_COMMON_SYSTEM_ERROR_HPP
-
-
-#include <websocketpp/common/cpp11.hpp>
-
-// If we've determined that we're in full C++11 mode and the user hasn't
-// explicitly disabled the use of C++11 system_error header, then prefer it to
-// boost.
-#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_SYSTEM_ERROR_
-    #ifndef _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
-        #define _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
-    #endif
-#endif
-
-// If we're on Visual Studio 2010 or higher and haven't explicitly disabled
-// the use of C++11 system_error header then prefer it to boost.
-#if defined(_MSC_VER) && _MSC_VER >= 1600 && !defined _WEBSOCKETPP_NO_CPP11_SYSTEM_ERROR_
-    #ifndef _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
-        #define _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
-    #endif
-#endif
-
-
-
-#ifdef _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
-    #include <system_error>
-#else
-    #include <boost/system/error_code.hpp>
-    #include <boost/system/system_error.hpp>
-#endif
-
-namespace websocketpp {
-namespace lib {
-
-#ifdef _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
-    using std::errc;
-    using std::error_code;
-    using std::error_category;
-    using std::error_condition;
-    using std::system_error;
-    #define _WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_ namespace std {
-    #define _WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_ }
-#else
-    namespace errc = boost::system::errc;
-    using boost::system::error_code;
-    using boost::system::error_category;
-    using boost::system::error_condition;
-    using boost::system::system_error;
-    #define _WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_ namespace boost { namespace system {
-    #define _WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_ }}
-#endif
-
-} // namespace lib
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_COMMON_SYSTEM_ERROR_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/thread.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/thread.hpp
deleted file mode 100644
index 1b0472aa..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/thread.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_THREAD_HPP
-#define WEBSOCKETPP_COMMON_THREAD_HPP
-
-#include <websocketpp/common/cpp11.hpp>
-
-// If we autodetect C++11 and haven't been explicitly instructed to not use
-// C++11 threads, then set the defines that instructs the rest of this header
-// to use C++11 <thread> and <mutex>
-#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_THREAD_
-    // MinGW by default does not support C++11 thread/mutex so even if the
-    // internal check for C++11 passes, ignore it if we are on MinGW
-    #if (!defined(__MINGW32__) && !defined(__MINGW64__))
-        #ifndef _WEBSOCKETPP_CPP11_THREAD_
-            #define _WEBSOCKETPP_CPP11_THREAD_
-        #endif
-    #endif
-#endif
-
-// If we're on Visual Studio 2013 or higher and haven't explicitly disabled
-// the use of C++11 thread header then prefer it to boost.
-#if defined(_MSC_VER) && _MSC_VER >= 1800 && !defined _WEBSOCKETPP_NO_CPP11_THREAD_
-    #ifndef _WEBSOCKETPP_CPP11_THREAD_
-        #define _WEBSOCKETPP_CPP11_THREAD_
-    #endif
-#endif
-
-#if defined(_WEBSOCKETPP_MINGW_THREAD_)
-    #include <mingw-threads/mingw.thread.h>
-    #include <mingw-threads/mingw.mutex.h>
-    #include <mingw-threads/mingw.condition_variable.h>
-#elif defined(_WEBSOCKETPP_CPP11_THREAD_)
-    #include <thread>
-    #include <mutex>
-    #include <condition_variable>
-#else
-    #include <boost/thread.hpp>
-    #include <boost/thread/mutex.hpp>
-    #include <boost/thread/condition_variable.hpp>
-#endif
-
-namespace websocketpp {
-namespace lib {
-
-#if defined(_WEBSOCKETPP_CPP11_THREAD_) || defined(_WEBSOCKETPP_MINGW_THREAD_)
-    using std::mutex;
-    using std::lock_guard;
-    using std::thread;
-    using std::unique_lock;
-    using std::condition_variable;
-#else
-    using boost::mutex;
-    using boost::lock_guard;
-    using boost::thread;
-    using boost::unique_lock;
-    using boost::condition_variable;
-#endif
-
-} // namespace lib
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_COMMON_THREAD_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/time.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/time.hpp
deleted file mode 100644
index 571688e1..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/time.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_TIME_HPP
-#define WEBSOCKETPP_COMMON_TIME_HPP
-
-#include <ctime>
-
-namespace websocketpp {
-namespace lib {
-
-// Code in this header was inspired by the following article and includes some
-// code from the related project g2log. The g2log code is public domain licensed
-// http://kjellkod.wordpress.com/2013/01/22/exploring-c11-part-2-localtime-and-time-again/
-
-/// Thread safe cross platform localtime
-inline std::tm localtime(std::time_t const & time) {
-    std::tm tm_snapshot;
-#if (defined(__MINGW32__) || defined(__MINGW64__))
-    memcpy(&tm_snapshot, ::localtime(&time), sizeof(std::tm));
-#elif (defined(WIN32) || defined(_WIN32) || defined(__WIN32__))
-    localtime_s(&tm_snapshot, &time); 
-#else
-    localtime_r(&time, &tm_snapshot); // POSIX  
-#endif
-    return tm_snapshot;
-}
-
-} // lib
-} // websocketpp
-
-#endif // WEBSOCKETPP_COMMON_TIME_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/common/type_traits.hpp b/src/sioclient/lib/websocketpp/websocketpp/common/type_traits.hpp
deleted file mode 100644
index c89b82b3..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/common/type_traits.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_COMMON_TYPE_TRAITS_HPP
-#define WEBSOCKETPP_COMMON_TYPE_TRAITS_HPP
-
-#include <websocketpp/common/cpp11.hpp>
-
-// If we've determined that we're in full C++11 mode and the user hasn't
-// explicitly disabled the use of C++11 functional header, then prefer it to
-// boost.
-#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_TYPE_TRAITS_
-    #ifndef _WEBSOCKETPP_CPP11_TYPE_TRAITS_
-        #define _WEBSOCKETPP_CPP11_TYPE_TRAITS_
-    #endif
-#endif
-
-
-#ifdef _WEBSOCKETPP_CPP11_TYPE_TRAITS_
-    #include <type_traits>
-#else
-    #include <boost/aligned_storage.hpp>
-#endif
-
-
-
-namespace websocketpp {
-namespace lib {
-
-#ifdef _WEBSOCKETPP_CPP11_TYPE_TRAITS_
-    using std::aligned_storage;
-    using std::is_same;
-#else
-    using boost::aligned_storage;
-    using boost::is_same;
-#endif
-
-} // namespace lib
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_COMMON_TYPE_TRAITS_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/concurrency/basic.hpp b/src/sioclient/lib/websocketpp/websocketpp/concurrency/basic.hpp
deleted file mode 100644
index 1943ad77..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/concurrency/basic.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONCURRENCY_BASIC_HPP
-#define WEBSOCKETPP_CONCURRENCY_BASIC_HPP
-
-#include <websocketpp/common/thread.hpp>
-
-namespace websocketpp {
-namespace concurrency {
-
-/// Concurrency policy that uses std::mutex / boost::mutex
-class basic {
-public:
-    typedef lib::mutex mutex_type;
-    typedef lib::lock_guard<mutex_type> scoped_lock_type;
-};
-
-} // namespace concurrency
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONCURRENCY_BASIC_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/concurrency/none.hpp b/src/sioclient/lib/websocketpp/websocketpp/concurrency/none.hpp
deleted file mode 100644
index da9aa411..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/concurrency/none.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONCURRENCY_NONE_HPP
-#define WEBSOCKETPP_CONCURRENCY_NONE_HPP
-
-namespace websocketpp {
-
-/// Concurrency handling support
-namespace concurrency {
-
-/// Implementation for no-op locking primitives
-namespace none_impl {
-/// A fake mutex implementation that does nothing
-class fake_mutex {
-public:
-    fake_mutex() {}
-    ~fake_mutex() {}
-};
-
-/// A fake lock guard implementation that does nothing
-class fake_lock_guard {
-public:
-    explicit fake_lock_guard(fake_mutex) {}
-    ~fake_lock_guard() {}
-};
-} // namespace none_impl
-
-/// Stub concurrency policy that implements the interface using no-ops.
-/**
- * This policy documents the concurrency policy interface using no-ops. It can
- * be used as a reference or base for building a new concurrency policy. It can
- * also be used as is to disable all locking for endpoints used in purely single
- * threaded programs.
- */
-class none {
-public:
-    /// The type of a mutex primitive
-    /**
-     * std::mutex is an example.
-     */
-    typedef none_impl::fake_mutex mutex_type;
-
-    /// The type of a scoped/RAII lock primitive.
-    /**
-     * The scoped lock constructor should take a mutex_type as a parameter,
-     * acquire that lock, and release it in its destructor. std::lock_guard is
-     * an example.
-     */
-    typedef none_impl::fake_lock_guard scoped_lock_type;
-};
-
-} // namespace concurrency
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONCURRENCY_ASYNC_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/config/asio.hpp b/src/sioclient/lib/websocketpp/websocketpp/config/asio.hpp
deleted file mode 100644
index d28d0fb8..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/config/asio.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONFIG_ASIO_TLS_HPP
-#define WEBSOCKETPP_CONFIG_ASIO_TLS_HPP
-
-#include <websocketpp/config/core.hpp>
-#include <websocketpp/transport/asio/endpoint.hpp>
-#include <websocketpp/transport/asio/security/tls.hpp>
-
-// Pull in non-tls config
-#include <websocketpp/config/asio_no_tls.hpp>
-
-// Define TLS config
-namespace websocketpp {
-namespace config {
-
-/// Server config with asio transport and TLS enabled
-struct asio_tls : public core {
-    typedef asio_tls type;
-    typedef core base;
-
-    typedef base::concurrency_type concurrency_type;
-
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-
-    typedef base::rng_type rng_type;
-
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config>
-        transport_type;
-};
-
-} // namespace config
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONFIG_ASIO_TLS_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/config/asio_client.hpp b/src/sioclient/lib/websocketpp/websocketpp/config/asio_client.hpp
deleted file mode 100644
index 1cb594d0..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/config/asio_client.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONFIG_ASIO_TLS_CLIENT_HPP
-#define WEBSOCKETPP_CONFIG_ASIO_TLS_CLIENT_HPP
-
-#include <websocketpp/config/core_client.hpp>
-#include <websocketpp/transport/asio/endpoint.hpp>
-#include <websocketpp/transport/asio/security/tls.hpp>
-
-// Pull in non-tls config
-#include <websocketpp/config/asio_no_tls_client.hpp>
-
-// Define TLS config
-namespace websocketpp {
-namespace config {
-
-/// Client config with asio transport and TLS enabled
-struct asio_tls_client : public core_client {
-    typedef asio_tls_client type;
-    typedef core_client base;
-
-    typedef base::concurrency_type concurrency_type;
-
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-
-    typedef base::rng_type rng_type;
-
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config>
-        transport_type;
-};
-
-} // namespace config
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONFIG_ASIO_TLS_CLIENT_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/config/asio_no_tls.hpp b/src/sioclient/lib/websocketpp/websocketpp/config/asio_no_tls.hpp
deleted file mode 100644
index 6c1357fb..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/config/asio_no_tls.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONFIG_ASIO_HPP
-#define WEBSOCKETPP_CONFIG_ASIO_HPP
-
-#include <websocketpp/config/core.hpp>
-#include <websocketpp/transport/asio/endpoint.hpp>
-
-namespace websocketpp {
-namespace config {
-
-/// Server config with asio transport and TLS disabled
-struct asio : public core {
-    typedef asio type;
-    typedef core base;
-
-    typedef base::concurrency_type concurrency_type;
-
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-
-    typedef base::rng_type rng_type;
-
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint
-            socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config>
-        transport_type;
-};
-
-} // namespace config
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONFIG_ASIO_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/config/asio_no_tls_client.hpp b/src/sioclient/lib/websocketpp/websocketpp/config/asio_no_tls_client.hpp
deleted file mode 100644
index 6e3f7ba0..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/config/asio_no_tls_client.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONFIG_ASIO_CLIENT_HPP
-#define WEBSOCKETPP_CONFIG_ASIO_CLIENT_HPP
-
-#include <websocketpp/config/core_client.hpp>
-#include <websocketpp/transport/asio/endpoint.hpp>
-
-namespace websocketpp {
-namespace config {
-
-/// Client config with asio transport and TLS disabled
-struct asio_client : public core_client {
-    typedef asio_client type;
-    typedef core_client base;
-
-    typedef base::concurrency_type concurrency_type;
-
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-
-    typedef base::rng_type rng_type;
-
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint
-            socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config>
-        transport_type;
-};
-
-} // namespace config
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONFIG_ASIO_CLIENT_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/config/boost_config.hpp b/src/sioclient/lib/websocketpp/websocketpp/config/boost_config.hpp
deleted file mode 100644
index 57671ccd..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/config/boost_config.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
- // This header defines WebSocket++ macros for C++11 compatibility based on the 
- // Boost.Config library. This will correctly configure most target platforms
- // simply by including this header before any other WebSocket++ header.
-
-#ifndef WEBSOCKETPP_CONFIG_BOOST_CONFIG_HPP
-#define WEBSOCKETPP_CONFIG_BOOST_CONFIG_HPP
-
-#include <boost/config.hpp>
-
-//  _WEBSOCKETPP_CPP11_MEMORY_ and _WEBSOCKETPP_CPP11_FUNCTIONAL_ presently
-//  only work if either both or neither is defined.
-#if !defined BOOST_NO_CXX11_SMART_PTR && !defined BOOST_NO_CXX11_HDR_FUNCTIONAL
-    #define _WEBSOCKETPP_CPP11_MEMORY_
-    #define _WEBSOCKETPP_CPP11_FUNCTIONAL_
-#endif
-
-#ifdef BOOST_ASIO_HAS_STD_CHRONO
-    #define _WEBSOCKETPP_CPP11_CHRONO_
-#endif
-
-#ifndef BOOST_NO_CXX11_HDR_RANDOM
-    #define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
-#endif
-
-#ifndef BOOST_NO_CXX11_HDR_REGEX
-    #define _WEBSOCKETPP_CPP11_REGEX_
-#endif
-
-#ifndef BOOST_NO_CXX11_HDR_SYSTEM_ERROR
-    #define _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
-#endif
-
-#ifndef BOOST_NO_CXX11_HDR_THREAD
-    #define _WEBSOCKETPP_CPP11_THREAD_
-#endif
-
-#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST
-    #define _WEBSOCKETPP_INITIALIZER_LISTS_
-#endif
-
-#define _WEBSOCKETPP_NOEXCEPT_TOKEN_  BOOST_NOEXCEPT
-#define _WEBSOCKETPP_CONSTEXPR_TOKEN_  BOOST_CONSTEXPR
-// TODO: nullptr support
-
-#endif // WEBSOCKETPP_CONFIG_BOOST_CONFIG_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/config/core.hpp b/src/sioclient/lib/websocketpp/websocketpp/config/core.hpp
deleted file mode 100644
index 93981aa0..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/config/core.hpp
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONFIG_CORE_HPP
-#define WEBSOCKETPP_CONFIG_CORE_HPP
-
-// Non-Policy common stuff
-#include <websocketpp/common/platforms.hpp>
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/stdint.hpp>
-
-// Concurrency
-#include <websocketpp/concurrency/basic.hpp>
-
-// Transport
-#include <websocketpp/transport/iostream/endpoint.hpp>
-
-// HTTP
-#include <websocketpp/http/request.hpp>
-#include <websocketpp/http/response.hpp>
-
-// Messages
-#include <websocketpp/message_buffer/message.hpp>
-#include <websocketpp/message_buffer/alloc.hpp>
-
-// Loggers
-#include <websocketpp/logger/basic.hpp>
-#include <websocketpp/logger/levels.hpp>
-
-// RNG
-#include <websocketpp/random/none.hpp>
-
-// User stub base classes
-#include <websocketpp/endpoint_base.hpp>
-#include <websocketpp/connection_base.hpp>
-
-// Extensions
-#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
-
-namespace websocketpp {
-namespace config {
-
-/// Server config with iostream transport
-struct core {
-    typedef core type;
-
-    // Concurrency policy
-    typedef websocketpp::concurrency::basic concurrency_type;
-
-    // HTTP Parser Policies
-    typedef http::parser::request request_type;
-    typedef http::parser::response response_type;
-
-    // Message Policies
-    typedef message_buffer::message<message_buffer::alloc::con_msg_manager>
-        message_type;
-    typedef message_buffer::alloc::con_msg_manager<message_type>
-        con_msg_manager_type;
-    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type>
-        endpoint_msg_manager_type;
-
-    /// Logging policies
-    typedef websocketpp::log::basic<concurrency_type,
-        websocketpp::log::elevel> elog_type;
-    typedef websocketpp::log::basic<concurrency_type,
-        websocketpp::log::alevel> alog_type;
-
-    /// RNG policies
-    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-
-    /// Controls compile time enabling/disabling of thread syncronization
-    /// code Disabling can provide a minor performance improvement to single
-    /// threaded applications
-    static bool const enable_multithreading = true;
-
-    struct transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::elog_type elog_type;
-        typedef type::alog_type alog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-
-        /// Controls compile time enabling/disabling of thread syncronization
-        /// code Disabling can provide a minor performance improvement to single
-        /// threaded applications
-        static bool const enable_multithreading = true;
-
-        /// Default timer values (in ms)
-
-        /// Length of time to wait for socket pre-initialization
-        /**
-         * Exactly what this includes depends on the socket policy in use
-         */
-        static const long timeout_socket_pre_init = 5000;
-
-        /// Length of time to wait before a proxy handshake is aborted
-        static const long timeout_proxy = 5000;
-
-        /// Length of time to wait for socket post-initialization
-        /**
-         * Exactly what this includes depends on the socket policy in use.
-         * Often this means the TLS handshake
-         */
-        static const long timeout_socket_post_init = 5000;
-
-        /// Length of time to wait for dns resolution
-        static const long timeout_dns_resolve = 5000;
-
-        /// Length of time to wait for TCP connect
-        static const long timeout_connect = 5000;
-
-        /// Length of time to wait for socket shutdown
-        static const long timeout_socket_shutdown = 5000;
-    };
-
-    /// Transport Endpoint Component
-    typedef websocketpp::transport::iostream::endpoint<transport_config>
-        transport_type;
-
-    /// User overridable Endpoint base class
-    typedef websocketpp::endpoint_base endpoint_base;
-    /// User overridable Connection base class
-    typedef websocketpp::connection_base connection_base;
-
-    /// Default timer values (in ms)
-
-    /// Length of time before an opening handshake is aborted
-    static const long timeout_open_handshake = 5000;
-    /// Length of time before a closing handshake is aborted
-    static const long timeout_close_handshake = 5000;
-    /// Length of time to wait for a pong after a ping
-    static const long timeout_pong = 5000;
-
-    /// WebSocket Protocol version to use as a client
-    /**
-     * What version of the WebSocket Protocol to use for outgoing client
-     * connections. Setting this to a value other than 13 (RFC6455) is not
-     * recommended.
-     */
-    static const int client_version = 13; // RFC6455
-
-    /// Default static error logging channels
-    /**
-     * Which error logging channels to enable at compile time. Channels not
-     * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely
-     * code to test whether or not to print out log messages on a certain
-     * channel
-     *
-     * Default is all except for development/debug level errors
-     */
-    static const websocketpp::log::level elog_level =
-        websocketpp::log::elevel::all ^ websocketpp::log::elevel::devel;
-
-    /// Default static access logging channels
-    /**
-     * Which access logging channels to enable at compile time. Channels not
-     * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely
-     * code to test whether or not to print out log messages on a certain
-     * channel
-     *
-     * Default is all except for development/debug level access messages
-     */
-    static const websocketpp::log::level alog_level =
-        websocketpp::log::alevel::all ^ websocketpp::log::alevel::devel;
-
-    /// Size of the per-connection read buffer
-    /**
-     * Each connection has an internal buffer of this size. A larger value will
-     * result in fewer trips through the library and less CPU overhead at the
-     * expense of increased memory usage per connection.
-     *
-     * If your application primarily deals in very large messages you may want
-     * to try setting this value higher.
-     *
-     * If your application has a lot of connections or primarily deals in small
-     * messages you may want to try setting this smaller.
-     */
-    static const size_t connection_read_buffer_size = 16384;
-
-    /// Drop connections immediately on protocol error.
-    /**
-     * Drop connections on protocol error rather than sending a close frame.
-     * Off by default. This may result in legit messages near the error being
-     * dropped as well. It may free up resources otherwise spent dealing with
-     * misbehaving clients.
-     */
-    static const bool drop_on_protocol_error = false;
-
-    /// Suppresses the return of detailed connection close information
-    /**
-     * Silence close suppresses the return of detailed connection close
-     * information during the closing handshake. This information is useful
-     * for debugging and presenting useful errors to end users but may be
-     * undesirable for security reasons in some production environments.
-     * Close reasons could be used by an attacker to confirm that the endpoint
-     * is out of resources or be used to identify the WebSocket implementation
-     * in use.
-     *
-     * Note: this will suppress *all* close codes, including those explicitly
-     * sent by local applications.
-     */
-    static const bool silent_close = false;
-
-    /// Default maximum message size
-    /**
-     * Default value for the processor's maximum message size. Maximum message size
-     * determines the point at which the library will fail a connection with the 
-     * message_too_big protocol error.
-     *
-     * The default is 32MB
-     *
-     * @since 0.3.0
-     */
-    static const size_t max_message_size = 32000000;
-    
-    /// Default maximum http body size
-    /**
-     * Default value for the http parser's maximum body size. Maximum body size
-     * determines the point at which the library will abort reading an HTTP
-     * connection with the 413/request entity too large error.
-     *
-     * The default is 32MB
-     *
-     * @since 0.5.0
-     */
-    static const size_t max_http_body_size = 32000000;
-
-    /// Global flag for enabling/disabling extensions
-    static const bool enable_extensions = true;
-
-    /// Extension specific settings:
-
-    /// permessage_compress extension
-    struct permessage_deflate_config {
-        typedef core::request_type request_type;
-
-        /// If the remote endpoint requests that we reset the compression
-        /// context after each message should we honor the request?
-        static const bool allow_disabling_context_takeover = true;
-
-        /// If the remote endpoint requests that we reduce the size of the
-        /// LZ77 sliding window size this is the lowest value that will be
-        /// allowed. Values range from 8 to 15. A value of 8 means we will
-        /// allow any possible window size. A value of 15 means do not allow
-        /// negotiation of the window size (ie require the default).
-        static const uint8_t minimum_outgoing_window_bits = 8;
-    };
-
-    typedef websocketpp::extensions::permessage_deflate::disabled
-        <permessage_deflate_config> permessage_deflate_type;
-
-    /// Autonegotiate permessage-deflate
-    /**
-     * Automatically enables the permessage-deflate extension.
-     *
-     * For clients this results in a permessage-deflate extension request being
-     * sent with every request rather than requiring it to be requested manually
-     *
-     * For servers this results in accepting the first set of extension settings
-     * requested by the client that we understand being used. The alternative is
-     * requiring the extension to be manually negotiated in `validate`. With
-     * auto-negotiate on, you may still override the auto-negotiate manually if
-     * needed.
-     */
-    //static const bool autonegotiate_compression = false;
-};
-
-} // namespace config
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONFIG_CORE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/config/core_client.hpp b/src/sioclient/lib/websocketpp/websocketpp/config/core_client.hpp
deleted file mode 100644
index dadf8a4e..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/config/core_client.hpp
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONFIG_CORE_CLIENT_HPP
-#define WEBSOCKETPP_CONFIG_CORE_CLIENT_HPP
-
-// Non-Policy common stuff
-#include <websocketpp/common/platforms.hpp>
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/stdint.hpp>
-
-// Concurrency
-#ifndef _WEBSOCKETPP_NO_THREADING_
-#include <websocketpp/concurrency/basic.hpp>
-#else
-#include <websocketpp/concurrency/none.hpp>
-#endif
-
-// Transport
-#include <websocketpp/transport/iostream/endpoint.hpp>
-
-// HTTP
-#include <websocketpp/http/request.hpp>
-#include <websocketpp/http/response.hpp>
-
-// Messages
-#include <websocketpp/message_buffer/message.hpp>
-#include <websocketpp/message_buffer/alloc.hpp>
-
-// Loggers
-#include <websocketpp/logger/basic.hpp>
-
-// RNG
-#include <websocketpp/random/random_device.hpp>
-
-// User stub base classes
-#include <websocketpp/endpoint_base.hpp>
-#include <websocketpp/connection_base.hpp>
-
-// Extensions
-#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
-
-namespace websocketpp {
-namespace config {
-
-/// Client config with iostream transport
-struct core_client {
-    typedef core_client type;
-
-    // Concurrency policy
-#ifndef _WEBSOCKETPP_NO_THREADING_
-    typedef websocketpp::concurrency::basic concurrency_type;
-#else
-    typedef websocketpp::concurrency::none concurrency_type;
-#endif
-
-    // HTTP Parser Policies
-    typedef http::parser::request request_type;
-    typedef http::parser::response response_type;
-
-    // Message Policies
-    typedef message_buffer::message<message_buffer::alloc::con_msg_manager>
-        message_type;
-    typedef message_buffer::alloc::con_msg_manager<message_type>
-        con_msg_manager_type;
-    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type>
-        endpoint_msg_manager_type;
-
-    /// Logging policies
-    typedef websocketpp::log::basic<concurrency_type,
-        websocketpp::log::elevel> elog_type;
-    typedef websocketpp::log::basic<concurrency_type,
-        websocketpp::log::alevel> alog_type;
-
-    /// RNG policies
-    typedef websocketpp::random::random_device::int_generator<uint32_t,
-        concurrency_type> rng_type;
-
-    /// Controls compile time enabling/disabling of thread syncronization code
-    /// Disabling can provide a minor performance improvement to single threaded
-    /// applications
-    static bool const enable_multithreading = true;
-
-    struct transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::elog_type elog_type;
-        typedef type::alog_type alog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-
-        /// Controls compile time enabling/disabling of thread syncronization
-        /// code Disabling can provide a minor performance improvement to single
-        /// threaded applications
-        static bool const enable_multithreading = true;
-
-        /// Default timer values (in ms)
-
-        /// Length of time to wait for socket pre-initialization
-        /**
-         * Exactly what this includes depends on the socket policy in use
-         */
-        static const long timeout_socket_pre_init = 5000;
-
-        /// Length of time to wait before a proxy handshake is aborted
-        static const long timeout_proxy = 5000;
-
-        /// Length of time to wait for socket post-initialization
-        /**
-         * Exactly what this includes depends on the socket policy in use.
-         * Often this means the TLS handshake
-         */
-        static const long timeout_socket_post_init = 5000;
-
-        /// Length of time to wait for dns resolution
-        static const long timeout_dns_resolve = 5000;
-
-        /// Length of time to wait for TCP connect
-        static const long timeout_connect = 5000;
-
-        /// Length of time to wait for socket shutdown
-        static const long timeout_socket_shutdown = 5000;
-    };
-
-    /// Transport Endpoint Component
-    typedef websocketpp::transport::iostream::endpoint<transport_config>
-        transport_type;
-
-    /// User overridable Endpoint base class
-    typedef websocketpp::endpoint_base endpoint_base;
-    /// User overridable Connection base class
-    typedef websocketpp::connection_base connection_base;
-
-    /// Default timer values (in ms)
-
-    /// Length of time before an opening handshake is aborted
-    static const long timeout_open_handshake = 5000;
-    /// Length of time before a closing handshake is aborted
-    static const long timeout_close_handshake = 5000;
-    /// Length of time to wait for a pong after a ping
-    static const long timeout_pong = 5000;
-
-    /// WebSocket Protocol version to use as a client
-    /**
-     * What version of the WebSocket Protocol to use for outgoing client
-     * connections. Setting this to a value other than 13 (RFC6455) is not
-     * recommended.
-     */
-    static const int client_version = 13; // RFC6455
-
-    /// Default static error logging channels
-    /**
-     * Which error logging channels to enable at compile time. Channels not
-     * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely
-     * code to test whether or not to print out log messages on a certain
-     * channel
-     *
-     * Default is all except for development/debug level errors
-     */
-    static const websocketpp::log::level elog_level =
-        websocketpp::log::elevel::all ^ websocketpp::log::elevel::devel;
-
-    /// Default static access logging channels
-    /**
-     * Which access logging channels to enable at compile time. Channels not
-     * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely
-     * code to test whether or not to print out log messages on a certain
-     * channel
-     *
-     * Default is all except for development/debug level access messages
-     */
-    static const websocketpp::log::level alog_level =
-        websocketpp::log::alevel::all ^ websocketpp::log::alevel::devel;
-
-    ///
-    static const size_t connection_read_buffer_size = 16384;
-
-    /// Drop connections immediately on protocol error.
-    /**
-     * Drop connections on protocol error rather than sending a close frame.
-     * Off by default. This may result in legit messages near the error being
-     * dropped as well. It may free up resources otherwise spent dealing with
-     * misbehaving clients.
-     */
-    static const bool drop_on_protocol_error = false;
-
-    /// Suppresses the return of detailed connection close information
-    /**
-     * Silence close suppresses the return of detailed connection close
-     * information during the closing handshake. This information is useful
-     * for debugging and presenting useful errors to end users but may be
-     * undesirable for security reasons in some production environments.
-     * Close reasons could be used by an attacker to confirm that the endpoint
-     * is out of resources or be used to identify the WebSocket implementation
-     * in use.
-     *
-     * Note: this will suppress *all* close codes, including those explicitly
-     * sent by local applications.
-     */
-    static const bool silent_close = false;
-
-    /// Default maximum message size
-    /**
-     * Default value for the processor's maximum message size. Maximum message size
-     * determines the point at which the library will fail a connection with the 
-     * message_too_big protocol error.
-     *
-     * The default is 32MB
-     *
-     * @since 0.3.0
-     */
-    static const size_t max_message_size = 32000000;
-
-    /// Default maximum http body size
-    /**
-     * Default value for the http parser's maximum body size. Maximum body size
-     * determines the point at which the library will abort reading an HTTP
-     * connection with the 413/request entity too large error.
-     *
-     * The default is 32MB
-     *
-     * @since 0.5.0
-     */
-    static const size_t max_http_body_size = 32000000;
-
-    /// Global flag for enabling/disabling extensions
-    static const bool enable_extensions = true;
-
-    /// Extension specific settings:
-
-    /// permessage_deflate extension
-    struct permessage_deflate_config {
-        typedef core_client::request_type request_type;
-
-        /// If the remote endpoint requests that we reset the compression
-        /// context after each message should we honor the request?
-        static const bool allow_disabling_context_takeover = true;
-
-        /// If the remote endpoint requests that we reduce the size of the
-        /// LZ77 sliding window size this is the lowest value that will be
-        /// allowed. Values range from 8 to 15. A value of 8 means we will
-        /// allow any possible window size. A value of 15 means do not allow
-        /// negotiation of the window size (ie require the default).
-        static const uint8_t minimum_outgoing_window_bits = 8;
-    };
-
-    typedef websocketpp::extensions::permessage_deflate::disabled
-        <permessage_deflate_config> permessage_deflate_type;
-
-    /// Autonegotiate permessage-compress
-    /**
-     * Automatically enables the permessage-compress extension.
-     *
-     * For clients this results in a permessage-compress extension request being
-     * sent with every request rather than requiring it to be requested manually
-     *
-     * For servers this results in accepting the first set of extension settings
-     * requested by the client that we understand being used. The alternative is
-     * requiring the extension to be manually negotiated in `validate`. With
-     * auto-negotiate on, you may still override the auto-negotiate manually if
-     * needed.
-     */
-    //static const bool autonegotiate_compression = false;
-};
-
-} // namespace config
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONFIG_CORE_CLIENT_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/config/debug.hpp b/src/sioclient/lib/websocketpp/websocketpp/config/debug.hpp
deleted file mode 100644
index 223f72fb..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/config/debug.hpp
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONFIG_DEBUG_HPP
-#define WEBSOCKETPP_CONFIG_DEBUG_HPP
-
-
-
-// Non-Policy common stuff
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/stdint.hpp>
-
-// Concurrency
-#include <websocketpp/concurrency/basic.hpp>
-
-// Transport
-#include <websocketpp/transport/iostream/endpoint.hpp>
-
-// HTTP
-#include <websocketpp/http/request.hpp>
-#include <websocketpp/http/response.hpp>
-
-// Messages
-#include <websocketpp/message_buffer/message.hpp>
-#include <websocketpp/message_buffer/alloc.hpp>
-
-// Loggers
-#include <websocketpp/logger/basic.hpp>
-
-// RNG
-#include <websocketpp/random/none.hpp>
-
-// User stub base classes
-#include <websocketpp/endpoint_base.hpp>
-#include <websocketpp/connection_base.hpp>
-
-// Extensions
-#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
-
-namespace websocketpp {
-namespace config {
-
-/// Client/Server debug config with iostream transport
-struct debug_core {
-    typedef debug_core type;
-
-    // Concurrency policy
-    typedef websocketpp::concurrency::basic concurrency_type;
-
-    // HTTP Parser Policies
-    typedef http::parser::request request_type;
-    typedef http::parser::response response_type;
-
-    // Message Policies
-    typedef message_buffer::message<message_buffer::alloc::con_msg_manager>
-        message_type;
-    typedef message_buffer::alloc::con_msg_manager<message_type>
-        con_msg_manager_type;
-    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type>
-        endpoint_msg_manager_type;
-
-    /// Logging policies
-    typedef websocketpp::log::basic<concurrency_type,
-        websocketpp::log::elevel> elog_type;
-    typedef websocketpp::log::basic<concurrency_type,
-        websocketpp::log::alevel> alog_type;
-
-    /// RNG policies
-    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-
-    /// Controls compile time enabling/disabling of thread syncronization
-    /// code Disabling can provide a minor performance improvement to single
-    /// threaded applications
-    static bool const enable_multithreading = true;
-
-    struct transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::elog_type elog_type;
-        typedef type::alog_type alog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-
-        /// Controls compile time enabling/disabling of thread syncronization
-        /// code Disabling can provide a minor performance improvement to single
-        /// threaded applications
-        static bool const enable_multithreading = true;
-
-        /// Default timer values (in ms)
-
-        /// Length of time to wait for socket pre-initialization
-        /**
-         * Exactly what this includes depends on the socket policy in use
-         */
-        static const long timeout_socket_pre_init = 5000;
-
-        /// Length of time to wait before a proxy handshake is aborted
-        static const long timeout_proxy = 5000;
-
-        /// Length of time to wait for socket post-initialization
-        /**
-         * Exactly what this includes depends on the socket policy in use.
-         * Often this means the TLS handshake
-         */
-        static const long timeout_socket_post_init = 5000;
-
-        /// Length of time to wait for dns resolution
-        static const long timeout_dns_resolve = 5000;
-
-        /// Length of time to wait for TCP connect
-        static const long timeout_connect = 5000;
-
-        /// Length of time to wait for socket shutdown
-        static const long timeout_socket_shutdown = 5000;
-    };
-
-    /// Transport Endpoint Component
-    typedef websocketpp::transport::iostream::endpoint<transport_config>
-        transport_type;
-
-    /// User overridable Endpoint base class
-    typedef websocketpp::endpoint_base endpoint_base;
-    /// User overridable Connection base class
-    typedef websocketpp::connection_base connection_base;
-
-    /// Default timer values (in ms)
-
-    /// Length of time before an opening handshake is aborted
-    static const long timeout_open_handshake = 5000;
-    /// Length of time before a closing handshake is aborted
-    static const long timeout_close_handshake = 5000;
-    /// Length of time to wait for a pong after a ping
-    static const long timeout_pong = 5000;
-
-    /// WebSocket Protocol version to use as a client
-    /**
-     * What version of the WebSocket Protocol to use for outgoing client
-     * connections. Setting this to a value other than 13 (RFC6455) is not
-     * recommended.
-     */
-    static const int client_version = 13; // RFC6455
-
-    /// Default static error logging channels
-    /**
-     * Which error logging channels to enable at compile time. Channels not
-     * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely
-     * code to test whether or not to print out log messages on a certain
-     * channel
-     *
-     * Default is all except for development/debug level errors
-     */
-    static const websocketpp::log::level elog_level =
-        websocketpp::log::elevel::all;
-
-    /// Default static access logging channels
-    /**
-     * Which access logging channels to enable at compile time. Channels not
-     * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely
-     * code to test whether or not to print out log messages on a certain
-     * channel
-     *
-     * Default is all except for development/debug level access messages
-     */
-    static const websocketpp::log::level alog_level =
-        websocketpp::log::alevel::all;
-
-    ///
-    static const size_t connection_read_buffer_size = 16384;
-
-    /// Drop connections immediately on protocol error.
-    /**
-     * Drop connections on protocol error rather than sending a close frame.
-     * Off by default. This may result in legit messages near the error being
-     * dropped as well. It may free up resources otherwise spent dealing with
-     * misbehaving clients.
-     */
-    static const bool drop_on_protocol_error = false;
-
-    /// Suppresses the return of detailed connection close information
-    /**
-     * Silence close suppresses the return of detailed connection close
-     * information during the closing handshake. This information is useful
-     * for debugging and presenting useful errors to end users but may be
-     * undesirable for security reasons in some production environments.
-     * Close reasons could be used by an attacker to confirm that the endpoint
-     * is out of resources or be used to identify the WebSocket implementation
-     * in use.
-     *
-     * Note: this will suppress *all* close codes, including those explicitly
-     * sent by local applications.
-     */
-    static const bool silent_close = false;
-
-    /// Default maximum message size
-    /**
-     * Default value for the processor's maximum message size. Maximum message size
-     * determines the point at which the library will fail a connection with the 
-     * message_too_big protocol error.
-     *
-     * The default is 32MB
-     *
-     * @since 0.3.0
-     */
-    static const size_t max_message_size = 32000000;
-
-    /// Default maximum http body size
-    /**
-     * Default value for the http parser's maximum body size. Maximum body size
-     * determines the point at which the library will abort reading an HTTP
-     * connection with the 413/request entity too large error.
-     *
-     * The default is 32MB
-     *
-     * @since 0.5.0
-     */
-    static const size_t max_http_body_size = 32000000;
-
-    /// Global flag for enabling/disabling extensions
-    static const bool enable_extensions = true;
-
-    /// Extension specific settings:
-
-    /// permessage_compress extension
-    struct permessage_deflate_config {
-        typedef type::request_type request_type;
-
-        /// If the remote endpoint requests that we reset the compression
-        /// context after each message should we honor the request?
-        static const bool allow_disabling_context_takeover = true;
-
-        /// If the remote endpoint requests that we reduce the size of the
-        /// LZ77 sliding window size this is the lowest value that will be
-        /// allowed. Values range from 8 to 15. A value of 8 means we will
-        /// allow any possible window size. A value of 15 means do not allow
-        /// negotiation of the window size (ie require the default).
-        static const uint8_t minimum_outgoing_window_bits = 8;
-    };
-
-    typedef websocketpp::extensions::permessage_deflate::disabled
-        <permessage_deflate_config> permessage_deflate_type;
-
-    /// Autonegotiate permessage-deflate
-    /**
-     * Automatically enables the permessage-deflate extension.
-     *
-     * For clients this results in a permessage-deflate extension request being
-     * sent with every request rather than requiring it to be requested manually
-     *
-     * For servers this results in accepting the first set of extension settings
-     * requested by the client that we understand being used. The alternative is
-     * requiring the extension to be manually negotiated in `validate`. With
-     * auto-negotiate on, you may still override the auto-negotiate manually if
-     * needed.
-     */
-    //static const bool autonegotiate_compression = false;
-};
-
-} // namespace config
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONFIG_CORE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/config/debug_asio.hpp b/src/sioclient/lib/websocketpp/websocketpp/config/debug_asio.hpp
deleted file mode 100644
index a57c736c..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/config/debug_asio.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONFIG_ASIO_TLS_DEBUG_HPP
-#define WEBSOCKETPP_CONFIG_ASIO_TLS_DEBUG_HPP
-
-#include <websocketpp/config/debug.hpp>
-#include <websocketpp/transport/asio/endpoint.hpp>
-#include <websocketpp/transport/asio/security/tls.hpp>
-
-// Pull in non-tls config
-#include <websocketpp/config/debug_asio_no_tls.hpp>
-
-// Define TLS config
-namespace websocketpp {
-namespace config {
-
-/// Client/Server debug config with asio transport and TLS enabled
-struct debug_asio_tls : public debug_core {
-    typedef debug_asio_tls type;
-    typedef debug_core base;
-
-    typedef base::concurrency_type concurrency_type;
-
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-
-    typedef base::rng_type rng_type;
-
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config>
-        transport_type;
-};
-
-} // namespace config
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONFIG_ASIO_TLS_DEBUG_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/config/debug_asio_no_tls.hpp b/src/sioclient/lib/websocketpp/websocketpp/config/debug_asio_no_tls.hpp
deleted file mode 100644
index b3dc83b4..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/config/debug_asio_no_tls.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONFIG_ASIO_DEBUG_HPP
-#define WEBSOCKETPP_CONFIG_ASIO_DEBUG_HPP
-
-#include <websocketpp/config/debug.hpp>
-#include <websocketpp/transport/asio/endpoint.hpp>
-
-namespace websocketpp {
-namespace config {
-
-/// Client/Server debug config with asio transport and TLS disabled
-struct debug_asio : public debug_core {
-    typedef debug_asio type;
-    typedef debug_core base;
-
-    typedef base::concurrency_type concurrency_type;
-
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-
-    typedef base::rng_type rng_type;
-
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint
-            socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config>
-        transport_type;
-};
-
-} // namespace config
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONFIG_ASIO_DEBUG_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/config/minimal_client.hpp b/src/sioclient/lib/websocketpp/websocketpp/config/minimal_client.hpp
deleted file mode 100644
index 72528cde..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/config/minimal_client.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONFIG_MINIMAL_CLIENT_HPP
-#define WEBSOCKETPP_CONFIG_MINIMAL_CLIENT_HPP
-
-#include <websocketpp/config/minimal_server.hpp>
-
-namespace websocketpp {
-namespace config {
-
-/// Client config with minimal dependencies
-/**
- * This config strips out as many dependencies as possible. It is suitable for
- * use as a base class for custom configs that want to implement or choose their
- * own policies for components that even the core config includes.
- *
- * NOTE: this config stubs out enough that it cannot be used directly. You must
- * supply at least a transport policy and a cryptographically secure random 
- * number generation policy for a config based on `minimal_client` to do 
- * anything useful.
- *
- * Present dependency list for minimal_server config:
- *
- * C++98 STL:
- * <algorithm>
- * <map>
- * <sstream>
- * <string>
- * <vector>
- *
- * C++11 STL or Boost
- * <memory>
- * <functional>
- * <system_error>
- *
- * Operating System:
- * <stdint.h> or <boost/cstdint.hpp>
- * <netinet/in.h> or <winsock2.h> (for ntohl.. could potentially bundle this)
- *
- * @since 0.4.0-dev
- */
-typedef minimal_server minimal_client;
-
-} // namespace config
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONFIG_MINIMAL_CLIENT_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/config/minimal_server.hpp b/src/sioclient/lib/websocketpp/websocketpp/config/minimal_server.hpp
deleted file mode 100644
index dd1aedb9..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/config/minimal_server.hpp
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONFIG_MINIMAL_HPP
-#define WEBSOCKETPP_CONFIG_MINIMAL_HPP
-
-// Non-Policy common stuff
-#include <websocketpp/common/platforms.hpp>
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/stdint.hpp>
-
-// Concurrency
-#include <websocketpp/concurrency/none.hpp>
-
-// Transport
-#include <websocketpp/transport/stub/endpoint.hpp>
-
-// HTTP
-#include <websocketpp/http/request.hpp>
-#include <websocketpp/http/response.hpp>
-
-// Messages
-#include <websocketpp/message_buffer/message.hpp>
-#include <websocketpp/message_buffer/alloc.hpp>
-
-// Loggers
-#include <websocketpp/logger/stub.hpp>
-
-// RNG
-#include <websocketpp/random/none.hpp>
-
-// User stub base classes
-#include <websocketpp/endpoint_base.hpp>
-#include <websocketpp/connection_base.hpp>
-
-// Extensions
-#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
-
-namespace websocketpp {
-namespace config {
-
-/// Server config with minimal dependencies
-/**
- * This config strips out as many dependencies as possible. It is suitable for
- * use as a base class for custom configs that want to implement or choose their
- * own policies for components that even the core config includes.
- *
- * NOTE: this config stubs out enough that it cannot be used directly. You must
- * supply at least a transport policy for a config based on `minimal_server` to
- * do anything useful.
- *
- * Present dependency list for minimal_server config:
- *
- * C++98 STL:
- * <algorithm>
- * <map>
- * <sstream>
- * <string>
- * <vector>
- *
- * C++11 STL or Boost
- * <memory>
- * <functional>
- * <system_error>
- *
- * Operating System:
- * <stdint.h> or <boost/cstdint.hpp>
- * <netinet/in.h> or <winsock2.h> (for ntohl.. could potentially bundle this)
- *
- * @since 0.4.0-dev
- */
-struct minimal_server {
-    typedef minimal_server type;
-
-    // Concurrency policy
-    typedef websocketpp::concurrency::none concurrency_type;
-
-    // HTTP Parser Policies
-    typedef http::parser::request request_type;
-    typedef http::parser::response response_type;
-
-    // Message Policies
-    typedef message_buffer::message<message_buffer::alloc::con_msg_manager>
-        message_type;
-    typedef message_buffer::alloc::con_msg_manager<message_type>
-        con_msg_manager_type;
-    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type>
-        endpoint_msg_manager_type;
-
-    /// Logging policies
-    typedef websocketpp::log::stub elog_type;
-    typedef websocketpp::log::stub alog_type;
-
-    /// RNG policies
-    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-
-    /// Controls compile time enabling/disabling of thread syncronization
-    /// code Disabling can provide a minor performance improvement to single
-    /// threaded applications
-    static bool const enable_multithreading = true;
-
-    struct transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::elog_type elog_type;
-        typedef type::alog_type alog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-
-        /// Controls compile time enabling/disabling of thread syncronization
-        /// code Disabling can provide a minor performance improvement to single
-        /// threaded applications
-        static bool const enable_multithreading = true;
-
-        /// Default timer values (in ms)
-
-        /// Length of time to wait for socket pre-initialization
-        /**
-         * Exactly what this includes depends on the socket policy in use
-         */
-        static const long timeout_socket_pre_init = 5000;
-
-        /// Length of time to wait before a proxy handshake is aborted
-        static const long timeout_proxy = 5000;
-
-        /// Length of time to wait for socket post-initialization
-        /**
-         * Exactly what this includes depends on the socket policy in use.
-         * Often this means the TLS handshake
-         */
-        static const long timeout_socket_post_init = 5000;
-
-        /// Length of time to wait for dns resolution
-        static const long timeout_dns_resolve = 5000;
-
-        /// Length of time to wait for TCP connect
-        static const long timeout_connect = 5000;
-
-        /// Length of time to wait for socket shutdown
-        static const long timeout_socket_shutdown = 5000;
-    };
-
-    /// Transport Endpoint Component
-    typedef websocketpp::transport::stub::endpoint<transport_config>
-        transport_type;
-
-    /// User overridable Endpoint base class
-    typedef websocketpp::endpoint_base endpoint_base;
-    /// User overridable Connection base class
-    typedef websocketpp::connection_base connection_base;
-
-    /// Default timer values (in ms)
-
-    /// Length of time before an opening handshake is aborted
-    static const long timeout_open_handshake = 5000;
-    /// Length of time before a closing handshake is aborted
-    static const long timeout_close_handshake = 5000;
-    /// Length of time to wait for a pong after a ping
-    static const long timeout_pong = 5000;
-
-    /// WebSocket Protocol version to use as a client
-    /**
-     * What version of the WebSocket Protocol to use for outgoing client
-     * connections. Setting this to a value other than 13 (RFC6455) is not
-     * recommended.
-     */
-    static const int client_version = 13; // RFC6455
-
-    /// Default static error logging channels
-    /**
-     * Which error logging channels to enable at compile time. Channels not
-     * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely
-     * code to test whether or not to print out log messages on a certain
-     * channel
-     *
-     * Default is all except for development/debug level errors
-     */
-    static const websocketpp::log::level elog_level =
-        websocketpp::log::elevel::none;
-
-    /// Default static access logging channels
-    /**
-     * Which access logging channels to enable at compile time. Channels not
-     * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely
-     * code to test whether or not to print out log messages on a certain
-     * channel
-     *
-     * Default is all except for development/debug level access messages
-     */
-    static const websocketpp::log::level alog_level =
-        websocketpp::log::alevel::none;
-
-    ///
-    static const size_t connection_read_buffer_size = 16384;
-
-    /// Drop connections immediately on protocol error.
-    /**
-     * Drop connections on protocol error rather than sending a close frame.
-     * Off by default. This may result in legit messages near the error being
-     * dropped as well. It may free up resources otherwise spent dealing with
-     * misbehaving clients.
-     */
-    static const bool drop_on_protocol_error = false;
-
-    /// Suppresses the return of detailed connection close information
-    /**
-     * Silence close suppresses the return of detailed connection close
-     * information during the closing handshake. This information is useful
-     * for debugging and presenting useful errors to end users but may be
-     * undesirable for security reasons in some production environments.
-     * Close reasons could be used by an attacker to confirm that the endpoint
-     * is out of resources or be used to identify the WebSocket implementation
-     * in use.
-     *
-     * Note: this will suppress *all* close codes, including those explicitly
-     * sent by local applications.
-     */
-    static const bool silent_close = false;
-
-    /// Default maximum message size
-    /**
-     * Default value for the processor's maximum message size. Maximum message size
-     * determines the point at which the library will fail a connection with the 
-     * message_too_big protocol error.
-     *
-     * The default is 32MB
-     *
-     * @since 0.4.0-alpha1
-     */
-    static const size_t max_message_size = 32000000;
-
-    /// Default maximum http body size
-    /**
-     * Default value for the http parser's maximum body size. Maximum body size
-     * determines the point at which the library will abort reading an HTTP
-     * connection with the 413/request entity too large error.
-     *
-     * The default is 32MB
-     *
-     * @since 0.5.0
-     */
-    static const size_t max_http_body_size = 32000000;
-
-    /// Global flag for enabling/disabling extensions
-    static const bool enable_extensions = true;
-
-    /// Extension specific settings:
-
-    /// permessage_compress extension
-    struct permessage_deflate_config {
-        typedef core::request_type request_type;
-
-        /// If the remote endpoint requests that we reset the compression
-        /// context after each message should we honor the request?
-        static const bool allow_disabling_context_takeover = true;
-
-        /// If the remote endpoint requests that we reduce the size of the
-        /// LZ77 sliding window size this is the lowest value that will be
-        /// allowed. Values range from 8 to 15. A value of 8 means we will
-        /// allow any possible window size. A value of 15 means do not allow
-        /// negotiation of the window size (ie require the default).
-        static const uint8_t minimum_outgoing_window_bits = 8;
-    };
-
-    typedef websocketpp::extensions::permessage_deflate::disabled
-        <permessage_deflate_config> permessage_deflate_type;
-
-    /// Autonegotiate permessage-deflate
-    /**
-     * Automatically enables the permessage-deflate extension.
-     *
-     * For clients this results in a permessage-deflate extension request being
-     * sent with every request rather than requiring it to be requested manually
-     *
-     * For servers this results in accepting the first set of extension settings
-     * requested by the client that we understand being used. The alternative is
-     * requiring the extension to be manually negotiated in `validate`. With
-     * auto-negotiate on, you may still override the auto-negotiate manually if
-     * needed.
-     */
-    //static const bool autonegotiate_compression = false;
-};
-
-} // namespace config
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONFIG_MINIMAL_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/connection.hpp b/src/sioclient/lib/websocketpp/websocketpp/connection.hpp
deleted file mode 100644
index d019fce3..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/connection.hpp
+++ /dev/null
@@ -1,1642 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONNECTION_HPP
-#define WEBSOCKETPP_CONNECTION_HPP
-
-#include <websocketpp/close.hpp>
-#include <websocketpp/error.hpp>
-#include <websocketpp/frame.hpp>
-
-#include <websocketpp/logger/levels.hpp>
-#include <websocketpp/processors/processor.hpp>
-#include <websocketpp/transport/base/connection.hpp>
-#include <websocketpp/http/constants.hpp>
-
-#include <websocketpp/common/connection_hdl.hpp>
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/functional.hpp>
-
-#include <queue>
-#include <sstream>
-#include <string>
-#include <vector>
-
-namespace websocketpp {
-
-/// The type and function signature of an open handler
-/**
- * The open handler is called once for every successful WebSocket connection
- * attempt. Either the fail handler or the open handler will be called for each
- * WebSocket connection attempt. HTTP Connections that did not attempt to
- * upgrade the connection to the WebSocket protocol will trigger the http
- * handler instead of fail/open.
- */
-typedef lib::function<void(connection_hdl)> open_handler;
-
-/// The type and function signature of a close handler
-/**
- * The close handler is called once for every successfully established
- * connection after it is no longer capable of sending or receiving new messages
- *
- * The close handler will be called exactly once for every connection for which
- * the open handler was called.
- */
-typedef lib::function<void(connection_hdl)> close_handler;
-
-/// The type and function signature of a fail handler
-/**
- * The fail handler is called once for every unsuccessful WebSocket connection
- * attempt. Either the fail handler or the open handler will be called for each
- * WebSocket connection attempt. HTTP Connections that did not attempt to
- * upgrade the connection to the WebSocket protocol will trigger the http
- * handler instead of fail/open.
- */
-typedef lib::function<void(connection_hdl)> fail_handler;
-
-/// The type and function signature of an interrupt handler
-/**
- * The interrupt handler is called when a connection receives an interrupt
- * request from the application. Interrupts allow the application to trigger a
- * handler to be run in the absense of a WebSocket level handler trigger (like
- * a new message).
- *
- * This is typically used by another application thread to schedule some tasks
- * that can only be run from within the handler chain for thread safety reasons.
- */
-typedef lib::function<void(connection_hdl)> interrupt_handler;
-
-/// The type and function signature of a ping handler
-/**
- * The ping handler is called when the connection receives a WebSocket ping
- * control frame. The string argument contains the ping payload. The payload is
- * a binary string up to 126 bytes in length. The ping handler returns a bool,
- * true if a pong response should be sent, false if the pong response should be
- * suppressed.
- */
-typedef lib::function<bool(connection_hdl,std::string)> ping_handler;
-
-/// The type and function signature of a pong handler
-/**
- * The pong handler is called when the connection receives a WebSocket pong
- * control frame. The string argument contains the pong payload. The payload is
- * a binary string up to 126 bytes in length.
- */
-typedef lib::function<void(connection_hdl,std::string)> pong_handler;
-
-/// The type and function signature of a pong timeout handler
-/**
- * The pong timeout handler is called when a ping goes unanswered by a pong for
- * longer than the locally specified timeout period.
- */
-typedef lib::function<void(connection_hdl,std::string)> pong_timeout_handler;
-
-/// The type and function signature of a validate handler
-/**
- * The validate handler is called after a WebSocket handshake has been received
- * and processed but before it has been accepted. This gives the application a
- * chance to implement connection details specific policies for accepting
- * connections and the ability to negotiate extensions and subprotocols.
- *
- * The validate handler return value indicates whether or not the connection
- * should be accepted. Additional methods may be called during the function to
- * set response headers, set HTTP return/error codes, etc.
- */
-typedef lib::function<bool(connection_hdl)> validate_handler;
-
-/// The type and function signature of a http handler
-/**
- * The http handler is called when an HTTP connection is made that does not
- * attempt to upgrade the connection to the WebSocket protocol. This allows
- * WebSocket++ servers to respond to these requests with regular HTTP responses.
- *
- * This can be used to deliver error pages & dashboards and to deliver static
- * files such as the base HTML & JavaScript for an otherwise single page
- * WebSocket application.
- *
- * Note: WebSocket++ is designed to be a high performance WebSocket server. It
- * is not tuned to provide a full featured, high performance, HTTP web server
- * solution. The HTTP handler is appropriate only for low volume HTTP traffic.
- * If you expect to serve high volumes of HTTP traffic a dedicated HTTP web
- * server is strongly recommended.
- *
- * The default HTTP handler will return a 426 Upgrade Required error. Custom
- * handlers may override the response status code to deliver any type of
- * response.
- */
-typedef lib::function<void(connection_hdl)> http_handler;
-
-//
-typedef lib::function<void(lib::error_code const & ec, size_t bytes_transferred)> read_handler;
-typedef lib::function<void(lib::error_code const & ec)> write_frame_handler;
-
-// constants related to the default WebSocket protocol versions available
-#ifdef _WEBSOCKETPP_INITIALIZER_LISTS_ // simplified C++11 version
-    /// Container that stores the list of protocol versions supported
-    /**
-     * @todo Move this to configs to allow compile/runtime disabling or enabling
-     * of protocol versions
-     */
-    static std::vector<int> const versions_supported = {0,7,8,13};
-#else
-    /// Helper array to get around lack of initializer lists pre C++11
-    static int const helper[] = {0,7,8,13};
-    /// Container that stores the list of protocol versions supported
-    /**
-     * @todo Move this to configs to allow compile/runtime disabling or enabling
-     * of protocol versions
-     */
-    static std::vector<int> const versions_supported(helper,helper+4);
-#endif
-
-namespace session {
-namespace state {
-    // externally visible session state (states based on the RFC)
-    enum value {
-        connecting = 0,
-        open = 1,
-        closing = 2,
-        closed = 3
-    };
-} // namespace state
-
-
-namespace fail {
-namespace status {
-    enum value {
-        GOOD = 0,           // no failure yet!
-        SYSTEM = 1,         // system call returned error, check that code
-        WEBSOCKET = 2,      // websocket close codes contain error
-        UNKNOWN = 3,        // No failure information is available
-        TIMEOUT_TLS = 4,    // TLS handshake timed out
-        TIMEOUT_WS = 5      // WS handshake timed out
-    };
-} // namespace status
-} // namespace fail
-
-namespace internal_state {
-    // More granular internal states. These are used for multi-threaded
-    // connection synchronization and preventing values that are not yet or no
-    // longer available from being used.
-
-    enum value {
-        USER_INIT = 0,
-        TRANSPORT_INIT = 1,
-        READ_HTTP_REQUEST = 2,
-        WRITE_HTTP_REQUEST = 3,
-        READ_HTTP_RESPONSE = 4,
-        WRITE_HTTP_RESPONSE = 5,
-        PROCESS_HTTP_REQUEST = 6,
-        PROCESS_CONNECTION = 7
-    };
-} // namespace internal_state
-
-
-namespace http_state {
-    // states to keep track of the progress of http connections
-
-    enum value {
-        init = 0,
-        deferred = 1,
-        headers_written = 2,
-        body_written = 3,
-        closed = 4
-    };
-} // namespace http_state
-
-} // namespace session
-
-/// Represents an individual WebSocket connection
-template <typename config>
-class connection
- : public config::transport_type::transport_con_type
- , public config::connection_base
-{
-public:
-    /// Type of this connection
-    typedef connection<config> type;
-    /// Type of a shared pointer to this connection
-    typedef lib::shared_ptr<type> ptr;
-    /// Type of a weak pointer to this connection
-    typedef lib::weak_ptr<type> weak_ptr;
-
-    /// Type of the concurrency component of this connection
-    typedef typename config::concurrency_type concurrency_type;
-    /// Type of the access logging policy
-    typedef typename config::alog_type alog_type;
-    /// Type of the error logging policy
-    typedef typename config::elog_type elog_type;
-
-    /// Type of the transport component of this connection
-    typedef typename config::transport_type::transport_con_type
-        transport_con_type;
-    /// Type of a shared pointer to the transport component of this connection
-    typedef typename transport_con_type::ptr transport_con_ptr;
-
-    typedef lib::function<void(ptr)> termination_handler;
-
-    typedef typename concurrency_type::scoped_lock_type scoped_lock_type;
-    typedef typename concurrency_type::mutex_type mutex_type;
-
-    typedef typename config::request_type request_type;
-    typedef typename config::response_type response_type;
-
-    typedef typename config::message_type message_type;
-    typedef typename message_type::ptr message_ptr;
-
-    typedef typename config::con_msg_manager_type con_msg_manager_type;
-    typedef typename con_msg_manager_type::ptr con_msg_manager_ptr;
-
-    /// Type of RNG
-    typedef typename config::rng_type rng_type;
-
-    typedef processor::processor<config> processor_type;
-    typedef lib::shared_ptr<processor_type> processor_ptr;
-
-    // Message handler (needs to know message type)
-    typedef lib::function<void(connection_hdl,message_ptr)> message_handler;
-
-    /// Type of a pointer to a transport timer handle
-    typedef typename transport_con_type::timer_ptr timer_ptr;
-
-    // Misc Convenience Types
-    typedef session::internal_state::value istate_type;
-
-private:
-    enum terminate_status {
-        failed = 1,
-        closed,
-        unknown
-    };
-public:
-
-    explicit connection(bool p_is_server, std::string const & ua, const lib::shared_ptr<alog_type>& alog,
-                        const lib::shared_ptr<elog_type>& elog, rng_type & rng)
-      : transport_con_type(p_is_server, alog, elog)
-      , m_handle_read_frame(lib::bind(
-            &type::handle_read_frame,
-            this,
-            lib::placeholders::_1,
-            lib::placeholders::_2
-        ))
-      , m_write_frame_handler(lib::bind(
-            &type::handle_write_frame,
-            this,
-            lib::placeholders::_1
-        ))
-      , m_user_agent(ua)
-      , m_open_handshake_timeout_dur(config::timeout_open_handshake)
-      , m_close_handshake_timeout_dur(config::timeout_close_handshake)
-      , m_pong_timeout_dur(config::timeout_pong)
-      , m_max_message_size(config::max_message_size)
-      , m_state(session::state::connecting)
-      , m_internal_state(session::internal_state::USER_INIT)
-      , m_msg_manager(new con_msg_manager_type())
-      , m_send_buffer_size(0)
-      , m_write_flag(false)
-      , m_read_flag(true)
-      , m_is_server(p_is_server)
-      , m_alog(alog)
-      , m_elog(elog)
-      , m_rng(rng)
-      , m_local_close_code(close::status::abnormal_close)
-      , m_remote_close_code(close::status::abnormal_close)
-      , m_is_http(false)
-      , m_http_state(session::http_state::init)
-      , m_was_clean(false)
-    {
-        m_alog->write(log::alevel::devel,"connection constructor");
-    }
-
-    /// Get a shared pointer to this component
-    ptr get_shared() {
-        return lib::static_pointer_cast<type>(transport_con_type::get_shared());
-    }
-
-    ///////////////////////////
-    // Set Handler Callbacks //
-    ///////////////////////////
-
-    /// Set open handler
-    /**
-     * The open handler is called after the WebSocket handshake is complete and
-     * the connection is considered OPEN.
-     *
-     * @param h The new open_handler
-     */
-    void set_open_handler(open_handler h) {
-        m_open_handler = h;
-    }
-
-    /// Set close handler
-    /**
-     * The close handler is called immediately after the connection is closed.
-     *
-     * @param h The new close_handler
-     */
-    void set_close_handler(close_handler h) {
-        m_close_handler = h;
-    }
-
-    /// Set fail handler
-    /**
-     * The fail handler is called whenever the connection fails while the
-     * handshake is bring processed.
-     *
-     * @param h The new fail_handler
-     */
-    void set_fail_handler(fail_handler h) {
-        m_fail_handler = h;
-    }
-
-    /// Set ping handler
-    /**
-     * The ping handler is called whenever the connection receives a ping
-     * control frame. The ping payload is included.
-     *
-     * The ping handler's return time controls whether or not a pong is
-     * sent in response to this ping. Returning false will suppress the
-     * return pong. If no ping handler is set a pong will be sent.
-     *
-     * @param h The new ping_handler
-     */
-    void set_ping_handler(ping_handler h) {
-        m_ping_handler = h;
-    }
-
-    /// Set pong handler
-    /**
-     * The pong handler is called whenever the connection receives a pong
-     * control frame. The pong payload is included.
-     *
-     * @param h The new pong_handler
-     */
-    void set_pong_handler(pong_handler h) {
-        m_pong_handler = h;
-    }
-
-    /// Set pong timeout handler
-    /**
-     * If the transport component being used supports timers, the pong timeout
-     * handler is called whenever a pong control frame is not received with the
-     * configured timeout period after the application sends a ping.
-     *
-     * The config setting `timeout_pong` controls the length of the timeout
-     * period. It is specified in milliseconds.
-     *
-     * This can be used to probe the health of the remote endpoint's WebSocket
-     * implementation. This does not guarantee that the remote application
-     * itself is still healthy but can be a useful diagnostic.
-     *
-     * Note: receipt of this callback doesn't mean the pong will never come.
-     * This functionality will not suppress delivery of the pong in question
-     * should it arrive after the timeout.
-     *
-     * @param h The new pong_timeout_handler
-     */
-    void set_pong_timeout_handler(pong_timeout_handler h) {
-        m_pong_timeout_handler = h;
-    }
-
-    /// Set interrupt handler
-    /**
-     * The interrupt handler is called whenever the connection is manually
-     * interrupted by the application.
-     *
-     * @param h The new interrupt_handler
-     */
-    void set_interrupt_handler(interrupt_handler h) {
-        m_interrupt_handler = h;
-    }
-
-    /// Set http handler
-    /**
-     * The http handler is called after an HTTP request other than a WebSocket
-     * upgrade request is received. It allows a WebSocket++ server to respond
-     * to regular HTTP requests on the same port as it processes WebSocket
-     * connections. This can be useful for hosting error messages, flash
-     * policy files, status pages, and other simple HTTP responses. It is not
-     * intended to be used as a primary web server.
-     *
-     * @param h The new http_handler
-     */
-    void set_http_handler(http_handler h) {
-        m_http_handler = h;
-    }
-
-    /// Set validate handler
-    /**
-     * The validate handler is called after a WebSocket handshake has been
-     * parsed but before a response is returned. It provides the application
-     * a chance to examine the request and determine whether or not it wants
-     * to accept the connection.
-     *
-     * Returning false from the validate handler will reject the connection.
-     * If no validate handler is present, all connections will be allowed.
-     *
-     * @param h The new validate_handler
-     */
-    void set_validate_handler(validate_handler h) {
-        m_validate_handler = h;
-    }
-
-    /// Set message handler
-    /**
-     * The message handler is called after a new message has been received.
-     *
-     * @param h The new message_handler
-     */
-    void set_message_handler(message_handler h) {
-        m_message_handler = h;
-    }
-
-    //////////////////////////////////////////
-    // Connection timeouts and other limits //
-    //////////////////////////////////////////
-
-    /// Set open handshake timeout
-    /**
-     * Sets the length of time the library will wait after an opening handshake
-     * has been initiated before cancelling it. This can be used to prevent
-     * excessive wait times for outgoing clients or excessive resource usage
-     * from broken clients or DoS attacks on servers.
-     *
-     * Connections that time out will have their fail handlers called with the
-     * open_handshake_timeout error code.
-     *
-     * The default value is specified via the compile time config value
-     * 'timeout_open_handshake'. The default value in the core config
-     * is 5000ms. A value of 0 will disable the timer entirely.
-     *
-     * To be effective, the transport you are using must support timers. See
-     * the documentation for your transport policy for details about its
-     * timer support.
-     *
-     * @param dur The length of the open handshake timeout in ms
-     */
-    void set_open_handshake_timeout(long dur) {
-        m_open_handshake_timeout_dur = dur;
-    }
-
-    /// Set close handshake timeout
-    /**
-     * Sets the length of time the library will wait after a closing handshake
-     * has been initiated before cancelling it. This can be used to prevent
-     * excessive wait times for outgoing clients or excessive resource usage
-     * from broken clients or DoS attacks on servers.
-     *
-     * Connections that time out will have their close handlers called with the
-     * close_handshake_timeout error code.
-     *
-     * The default value is specified via the compile time config value
-     * 'timeout_close_handshake'. The default value in the core config
-     * is 5000ms. A value of 0 will disable the timer entirely.
-     *
-     * To be effective, the transport you are using must support timers. See
-     * the documentation for your transport policy for details about its
-     * timer support.
-     *
-     * @param dur The length of the close handshake timeout in ms
-     */
-    void set_close_handshake_timeout(long dur) {
-        m_close_handshake_timeout_dur = dur;
-    }
-
-    /// Set pong timeout
-    /**
-     * Sets the length of time the library will wait for a pong response to a
-     * ping. This can be used as a keepalive or to detect broken  connections.
-     *
-     * Pong responses that time out will have the pong timeout handler called.
-     *
-     * The default value is specified via the compile time config value
-     * 'timeout_pong'. The default value in the core config
-     * is 5000ms. A value of 0 will disable the timer entirely.
-     *
-     * To be effective, the transport you are using must support timers. See
-     * the documentation for your transport policy for details about its
-     * timer support.
-     *
-     * @param dur The length of the pong timeout in ms
-     */
-    void set_pong_timeout(long dur) {
-        m_pong_timeout_dur = dur;
-    }
-
-    /// Get maximum message size
-    /**
-     * Get maximum message size. Maximum message size determines the point at 
-     * which the connection will fail with the message_too_big protocol error.
-     *
-     * The default is set by the endpoint that creates the connection.
-     *
-     * @since 0.3.0
-     */
-    size_t get_max_message_size() const {
-        return m_max_message_size;
-    }
-    
-    /// Set maximum message size
-    /**
-     * Set maximum message size. Maximum message size determines the point at 
-     * which the connection will fail with the message_too_big protocol error. 
-     * This value may be changed during the connection.
-     *
-     * The default is set by the endpoint that creates the connection.
-     *
-     * @since 0.3.0
-     *
-     * @param new_value The value to set as the maximum message size.
-     */
-    void set_max_message_size(size_t new_value) {
-        m_max_message_size = new_value;
-        if (m_processor) {
-            m_processor->set_max_message_size(new_value);
-        }
-    }
-    
-    /// Get maximum HTTP message body size
-    /**
-     * Get maximum HTTP message body size. Maximum message body size determines
-     * the point at which the connection will stop reading an HTTP request whose
-     * body is too large.
-     *
-     * The default is set by the endpoint that creates the connection.
-     *
-     * @since 0.5.0
-     *
-     * @return The maximum HTTP message body size
-     */
-    size_t get_max_http_body_size() const {
-        return m_request.get_max_body_size();
-    }
-    
-    /// Set maximum HTTP message body size
-    /**
-     * Set maximum HTTP message body size. Maximum message body size determines
-     * the point at which the connection will stop reading an HTTP request whose
-     * body is too large.
-     *
-     * The default is set by the endpoint that creates the connection.
-     *
-     * @since 0.5.0
-     *
-     * @param new_value The value to set as the maximum message size.
-     */
-    void set_max_http_body_size(size_t new_value) {
-        m_request.set_max_body_size(new_value);
-    }
-
-    //////////////////////////////////
-    // Uncategorized public methods //
-    //////////////////////////////////
-
-    /// Get the size of the outgoing write buffer (in payload bytes)
-    /**
-     * Retrieves the number of bytes in the outgoing write buffer that have not
-     * already been dispatched to the transport layer. This represents the bytes
-     * that are presently cancelable without uncleanly ending the websocket
-     * connection
-     *
-     * This method invokes the m_write_lock mutex
-     *
-     * @return The current number of bytes in the outgoing send buffer.
-     */
-    size_t get_buffered_amount() const;
-
-    /// Get the size of the outgoing write buffer (in payload bytes)
-    /**
-     * @deprecated use `get_buffered_amount` instead
-     */
-    size_t buffered_amount() const {
-        return get_buffered_amount();
-    }
-
-    ////////////////////
-    // Action Methods //
-    ////////////////////
-
-    /// Create a message and then add it to the outgoing send queue
-    /**
-     * Convenience method to send a message given a payload string and
-     * optionally an opcode. Default opcode is utf8 text.
-     *
-     * This method locks the m_write_lock mutex
-     *
-     * @param payload The payload string to generated the message with
-     *
-     * @param op The opcode to generated the message with. Default is
-     * frame::opcode::text
-     */
-    lib::error_code send(std::string const & payload, frame::opcode::value op =
-        frame::opcode::text);
-
-    /// Send a message (raw array overload)
-    /**
-     * Convenience method to send a message given a raw array and optionally an
-     * opcode. Default opcode is binary.
-     *
-     * This method locks the m_write_lock mutex
-     *
-     * @param payload A pointer to the array containing the bytes to send.
-     *
-     * @param len Length of the array.
-     *
-     * @param op The opcode to generated the message with. Default is
-     * frame::opcode::binary
-     */
-    lib::error_code send(void const * payload, size_t len, frame::opcode::value
-        op = frame::opcode::binary);
-
-    /// Add a message to the outgoing send queue
-    /**
-     * If presented with a prepared message it is added without validation or
-     * framing. If presented with an unprepared message it is validated, framed,
-     * and then added
-     *
-     * Errors are returned via an exception
-     * \todo make exception system_error rather than error_code
-     *
-     * This method invokes the m_write_lock mutex
-     *
-     * @param msg A message_ptr to the message to send.
-     */
-    lib::error_code send(message_ptr msg);
-
-    /// Asyncronously invoke handler::on_inturrupt
-    /**
-     * Signals to the connection to asyncronously invoke the on_inturrupt
-     * callback for this connection's handler once it is safe to do so.
-     *
-     * When the on_inturrupt handler callback is called it will be from
-     * within the transport event loop with all the thread safety features
-     * guaranteed by the transport to regular handlers
-     *
-     * Multiple inturrupt signals can be active at once on the same connection
-     *
-     * @return An error code
-     */
-    lib::error_code interrupt();
-    
-    /// Transport inturrupt callback
-    void handle_interrupt();
-    
-    /// Pause reading of new data
-    /**
-     * Signals to the connection to halt reading of new data. While reading is paused, 
-     * the connection will stop reading from its associated socket. In turn this will 
-     * result in TCP based flow control kicking in and slowing data flow from the remote
-     * endpoint.
-     *
-     * This is useful for applications that push new requests to a queue to be processed
-     * by another thread and need a way to signal when their request queue is full without
-     * blocking the network processing thread.
-     *
-     * Use `resume_reading()` to resume.
-     *
-     * If supported by the transport this is done asynchronously. As such reading may not
-     * stop until the current read operation completes. Typically you can expect to
-     * receive no more bytes after initiating a read pause than the size of the read 
-     * buffer.
-     *
-     * If reading is paused for this connection already nothing is changed.
-     */
-    lib::error_code pause_reading();
-
-    /// Pause reading callback
-    void handle_pause_reading();
-
-    /// Resume reading of new data
-    /**
-     * Signals to the connection to resume reading of new data after it was paused by
-     * `pause_reading()`.
-     *
-     * If reading is not paused for this connection already nothing is changed.
-     */
-    lib::error_code resume_reading();
-
-    /// Resume reading callback
-    void handle_resume_reading();
-
-    /// Send a ping
-    /**
-     * Initiates a ping with the given payload/
-     *
-     * There is no feedback directly from ping except in cases of immediately
-     * detectable errors. Feedback will be provided via on_pong or
-     * on_pong_timeout callbacks.
-     *
-     * Ping locks the m_write_lock mutex
-     *
-     * @param payload Payload to be used for the ping
-     */
-    void ping(std::string const & payload);
-
-    /// exception free variant of ping
-    void ping(std::string const & payload, lib::error_code & ec);
-
-    /// Utility method that gets called back when the ping timer expires
-    void handle_pong_timeout(std::string payload, lib::error_code const & ec);
-
-    /// Send a pong
-    /**
-     * Initiates a pong with the given payload.
-     *
-     * There is no feedback from a pong once sent.
-     *
-     * Pong locks the m_write_lock mutex
-     *
-     * @param payload Payload to be used for the pong
-     */
-    void pong(std::string const & payload);
-
-    /// exception free variant of pong
-    void pong(std::string const & payload, lib::error_code & ec);
-
-    /// Close the connection
-    /**
-     * Initiates the close handshake process.
-     *
-     * If close returns successfully the connection will be in the closing
-     * state and no additional messages may be sent. All messages sent prior
-     * to calling close will be written out before the connection is closed.
-     *
-     * If no reason is specified none will be sent. If no code is specified
-     * then no code will be sent.
-     *
-     * The handler's on_close callback will be called once the close handshake
-     * is complete.
-     *
-     * Reasons will be automatically truncated to the maximum length (123 bytes)
-     * if necessary.
-     *
-     * @param code The close code to send
-     * @param reason The close reason to send
-     */
-    void close(close::status::value const code, std::string const & reason);
-
-    /// exception free variant of close
-    void close(close::status::value const code, std::string const & reason,
-        lib::error_code & ec);
-
-    ////////////////////////////////////////////////
-    // Pass-through access to the uri information //
-    ////////////////////////////////////////////////
-
-    /// Returns the secure flag from the connection URI
-    /**
-     * This value is available after the HTTP request has been fully read and
-     * may be called from any thread.
-     *
-     * @return Whether or not the connection URI is flagged secure.
-     */
-    bool get_secure() const;
-
-    /// Returns the host component of the connection URI
-    /**
-     * This value is available after the HTTP request has been fully read and
-     * may be called from any thread.
-     *
-     * @return The host component of the connection URI
-     */
-    std::string const & get_host() const;
-
-    /// Returns the resource component of the connection URI
-    /**
-     * This value is available after the HTTP request has been fully read and
-     * may be called from any thread.
-     *
-     * @return The resource component of the connection URI
-     */
-    std::string const & get_resource() const;
-
-    /// Returns the port component of the connection URI
-    /**
-     * This value is available after the HTTP request has been fully read and
-     * may be called from any thread.
-     *
-     * @return The port component of the connection URI
-     */
-    uint16_t get_port() const;
-
-    /// Gets the connection URI
-    /**
-     * This should really only be called by internal library methods unless you
-     * really know what you are doing.
-     *
-     * @return A pointer to the connection's URI
-     */
-    uri_ptr get_uri() const;
-
-    /// Sets the connection URI
-    /**
-     * This should really only be called by internal library methods unless you
-     * really know what you are doing.
-     *
-     * @param uri The new URI to set
-     */
-    void set_uri(uri_ptr uri);
-
-    /////////////////////////////
-    // Subprotocol negotiation //
-    /////////////////////////////
-
-    /// Gets the negotated subprotocol
-    /**
-     * Retrieves the subprotocol that was negotiated during the handshake. This
-     * method is valid in the open handler and later.
-     *
-     * @return The negotiated subprotocol
-     */
-    std::string const & get_subprotocol() const;
-
-    /// Gets all of the subprotocols requested by the client
-    /**
-     * Retrieves the subprotocols that were requested during the handshake. This
-     * method is valid in the validate handler and later.
-     *
-     * @return A vector of the requested subprotocol
-     */
-    std::vector<std::string> const & get_requested_subprotocols() const;
-
-    /// Adds the given subprotocol string to the request list (exception free)
-    /**
-     * Adds a subprotocol to the list to send with the opening handshake. This
-     * may be called multiple times to request more than one. If the server
-     * supports one of these, it may choose one. If so, it will return it
-     * in it's handshake reponse and the value will be available via
-     * get_subprotocol(). Subprotocol requests should be added in order of
-     * preference.
-     *
-     * @param request The subprotocol to request
-     * @param ec A reference to an error code that will be filled in the case of
-     * errors
-     */
-    void add_subprotocol(std::string const & request, lib::error_code & ec);
-
-    /// Adds the given subprotocol string to the request list
-    /**
-     * Adds a subprotocol to the list to send with the opening handshake. This
-     * may be called multiple times to request more than one. If the server
-     * supports one of these, it may choose one. If so, it will return it
-     * in it's handshake reponse and the value will be available via
-     * get_subprotocol(). Subprotocol requests should be added in order of
-     * preference.
-     *
-     * @param request The subprotocol to request
-     */
-    void add_subprotocol(std::string const & request);
-
-    /// Select a subprotocol to use (exception free)
-    /**
-     * Indicates which subprotocol should be used for this connection. Valid
-     * only during the validate handler callback. Subprotocol selected must have
-     * been requested by the client. Consult get_requested_subprotocols() for a
-     * list of valid subprotocols.
-     *
-     * This member function is valid on server endpoints/connections only
-     *
-     * @param value The subprotocol to select
-     * @param ec A reference to an error code that will be filled in the case of
-     * errors
-     */
-    void select_subprotocol(std::string const & value, lib::error_code & ec);
-
-    /// Select a subprotocol to use
-    /**
-     * Indicates which subprotocol should be used for this connection. Valid
-     * only during the validate handler callback. Subprotocol selected must have
-     * been requested by the client. Consult get_requested_subprotocols() for a
-     * list of valid subprotocols.
-     *
-     * This member function is valid on server endpoints/connections only
-     *
-     * @param value The subprotocol to select
-     */
-    void select_subprotocol(std::string const & value);
-
-    /////////////////////////////////////////////////////////////
-    // Pass-through access to the request and response objects //
-    /////////////////////////////////////////////////////////////
-
-    /// Retrieve a request header
-    /**
-     * Retrieve the value of a header from the handshake HTTP request.
-     *
-     * @param key Name of the header to get
-     * @return The value of the header
-     */
-    std::string const & get_request_header(std::string const & key) const;
-
-    /// Retrieve a request body
-    /**
-     * Retrieve the value of the request body. This value is typically used with
-     * PUT and POST requests to upload files or other data. Only HTTP
-     * connections will ever have bodies. WebSocket connection's will always
-     * have blank bodies.
-     *
-     * @return The value of the request body.
-     */
-    std::string const & get_request_body() const;
-
-    /// Retrieve a response header
-    /**
-     * Retrieve the value of a header from the handshake HTTP request.
-     *
-     * @param key Name of the header to get
-     * @return The value of the header
-     */
-    std::string const & get_response_header(std::string const & key) const;
-
-    /// Get response HTTP status code
-    /**
-     * Gets the response status code 
-     *
-     * @since 0.7.0
-     *
-     * @return The response status code sent
-     */
-    http::status_code::value get_response_code() const {
-        return m_response.get_status_code();
-    }
-
-    /// Get response HTTP status message
-    /**
-     * Gets the response status message 
-     *
-     * @since 0.7.0
-     *
-     * @return The response status message sent
-     */
-    std::string const & get_response_msg() const {
-        return m_response.get_status_msg();
-    }
-    
-    /// Set response status code and message
-    /**
-     * Sets the response status code to `code` and looks up the corresponding
-     * message for standard codes. Non-standard codes will be entered as Unknown
-     * use set_status(status_code::value,std::string) overload to set both
-     * values explicitly.
-     *
-     * This member function is valid only from the http() and validate() handler
-     * callbacks.
-     *
-     * @param code Code to set
-     * @param msg Message to set
-     * @see websocketpp::http::response::set_status
-     */
-    void set_status(http::status_code::value code);
-
-    /// Set response status code and message
-    /**
-     * Sets the response status code and message to independent custom values.
-     * use set_status(status_code::value) to set the code and have the standard
-     * message be automatically set.
-     *
-     * This member function is valid only from the http() and validate() handler
-     * callbacks.
-     *
-     * @param code Code to set
-     * @param msg Message to set
-     * @see websocketpp::http::response::set_status
-     */
-    void set_status(http::status_code::value code, std::string const & msg);
-
-    /// Set response body content
-    /**
-     * Set the body content of the HTTP response to the parameter string. Note
-     * set_body will also set the Content-Length HTTP header to the appropriate
-     * value. If you want the Content-Length header to be something else set it
-     * to something else after calling set_body
-     *
-     * This member function is valid only from the http() and validate() handler
-     * callbacks.
-     *
-     * @param value String data to include as the body content.
-     * @see websocketpp::http::response::set_body
-     */
-    void set_body(std::string const & value);
-
-    /// Append a header
-    /**
-     * If a header with this name already exists the value will be appended to
-     * the existing header to form a comma separated list of values. Use
-     * `connection::replace_header` to overwrite existing values.
-     *
-     * This member function is valid only from the http() and validate() handler
-     * callbacks, or to a client connection before connect has been called.
-     *
-     * @param key Name of the header to set
-     * @param val Value to add
-     * @see replace_header
-     * @see websocketpp::http::parser::append_header
-     */
-    void append_header(std::string const & key, std::string const & val);
-
-    /// Replace a header
-    /**
-     * If a header with this name already exists the old value will be replaced
-     * Use `connection::append_header` to append to a list of existing values.
-     *
-     * This member function is valid only from the http() and validate() handler
-     * callbacks, or to a client connection before connect has been called.
-     *
-     * @param key Name of the header to set
-     * @param val Value to set
-     * @see append_header
-     * @see websocketpp::http::parser::replace_header
-     */
-    void replace_header(std::string const & key, std::string const & val);
-
-    /// Remove a header
-    /**
-     * Removes a header from the response.
-     *
-     * This member function is valid only from the http() and validate() handler
-     * callbacks, or to a client connection before connect has been called.
-     *
-     * @param key The name of the header to remove
-     * @see websocketpp::http::parser::remove_header
-     */
-    void remove_header(std::string const & key);
-
-    /// Get request object
-    /**
-     * Direct access to request object. This can be used to call methods of the
-     * request object that are not part of the standard request API that
-     * connection wraps.
-     *
-     * Note use of this method involves using behavior specific to the
-     * configured HTTP policy. Such behavior may not work with alternate HTTP
-     * policies.
-     *
-     * @since 0.3.0-alpha3
-     *
-     * @return A const reference to the raw request object
-     */
-    request_type const & get_request() const {
-        return m_request;
-    }
-    
-    /// Get response object
-    /**
-     * Direct access to the HTTP response sent or received as a part of the
-     * opening handshake. This can be used to call methods of the response
-     * object that are not part of the standard request API that connection
-     * wraps.
-     *
-     * Note use of this method involves using behavior specific to the
-     * configured HTTP policy. Such behavior may not work with alternate HTTP
-     * policies.
-     *
-     * @since 0.7.0
-     *
-     * @return A const reference to the raw response object
-     */
-    response_type const & get_response() const {
-        return m_response;
-    }
-    
-    /// Defer HTTP Response until later (Exception free)
-    /**
-     * Used in the http handler to defer the HTTP response for this connection
-     * until later. Handshake timers will be canceled and the connection will be
-     * left open until `send_http_response` or an equivalent is called.
-     *
-     * Warning: deferred connections won't time out and as a result can tie up
-     * resources.
-     *
-     * @since 0.6.0
-     *
-     * @return A status code, zero on success, non-zero otherwise
-     */
-    lib::error_code defer_http_response();
-    
-    /// Send deferred HTTP Response (exception free)
-    /**
-     * Sends an http response to an HTTP connection that was deferred. This will
-     * send a complete response including all headers, status line, and body
-     * text. The connection will be closed afterwards.
-     *
-     * @since 0.6.0
-     *
-     * @param ec A status code, zero on success, non-zero otherwise
-     */
-    void send_http_response(lib::error_code & ec);
-    
-    /// Send deferred HTTP Response
-    void send_http_response();
-    
-    // TODO HTTPNBIO: write_headers
-    // function that processes headers + status so far and writes it to the wire
-    // beginning the HTTP response body state. This method will ignore anything
-    // in the response body.
-    
-    // TODO HTTPNBIO: write_body_message
-    // queues the specified message_buffer for async writing
-    
-    // TODO HTTPNBIO: finish connection
-    //
-    
-    // TODO HTTPNBIO: write_response
-    // Writes the whole response, headers + body and closes the connection
-    
-    
-
-    /////////////////////////////////////////////////////////////
-    // Pass-through access to the other connection information //
-    /////////////////////////////////////////////////////////////
-
-    /// Get Connection Handle
-    /**
-     * The connection handle is a token that can be shared outside the
-     * WebSocket++ core for the purposes of identifying a connection and
-     * sending it messages.
-     *
-     * @return A handle to the connection
-     */
-    connection_hdl get_handle() const {
-        return m_connection_hdl;
-    }
-
-    /// Get whether or not this connection is part of a server or client
-    /**
-     * @return whether or not the connection is attached to a server endpoint
-     */
-    bool is_server() const {
-        return m_is_server;
-    }
-
-    /// Return the same origin policy origin value from the opening request.
-    /**
-     * This value is available after the HTTP request has been fully read and
-     * may be called from any thread.
-     *
-     * @return The connection's origin value from the opening handshake.
-     */
-    std::string const & get_origin() const;
-
-    /// Return the connection state.
-    /**
-     * Values can be connecting, open, closing, and closed
-     *
-     * @return The connection's current state.
-     */
-    session::state::value get_state() const;
-
-
-    /// Get the WebSocket close code sent by this endpoint.
-    /**
-     * @return The WebSocket close code sent by this endpoint.
-     */
-    close::status::value get_local_close_code() const {
-        return m_local_close_code;
-    }
-
-    /// Get the WebSocket close reason sent by this endpoint.
-    /**
-     * @return The WebSocket close reason sent by this endpoint.
-     */
-    std::string const & get_local_close_reason() const {
-        return m_local_close_reason;
-    }
-
-    /// Get the WebSocket close code sent by the remote endpoint.
-    /**
-     * @return The WebSocket close code sent by the remote endpoint.
-     */
-    close::status::value get_remote_close_code() const {
-        return m_remote_close_code;
-    }
-
-    /// Get the WebSocket close reason sent by the remote endpoint.
-    /**
-     * @return The WebSocket close reason sent by the remote endpoint.
-     */
-    std::string const & get_remote_close_reason() const {
-        return m_remote_close_reason;
-    }
-
-    /// Get the internal error code for a closed/failed connection
-    /**
-     * Retrieves a machine readable detailed error code indicating the reason
-     * that the connection was closed or failed. Valid only after the close or
-     * fail handler is called.
-     *
-     * @return Error code indicating the reason the connection was closed or
-     * failed
-     */
-    lib::error_code get_ec() const {
-        return m_ec;
-    }
-
-    /// Get a message buffer
-    /**
-     * Warning: The API related to directly sending message buffers may change
-     * before the 1.0 release. If you plan to use it, please keep an eye on any
-     * breaking changes notifications in future release notes. Also if you have
-     * any feedback about usage and capabilities now is a great time to provide
-     * it.
-     *
-     * Message buffers are used to store message payloads and other message
-     * metadata.
-     *
-     * The size parameter is a hint only. Your final payload does not need to
-     * match it. There may be some performance benefits if the initial size
-     * guess is equal to or slightly higher than the final payload size.
-     *
-     * @param op The opcode for the new message
-     * @param size A hint to optimize the initial allocation of payload space.
-     * @return A new message buffer
-     */
-    message_ptr get_message(websocketpp::frame::opcode::value op, size_t size)
-        const
-    {
-        return m_msg_manager->get_message(op, size);
-    }
-
-    ////////////////////////////////////////////////////////////////////////
-    // The remaining public member functions are for internal/policy use  //
-    // only. Do not call from application code unless you understand what //
-    // you are doing.                                                     //
-    ////////////////////////////////////////////////////////////////////////
-
-    
-
-    void read_handshake(size_t num_bytes);
-
-    void handle_read_handshake(lib::error_code const & ec,
-        size_t bytes_transferred);
-    void handle_read_http_response(lib::error_code const & ec,
-        size_t bytes_transferred);
-
-    
-    void handle_write_http_response(lib::error_code const & ec);
-    void handle_send_http_request(lib::error_code const & ec);
-
-    void handle_open_handshake_timeout(lib::error_code const & ec);
-    void handle_close_handshake_timeout(lib::error_code const & ec);
-
-    void handle_read_frame(lib::error_code const & ec, size_t bytes_transferred);
-    void read_frame();
-
-    /// Get array of WebSocket protocol versions that this connection supports.
-    std::vector<int> const & get_supported_versions() const;
-
-    /// Sets the handler for a terminating connection. Should only be used
-    /// internally by the endpoint class.
-    void set_termination_handler(termination_handler new_handler);
-
-    void terminate(lib::error_code const & ec);
-    void handle_terminate(terminate_status tstat, lib::error_code const & ec);
-
-    /// Checks if there are frames in the send queue and if there are sends one
-    /**
-     * \todo unit tests
-     *
-     * This method locks the m_write_lock mutex
-     */
-    void write_frame();
-
-    /// Process the results of a frame write operation and start the next write
-    /**
-     * \todo unit tests
-     *
-     * This method locks the m_write_lock mutex
-     *
-     * @param terminate Whether or not to terminate the connection upon
-     * completion of this write.
-     *
-     * @param ec A status code from the transport layer, zero on success,
-     * non-zero otherwise.
-     */
-    void handle_write_frame(lib::error_code const & ec);
-// protected:
-    // This set of methods would really like to be protected, but doing so 
-    // requires that the endpoint be able to friend the connection. This is 
-    // allowed with C++11, but not prior versions
-
-    /// Start the connection state machine
-    void start();
-
-    /// Set Connection Handle
-    /**
-     * The connection handle is a token that can be shared outside the
-     * WebSocket++ core for the purposes of identifying a connection and
-     * sending it messages.
-     *
-     * @param hdl A connection_hdl that the connection will use to refer
-     * to itself.
-     */
-    void set_handle(connection_hdl hdl) {
-        m_connection_hdl = hdl;
-        transport_con_type::set_handle(hdl);
-    }
-protected:
-    void handle_transport_init(lib::error_code const & ec);
-
-    /// Set m_processor based on information in m_request. Set m_response
-    /// status and return an error code indicating status.
-    lib::error_code initialize_processor();
-
-    /// Perform WebSocket handshake validation of m_request using m_processor.
-    /// set m_response and return an error code indicating status.
-    lib::error_code process_handshake_request();
-private:
-    
-
-    /// Completes m_response, serializes it, and sends it out on the wire.
-    void write_http_response(lib::error_code const & ec);
-
-    /// Sends an opening WebSocket connect request
-    void send_http_request();
-
-    /// Alternate path for write_http_response in error conditions
-    void write_http_response_error(lib::error_code const & ec);
-
-    /// Process control message
-    /**
-     *
-     */
-    void process_control_frame(message_ptr msg);
-
-    /// Send close acknowledgement
-    /**
-     * If no arguments are present no close code/reason will be specified.
-     *
-     * Note: the close code/reason values provided here may be overrided by
-     * other settings (such as silent close).
-     *
-     * @param code The close code to send
-     * @param reason The close reason to send
-     * @return A status code, zero on success, non-zero otherwise
-     */
-    lib::error_code send_close_ack(close::status::value code =
-        close::status::blank, std::string const & reason = std::string());
-
-    /// Send close frame
-    /**
-     * If no arguments are present no close code/reason will be specified.
-     *
-     * Note: the close code/reason values provided here may be overrided by
-     * other settings (such as silent close).
-     *
-     * The ack flag determines what to do in the case of a blank status and
-     * whether or not to terminate the TCP connection after sending it.
-     *
-     * @param code The close code to send
-     * @param reason The close reason to send
-     * @param ack Whether or not this is an acknowledgement close frame
-     * @return A status code, zero on success, non-zero otherwise
-     */
-    lib::error_code send_close_frame(close::status::value code =
-        close::status::blank, std::string const & reason = std::string(), bool ack = false,
-        bool terminal = false);
-
-    /// Get a pointer to a new WebSocket protocol processor for a given version
-    /**
-     * @param version Version number of the WebSocket protocol to get a
-     * processor for. Negative values indicate invalid/unknown versions and will
-     * always return a null ptr
-     *
-     * @return A shared_ptr to a new instance of the appropriate processor or a
-     * null ptr if there is no installed processor that matches the version
-     * number.
-     */
-    processor_ptr get_processor(int version) const;
-
-    /// Add a message to the write queue
-    /**
-     * Adds a message to the write queue and updates any associated shared state
-     *
-     * Must be called while holding m_write_lock
-     *
-     * @todo unit tests
-     *
-     * @param msg The message to push
-     */
-    void write_push(message_ptr msg);
-
-    /// Pop a message from the write queue
-    /**
-     * Removes and returns a message from the write queue and updates any
-     * associated shared state.
-     *
-     * Must be called while holding m_write_lock
-     *
-     * @todo unit tests
-     *
-     * @return the message_ptr at the front of the queue
-     */
-    message_ptr write_pop();
-
-    /// Prints information about the incoming connection to the access log
-    /**
-     * Prints information about the incoming connection to the access log.
-     * Includes: connection type, websocket version, remote endpoint, user agent
-     * path, status code.
-     */
-    void log_open_result();
-
-    /// Prints information about a connection being closed to the access log
-    /**
-     * Includes: local and remote close codes and reasons
-     */
-    void log_close_result();
-
-    /// Prints information about a connection being failed to the access log
-    /**
-     * Includes: error code and message for why it was failed
-     */
-    void log_fail_result();
-    
-    /// Prints information about HTTP connections
-    /**
-     * Includes: TODO
-     */
-    void log_http_result();
-
-    /// Prints information about an arbitrary error code on the specified channel
-    template <typename error_type>
-    void log_err(log::level l, char const * msg, error_type const & ec) {
-        std::stringstream s;
-        s << msg << " error: " << ec << " (" << ec.message() << ")";
-        m_elog->write(l, s.str());
-    }
-
-    // internal handler functions
-    read_handler            m_handle_read_frame;
-    write_frame_handler     m_write_frame_handler;
-
-    // static settings
-    std::string const       m_user_agent;
-
-    /// Pointer to the connection handle
-    connection_hdl          m_connection_hdl;
-
-    /// Handler objects
-    open_handler            m_open_handler;
-    close_handler           m_close_handler;
-    fail_handler            m_fail_handler;
-    ping_handler            m_ping_handler;
-    pong_handler            m_pong_handler;
-    pong_timeout_handler    m_pong_timeout_handler;
-    interrupt_handler       m_interrupt_handler;
-    http_handler            m_http_handler;
-    validate_handler        m_validate_handler;
-    message_handler         m_message_handler;
-
-    /// constant values
-    long                    m_open_handshake_timeout_dur;
-    long                    m_close_handshake_timeout_dur;
-    long                    m_pong_timeout_dur;
-    size_t                  m_max_message_size;
-
-    /// External connection state
-    /**
-     * Lock: m_connection_state_lock
-     */
-    session::state::value   m_state;
-
-    /// Internal connection state
-    /**
-     * Lock: m_connection_state_lock
-     */
-    istate_type             m_internal_state;
-
-    mutable mutex_type      m_connection_state_lock;
-
-    /// The lock used to protect the message queue
-    /**
-     * Serializes access to the write queue as well as shared state within the
-     * processor.
-     */
-    mutex_type              m_write_lock;
-
-    // connection resources
-    char                    m_buf[config::connection_read_buffer_size];
-    size_t                  m_buf_cursor;
-    termination_handler     m_termination_handler;
-    con_msg_manager_ptr     m_msg_manager;
-    timer_ptr               m_handshake_timer;
-    timer_ptr               m_ping_timer;
-
-    /// @todo this is not memory efficient. this value is not used after the
-    /// handshake.
-    std::string m_handshake_buffer;
-
-    /// Pointer to the processor object for this connection
-    /**
-     * The processor provides functionality that is specific to the WebSocket
-     * protocol version that the client has negotiated. It also contains all of
-     * the state necessary to encode and decode the incoming and outgoing
-     * WebSocket byte streams
-     *
-     * Use of the prepare_data_frame method requires lock: m_write_lock
-     */
-    processor_ptr           m_processor;
-
-    /// Queue of unsent outgoing messages
-    /**
-     * Lock: m_write_lock
-     */
-    std::queue<message_ptr> m_send_queue;
-
-    /// Size in bytes of the outstanding payloads in the write queue
-    /**
-     * Lock: m_write_lock
-     */
-    size_t m_send_buffer_size;
-
-    /// buffer holding the various parts of the current message being writen
-    /**
-     * Lock m_write_lock
-     */
-    std::vector<transport::buffer> m_send_buffer;
-
-    /// a list of pointers to hold on to the messages being written to keep them
-    /// from going out of scope before the write is complete.
-    std::vector<message_ptr> m_current_msgs;
-
-    /// True if there is currently an outstanding transport write
-    /**
-     * Lock m_write_lock
-     */
-    bool m_write_flag;
-
-    /// True if this connection is presently reading new data
-    bool m_read_flag;
-
-    // connection data
-    request_type            m_request;
-    response_type           m_response;
-    uri_ptr                 m_uri;
-    std::string             m_subprotocol;
-
-    // connection data that might not be necessary to keep around for the life
-    // of the whole connection.
-    std::vector<std::string> m_requested_subprotocols;
-
-    bool const              m_is_server;
-    const lib::shared_ptr<alog_type> m_alog;
-    const lib::shared_ptr<elog_type> m_elog;
-
-    rng_type & m_rng;
-
-    // Close state
-    /// Close code that was sent on the wire by this endpoint
-    close::status::value    m_local_close_code;
-
-    /// Close reason that was sent on the wire by this endpoint
-    std::string             m_local_close_reason;
-
-    /// Close code that was received on the wire from the remote endpoint
-    close::status::value    m_remote_close_code;
-
-    /// Close reason that was received on the wire from the remote endpoint
-    std::string             m_remote_close_reason;
-
-    /// Detailed internal error code
-    lib::error_code m_ec;
-    
-    /// A flag that gets set once it is determined that the connection is an
-    /// HTTP connection and not a WebSocket one.
-    bool m_is_http;
-    
-    /// A flag that gets set when the completion of an http connection is
-    /// deferred until later.
-    session::http_state::value m_http_state;
-
-    bool m_was_clean;
-};
-
-} // namespace websocketpp
-
-#include <websocketpp/impl/connection_impl.hpp>
-
-#endif // WEBSOCKETPP_CONNECTION_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/connection_base.hpp b/src/sioclient/lib/websocketpp/websocketpp/connection_base.hpp
deleted file mode 100644
index 2e700962..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/connection_base.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONNECTION_BASE_HPP
-#define WEBSOCKETPP_CONNECTION_BASE_HPP
-
-namespace websocketpp {
-
-/// Stub for user supplied base class.
-class connection_base {};
-
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONNECTION_BASE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/endpoint.hpp b/src/sioclient/lib/websocketpp/websocketpp/endpoint.hpp
deleted file mode 100644
index c124b1d9..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/endpoint.hpp
+++ /dev/null
@@ -1,700 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_ENDPOINT_HPP
-#define WEBSOCKETPP_ENDPOINT_HPP
-
-#include <websocketpp/connection.hpp>
-
-#include <websocketpp/logger/levels.hpp>
-#include <websocketpp/version.hpp>
-
-#include <string>
-
-namespace websocketpp {
-
-/// Creates and manages connections associated with a WebSocket endpoint
-template <typename connection, typename config>
-class endpoint : public config::transport_type, public config::endpoint_base {
-public:
-    // Import appropriate types from our helper class
-    // See endpoint_types for more details.
-    typedef endpoint<connection,config> type;
-
-    /// Type of the transport component of this endpoint
-    typedef typename config::transport_type transport_type;
-    /// Type of the concurrency component of this endpoint
-    typedef typename config::concurrency_type concurrency_type;
-
-    /// Type of the connections that this endpoint creates
-    typedef connection connection_type;
-    /// Shared pointer to connection_type
-    typedef typename connection_type::ptr connection_ptr;
-    /// Weak pointer to connection type
-    typedef typename connection_type::weak_ptr connection_weak_ptr;
-
-    /// Type of the transport component of the connections that this endpoint
-    /// creates
-    typedef typename transport_type::transport_con_type transport_con_type;
-    /// Type of a shared pointer to the transport component of the connections
-    /// that this endpoint creates.
-    typedef typename transport_con_type::ptr transport_con_ptr;
-
-    /// Type of message_handler
-    typedef typename connection_type::message_handler message_handler;
-    /// Type of message pointers that this endpoint uses
-    typedef typename connection_type::message_ptr message_ptr;
-
-    /// Type of error logger
-    typedef typename config::elog_type elog_type;
-    /// Type of access logger
-    typedef typename config::alog_type alog_type;
-
-    /// Type of our concurrency policy's scoped lock object
-    typedef typename concurrency_type::scoped_lock_type scoped_lock_type;
-    /// Type of our concurrency policy's mutex object
-    typedef typename concurrency_type::mutex_type mutex_type;
-
-    /// Type of RNG
-    typedef typename config::rng_type rng_type;
-
-    // TODO: organize these
-    typedef typename connection_type::termination_handler termination_handler;
-
-    // This would be ideal. Requires C++11 though
-    //friend connection;
-
-    explicit endpoint(bool p_is_server)
-      : m_alog(new alog_type(config::alog_level, log::channel_type_hint::access))
-      , m_elog(new elog_type(config::elog_level, log::channel_type_hint::error))
-      , m_user_agent(::websocketpp::user_agent)
-      , m_open_handshake_timeout_dur(config::timeout_open_handshake)
-      , m_close_handshake_timeout_dur(config::timeout_close_handshake)
-      , m_pong_timeout_dur(config::timeout_pong)
-      , m_max_message_size(config::max_message_size)
-      , m_max_http_body_size(config::max_http_body_size)
-      , m_is_server(p_is_server)
-    {
-        m_alog->set_channels(config::alog_level);
-        m_elog->set_channels(config::elog_level);
-
-        m_alog->write(log::alevel::devel, "endpoint constructor");
-
-        transport_type::init_logging(m_alog, m_elog);
-    }
-
-
-    /// Destructor
-    ~endpoint<connection,config>() {}
-
-    #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-        // no copy constructor because endpoints are not copyable
-        endpoint(endpoint &) = delete;
-    
-        // no copy assignment operator because endpoints are not copyable
-        endpoint & operator=(endpoint const &) = delete;
-    #endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-
-    #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
-        /// Move constructor
-        endpoint(endpoint && o) 
-         : config::transport_type(std::move(o))
-         , config::endpoint_base(std::move(o))
-         , m_alog(std::move(o.m_alog))
-         , m_elog(std::move(o.m_elog))
-         , m_user_agent(std::move(o.m_user_agent))
-         , m_open_handler(std::move(o.m_open_handler))
-         
-         , m_close_handler(std::move(o.m_close_handler))
-         , m_fail_handler(std::move(o.m_fail_handler))
-         , m_ping_handler(std::move(o.m_ping_handler))
-         , m_pong_handler(std::move(o.m_pong_handler))
-         , m_pong_timeout_handler(std::move(o.m_pong_timeout_handler))
-         , m_interrupt_handler(std::move(o.m_interrupt_handler))
-         , m_http_handler(std::move(o.m_http_handler))
-         , m_validate_handler(std::move(o.m_validate_handler))
-         , m_message_handler(std::move(o.m_message_handler))
-
-         , m_open_handshake_timeout_dur(o.m_open_handshake_timeout_dur)
-         , m_close_handshake_timeout_dur(o.m_close_handshake_timeout_dur)
-         , m_pong_timeout_dur(o.m_pong_timeout_dur)
-         , m_max_message_size(o.m_max_message_size)
-         , m_max_http_body_size(o.m_max_http_body_size)
-
-         , m_rng(std::move(o.m_rng))
-         , m_is_server(o.m_is_server)         
-        {}
-
-    #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-        // no move assignment operator because of const member variables
-        endpoint & operator=(endpoint &&) = delete;
-    #endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-
-    #endif // _WEBSOCKETPP_MOVE_SEMANTICS_
-
-
-    /// Returns the user agent string that this endpoint will use
-    /**
-     * Returns the user agent string that this endpoint will use when creating
-     * new connections.
-     *
-     * The default value for this version is stored in websocketpp::user_agent
-     *
-     * @return The user agent string.
-     */
-    std::string get_user_agent() const {
-        scoped_lock_type guard(m_mutex);
-        return m_user_agent;
-    }
-
-    /// Sets the user agent string that this endpoint will use
-    /**
-     * Sets the identifier that this endpoint will use when creating new
-     * connections. Changing this value will only affect future connections.
-     * For client endpoints this will be sent as the "User-Agent" header in
-     * outgoing requests. For server endpoints this will be sent in the "Server"
-     * response header.
-     *
-     * Setting this value to the empty string will suppress the use of the
-     * Server and User-Agent headers. This is typically done to hide
-     * implementation details for security purposes.
-     *
-     * For best results set this before accepting or opening connections.
-     *
-     * The default value for this version is stored in websocketpp::user_agent
-     *
-     * This can be overridden on an individual connection basis by setting a
-     * custom "Server" header during the validate handler or "User-Agent"
-     * header on a connection before calling connect().
-     *
-     * @param ua The string to set the user agent to.
-     */
-    void set_user_agent(std::string const & ua) {
-        scoped_lock_type guard(m_mutex);
-        m_user_agent = ua;
-    }
-
-    /// Returns whether or not this endpoint is a server.
-    /**
-     * @return Whether or not this endpoint is a server
-     */
-    bool is_server() const {
-        return m_is_server;
-    }
-
-    /********************************/
-    /* Pass-through logging adaptor */
-    /********************************/
-
-    /// Set Access logging channel
-    /**
-     * Set the access logger's channel value. The value is a number whose
-     * interpretation depends on the logging policy in use.
-     *
-     * @param channels The channel value(s) to set
-     */
-    void set_access_channels(log::level channels) {
-        m_alog->set_channels(channels);
-    }
-
-    /// Clear Access logging channels
-    /**
-     * Clear the access logger's channel value. The value is a number whose
-     * interpretation depends on the logging policy in use.
-     *
-     * @param channels The channel value(s) to clear
-     */
-    void clear_access_channels(log::level channels) {
-        m_alog->clear_channels(channels);
-    }
-
-    /// Set Error logging channel
-    /**
-     * Set the error logger's channel value. The value is a number whose
-     * interpretation depends on the logging policy in use.
-     *
-     * @param channels The channel value(s) to set
-     */
-    void set_error_channels(log::level channels) {
-        m_elog->set_channels(channels);
-    }
-
-    /// Clear Error logging channels
-    /**
-     * Clear the error logger's channel value. The value is a number whose
-     * interpretation depends on the logging policy in use.
-     *
-     * @param channels The channel value(s) to clear
-     */
-    void clear_error_channels(log::level channels) {
-        m_elog->clear_channels(channels);
-    }
-
-    /// Get reference to access logger
-    /**
-     * @return A reference to the access logger
-     */
-    alog_type & get_alog() {
-        return *m_alog;
-    }
-
-    /// Get reference to error logger
-    /**
-     * @return A reference to the error logger
-     */
-    elog_type & get_elog() {
-        return *m_elog;
-    }
-
-    /*************************/
-    /* Set Handler functions */
-    /*************************/
-
-    void set_open_handler(open_handler h) {
-        m_alog->write(log::alevel::devel,"set_open_handler");
-        scoped_lock_type guard(m_mutex);
-        m_open_handler = h;
-    }
-    void set_close_handler(close_handler h) {
-        m_alog->write(log::alevel::devel,"set_close_handler");
-        scoped_lock_type guard(m_mutex);
-        m_close_handler = h;
-    }
-    void set_fail_handler(fail_handler h) {
-        m_alog->write(log::alevel::devel,"set_fail_handler");
-        scoped_lock_type guard(m_mutex);
-        m_fail_handler = h;
-    }
-    void set_ping_handler(ping_handler h) {
-        m_alog->write(log::alevel::devel,"set_ping_handler");
-        scoped_lock_type guard(m_mutex);
-        m_ping_handler = h;
-    }
-    void set_pong_handler(pong_handler h) {
-        m_alog->write(log::alevel::devel,"set_pong_handler");
-        scoped_lock_type guard(m_mutex);
-        m_pong_handler = h;
-    }
-    void set_pong_timeout_handler(pong_timeout_handler h) {
-        m_alog->write(log::alevel::devel,"set_pong_timeout_handler");
-        scoped_lock_type guard(m_mutex);
-        m_pong_timeout_handler = h;
-    }
-    void set_interrupt_handler(interrupt_handler h) {
-        m_alog->write(log::alevel::devel,"set_interrupt_handler");
-        scoped_lock_type guard(m_mutex);
-        m_interrupt_handler = h;
-    }
-    void set_http_handler(http_handler h) {
-        m_alog->write(log::alevel::devel,"set_http_handler");
-        scoped_lock_type guard(m_mutex);
-        m_http_handler = h;
-    }
-    void set_validate_handler(validate_handler h) {
-        m_alog->write(log::alevel::devel,"set_validate_handler");
-        scoped_lock_type guard(m_mutex);
-        m_validate_handler = h;
-    }
-    void set_message_handler(message_handler h) {
-        m_alog->write(log::alevel::devel,"set_message_handler");
-        scoped_lock_type guard(m_mutex);
-        m_message_handler = h;
-    }
-
-    //////////////////////////////////////////
-    // Connection timeouts and other limits //
-    //////////////////////////////////////////
-
-    /// Set open handshake timeout
-    /**
-     * Sets the length of time the library will wait after an opening handshake
-     * has been initiated before cancelling it. This can be used to prevent
-     * excessive wait times for outgoing clients or excessive resource usage
-     * from broken clients or DoS attacks on servers.
-     *
-     * Connections that time out will have their fail handlers called with the
-     * open_handshake_timeout error code.
-     *
-     * The default value is specified via the compile time config value
-     * 'timeout_open_handshake'. The default value in the core config
-     * is 5000ms. A value of 0 will disable the timer entirely.
-     *
-     * To be effective, the transport you are using must support timers. See
-     * the documentation for your transport policy for details about its
-     * timer support.
-     *
-     * @param dur The length of the open handshake timeout in ms
-     */
-    void set_open_handshake_timeout(long dur) {
-        scoped_lock_type guard(m_mutex);
-        m_open_handshake_timeout_dur = dur;
-    }
-
-    /// Set close handshake timeout
-    /**
-     * Sets the length of time the library will wait after a closing handshake
-     * has been initiated before cancelling it. This can be used to prevent
-     * excessive wait times for outgoing clients or excessive resource usage
-     * from broken clients or DoS attacks on servers.
-     *
-     * Connections that time out will have their close handlers called with the
-     * close_handshake_timeout error code.
-     *
-     * The default value is specified via the compile time config value
-     * 'timeout_close_handshake'. The default value in the core config
-     * is 5000ms. A value of 0 will disable the timer entirely.
-     *
-     * To be effective, the transport you are using must support timers. See
-     * the documentation for your transport policy for details about its
-     * timer support.
-     *
-     * @param dur The length of the close handshake timeout in ms
-     */
-    void set_close_handshake_timeout(long dur) {
-        scoped_lock_type guard(m_mutex);
-        m_close_handshake_timeout_dur = dur;
-    }
-
-    /// Set pong timeout
-    /**
-     * Sets the length of time the library will wait for a pong response to a
-     * ping. This can be used as a keepalive or to detect broken  connections.
-     *
-     * Pong responses that time out will have the pong timeout handler called.
-     *
-     * The default value is specified via the compile time config value
-     * 'timeout_pong'. The default value in the core config
-     * is 5000ms. A value of 0 will disable the timer entirely.
-     *
-     * To be effective, the transport you are using must support timers. See
-     * the documentation for your transport policy for details about its
-     * timer support.
-     *
-     * @param dur The length of the pong timeout in ms
-     */
-    void set_pong_timeout(long dur) {
-        scoped_lock_type guard(m_mutex);
-        m_pong_timeout_dur = dur;
-    }
-
-    /// Get default maximum message size
-    /**
-     * Get the default maximum message size that will be used for new 
-     * connections created by this endpoint. The maximum message size determines
-     * the point at which the connection will fail a connection with the 
-     * message_too_big protocol error.
-     *
-     * The default is set by the max_message_size value from the template config
-     *
-     * @since 0.3.0
-     */
-    size_t get_max_message_size() const {
-        return m_max_message_size;
-    }
-    
-    /// Set default maximum message size
-    /**
-     * Set the default maximum message size that will be used for new 
-     * connections created by this endpoint. Maximum message size determines the
-     * point at which the connection will fail a connection with the
-     * message_too_big protocol error.
-     *
-     * The default is set by the max_message_size value from the template config
-     *
-     * @since 0.3.0
-     *
-     * @param new_value The value to set as the maximum message size.
-     */
-    void set_max_message_size(size_t new_value) {
-        m_max_message_size = new_value;
-    }
-
-    /// Get maximum HTTP message body size
-    /**
-     * Get maximum HTTP message body size. Maximum message body size determines
-     * the point at which the connection will stop reading an HTTP request whose
-     * body is too large.
-     *
-     * The default is set by the max_http_body_size value from the template
-     * config
-     *
-     * @since 0.5.0
-     *
-     * @return The maximum HTTP message body size
-     */
-    size_t get_max_http_body_size() const {
-        return m_max_http_body_size;
-    }
-    
-    /// Set maximum HTTP message body size
-    /**
-     * Set maximum HTTP message body size. Maximum message body size determines
-     * the point at which the connection will stop reading an HTTP request whose
-     * body is too large.
-     *
-     * The default is set by the max_http_body_size value from the template
-     * config
-     *
-     * @since 0.5.1
-     *
-     * @param new_value The value to set as the maximum message size.
-     */
-    void set_max_http_body_size(size_t new_value) {
-        m_max_http_body_size = new_value;
-    }
-
-    /*************************************/
-    /* Connection pass through functions */
-    /*************************************/
-
-    /**
-     * These functions act as adaptors to their counterparts in connection. They
-     * can produce one additional type of error, the bad_connection error, that
-     * indicates that the conversion from connection_hdl to connection_ptr
-     * failed due to the connection not existing anymore. Each method has a
-     * default and an exception free varient.
-     */
-
-    void interrupt(connection_hdl hdl, lib::error_code & ec);
-    void interrupt(connection_hdl hdl);
-
-    /// Pause reading of new data (exception free)
-    /**
-     * Signals to the connection to halt reading of new data. While reading is 
-     * paused, the connection will stop reading from its associated socket. In
-     * turn this will result in TCP based flow control kicking in and slowing
-     * data flow from the remote endpoint.
-     *
-     * This is useful for applications that push new requests to a queue to be 
-     * processed by another thread and need a way to signal when their request
-     * queue is full without blocking the network processing thread.
-     *
-     * Use `resume_reading()` to resume.
-     *
-     * If supported by the transport this is done asynchronously. As such
-     * reading may not stop until the current read operation completes. 
-     * Typically you can expect to receive no more bytes after initiating a read
-     * pause than the size of the read buffer.
-     *
-     * If reading is paused for this connection already nothing is changed.
-     */
-    void pause_reading(connection_hdl hdl, lib::error_code & ec);
-    
-    /// Pause reading of new data
-    void pause_reading(connection_hdl hdl);
-
-    /// Resume reading of new data (exception free)
-    /**
-     * Signals to the connection to resume reading of new data after it was 
-     * paused by `pause_reading()`.
-     *
-     * If reading is not paused for this connection already nothing is changed.
-     */
-    void resume_reading(connection_hdl hdl, lib::error_code & ec);
-
-    /// Resume reading of new data
-    void resume_reading(connection_hdl hdl);
-
-    /// Send deferred HTTP Response
-    /**
-     * Sends an http response to an HTTP connection that was deferred. This will
-     * send a complete response including all headers, status line, and body
-     * text. The connection will be closed afterwards.
-     *
-     * Exception free variant
-     *
-     * @since 0.6.0
-     *
-     * @param hdl The connection to send the response on
-     * @param ec A status code, zero on success, non-zero otherwise
-     */
-    void send_http_response(connection_hdl hdl, lib::error_code & ec);
-        
-    /// Send deferred HTTP Response (exception free)
-    /**
-     * Sends an http response to an HTTP connection that was deferred. This will
-     * send a complete response including all headers, status line, and body
-     * text. The connection will be closed afterwards.
-     *
-     * Exception variant
-     *
-     * @since 0.6.0
-     *
-     * @param hdl The connection to send the response on
-     */
-    void send_http_response(connection_hdl hdl);
-
-    /// Create a message and add it to the outgoing send queue (exception free)
-    /**
-     * Convenience method to send a message given a payload string and an opcode
-     *
-     * @param [in] hdl The handle identifying the connection to send via.
-     * @param [in] payload The payload string to generated the message with
-     * @param [in] op The opcode to generated the message with.
-     * @param [out] ec A code to fill in for errors
-     */
-    void send(connection_hdl hdl, std::string const & payload,
-        frame::opcode::value op, lib::error_code & ec);
-    /// Create a message and add it to the outgoing send queue
-    /**
-     * Convenience method to send a message given a payload string and an opcode
-     *
-     * @param [in] hdl The handle identifying the connection to send via.
-     * @param [in] payload The payload string to generated the message with
-     * @param [in] op The opcode to generated the message with.
-     * @param [out] ec A code to fill in for errors
-     */
-    void send(connection_hdl hdl, std::string const & payload,
-        frame::opcode::value op);
-
-    void send(connection_hdl hdl, void const * payload, size_t len,
-        frame::opcode::value op, lib::error_code & ec);
-    void send(connection_hdl hdl, void const * payload, size_t len,
-        frame::opcode::value op);
-
-    void send(connection_hdl hdl, message_ptr msg, lib::error_code & ec);
-    void send(connection_hdl hdl, message_ptr msg);
-
-    void close(connection_hdl hdl, close::status::value const code,
-        std::string const & reason, lib::error_code & ec);
-    void close(connection_hdl hdl, close::status::value const code,
-        std::string const & reason);
-
-    /// Send a ping to a specific connection
-    /**
-     * @since 0.3.0-alpha3
-     *
-     * @param [in] hdl The connection_hdl of the connection to send to.
-     * @param [in] payload The payload string to send.
-     * @param [out] ec A reference to an error code to fill in
-     */
-    void ping(connection_hdl hdl, std::string const & payload,
-        lib::error_code & ec);
-    /// Send a ping to a specific connection
-    /**
-     * Exception variant of `ping`
-     *
-     * @since 0.3.0-alpha3
-     *
-     * @param [in] hdl The connection_hdl of the connection to send to.
-     * @param [in] payload The payload string to send.
-     */
-    void ping(connection_hdl hdl, std::string const & payload);
-
-    /// Send a pong to a specific connection
-    /**
-     * @since 0.3.0-alpha3
-     *
-     * @param [in] hdl The connection_hdl of the connection to send to.
-     * @param [in] payload The payload string to send.
-     * @param [out] ec A reference to an error code to fill in
-     */
-    void pong(connection_hdl hdl, std::string const & payload,
-        lib::error_code & ec);
-    /// Send a pong to a specific connection
-    /**
-     * Exception variant of `pong`
-     *
-     * @since 0.3.0-alpha3
-     *
-     * @param [in] hdl The connection_hdl of the connection to send to.
-     * @param [in] payload The payload string to send.
-     */
-    void pong(connection_hdl hdl, std::string const & payload);
-
-    /// Retrieves a connection_ptr from a connection_hdl (exception free)
-    /**
-     * Converting a weak pointer to shared_ptr is not thread safe because the
-     * pointer could be deleted at any time.
-     *
-     * NOTE: This method may be called by handler to upgrade its handle to a
-     * full connection_ptr. That full connection may then be used safely for the
-     * remainder of the handler body. get_con_from_hdl and the resulting
-     * connection_ptr are NOT safe to use outside the handler loop.
-     *
-     * @param hdl The connection handle to translate
-     *
-     * @return the connection_ptr. May be NULL if the handle was invalid.
-     */
-    connection_ptr get_con_from_hdl(connection_hdl hdl, lib::error_code & ec) {
-        connection_ptr con = lib::static_pointer_cast<connection_type>(
-            hdl.lock());
-        if (!con) {
-            ec = error::make_error_code(error::bad_connection);
-        }
-        return con;
-    }
-
-    /// Retrieves a connection_ptr from a connection_hdl (exception version)
-    connection_ptr get_con_from_hdl(connection_hdl hdl) {
-        lib::error_code ec;
-        connection_ptr con = this->get_con_from_hdl(hdl,ec);
-        if (ec) {
-            throw exception(ec);
-        }
-        return con;
-    }
-protected:
-    connection_ptr create_connection();
-
-    lib::shared_ptr<alog_type> m_alog;
-    lib::shared_ptr<elog_type> m_elog;
-private:
-    // dynamic settings
-    std::string                 m_user_agent;
-
-    open_handler                m_open_handler;
-    close_handler               m_close_handler;
-    fail_handler                m_fail_handler;
-    ping_handler                m_ping_handler;
-    pong_handler                m_pong_handler;
-    pong_timeout_handler        m_pong_timeout_handler;
-    interrupt_handler           m_interrupt_handler;
-    http_handler                m_http_handler;
-    validate_handler            m_validate_handler;
-    message_handler             m_message_handler;
-
-    long                        m_open_handshake_timeout_dur;
-    long                        m_close_handshake_timeout_dur;
-    long                        m_pong_timeout_dur;
-    size_t                      m_max_message_size;
-    size_t                      m_max_http_body_size;
-
-    rng_type m_rng;
-
-    // static settings
-    bool const                  m_is_server;
-
-    // endpoint state
-    mutable mutex_type          m_mutex;
-};
-
-} // namespace websocketpp
-
-#include <websocketpp/impl/endpoint_impl.hpp>
-
-#endif // WEBSOCKETPP_ENDPOINT_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/endpoint_base.hpp b/src/sioclient/lib/websocketpp/websocketpp/endpoint_base.hpp
deleted file mode 100644
index 1ad1a44d..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/endpoint_base.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_ENDPOINT_BASE_HPP
-#define WEBSOCKETPP_ENDPOINT_BASE_HPP
-
-namespace websocketpp {
-
-/// Stub for user supplied base class.
-class endpoint_base {};
-
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_ENDPOINT_BASE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/error.hpp b/src/sioclient/lib/websocketpp/websocketpp/error.hpp
deleted file mode 100644
index 562fb6ed..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/error.hpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_ERROR_HPP
-#define WEBSOCKETPP_ERROR_HPP
-
-#include <exception>
-#include <string>
-#include <utility>
-
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/system_error.hpp>
-
-namespace websocketpp {
-
-/// Combination error code / string type for returning two values
-typedef std::pair<lib::error_code,std::string> err_str_pair;
-
-/// Library level error codes
-namespace error {
-enum value {
-    /// Catch-all library error
-    general = 1,
-
-    /// send attempted when endpoint write queue was full
-    send_queue_full,
-
-    /// Attempted an operation using a payload that was improperly formatted
-    /// ex: invalid UTF8 encoding on a text message.
-    payload_violation,
-
-    /// Attempted to open a secure connection with an insecure endpoint
-    endpoint_not_secure,
-
-    /// Attempted an operation that required an endpoint that is no longer
-    /// available. This is usually because the endpoint went out of scope
-    /// before a connection that it created.
-    endpoint_unavailable,
-
-    /// An invalid uri was supplied
-    invalid_uri,
-
-    /// The endpoint is out of outgoing message buffers
-    no_outgoing_buffers,
-
-    /// The endpoint is out of incoming message buffers
-    no_incoming_buffers,
-
-    /// The connection was in the wrong state for this operation
-    invalid_state,
-
-    /// Unable to parse close code
-    bad_close_code,
-
-    /// Close code is in a reserved range
-    reserved_close_code,
-
-    /// Close code is invalid
-    invalid_close_code,
-
-    /// Invalid UTF-8
-    invalid_utf8,
-
-    /// Invalid subprotocol
-    invalid_subprotocol,
-
-    /// An operation was attempted on a connection that did not exist or was
-    /// already deleted.
-    bad_connection,
-
-    /// Unit testing utility error code
-    test,
-
-    /// Connection creation attempted failed
-    con_creation_failed,
-
-    /// Selected subprotocol was not requested by the client
-    unrequested_subprotocol,
-
-    /// Attempted to use a client specific feature on a server endpoint
-    client_only,
-
-    /// Attempted to use a server specific feature on a client endpoint
-    server_only,
-
-    /// HTTP connection ended
-    http_connection_ended,
-
-    /// WebSocket opening handshake timed out
-    open_handshake_timeout,
-
-    /// WebSocket close handshake timed out
-    close_handshake_timeout,
-
-    /// Invalid port in URI
-    invalid_port,
-
-    /// An async accept operation failed because the underlying transport has been
-    /// requested to not listen for new connections anymore.
-    async_accept_not_listening,
-
-    /// The requested operation was canceled
-    operation_canceled,
-
-    /// Connection rejected
-    rejected,
-
-    /// Upgrade Required. This happens if an HTTP request is made to a
-    /// WebSocket++ server that doesn't implement an http handler
-    upgrade_required,
-
-    /// Invalid WebSocket protocol version
-    invalid_version,
-
-    /// Unsupported WebSocket protocol version
-    unsupported_version,
-
-    /// HTTP parse error
-    http_parse_error,
-    
-    /// Extension negotiation failed
-    extension_neg_failed
-}; // enum value
-
-
-class category : public lib::error_category {
-public:
-    category() {}
-
-    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
-        return "websocketpp";
-    }
-
-    std::string message(int value) const {
-        switch(value) {
-            case error::general:
-                return "Generic error";
-            case error::send_queue_full:
-                return "send queue full";
-            case error::payload_violation:
-                return "payload violation";
-            case error::endpoint_not_secure:
-                return "endpoint not secure";
-            case error::endpoint_unavailable:
-                return "endpoint not available";
-            case error::invalid_uri:
-                return "invalid uri";
-            case error::no_outgoing_buffers:
-                return "no outgoing message buffers";
-            case error::no_incoming_buffers:
-                return "no incoming message buffers";
-            case error::invalid_state:
-                return "invalid state";
-            case error::bad_close_code:
-                return "Unable to extract close code";
-            case error::invalid_close_code:
-                return "Extracted close code is in an invalid range";
-            case error::reserved_close_code:
-                return "Extracted close code is in a reserved range";
-            case error::invalid_utf8:
-                return "Invalid UTF-8";
-            case error::invalid_subprotocol:
-                return "Invalid subprotocol";
-            case error::bad_connection:
-                return "Bad Connection";
-            case error::test:
-                return "Test Error";
-            case error::con_creation_failed:
-                return "Connection creation attempt failed";
-            case error::unrequested_subprotocol:
-                return "Selected subprotocol was not requested by the client";
-            case error::client_only:
-                return "Feature not available on server endpoints";
-            case error::server_only:
-                return "Feature not available on client endpoints";
-            case error::http_connection_ended:
-                return "HTTP connection ended";
-            case error::open_handshake_timeout:
-                return "The opening handshake timed out";
-            case error::close_handshake_timeout:
-                return "The closing handshake timed out";
-            case error::invalid_port:
-                return "Invalid URI port";
-            case error::async_accept_not_listening:
-                return "Async Accept not listening";
-            case error::operation_canceled:
-                return "Operation canceled";
-            case error::rejected:
-                return "Connection rejected";
-            case error::upgrade_required:
-                return "Upgrade required";
-            case error::invalid_version:
-                return "Invalid version";
-            case error::unsupported_version:
-                return "Unsupported version";
-            case error::http_parse_error:
-                return "HTTP parse error";
-            case error::extension_neg_failed:
-                return "Extension negotiation failed";
-            default:
-                return "Unknown";
-        }
-    }
-};
-
-inline const lib::error_category& get_category() {
-    static category instance;
-    return instance;
-}
-
-inline lib::error_code make_error_code(error::value e) {
-    return lib::error_code(static_cast<int>(e), get_category());
-}
-
-} // namespace error
-} // namespace websocketpp
-
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
-template<> struct is_error_code_enum<websocketpp::error::value>
-{
-    static bool const value = true;
-};
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
-
-namespace websocketpp {
-
-class exception : public std::exception {
-public:
-    exception(std::string const & msg, lib::error_code ec = make_error_code(error::general))
-      : m_msg(msg.empty() ? ec.message() : msg), m_code(ec)
-    {}
-
-    explicit exception(lib::error_code ec)
-      : m_msg(ec.message()), m_code(ec)
-    {}
-
-    ~exception() throw() {}
-
-    virtual char const * what() const throw() {
-        return m_msg.c_str();
-    }
-
-    lib::error_code code() const throw() {
-        return m_code;
-    }
-
-    const std::string m_msg;
-    lib::error_code m_code;
-};
-
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_ERROR_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/extensions/extension.hpp b/src/sioclient/lib/websocketpp/websocketpp/extensions/extension.hpp
deleted file mode 100644
index f5fbd9f7..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/extensions/extension.hpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_EXTENSION_HPP
-#define WEBSOCKETPP_EXTENSION_HPP
-
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/system_error.hpp>
-
-#include <string>
-#include <vector>
-
-namespace websocketpp {
-
-/**
- * Some generic information about extensions
- *
- * Each extension object has an implemented flag. It can be retrieved by calling
- * is_implemented(). This compile time flag indicates whether or not the object
- * in question actually implements the extension or if it is a placeholder stub
- *
- * Each extension object also has an enabled flag. It can be retrieved by
- * calling is_enabled(). This runtime flag indicates whether or not the
- * extension has been negotiated for this connection.
- */
-namespace extensions {
-
-namespace error {
-enum value {
-    /// Catch all
-    general = 1,
-
-    /// Extension disabled
-    disabled
-};
-
-class category : public lib::error_category {
-public:
-    category() {}
-
-    const char *name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
-        return "websocketpp.extension";
-    }
-
-    std::string message(int value) const {
-        switch(value) {
-            case general:
-                return "Generic extension error";
-            case disabled:
-                return "Use of methods from disabled extension";
-            default:
-                return "Unknown permessage-compress error";
-        }
-    }
-};
-
-inline lib::error_category const & get_category() {
-    static category instance;
-    return instance;
-}
-
-inline lib::error_code make_error_code(error::value e) {
-    return lib::error_code(static_cast<int>(e), get_category());
-}
-
-} // namespace error
-} // namespace extensions
-} // namespace websocketpp
-
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
-template<> struct is_error_code_enum
-    <websocketpp::extensions::error::value>
-{
-    static const bool value = true;
-};
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
-
-#endif // WEBSOCKETPP_EXTENSION_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/extensions/permessage_deflate/disabled.hpp b/src/sioclient/lib/websocketpp/websocketpp/extensions/permessage_deflate/disabled.hpp
deleted file mode 100644
index 65730952..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/extensions/permessage_deflate/disabled.hpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_EXTENSION_PERMESSAGE_DEFLATE_DISABLED_HPP
-#define WEBSOCKETPP_EXTENSION_PERMESSAGE_DEFLATE_DISABLED_HPP
-
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/stdint.hpp>
-#include <websocketpp/common/system_error.hpp>
-
-#include <websocketpp/http/constants.hpp>
-#include <websocketpp/extensions/extension.hpp>
-
-#include <map>
-#include <string>
-#include <utility>
-
-namespace websocketpp {
-namespace extensions {
-namespace permessage_deflate {
-
-/// Stub class for use when disabling permessage_deflate extension
-/**
- * This class is a stub that implements the permessage_deflate interface
- * with minimal dependencies. It is used to disable permessage_deflate
- * functionality at compile time without loading any unnecessary code.
- */
-template <typename config>
-class disabled {
-    typedef std::pair<lib::error_code,std::string> err_str_pair;
-
-public:
-    /// Negotiate extension
-    /**
-     * The disabled extension always fails the negotiation with a disabled
-     * error.
-     *
-     * @param offer Attribute from client's offer
-     * @return Status code and value to return to remote endpoint
-     */
-    err_str_pair negotiate(http::attribute_list const &) {
-        return make_pair(make_error_code(error::disabled),std::string());
-    }
-
-    /// Initialize state
-    /**
-     * For the disabled extension state initialization is a no-op.
-     *
-     * @param is_server True to initialize as a server, false for a client.
-     * @return A code representing the error that occurred, if any
-     */
-    lib::error_code init(bool) {
-        return lib::error_code();
-    }
-
-    /// Returns true if the extension is capable of providing
-    /// permessage_deflate functionality
-    bool is_implemented() const {
-        return false;
-    }
-
-    /// Returns true if permessage_deflate functionality is active for this
-    /// connection
-    bool is_enabled() const {
-        return false;
-    }
-
-    /// Generate extension offer
-    /**
-     * Creates an offer string to include in the Sec-WebSocket-Extensions
-     * header of outgoing client requests.
-     *
-     * @return A WebSocket extension offer string for this extension
-     */
-    std::string generate_offer() const {
-        return "";
-    }
-
-    /// Compress bytes
-    /**
-     * @param [in] in String to compress
-     * @param [out] out String to append compressed bytes to
-     * @return Error or status code
-     */
-    lib::error_code compress(std::string const &, std::string &) {
-        return make_error_code(error::disabled);
-    }
-
-    /// Decompress bytes
-    /**
-     * @param buf Byte buffer to decompress
-     * @param len Length of buf
-     * @param out String to append decompressed bytes to
-     * @return Error or status code
-     */
-    lib::error_code decompress(uint8_t const *, size_t, std::string &) {
-        return make_error_code(error::disabled);
-    }
-};
-
-} // namespace permessage_deflate
-} // namespace extensions
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_EXTENSION_PERMESSAGE_DEFLATE_DISABLED_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/extensions/permessage_deflate/enabled.hpp b/src/sioclient/lib/websocketpp/websocketpp/extensions/permessage_deflate/enabled.hpp
deleted file mode 100644
index d05403a8..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/extensions/permessage_deflate/enabled.hpp
+++ /dev/null
@@ -1,817 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_PROCESSOR_EXTENSION_PERMESSAGEDEFLATE_HPP
-#define WEBSOCKETPP_PROCESSOR_EXTENSION_PERMESSAGEDEFLATE_HPP
-
-
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/memory.hpp>
-#include <websocketpp/common/platforms.hpp>
-#include <websocketpp/common/stdint.hpp>
-#include <websocketpp/common/system_error.hpp>
-#include <websocketpp/error.hpp>
-
-#include <websocketpp/extensions/extension.hpp>
-
-#include "zlib.h"
-
-#include <algorithm>
-#include <string>
-#include <vector>
-
-namespace websocketpp {
-namespace extensions {
-
-/// Implementation of RFC 7692, the permessage-deflate WebSocket extension
-/**
- * ### permessage-deflate interface
- *
- * **init**\n
- * `lib::error_code init(bool is_server)`\n
- * Performs initialization
- *
- * **is_implimented**\n
- * `bool is_implimented()`\n
- * Returns whether or not the object impliments the extension or not
- *
- * **is_enabled**\n
- * `bool is_enabled()`\n
- * Returns whether or not the extension was negotiated for the current
- * connection
- *
- * **generate_offer**\n
- * `std::string generate_offer() const`\n
- * Create an extension offer string based on local policy
- *
- * **validate_response**\n
- * `lib::error_code validate_response(http::attribute_list const & response)`\n
- * Negotiate the parameters of extension use
- *
- * **negotiate**\n
- * `err_str_pair negotiate(http::attribute_list const & attributes)`\n
- * Negotiate the parameters of extension use
- *
- * **compress**\n
- * `lib::error_code compress(std::string const & in, std::string & out)`\n
- * Compress the bytes in `in` and append them to `out`
- *
- * **decompress**\n
- * `lib::error_code decompress(uint8_t const * buf, size_t len, std::string &
- * out)`\n
- * Decompress `len` bytes from `buf` and append them to string `out`
- */
-namespace permessage_deflate {
-
-/// Permessage deflate error values
-namespace error {
-enum value {
-    /// Catch all
-    general = 1,
-
-    /// Invalid extension attributes
-    invalid_attributes,
-
-    /// Invalid extension attribute value
-    invalid_attribute_value,
-
-    /// Invalid megotiation mode
-    invalid_mode,
-
-    /// Unsupported extension attributes
-    unsupported_attributes,
-
-    /// Invalid value for max_window_bits
-    invalid_max_window_bits,
-
-    /// ZLib Error
-    zlib_error,
-
-    /// Uninitialized
-    uninitialized,
-};
-
-/// Permessage-deflate error category
-class category : public lib::error_category {
-public:
-    category() {}
-
-    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
-        return "websocketpp.extension.permessage-deflate";
-    }
-
-    std::string message(int value) const {
-        switch(value) {
-            case general:
-                return "Generic permessage-compress error";
-            case invalid_attributes:
-                return "Invalid extension attributes";
-            case invalid_attribute_value:
-                return "Invalid extension attribute value";
-            case invalid_mode:
-                return "Invalid permessage-deflate negotiation mode";
-            case unsupported_attributes:
-                return "Unsupported extension attributes";
-            case invalid_max_window_bits:
-                return "Invalid value for max_window_bits";
-            case zlib_error:
-                return "A zlib function returned an error";
-            case uninitialized:
-                return "Deflate extension must be initialized before use";
-            default:
-                return "Unknown permessage-compress error";
-        }
-    }
-};
-
-/// Get a reference to a static copy of the permessage-deflate error category
-inline lib::error_category const & get_category() {
-    static category instance;
-    return instance;
-}
-
-/// Create an error code in the permessage-deflate category
-inline lib::error_code make_error_code(error::value e) {
-    return lib::error_code(static_cast<int>(e), get_category());
-}
-
-} // namespace error
-} // namespace permessage_deflate
-} // namespace extensions
-} // namespace websocketpp
-
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
-template<> struct is_error_code_enum
-    <websocketpp::extensions::permessage_deflate::error::value>
-{
-    static bool const value = true;
-};
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
-namespace websocketpp {
-namespace extensions {
-namespace permessage_deflate {
-
-/// Default value for server_max_window_bits as defined by RFC 7692
-static uint8_t const default_server_max_window_bits = 15;
-/// Minimum value for server_max_window_bits as defined by RFC 7692
-/**
- * NOTE: A value of 8 is not actually supported by zlib, the deflate
- * library that WebSocket++ uses. To preserve backwards compatibility
- * with RFC 7692 and previous versions of the library a value of 8
- * is accepted by the library but will always be negotiated as 9.
- */
-static uint8_t const min_server_max_window_bits = 8;
-/// Maximum value for server_max_window_bits as defined by RFC 7692
-static uint8_t const max_server_max_window_bits = 15;
-
-/// Default value for client_max_window_bits as defined by RFC 7692
-static uint8_t const default_client_max_window_bits = 15;
-/// Minimum value for client_max_window_bits as defined by RFC 7692
-/**
- * NOTE: A value of 8 is not actually supported by zlib, the deflate
- * library that WebSocket++ uses. To preserve backwards compatibility
- * with RFC 7692 and previous versions of the library a value of 8
- * is accepted by the library but will always be negotiated as 9.
- */
-static uint8_t const min_client_max_window_bits = 8;
-/// Maximum value for client_max_window_bits as defined by RFC 7692
-static uint8_t const max_client_max_window_bits = 15;
-
-namespace mode {
-enum value {
-    /// Accept any value the remote endpoint offers
-    accept = 1,
-    /// Decline any value the remote endpoint offers. Insist on defaults.
-    decline,
-    /// Use the largest value common to both offers
-    largest,
-    /// Use the smallest value common to both offers
-    smallest
-};
-} // namespace mode
-
-template <typename config>
-class enabled {
-public:
-    enabled()
-      : m_enabled(false)
-      , m_server_no_context_takeover(false)
-      , m_client_no_context_takeover(false)
-      , m_server_max_window_bits(15)
-      , m_client_max_window_bits(15)
-      , m_server_max_window_bits_mode(mode::accept)
-      , m_client_max_window_bits_mode(mode::accept)
-      , m_initialized(false)
-      , m_compress_buffer_size(8192)
-    {
-        m_dstate.zalloc = Z_NULL;
-        m_dstate.zfree = Z_NULL;
-        m_dstate.opaque = Z_NULL;
-
-        m_istate.zalloc = Z_NULL;
-        m_istate.zfree = Z_NULL;
-        m_istate.opaque = Z_NULL;
-        m_istate.avail_in = 0;
-        m_istate.next_in = Z_NULL;
-    }
-
-    ~enabled() {
-        if (!m_initialized) {
-            return;
-        }
-
-        int ret = deflateEnd(&m_dstate);
-
-        if (ret != Z_OK) {
-            //std::cout << "error cleaning up zlib compression state"
-            //          << std::endl;
-        }
-
-        ret = inflateEnd(&m_istate);
-
-        if (ret != Z_OK) {
-            //std::cout << "error cleaning up zlib decompression state"
-            //          << std::endl;
-        }
-    }
-
-    /// Initialize zlib state
-    /**
-     * Note: this should be called *after* the negotiation methods. It will use
-     * information from the negotiation to determine how to initialize the zlib
-     * data structures.
-     *
-     * @todo memory level, strategy, etc are hardcoded
-     *
-     * @param is_server True to initialize as a server, false for a client.
-     * @return A code representing the error that occurred, if any
-     */
-    lib::error_code init(bool is_server) {
-        uint8_t deflate_bits;
-        uint8_t inflate_bits;
-
-        if (is_server) {
-            deflate_bits = m_server_max_window_bits;
-            inflate_bits = m_client_max_window_bits;
-        } else {
-            deflate_bits = m_client_max_window_bits;
-            inflate_bits = m_server_max_window_bits;
-        }
-
-        int ret = deflateInit2(
-            &m_dstate,
-            Z_DEFAULT_COMPRESSION,
-            Z_DEFLATED,
-            -1*deflate_bits,
-            4, // memory level 1-9
-            Z_DEFAULT_STRATEGY
-        );
-
-        if (ret != Z_OK) {
-            return make_error_code(error::zlib_error);
-        }
-
-        ret = inflateInit2(
-            &m_istate,
-            -1*inflate_bits
-        );
-
-        if (ret != Z_OK) {
-            return make_error_code(error::zlib_error);
-        }
-
-        m_compress_buffer.reset(new unsigned char[m_compress_buffer_size]);
-        m_decompress_buffer.reset(new unsigned char[m_compress_buffer_size]);
-        if ((m_server_no_context_takeover && is_server) ||
-            (m_client_no_context_takeover && !is_server))
-        {
-            m_flush = Z_FULL_FLUSH;
-        } else {
-            m_flush = Z_SYNC_FLUSH;
-        }
-        m_initialized = true;
-        return lib::error_code();
-    }
-
-    /// Test if this object implements the permessage-deflate specification
-    /**
-     * Because this object does implieent it, it will always return true.
-     *
-     * @return Whether or not this object implements permessage-deflate
-     */
-    bool is_implemented() const {
-        return true;
-    }
-
-    /// Test if the extension was negotiated for this connection
-    /**
-     * Retrieves whether or not this extension is in use based on the initial
-     * handshake extension negotiations.
-     *
-     * @return Whether or not the extension is in use
-     */
-    bool is_enabled() const {
-        return m_enabled;
-    }
-
-    /// Reset server's outgoing LZ77 sliding window for each new message
-    /**
-     * Enabling this setting will cause the server's compressor to reset the
-     * compression state (the LZ77 sliding window) for every message. This
-     * means that the compressor will not look back to patterns in previous
-     * messages to improve compression. This will reduce the compression
-     * efficiency for large messages somewhat and small messages drastically.
-     *
-     * This option may reduce server compressor memory usage and client
-     * decompressor memory usage.
-     * @todo Document to what extent memory usage will be reduced
-     *
-     * For clients, this option is dependent on server support. Enabling it
-     * via this method does not guarantee that it will be successfully
-     * negotiated, only that it will be requested.
-     *
-     * For servers, no client support is required. Enabling this option on a
-     * server will result in its use. The server will signal to clients that
-     * the option will be in use so they can optimize resource usage if they
-     * are able.
-     */
-    void enable_server_no_context_takeover() {
-        m_server_no_context_takeover = true;
-    }
-
-    /// Reset client's outgoing LZ77 sliding window for each new message
-    /**
-     * Enabling this setting will cause the client's compressor to reset the
-     * compression state (the LZ77 sliding window) for every message. This
-     * means that the compressor will not look back to patterns in previous
-     * messages to improve compression. This will reduce the compression
-     * efficiency for large messages somewhat and small messages drastically.
-     *
-     * This option may reduce client compressor memory usage and server
-     * decompressor memory usage.
-     * @todo Document to what extent memory usage will be reduced
-     *
-     * This option is supported by all compliant clients and servers. Enabling
-     * it via either endpoint should be sufficient to ensure it is used.
-     */
-    void enable_client_no_context_takeover() {
-        m_client_no_context_takeover = true;
-    }
-
-    /// Limit server LZ77 sliding window size
-    /**
-     * The bits setting is the base 2 logarithm of the maximum window size that
-     * the server must use to compress outgoing messages. The permitted range
-     * is 9 to 15 inclusive. 9 represents a 512 byte window and 15 a 32KiB
-     * window. The default setting is 15.
-     *
-     * Mode Options:
-     * - accept: Accept whatever the remote endpoint offers.
-     * - decline: Decline any offers to deviate from the defaults
-     * - largest: Accept largest window size acceptable to both endpoints
-     * - smallest: Accept smallest window size acceptiable to both endpoints
-     *
-     * This setting is dependent on server support. A client requesting this
-     * setting may be rejected by the server or have the exact value used
-     * adjusted by the server. A server may unilaterally set this value without
-     * client support.
-     *
-     * NOTE: The permessage-deflate spec specifies that a value of 8 is allowed.
-     * Prior to version 0.8.0 a value of 8 was also allowed by this library.
-     * zlib, the deflate compression library that WebSocket++ uses has always
-     * silently adjusted a value of 8 to 9. In recent versions of zlib (1.2.9 
-     * and greater) a value of 8 is now explicitly rejected. WebSocket++ 0.8.0
-     * continues to perform the 8->9 conversion for backwards compatibility
-     * purposes but this should be considered deprecated functionality.
-     *
-     * @param bits The size to request for the outgoing window size
-     * @param mode The mode to use for negotiating this parameter
-     * @return A status code
-     */
-    lib::error_code set_server_max_window_bits(uint8_t bits, mode::value mode) {
-        if (bits < min_server_max_window_bits || bits > max_server_max_window_bits) {
-            return error::make_error_code(error::invalid_max_window_bits);
-        }
-
-        // See note in doc comment above about what is happening here
-        if (bits == 8) {
-            bits = 9;
-        }
-
-        m_server_max_window_bits = bits;
-        m_server_max_window_bits_mode = mode;
-
-        return lib::error_code();
-    }
-
-    /// Limit client LZ77 sliding window size
-    /**
-     * The bits setting is the base 2 logarithm of the window size that the
-     * client must use to compress outgoing messages. The permitted range is 9
-     * to 15 inclusive. 9 represents a 512 byte window and 15 a 32KiB window.
-     * The default setting is 15.
-     *
-     * Mode Options:
-     * - accept: Accept whatever the remote endpoint offers.
-     * - decline: Decline any offers to deviate from the defaults
-     * - largest: Accept largest window size acceptable to both endpoints
-     * - smallest: Accept smallest window size acceptiable to both endpoints
-     *
-     * This setting is dependent on client support. A client may limit its own
-     * outgoing window size unilaterally. A server may only limit the client's
-     * window size if the remote client supports that feature.
-     *
-     * NOTE: The permessage-deflate spec specifies that a value of 8 is allowed.
-     * Prior to version 0.8.0 a value of 8 was also allowed by this library.
-     * zlib, the deflate compression library that WebSocket++ uses has always
-     * silently adjusted a value of 8 to 9. In recent versions of zlib (1.2.9 
-     * and greater) a value of 8 is now explicitly rejected. WebSocket++ 0.8.0
-     * continues to perform the 8->9 conversion for backwards compatibility
-     * purposes but this should be considered deprecated functionality.
-     *
-     * @param bits The size to request for the outgoing window size
-     * @param mode The mode to use for negotiating this parameter
-     * @return A status code
-     */
-    lib::error_code set_client_max_window_bits(uint8_t bits, mode::value mode) {
-        if (bits < min_client_max_window_bits || bits > max_client_max_window_bits) {
-            return error::make_error_code(error::invalid_max_window_bits);
-        }
-
-        // See note in doc comment above about what is happening here
-        if (bits == 8) {
-            bits = 9;
-        }
-
-        m_client_max_window_bits = bits;
-        m_client_max_window_bits_mode = mode;
-
-        return lib::error_code();
-    }
-
-    /// Generate extension offer
-    /**
-     * Creates an offer string to include in the Sec-WebSocket-Extensions
-     * header of outgoing client requests.
-     *
-     * @return A WebSocket extension offer string for this extension
-     */
-    std::string generate_offer() const {
-        // TODO: this should be dynamically generated based on user settings
-        return "permessage-deflate; client_no_context_takeover; client_max_window_bits";
-    }
-
-    /// Validate extension response
-    /**
-     * Confirm that the server has negotiated settings compatible with our
-     * original offer and apply those settings to the extension state.
-     *
-     * @param response The server response attribute list to validate
-     * @return Validation error or 0 on success
-     */
-    lib::error_code validate_offer(http::attribute_list const &) {
-        return lib::error_code();
-    }
-
-    /// Negotiate extension
-    /**
-     * Confirm that the client's extension negotiation offer has settings
-     * compatible with local policy. If so, generate a reply and apply those
-     * settings to the extension state.
-     *
-     * @param offer Attribute from client's offer
-     * @return Status code and value to return to remote endpoint
-     */
-    err_str_pair negotiate(http::attribute_list const & offer) {
-        err_str_pair ret;
-
-        http::attribute_list::const_iterator it;
-        for (it = offer.begin(); it != offer.end(); ++it) {
-            if (it->first == "server_no_context_takeover") {
-                negotiate_server_no_context_takeover(it->second,ret.first);
-            } else if (it->first == "client_no_context_takeover") {
-                negotiate_client_no_context_takeover(it->second,ret.first);
-            } else if (it->first == "server_max_window_bits") {
-                negotiate_server_max_window_bits(it->second,ret.first);
-            } else if (it->first == "client_max_window_bits") {
-                negotiate_client_max_window_bits(it->second,ret.first);
-            } else {
-                ret.first = make_error_code(error::invalid_attributes);
-            }
-
-            if (ret.first) {
-                break;
-            }
-        }
-
-        if (ret.first == lib::error_code()) {
-            m_enabled = true;
-            ret.second = generate_response();
-        }
-
-        return ret;
-    }
-
-    /// Compress bytes
-    /**
-     * @todo: avail_in/out is 32 bit, need to fix for cases of >32 bit frames
-     * on 64 bit machines.
-     *
-     * @param [in] in String to compress
-     * @param [out] out String to append compressed bytes to
-     * @return Error or status code
-     */
-    lib::error_code compress(std::string const & in, std::string & out) {
-        if (!m_initialized) {
-            return make_error_code(error::uninitialized);
-        }
-
-        size_t output;
-
-        if (in.empty()) {
-            uint8_t buf[6] = {0x02, 0x00, 0x00, 0x00, 0xff, 0xff};
-            out.append((char *)(buf),6);
-            return lib::error_code();
-        }
-
-        m_dstate.avail_in = in.size();
-        m_dstate.next_in = (unsigned char *)(const_cast<char *>(in.data()));
-
-        do {
-            // Output to local buffer
-            m_dstate.avail_out = m_compress_buffer_size;
-            m_dstate.next_out = m_compress_buffer.get();
-
-            deflate(&m_dstate, m_flush);
-
-            output = m_compress_buffer_size - m_dstate.avail_out;
-
-            out.append((char *)(m_compress_buffer.get()),output);
-        } while (m_dstate.avail_out == 0);
-
-        return lib::error_code();
-    }
-
-    /// Decompress bytes
-    /**
-     * @param buf Byte buffer to decompress
-     * @param len Length of buf
-     * @param out String to append decompressed bytes to
-     * @return Error or status code
-     */
-    lib::error_code decompress(uint8_t const * buf, size_t len, std::string &
-        out)
-    {
-        if (!m_initialized) {
-            return make_error_code(error::uninitialized);
-        }
-
-        int ret;
-
-        m_istate.avail_in = len;
-        m_istate.next_in = const_cast<unsigned char *>(buf);
-
-        do {
-            m_istate.avail_out = m_compress_buffer_size;
-            m_istate.next_out = m_decompress_buffer.get();
-
-            ret = inflate(&m_istate, Z_SYNC_FLUSH);
-
-            if (ret == Z_NEED_DICT || ret == Z_DATA_ERROR || ret == Z_MEM_ERROR) {
-                return make_error_code(error::zlib_error);
-            }
-
-            out.append(
-                reinterpret_cast<char *>(m_decompress_buffer.get()),
-                m_compress_buffer_size - m_istate.avail_out
-            );
-        } while (m_istate.avail_out == 0);
-
-        return lib::error_code();
-    }
-private:
-    /// Generate negotiation response
-    /**
-     * @return Generate extension negotiation reponse string to send to client
-     */
-    std::string generate_response() {
-        std::string ret = "permessage-deflate";
-
-        if (m_server_no_context_takeover) {
-            ret += "; server_no_context_takeover";
-        }
-
-        if (m_client_no_context_takeover) {
-            ret += "; client_no_context_takeover";
-        }
-
-        if (m_server_max_window_bits < default_server_max_window_bits) {
-            std::stringstream s;
-            s << int(m_server_max_window_bits);
-            ret += "; server_max_window_bits="+s.str();
-        }
-
-        if (m_client_max_window_bits < default_client_max_window_bits) {
-            std::stringstream s;
-            s << int(m_client_max_window_bits);
-            ret += "; client_max_window_bits="+s.str();
-        }
-
-        return ret;
-    }
-
-    /// Negotiate server_no_context_takeover attribute
-    /**
-     * @param [in] value The value of the attribute from the offer
-     * @param [out] ec A reference to the error code to return errors via
-     */
-    void negotiate_server_no_context_takeover(std::string const & value,
-        lib::error_code & ec)
-    {
-        if (!value.empty()) {
-            ec = make_error_code(error::invalid_attribute_value);
-            return;
-        }
-
-        m_server_no_context_takeover = true;
-    }
-
-    /// Negotiate client_no_context_takeover attribute
-    /**
-     * @param [in] value The value of the attribute from the offer
-     * @param [out] ec A reference to the error code to return errors via
-     */
-    void negotiate_client_no_context_takeover(std::string const & value,
-        lib::error_code & ec)
-    {
-        if (!value.empty()) {
-            ec = make_error_code(error::invalid_attribute_value);
-            return;
-        }
-
-        m_client_no_context_takeover = true;
-    }
-
-    /// Negotiate server_max_window_bits attribute
-    /**
-     * When this method starts, m_server_max_window_bits will contain the server's
-     * preferred value and m_server_max_window_bits_mode will contain the mode the
-     * server wants to use to for negotiation. `value` contains the value the
-     * client requested that we use.
-     *
-     * options:
-     * - decline (ignore value, offer our default instead)
-     * - accept (use the value requested by the client)
-     * - largest (use largest value acceptable to both)
-     * - smallest (use smallest possible value)
-     *
-     * NOTE: As a value of 8 is no longer explicitly supported by zlib but might
-     * be requested for negotiation by an older client/server, if the result of
-     * the negotiation would be to send a value of 8, a value of 9 is offered
-     * instead. This ensures that WebSocket++ will only ever negotiate connections
-     * with compression settings explicitly supported by zlib.
-     *
-     * @param [in] value The value of the attribute from the offer
-     * @param [out] ec A reference to the error code to return errors via
-     */
-    void negotiate_server_max_window_bits(std::string const & value,
-        lib::error_code & ec)
-    {
-        uint8_t bits = uint8_t(atoi(value.c_str()));
-
-        if (bits < min_server_max_window_bits || bits > max_server_max_window_bits) {
-            ec = make_error_code(error::invalid_attribute_value);
-            m_server_max_window_bits = default_server_max_window_bits;
-            return;
-        }
-
-        switch (m_server_max_window_bits_mode) {
-            case mode::decline:
-                m_server_max_window_bits = default_server_max_window_bits;
-                break;
-            case mode::accept:
-                m_server_max_window_bits = bits;
-                break;
-            case mode::largest:
-                m_server_max_window_bits = std::min(bits,m_server_max_window_bits);
-                break;
-            case mode::smallest:
-                m_server_max_window_bits = min_server_max_window_bits;
-                break;
-            default:
-                ec = make_error_code(error::invalid_mode);
-                m_server_max_window_bits = default_server_max_window_bits;
-        }
-
-        // See note in doc comment
-        if (m_server_max_window_bits == 8) {
-            m_server_max_window_bits = 9;
-        }
-    }
-
-    /// Negotiate client_max_window_bits attribute
-    /**
-     * When this method starts, m_client_max_window_bits and m_c2s_max_window_mode
-     * will contain the server's preferred values for window size and
-     * negotiation mode.
-     *
-     * options:
-     * - decline (ignore value, offer our default instead)
-     * - accept (use the value requested by the client)
-     * - largest (use largest value acceptable to both)
-     * - smallest (use smallest possible value)
-     *
-     * NOTE: As a value of 8 is no longer explicitly supported by zlib but might
-     * be requested for negotiation by an older client/server, if the result of
-     * the negotiation would be to send a value of 8, a value of 9 is offered
-     * instead. This ensures that WebSocket++ will only ever negotiate connections
-     * with compression settings explicitly supported by zlib.
-     *
-     * @param [in] value The value of the attribute from the offer
-     * @param [out] ec A reference to the error code to return errors via
-     */
-    void negotiate_client_max_window_bits(std::string const & value,
-            lib::error_code & ec)
-    {
-        uint8_t bits = uint8_t(atoi(value.c_str()));
-
-        if (value.empty()) {
-            bits = default_client_max_window_bits;
-        } else if (bits < min_client_max_window_bits ||
-                   bits > max_client_max_window_bits)
-        {
-            ec = make_error_code(error::invalid_attribute_value);
-            m_client_max_window_bits = default_client_max_window_bits;
-            return;
-        }
-
-        switch (m_client_max_window_bits_mode) {
-            case mode::decline:
-                m_client_max_window_bits = default_client_max_window_bits;
-                break;
-            case mode::accept:
-                m_client_max_window_bits = bits;
-                break;
-            case mode::largest:
-                m_client_max_window_bits = std::min(bits,m_client_max_window_bits);
-                break;
-            case mode::smallest:
-                m_client_max_window_bits = min_client_max_window_bits;
-                break;
-            default:
-                ec = make_error_code(error::invalid_mode);
-                m_client_max_window_bits = default_client_max_window_bits;
-        }
-
-        // See note in doc comment
-        if (m_client_max_window_bits == 8) {
-            m_client_max_window_bits = 9;
-        }
-    }
-
-    bool m_enabled;
-    bool m_server_no_context_takeover;
-    bool m_client_no_context_takeover;
-    uint8_t m_server_max_window_bits;
-    uint8_t m_client_max_window_bits;
-    mode::value m_server_max_window_bits_mode;
-    mode::value m_client_max_window_bits_mode;
-
-    bool m_initialized;
-    int m_flush;
-    size_t m_compress_buffer_size;
-    lib::unique_ptr_uchar_array m_compress_buffer;
-    lib::unique_ptr_uchar_array m_decompress_buffer;
-    z_stream m_dstate;
-    z_stream m_istate;
-};
-
-} // namespace permessage_deflate
-} // namespace extensions
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_PROCESSOR_EXTENSION_PERMESSAGEDEFLATE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/frame.hpp b/src/sioclient/lib/websocketpp/websocketpp/frame.hpp
deleted file mode 100644
index 18a990b3..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/frame.hpp
+++ /dev/null
@@ -1,864 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_FRAME_HPP
-#define WEBSOCKETPP_FRAME_HPP
-
-#include <algorithm>
-#include <string>
-
-#include <websocketpp/common/system_error.hpp>
-#include <websocketpp/common/network.hpp>
-
-#include <websocketpp/utilities.hpp>
-
-namespace websocketpp {
-/// Data structures and utility functions for manipulating WebSocket frames
-/**
- * namespace frame provides a number of data structures and utility functions
- * for reading, writing, and manipulating binary encoded WebSocket frames.
- */
-namespace frame {
-
-/// Minimum length of a WebSocket frame header.
-static unsigned int const BASIC_HEADER_LENGTH = 2;
-/// Maximum length of a WebSocket header
-static unsigned int const MAX_HEADER_LENGTH = 14;
-/// Maximum length of the variable portion of the WebSocket header
-static unsigned int const MAX_EXTENDED_HEADER_LENGTH = 12;
-
-/// Two byte conversion union
-union uint16_converter {
-    uint16_t i;
-    uint8_t  c[2];
-};
-
-/// Four byte conversion union
-union uint32_converter {
-    uint32_t i;
-    uint8_t c[4];
-};
-
-/// Eight byte conversion union
-union uint64_converter {
-    uint64_t i;
-    uint8_t  c[8];
-};
-
-/// Constants and utility functions related to WebSocket opcodes
-/**
- * WebSocket Opcodes are 4 bits. See RFC6455 section 5.2.
- */
-namespace opcode {
-    enum value {
-        continuation = 0x0,
-        text = 0x1,
-        binary = 0x2,
-        rsv3 = 0x3,
-        rsv4 = 0x4,
-        rsv5 = 0x5,
-        rsv6 = 0x6,
-        rsv7 = 0x7,
-        close = 0x8,
-        ping = 0x9,
-        pong = 0xA,
-        control_rsvb = 0xB,
-        control_rsvc = 0xC,
-        control_rsvd = 0xD,
-        control_rsve = 0xE,
-        control_rsvf = 0xF,
-
-        CONTINUATION = 0x0,
-        TEXT = 0x1,
-        BINARY = 0x2,
-        RSV3 = 0x3,
-        RSV4 = 0x4,
-        RSV5 = 0x5,
-        RSV6 = 0x6,
-        RSV7 = 0x7,
-        CLOSE = 0x8,
-        PING = 0x9,
-        PONG = 0xA,
-        CONTROL_RSVB = 0xB,
-        CONTROL_RSVC = 0xC,
-        CONTROL_RSVD = 0xD,
-        CONTROL_RSVE = 0xE,
-        CONTROL_RSVF = 0xF
-    };
-
-    /// Check if an opcode is reserved
-    /**
-     * @param v The opcode to test.
-     * @return Whether or not the opcode is reserved.
-     */
-    inline bool reserved(value v) {
-        return (v >= rsv3 && v <= rsv7) ||
-               (v >= control_rsvb && v <= control_rsvf);
-    }
-
-    /// Check if an opcode is invalid
-    /**
-     * Invalid opcodes are negative or require greater than 4 bits to store.
-     *
-     * @param v The opcode to test.
-     * @return Whether or not the opcode is invalid.
-     */
-    inline bool invalid(value v) {
-        return (v > 0xF || v < 0);
-    }
-
-    /// Check if an opcode is for a control frame
-    /**
-     * @param v The opcode to test.
-     * @return Whether or not the opcode is a control opcode.
-     */
-    inline bool is_control(value v) {
-        return v >= 0x8;
-    }
-}
-
-/// Constants related to frame and payload limits
-namespace limits {
-    /// Minimum length of a WebSocket frame header.
-    static unsigned int const basic_header_length = 2;
-
-    /// Maximum length of a WebSocket header
-    static unsigned int const max_header_length = 14;
-
-    /// Maximum length of the variable portion of the WebSocket header
-    static unsigned int const max_extended_header_length = 12;
-
-    /// Maximum size of a basic WebSocket payload
-    static uint8_t const payload_size_basic = 125;
-
-    /// Maximum size of an extended WebSocket payload (basic payload = 126)
-    static uint16_t const payload_size_extended = 0xFFFF; // 2^16, 65535
-
-    /// Maximum size of a jumbo WebSocket payload (basic payload = 127)
-    static uint64_t const payload_size_jumbo = 0x7FFFFFFFFFFFFFFFLL;//2^63
-
-    /// Maximum size of close frame reason
-    /**
-     * This is payload_size_basic - 2 bytes (as first two bytes are used for
-     * the close code
-     */
-    static uint8_t const close_reason_size = 123;
-}
-
-
-// masks for fields in the basic header
-static uint8_t const BHB0_OPCODE = 0x0F;
-static uint8_t const BHB0_RSV3 = 0x10;
-static uint8_t const BHB0_RSV2 = 0x20;
-static uint8_t const BHB0_RSV1 = 0x40;
-static uint8_t const BHB0_FIN = 0x80;
-
-static uint8_t const BHB1_PAYLOAD = 0x7F;
-static uint8_t const BHB1_MASK = 0x80;
-
-static uint8_t const payload_size_code_16bit = 0x7E; // 126
-static uint8_t const payload_size_code_64bit = 0x7F; // 127
-
-typedef uint32_converter masking_key_type;
-
-/// The constant size component of a WebSocket frame header
-struct basic_header {
-    basic_header() : b0(0x00),b1(0x00) {}
-
-    basic_header(uint8_t p0, uint8_t p1) : b0(p0), b1(p1) {}
-
-    basic_header(opcode::value op, uint64_t size, bool fin, bool mask,
-        bool rsv1 = false, bool rsv2 = false, bool rsv3 = false) : b0(0x00),
-        b1(0x00)
-    {
-        if (fin) {
-            b0 |= BHB0_FIN;
-        }
-        if (rsv1) {
-            b0 |= BHB0_RSV1;
-        }
-        if (rsv2) {
-            b0 |= BHB0_RSV2;
-        }
-        if (rsv3) {
-            b0 |= BHB0_RSV3;
-        }
-        b0 |= (op & BHB0_OPCODE);
-
-        if (mask) {
-            b1 |= BHB1_MASK;
-        }
-
-        uint8_t basic_value;
-
-        if (size <= limits::payload_size_basic) {
-            basic_value = static_cast<uint8_t>(size);
-        } else if (size <= limits::payload_size_extended) {
-            basic_value = payload_size_code_16bit;
-        } else {
-            basic_value = payload_size_code_64bit;
-        }
-
-
-        b1 |= basic_value;
-    }
-
-    uint8_t b0;
-    uint8_t b1;
-};
-
-/// The variable size component of a WebSocket frame header
-struct extended_header {
-    extended_header() {
-        std::fill_n(this->bytes,MAX_EXTENDED_HEADER_LENGTH,0x00);
-    }
-
-    extended_header(uint64_t payload_size) {
-        std::fill_n(this->bytes,MAX_EXTENDED_HEADER_LENGTH,0x00);
-
-        copy_payload(payload_size);
-    }
-
-    extended_header(uint64_t payload_size, uint32_t masking_key) {
-        std::fill_n(this->bytes,MAX_EXTENDED_HEADER_LENGTH,0x00);
-
-        // Copy payload size
-        int offset = copy_payload(payload_size);
-
-        // Copy Masking Key
-        uint32_converter temp32;
-        temp32.i = masking_key;
-        std::copy(temp32.c,temp32.c+4,bytes+offset);
-    }
-
-    uint8_t bytes[MAX_EXTENDED_HEADER_LENGTH];
-private:
-    int copy_payload(uint64_t payload_size) {
-        int payload_offset = 0;
-
-        if (payload_size <= limits::payload_size_basic) {
-            payload_offset = 8;
-        } else if (payload_size <= limits::payload_size_extended) {
-            payload_offset = 6;
-        }
-
-        uint64_converter temp64;
-        temp64.i = lib::net::_htonll(payload_size);
-        std::copy(temp64.c+payload_offset,temp64.c+8,bytes);
-
-        return 8-payload_offset;
-    }
-};
-
-bool get_fin(basic_header const &h);
-void set_fin(basic_header &h, bool value);
-bool get_rsv1(basic_header const &h);
-void set_rsv1(basic_header &h, bool value);
-bool get_rsv2(basic_header const &h);
-void set_rsv2(basic_header &h, bool value);
-bool get_rsv3(basic_header const &h);
-void set_rsv3(basic_header &h, bool value);
-opcode::value get_opcode(basic_header const &h);
-bool get_masked(basic_header const &h);
-void set_masked(basic_header &h, bool value);
-uint8_t get_basic_size(basic_header const &);
-size_t get_header_len(basic_header const &);
-unsigned int get_masking_key_offset(basic_header const &);
-
-std::string write_header(basic_header const &, extended_header const &);
-masking_key_type get_masking_key(basic_header const &, extended_header const &);
-uint16_t get_extended_size(extended_header const &);
-uint64_t get_jumbo_size(extended_header const &);
-uint64_t get_payload_size(basic_header const &, extended_header const &);
-
-size_t prepare_masking_key(masking_key_type const & key);
-size_t circshift_prepared_key(size_t prepared_key, size_t offset);
-
-// Functions for performing xor based masking and unmasking
-template <typename input_iter, typename output_iter>
-void byte_mask(input_iter b, input_iter e, output_iter o, masking_key_type
-    const & key, size_t key_offset = 0);
-template <typename iter_type>
-void byte_mask(iter_type b, iter_type e, masking_key_type const & key,
-    size_t key_offset = 0);
-void word_mask_exact(uint8_t * input, uint8_t * output, size_t length,
-    masking_key_type const & key);
-void word_mask_exact(uint8_t * data, size_t length, masking_key_type const &
-    key);
-size_t word_mask_circ(uint8_t * input, uint8_t * output, size_t length,
-    size_t prepared_key);
-size_t word_mask_circ(uint8_t * data, size_t length, size_t prepared_key);
-
-/// Check whether the frame's FIN bit is set.
-/**
- * @param [in] h The basic header to extract from.
- * @return True if the header's fin bit is set.
- */
-inline bool get_fin(basic_header const & h) {
-    return ((h.b0 & BHB0_FIN) == BHB0_FIN);
-}
-
-/// Set the frame's FIN bit
-/**
- * @param [out] h Header to set.
- * @param [in] value Value to set it to.
- */
-inline void set_fin(basic_header & h, bool value) {
-    h.b0 = (value ? h.b0 | BHB0_FIN : h.b0 & ~BHB0_FIN);
-}
-
-/// check whether the frame's RSV1 bit is set
-/**
- * @param [in] h The basic header to extract from.
- * @return True if the header's RSV1 bit is set.
- */
-inline bool get_rsv1(const basic_header &h) {
-    return ((h.b0 & BHB0_RSV1) == BHB0_RSV1);
-}
-
-/// Set the frame's RSV1 bit
-/**
- * @param [out] h Header to set.
- * @param [in] value Value to set it to.
- */
-inline void set_rsv1(basic_header &h, bool value) {
-    h.b0 = (value ? h.b0 | BHB0_RSV1 : h.b0 & ~BHB0_RSV1);
-}
-
-/// check whether the frame's RSV2 bit is set
-/**
- * @param [in] h The basic header to extract from.
- * @return True if the header's RSV2 bit is set.
- */
-inline bool get_rsv2(const basic_header &h) {
-    return ((h.b0 & BHB0_RSV2) == BHB0_RSV2);
-}
-
-/// Set the frame's RSV2 bit
-/**
- * @param [out] h Header to set.
- * @param [in] value Value to set it to.
- */
-inline void set_rsv2(basic_header &h, bool value) {
-    h.b0 = (value ? h.b0 | BHB0_RSV2 : h.b0 & ~BHB0_RSV2);
-}
-
-/// check whether the frame's RSV3 bit is set
-/**
- * @param [in] h The basic header to extract from.
- * @return True if the header's RSV3 bit is set.
- */
-inline bool get_rsv3(const basic_header &h) {
-    return ((h.b0 & BHB0_RSV3) == BHB0_RSV3);
-}
-
-/// Set the frame's RSV3 bit
-/**
- * @param [out] h Header to set.
- * @param [in] value Value to set it to.
- */
-inline void set_rsv3(basic_header &h, bool value) {
-    h.b0 = (value ? h.b0 | BHB0_RSV3 : h.b0 & ~BHB0_RSV3);
-}
-
-/// Extract opcode from basic header
-/**
- * @param [in] h The basic header to extract from.
- * @return The opcode value of the header.
- */
-inline opcode::value get_opcode(const basic_header &h) {
-    return opcode::value(h.b0 & BHB0_OPCODE);
-}
-
-/// check whether the frame is masked
-/**
- * @param [in] h The basic header to extract from.
- * @return True if the header mask bit is set.
- */
-inline bool get_masked(basic_header const & h) {
-    return ((h.b1 & BHB1_MASK) == BHB1_MASK);
-}
-
-/// Set the frame's MASK bit
-/**
- * @param [out] h Header to set.
- * @param value Value to set it to.
- */
-inline void set_masked(basic_header & h, bool value) {
-    h.b1 = (value ? h.b1 | BHB1_MASK : h.b1 & ~BHB1_MASK);
-}
-
-/// Extracts the raw payload length specified in the basic header
-/**
- * A basic WebSocket frame header contains a 7 bit value that represents the
- * payload size. There are two reserved values that are used to indicate that
- * the actual payload size will not fit in 7 bits and that the full payload
- * size is included in a separate field. The values are as follows:
- *
- * PAYLOAD_SIZE_CODE_16BIT (0x7E) indicates that the actual payload is less
- * than 16 bit
- *
- * PAYLOAD_SIZE_CODE_64BIT (0x7F) indicates that the actual payload is less
- * than 63 bit
- *
- * @param [in] h Basic header to read value from.
- * @return The exact size encoded in h.
- */
-inline uint8_t get_basic_size(const basic_header &h) {
-    return h.b1 & BHB1_PAYLOAD;
-}
-
-/// Calculates the full length of the header based on the first bytes.
-/**
- * A WebSocket frame header always has at least two bytes. Encoded within the
- * first two bytes is all the information necessary to calculate the full
- * (variable) header length. get_header_len() calculates the full header
- * length for the given two byte basic header.
- *
- * @param h Basic frame header to extract size from.
- * @return Full length of the extended header.
- */
-inline size_t get_header_len(basic_header const & h) {
-    // TODO: check extensions?
-
-    // masking key offset represents the space used for the extended length
-    // fields
-    size_t size = BASIC_HEADER_LENGTH + get_masking_key_offset(h);
-
-    // If the header is masked there is a 4 byte masking key
-    if (get_masked(h)) {
-        size += 4;
-    }
-
-    return size;
-}
-
-/// Calculate the offset location of the masking key within the extended header
-/**
- * Calculate the offset location of the masking key within the extended header
- * using information from its corresponding basic header
- *
- * @param h Corresponding basic header to calculate from.
- *
- * @return byte offset of the first byte of the masking key
- */
-inline unsigned int get_masking_key_offset(const basic_header &h) {
-    if (get_basic_size(h) == payload_size_code_16bit) {
-        return 2;
-    } else if (get_basic_size(h) == payload_size_code_64bit) {
-        return 8;
-    } else {
-        return 0;
-    }
-}
-
-/// Generate a properly sized contiguous string that encodes a full frame header
-/**
- * Copy the basic header h and extended header e into a properly sized
- * contiguous frame header string for the purposes of writing out to the wire.
- *
- * @param h The basic header to include
- * @param e The extended header to include
- *
- * @return A contiguous string containing h and e
- */
-inline std::string prepare_header(const basic_header &h, const
-    extended_header &e)
-{
-    std::string ret;
-
-    ret.push_back(char(h.b0));
-    ret.push_back(char(h.b1));
-    ret.append(
-        reinterpret_cast<const char*>(e.bytes),
-        get_header_len(h)-BASIC_HEADER_LENGTH
-    );
-
-    return ret;
-}
-
-/// Extract the masking key from a frame header
-/**
- * Note that while read and written as an integer at times, this value is not
- * an integer and should never be interpreted as one. Big and little endian
- * machines will generate and store masking keys differently without issue as
- * long as the integer values remain irrelivant.
- *
- * @param h The basic header to extract from
- * @param e The extended header to extract from
- *
- * @return The masking key as an integer.
- */
-inline masking_key_type get_masking_key(const basic_header &h, const
-    extended_header &e)
-{
-    masking_key_type temp32;
-
-    if (!get_masked(h)) {
-        temp32.i = 0;
-    } else {
-        unsigned int offset = get_masking_key_offset(h);
-        std::copy(e.bytes+offset,e.bytes+offset+4,temp32.c);
-    }
-
-    return temp32;
-}
-
-/// Extract the extended size field from an extended header
-/**
- * It is the responsibility of the caller to verify that e is a valid extended
- * header. This function assumes that e contains an extended payload size.
- *
- * @param e The extended header to extract from
- *
- * @return The size encoded in the extended header in host byte order
- */
-inline uint16_t get_extended_size(const extended_header &e) {
-    uint16_converter temp16;
-    std::copy(e.bytes,e.bytes+2,temp16.c);
-    return ntohs(temp16.i);
-}
-
-/// Extract the jumbo size field from an extended header
-/**
- * It is the responsibility of the caller to verify that e is a valid extended
- * header. This function assumes that e contains a jumbo payload size.
- *
- * @param e The extended header to extract from
- *
- * @return The size encoded in the extended header in host byte order
- */
-inline uint64_t get_jumbo_size(const extended_header &e) {
-    uint64_converter temp64;
-    std::copy(e.bytes,e.bytes+8,temp64.c);
-    return lib::net::_ntohll(temp64.i);
-}
-
-/// Extract the full payload size field from a WebSocket header
-/**
- * It is the responsibility of the caller to verify that h and e together
- * represent a valid WebSocket frame header. This function assumes only that h
- * and e are valid. It uses information in the basic header to determine where
- * to look for the payload_size
- *
- * @param h The basic header to extract from
- * @param e The extended header to extract from
- *
- * @return The size encoded in the combined header in host byte order.
- */
-inline uint64_t get_payload_size(const basic_header &h, const
-    extended_header &e)
-{
-    uint8_t val = get_basic_size(h);
-
-    if (val <= limits::payload_size_basic) {
-        return val;
-    } else if (val == payload_size_code_16bit) {
-        return get_extended_size(e);
-    } else {
-        return get_jumbo_size(e);
-    }
-}
-
-/// Extract a masking key into a value the size of a machine word.
-/**
- * Machine word size must be 4 or 8.
- *
- * @param key Masking key to extract from
- *
- * @return prepared key as a machine word
- */
-inline size_t prepare_masking_key(const masking_key_type& key) {
-    size_t low_bits = static_cast<size_t>(key.i);
-
-    if (sizeof(size_t) == 8) {
-        uint64_t high_bits = static_cast<size_t>(key.i);
-        return static_cast<size_t>((high_bits << 32) | low_bits);
-    } else {
-        return low_bits;
-    }
-}
-
-/// circularly shifts the supplied prepared masking key by offset bytes
-/**
- * Prepared_key must be the output of prepare_masking_key with the associated
- * restrictions on the machine word size. offset must be greater than or equal
- * to zero and less than sizeof(size_t).
- */
-inline size_t circshift_prepared_key(size_t prepared_key, size_t offset) {
-    if (offset == 0) {
-        return prepared_key;
-    }
-    if (lib::net::is_little_endian()) {
-        size_t temp = prepared_key << (sizeof(size_t)-offset)*8;
-        return (prepared_key >> offset*8) | temp;
-    } else {
-        size_t temp = prepared_key >> (sizeof(size_t)-offset)*8;
-        return (prepared_key << offset*8) | temp;
-    }
-}
-
-/// Byte by byte mask/unmask
-/**
- * Iterator based byte by byte masking and unmasking for WebSocket payloads.
- * Performs masking in place using the supplied key offset by the supplied
- * offset number of bytes.
- *
- * This function is simple and can be done in place on input with arbitrary
- * lengths and does not vary based on machine word size. It is slow.
- *
- * @param b Beginning iterator to start masking
- *
- * @param e Ending iterator to end masking
- *
- * @param o Beginning iterator to store masked results
- *
- * @param key 32 bit key to mask with.
- *
- * @param key_offset offset value to start masking at.
- */
-template <typename input_iter, typename output_iter>
-void byte_mask(input_iter first, input_iter last, output_iter result,
-    masking_key_type const & key, size_t key_offset)
-{
-    size_t key_index = key_offset%4;
-    while (first != last) {
-        *result = *first ^ key.c[key_index++];
-        key_index %= 4;
-        ++result;
-        ++first;
-    }
-}
-
-/// Byte by byte mask/unmask (in place)
-/**
- * Iterator based byte by byte masking and unmasking for WebSocket payloads.
- * Performs masking in place using the supplied key offset by the supplied
- * offset number of bytes.
- *
- * This function is simple and can be done in place on input with arbitrary
- * lengths and does not vary based on machine word size. It is slow.
- *
- * @param b Beginning iterator to start masking
- *
- * @param e Ending iterator to end masking
- *
- * @param key 32 bit key to mask with.
- *
- * @param key_offset offset value to start masking at.
- */
-template <typename iter_type>
-void byte_mask(iter_type b, iter_type e, masking_key_type const & key,
-    size_t key_offset)
-{
-    byte_mask(b,e,b,key,key_offset);
-}
-
-/// Exact word aligned mask/unmask
-/**
- * Balanced combination of byte by byte and circular word by word masking.
- * Best used to mask complete messages at once. Has much higher setup costs than
- * word_mask_circ but works with exact sized buffers.
- *
- * Buffer based word by word masking and unmasking for WebSocket payloads.
- * Masking is done in word by word chunks with the remainder not divisible by
- * the word size done byte by byte.
- *
- * input and output must both be at least length bytes. Exactly length bytes
- * will be written.
- *
- * @param input buffer to mask or unmask
- *
- * @param output buffer to store the output. May be the same as input.
- *
- * @param length length of data buffer
- *
- * @param key Masking key to use
- */
-inline void word_mask_exact(uint8_t* input, uint8_t* output, size_t length,
-    const masking_key_type& key)
-{
-    size_t prepared_key = prepare_masking_key(key);
-    size_t n = length/sizeof(size_t);
-    size_t* input_word = reinterpret_cast<size_t*>(input);
-    size_t* output_word = reinterpret_cast<size_t*>(output);
-
-    for (size_t i = 0; i < n; i++) {
-        output_word[i] = input_word[i] ^ prepared_key;
-    }
-
-    for (size_t i = n*sizeof(size_t); i < length; i++) {
-        output[i] = input[i] ^ key.c[i%4];
-    }
-}
-
-/// Exact word aligned mask/unmask (in place)
-/**
- * In place version of word_mask_exact
- *
- * @see word_mask_exact
- *
- * @param data buffer to read and write from
- *
- * @param length length of data buffer
- *
- * @param key Masking key to use
- */
-inline void word_mask_exact(uint8_t* data, size_t length, const
-    masking_key_type& key)
-{
-    word_mask_exact(data,data,length,key);
-}
-
-/// Circular word aligned mask/unmask
-/**
- * Performs a circular mask/unmask in word sized chunks using pre-prepared keys
- * that store state between calls. Best for providing streaming masking or
- * unmasking of small chunks at a time of a larger message. Requires that the
- * underlying allocated size of the data buffer be a multiple of the word size.
- * Data in the buffer after `length` will be overwritten only with the same
- * values that were originally present.
- *
- * Buffer based word by word masking and unmasking for WebSocket payloads.
- * Performs masking in place using the supplied key. Casts the data buffer to
- * an array of size_t's and performs masking word by word. The underlying
- * buffer size must be a muliple of the word size.
- *
- * word_mask returns a copy of prepared_key circularly shifted based on the
- * length value. The returned value may be fed back into word_mask when more
- * data is available.
- *
- * input and output must both have length at least:
- *    ceil(length/sizeof(size_t))*sizeof(size_t)
- * Exactly that many bytes will be written, although only exactly length bytes
- * will be changed (trailing bytes will be replaced without masking)
- *
- * @param data Character buffer to mask
- *
- * @param length Length of data
- *
- * @param prepared_key Prepared key to use.
- *
- * @return the prepared_key shifted to account for the input length
- */
-inline size_t word_mask_circ(uint8_t * input, uint8_t * output, size_t length,
-    size_t prepared_key)
-{
-    size_t n = length / sizeof(size_t); // whole words
-    size_t l = length - (n * sizeof(size_t)); // remaining bytes
-    size_t * input_word = reinterpret_cast<size_t *>(input);
-    size_t * output_word = reinterpret_cast<size_t *>(output);
-
-    // mask word by word
-    for (size_t i = 0; i < n; i++) {
-        output_word[i] = input_word[i] ^ prepared_key;
-    }
-
-    // mask partial word at the end
-    size_t start = length - l;
-    uint8_t * byte_key = reinterpret_cast<uint8_t *>(&prepared_key);
-    for (size_t i = 0; i < l; ++i) {
-        output[start+i] = input[start+i] ^ byte_key[i];
-    }
-
-    return circshift_prepared_key(prepared_key,l);
-}
-
-/// Circular word aligned mask/unmask (in place)
-/**
- * In place version of word_mask_circ
- *
- * @see word_mask_circ
- *
- * @param data Character buffer to read from and write to
- *
- * @param length Length of data
- *
- * @param prepared_key Prepared key to use.
- *
- * @return the prepared_key shifted to account for the input length
- */
-inline size_t word_mask_circ(uint8_t* data, size_t length, size_t prepared_key){
-    return word_mask_circ(data,data,length,prepared_key);
-}
-
-/// Circular byte aligned mask/unmask
-/**
- * Performs a circular mask/unmask in byte sized chunks using pre-prepared keys
- * that store state between calls. Best for providing streaming masking or
- * unmasking of small chunks at a time of a larger message. Requires that the
- * underlying allocated size of the data buffer be a multiple of the word size.
- * Data in the buffer after `length` will be overwritten only with the same
- * values that were originally present.
- *
- * word_mask returns a copy of prepared_key circularly shifted based on the
- * length value. The returned value may be fed back into byte_mask when more
- * data is available.
- *
- * @param data Character buffer to mask
- *
- * @param length Length of data
- *
- * @param prepared_key Prepared key to use.
- *
- * @return the prepared_key shifted to account for the input length
- */
-inline size_t byte_mask_circ(uint8_t * input, uint8_t * output, size_t length,
-    size_t prepared_key)
-{
-    uint32_converter key;
-    key.i = prepared_key;
-
-    for (size_t i = 0; i < length; ++i) {
-        output[i] = input[i] ^ key.c[i % 4];
-    }
-
-    return circshift_prepared_key(prepared_key,length % 4);
-}
-
-/// Circular byte aligned mask/unmask (in place)
-/**
- * In place version of byte_mask_circ
- *
- * @see byte_mask_circ
- *
- * @param data Character buffer to read from and write to
- *
- * @param length Length of data
- *
- * @param prepared_key Prepared key to use.
- *
- * @return the prepared_key shifted to account for the input length
- */
-inline size_t byte_mask_circ(uint8_t* data, size_t length, size_t prepared_key){
-    return byte_mask_circ(data,data,length,prepared_key);
-}
-
-} // namespace frame
-} // namespace websocketpp
-
-#endif //WEBSOCKETPP_FRAME_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/http/constants.hpp b/src/sioclient/lib/websocketpp/websocketpp/http/constants.hpp
deleted file mode 100644
index f946cb31..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/http/constants.hpp
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef HTTP_CONSTANTS_HPP
-#define HTTP_CONSTANTS_HPP
-
-#include <exception>
-#include <map>
-#include <string>
-#include <vector>
-#include <utility>
-
-namespace websocketpp {
-/// HTTP handling support
-namespace http {
-    /// The type of an HTTP attribute list
-    /**
-     * The attribute list is an unordered key/value map. Encoded attribute
-     * values are delimited by semicolons.
-     */
-    typedef std::map<std::string,std::string> attribute_list;
-
-    /// The type of an HTTP parameter list
-    /**
-     * The parameter list is an ordered pairing of a parameter and its
-     * associated attribute list. Encoded parameter values are delimited by
-     * commas.
-     */
-    typedef std::vector< std::pair<std::string,attribute_list> > parameter_list;
-
-    /// Literal value of the HTTP header delimiter
-    static char const header_delimiter[] = "\r\n";
-
-    /// Literal value of the HTTP header separator
-    static char const header_separator[] = ":";
-
-    /// Literal value of an empty header
-    static std::string const empty_header;
-
-    /// Maximum size in bytes before rejecting an HTTP header as too big.
-    size_t const max_header_size = 16000;
-    
-    /// Default Maximum size in bytes for HTTP message bodies.
-    size_t const max_body_size = 32000000;
-
-    /// Number of bytes to use for temporary istream read buffers
-    size_t const istream_buffer = 512;
-
-    /// invalid HTTP token characters
-    /**
-     * 0x00 - 0x32, 0x7f-0xff
-     * ( ) < > @ , ; : \ " / [ ] ? = { }
-     */
-    static char const header_token[] = {
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 00..0f
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 10..1f
-        0,1,0,1,1,1,1,1,0,0,1,1,0,1,1,0, // 20..2f
-        1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0, // 30..3f
-        0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 40..4f
-        1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,1, // 50..5f
-        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 60..6f
-        1,1,1,1,1,1,1,1,1,1,1,0,1,0,1,0, // 70..7f
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 80..8f
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 90..9f
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // a0..af
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // b0..bf
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // c0..cf
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // d0..df
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // e0..ef
-        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // f0..ff
-    };
-
-    /// Is the character a token
-    inline bool is_token_char(unsigned char c) {
-        return (header_token[c] == 1);
-    }
-
-    /// Is the character a non-token
-    inline bool is_not_token_char(unsigned char c) {
-        return !header_token[c];
-    }
-
-    /// Is the character whitespace
-    /**
-     * whitespace is space (32) or horizontal tab (9)
-     */
-    inline bool is_whitespace_char(unsigned char c) {
-        return (c == 9 || c == 32);
-    }
-
-    /// Is the character non-whitespace
-    inline bool is_not_whitespace_char(unsigned char c) {
-        return (c != 9 && c != 32);
-    }
-
-    /// HTTP Status codes
-    namespace status_code {
-        enum value {
-            uninitialized = 0,
-
-            continue_code = 100,
-            switching_protocols = 101,
-
-            ok = 200,
-            created = 201,
-            accepted = 202,
-            non_authoritative_information = 203,
-            no_content = 204,
-            reset_content = 205,
-            partial_content = 206,
-
-            multiple_choices = 300,
-            moved_permanently = 301,
-            found = 302,
-            see_other = 303,
-            not_modified = 304,
-            use_proxy = 305,
-            temporary_redirect = 307,
-
-            bad_request = 400,
-            unauthorized = 401,
-            payment_required = 402,
-            forbidden = 403,
-            not_found = 404,
-            method_not_allowed = 405,
-            not_acceptable = 406,
-            proxy_authentication_required = 407,
-            request_timeout = 408,
-            conflict = 409,
-            gone = 410,
-            length_required = 411,
-            precondition_failed = 412,
-            request_entity_too_large = 413,
-            request_uri_too_long = 414,
-            unsupported_media_type = 415,
-            request_range_not_satisfiable = 416,
-            expectation_failed = 417,
-            im_a_teapot = 418,
-            upgrade_required = 426,
-            precondition_required = 428,
-            too_many_requests = 429,
-            request_header_fields_too_large = 431,
-
-            internal_server_error = 500,
-            not_implemented = 501,
-            bad_gateway = 502,
-            service_unavailable = 503,
-            gateway_timeout = 504,
-            http_version_not_supported = 505,
-            not_extended = 510,
-            network_authentication_required = 511
-        };
-
-        // TODO: should this be inline?
-        inline std::string get_string(value c) {
-            switch (c) {
-                case uninitialized:
-                    return "Uninitialized";
-                case continue_code:
-                    return "Continue";
-                case switching_protocols:
-                    return "Switching Protocols";
-                case ok:
-                    return "OK";
-                case created:
-                    return "Created";
-                case accepted:
-                    return "Accepted";
-                case non_authoritative_information:
-                    return "Non Authoritative Information";
-                case no_content:
-                    return "No Content";
-                case reset_content:
-                    return "Reset Content";
-                case partial_content:
-                    return "Partial Content";
-                case multiple_choices:
-                    return "Multiple Choices";
-                case moved_permanently:
-                    return "Moved Permanently";
-                case found:
-                    return "Found";
-                case see_other:
-                    return "See Other";
-                case not_modified:
-                    return "Not Modified";
-                case use_proxy:
-                    return "Use Proxy";
-                case temporary_redirect:
-                    return "Temporary Redirect";
-                case bad_request:
-                    return "Bad Request";
-                case unauthorized:
-                    return "Unauthorized";
-                case payment_required:
-                    return "Payment Required";
-                case forbidden:
-                    return "Forbidden";
-                case not_found:
-                    return "Not Found";
-                case method_not_allowed:
-                    return "Method Not Allowed";
-                case not_acceptable:
-                    return "Not Acceptable";
-                case proxy_authentication_required:
-                    return "Proxy Authentication Required";
-                case request_timeout:
-                    return "Request Timeout";
-                case conflict:
-                    return "Conflict";
-                case gone:
-                    return "Gone";
-                case length_required:
-                    return "Length Required";
-                case precondition_failed:
-                    return "Precondition Failed";
-                case request_entity_too_large:
-                    return "Request Entity Too Large";
-                case request_uri_too_long:
-                    return "Request-URI Too Long";
-                case unsupported_media_type:
-                    return "Unsupported Media Type";
-                case request_range_not_satisfiable:
-                    return "Requested Range Not Satisfiable";
-                case expectation_failed:
-                    return "Expectation Failed";
-                case im_a_teapot:
-                    return "I'm a teapot";
-                case upgrade_required:
-                    return "Upgrade Required";
-                case precondition_required:
-                    return "Precondition Required";
-                case too_many_requests:
-                    return "Too Many Requests";
-                case request_header_fields_too_large:
-                    return "Request Header Fields Too Large";
-                case internal_server_error:
-                    return "Internal Server Error";
-                case not_implemented:
-                    return "Not Implemented";
-                case bad_gateway:
-                    return "Bad Gateway";
-                case service_unavailable:
-                    return "Service Unavailable";
-                case gateway_timeout:
-                    return "Gateway Timeout";
-                case http_version_not_supported:
-                    return "HTTP Version Not Supported";
-                case not_extended:
-                    return "Not Extended";
-                case network_authentication_required:
-                    return "Network Authentication Required";
-                default:
-                    return "Unknown";
-            }
-        }
-    }
-
-    class exception : public std::exception {
-    public:
-        exception(const std::string& log_msg,
-                  status_code::value error_code,
-                  const std::string& error_msg = std::string(),
-                  const std::string& body = std::string())
-          : m_msg(log_msg)
-          , m_error_msg(error_msg)
-          , m_body(body)
-          , m_error_code(error_code) {}
-
-        ~exception() throw() {}
-
-        virtual const char* what() const throw() {
-            return m_msg.c_str();
-        }
-
-        std::string         m_msg;
-        std::string         m_error_msg;
-        std::string         m_body;
-        status_code::value  m_error_code;
-    };
-}
-}
-
-#endif // HTTP_CONSTANTS_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/http/impl/parser.hpp b/src/sioclient/lib/websocketpp/websocketpp/http/impl/parser.hpp
deleted file mode 100644
index fd24adb5..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/http/impl/parser.hpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef HTTP_PARSER_IMPL_HPP
-#define HTTP_PARSER_IMPL_HPP
-
-#include <algorithm>
-#include <cstdlib>
-#include <istream>
-#include <sstream>
-#include <string>
-
-namespace websocketpp {
-namespace http {
-namespace parser {
-
-inline void parser::set_version(std::string const & version) {
-    m_version = version;
-}
-
-inline std::string const & parser::get_header(std::string const & key) const {
-    header_list::const_iterator h = m_headers.find(key);
-
-    if (h == m_headers.end()) {
-        return empty_header;
-    } else {
-        return h->second;
-    }
-}
-
-inline bool parser::get_header_as_plist(std::string const & key,
-    parameter_list & out) const
-{
-    header_list::const_iterator it = m_headers.find(key);
-
-    if (it == m_headers.end() || it->second.size() == 0) {
-        return false;
-    }
-
-    return this->parse_parameter_list(it->second,out);
-}
-
-inline void parser::append_header(std::string const & key, std::string const &
-    val)
-{
-    if (std::find_if(key.begin(),key.end(),is_not_token_char) != key.end()) {
-        throw exception("Invalid header name",status_code::bad_request);
-    }
-
-    if (this->get_header(key).empty()) {
-        m_headers[key] = val;
-    } else {
-        m_headers[key] += ", " + val;
-    }
-}
-
-inline void parser::replace_header(std::string const & key, std::string const &
-    val)
-{
-    m_headers[key] = val;
-}
-
-inline void parser::remove_header(std::string const & key) {
-    m_headers.erase(key);
-}
-
-inline void parser::set_body(std::string const & value) {
-    if (value.size() == 0) {
-        remove_header("Content-Length");
-        m_body.clear();
-        return;
-    }
-
-    // TODO: should this method respect the max size? If so how should errors
-    // be indicated?
-
-    std::stringstream len;
-    len << value.size();
-    replace_header("Content-Length", len.str());
-    m_body = value;
-}
-
-inline bool parser::parse_parameter_list(std::string const & in,
-    parameter_list & out) const
-{
-    if (in.size() == 0) {
-        return false;
-    }
-
-    std::string::const_iterator it;
-    it = extract_parameters(in.begin(),in.end(),out);
-    return (it == in.begin());
-}
-
-inline bool parser::prepare_body() {
-    if (!get_header("Content-Length").empty()) {
-        std::string const & cl_header = get_header("Content-Length");
-        char * end;
-        
-        // TODO: not 100% sure what the compatibility of this method is. Also,
-        // I believe this will only work up to 32bit sizes. Is there a need for
-        // > 4GiB HTTP payloads?
-        m_body_bytes_needed = std::strtoul(cl_header.c_str(),&end,10);
-        
-        if (m_body_bytes_needed > m_body_bytes_max) {
-            throw exception("HTTP message body too large",
-                status_code::request_entity_too_large);
-        }
-        
-        m_body_encoding = body_encoding::plain;
-        return true;
-    } else if (get_header("Transfer-Encoding") == "chunked") {
-        // TODO
-        //m_body_encoding = body_encoding::chunked;
-        return false;
-    } else {
-        return false;
-    }
-}
-
-inline size_t parser::process_body(char const * buf, size_t len) {
-    if (m_body_encoding == body_encoding::plain) {
-        size_t processed = (std::min)(m_body_bytes_needed,len);
-        m_body.append(buf,processed);
-        m_body_bytes_needed -= processed;
-        return processed;
-    } else if (m_body_encoding == body_encoding::chunked) {
-        // TODO: 
-        throw exception("Unexpected body encoding",
-            status_code::internal_server_error);
-    } else {
-        throw exception("Unexpected body encoding",
-            status_code::internal_server_error);
-    }
-}
-
-inline void parser::process_header(std::string::iterator begin,
-    std::string::iterator end)
-{
-    std::string::iterator cursor = std::search(
-        begin,
-        end,
-        header_separator,
-        header_separator + sizeof(header_separator) - 1
-    );
-
-    if (cursor == end) {
-        throw exception("Invalid header line",status_code::bad_request);
-    }
-
-    append_header(strip_lws(std::string(begin,cursor)),
-                  strip_lws(std::string(cursor+sizeof(header_separator)-1,end)));
-}
-
-inline header_list const & parser::get_headers() const {
-    return m_headers;
-}
-
-inline std::string parser::raw_headers() const {
-    std::stringstream raw;
-
-    header_list::const_iterator it;
-    for (it = m_headers.begin(); it != m_headers.end(); it++) {
-        raw << it->first << ": " << it->second << "\r\n";
-    }
-
-    return raw.str();
-}
-
-
-
-} // namespace parser
-} // namespace http
-} // namespace websocketpp
-
-#endif // HTTP_PARSER_IMPL_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/http/impl/request.hpp b/src/sioclient/lib/websocketpp/websocketpp/http/impl/request.hpp
deleted file mode 100644
index 311a620f..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/http/impl/request.hpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef HTTP_PARSER_REQUEST_IMPL_HPP
-#define HTTP_PARSER_REQUEST_IMPL_HPP
-
-#include <algorithm>
-#include <sstream>
-#include <string>
-
-#include <websocketpp/http/parser.hpp>
-
-namespace websocketpp {
-namespace http {
-namespace parser {
-
-inline size_t request::consume(char const * buf, size_t len) {
-    size_t bytes_processed;
-    
-    if (m_ready) {return 0;}
-    
-    if (m_body_bytes_needed > 0) {
-        bytes_processed = process_body(buf,len);
-        if (body_ready()) {
-            m_ready = true;
-        }
-        return bytes_processed;
-    }
-
-    // copy new header bytes into buffer
-    m_buf->append(buf,len);
-
-    // Search for delimiter in buf. If found read until then. If not read all
-    std::string::iterator begin = m_buf->begin();
-    std::string::iterator end;
-
-    for (;;) {
-        // search for line delimiter
-        end = std::search(
-            begin,
-            m_buf->end(),
-            header_delimiter,
-            header_delimiter+sizeof(header_delimiter)-1
-        );
-        
-        m_header_bytes += (end-begin+sizeof(header_delimiter));
-        
-        if (m_header_bytes > max_header_size) {
-            // exceeded max header size
-            throw exception("Maximum header size exceeded.",
-                status_code::request_header_fields_too_large);
-        }
-
-        if (end == m_buf->end()) {
-            // we are out of bytes. Discard the processed bytes and copy the
-            // remaining unprecessed bytes to the beginning of the buffer
-            std::copy(begin,end,m_buf->begin());
-            m_buf->resize(static_cast<std::string::size_type>(end-begin));
-            m_header_bytes -= m_buf->size();
-
-            return len;
-        }
-
-        //the range [begin,end) now represents a line to be processed.
-        if (end-begin == 0) {
-            // we got a blank line
-            if (m_method.empty() || get_header("Host").empty()) {
-                throw exception("Incomplete Request",status_code::bad_request);
-            }
-
-            bytes_processed = (
-                len - static_cast<std::string::size_type>(m_buf->end()-end)
-                    + sizeof(header_delimiter) - 1
-            );
-
-            // frees memory used temporarily during request parsing
-            m_buf.reset();
-
-            // if this was not an upgrade request and has a content length
-            // continue capturing content-length bytes and expose them as a 
-            // request body.
-            
-            if (prepare_body()) {
-                bytes_processed += process_body(buf+bytes_processed,len-bytes_processed);
-                if (body_ready()) {
-                    m_ready = true;
-                }
-                return bytes_processed;
-            } else {
-                m_ready = true;
-
-                // return number of bytes processed (starting bytes - bytes left)
-                return bytes_processed;
-            }
-        } else {
-            if (m_method.empty()) {
-                this->process(begin,end);
-            } else {
-                this->process_header(begin,end);
-            }
-        }
-
-        begin = end+(sizeof(header_delimiter)-1);
-    }
-}
-
-inline std::string request::raw() const {
-    // TODO: validation. Make sure all required fields have been set?
-    std::stringstream ret;
-
-    ret << m_method << " " << m_uri << " " << get_version() << "\r\n";
-    ret << raw_headers() << "\r\n" << m_body;
-
-    return ret.str();
-}
-
-inline std::string request::raw_head() const {
-    // TODO: validation. Make sure all required fields have been set?
-    std::stringstream ret;
-
-    ret << m_method << " " << m_uri << " " << get_version() << "\r\n";
-    ret << raw_headers() << "\r\n";
-
-    return ret.str();
-}
-
-inline void request::set_method(std::string const & method) {
-    if (std::find_if(method.begin(),method.end(),is_not_token_char) != method.end()) {
-        throw exception("Invalid method token.",status_code::bad_request);
-    }
-
-    m_method = method;
-}
-
-inline void request::set_uri(std::string const & uri) {
-    // TODO: validation?
-    m_uri = uri;
-}
-
-inline void request::process(std::string::iterator begin, std::string::iterator
-    end)
-{
-    std::string::iterator cursor_start = begin;
-    std::string::iterator cursor_end = std::find(begin,end,' ');
-
-    if (cursor_end == end) {
-        throw exception("Invalid request line1",status_code::bad_request);
-    }
-
-    set_method(std::string(cursor_start,cursor_end));
-
-    cursor_start = cursor_end+1;
-    cursor_end = std::find(cursor_start,end,' ');
-
-    if (cursor_end == end) {
-        throw exception("Invalid request line2",status_code::bad_request);
-    }
-
-    set_uri(std::string(cursor_start,cursor_end));
-    set_version(std::string(cursor_end+1,end));
-}
-
-} // namespace parser
-} // namespace http
-} // namespace websocketpp
-
-#endif // HTTP_PARSER_REQUEST_IMPL_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/http/impl/response.hpp b/src/sioclient/lib/websocketpp/websocketpp/http/impl/response.hpp
deleted file mode 100644
index 4400cda5..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/http/impl/response.hpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef HTTP_PARSER_RESPONSE_IMPL_HPP
-#define HTTP_PARSER_RESPONSE_IMPL_HPP
-
-#include <algorithm>
-#include <istream>
-#include <sstream>
-#include <string>
-
-#include <websocketpp/http/parser.hpp>
-
-namespace websocketpp {
-namespace http {
-namespace parser {
-
-inline size_t response::consume(char const * buf, size_t len) {
-    if (m_state == DONE) {return 0;}
-
-    if (m_state == BODY) {
-        return this->process_body(buf,len);
-    }
-
-    // copy new header bytes into buffer
-    m_buf->append(buf,len);
-
-    // Search for delimiter in buf. If found read until then. If not read all
-    std::string::iterator begin = m_buf->begin();
-    std::string::iterator end = begin;
-
-
-    for (;;) {
-        // search for delimiter
-        end = std::search(
-            begin,
-            m_buf->end(),
-            header_delimiter,
-            header_delimiter + sizeof(header_delimiter) - 1
-        );
-
-        m_header_bytes += (end-begin+sizeof(header_delimiter));
-        
-        if (m_header_bytes > max_header_size) {
-            // exceeded max header size
-            throw exception("Maximum header size exceeded.",
-                status_code::request_header_fields_too_large);
-        }
-
-        if (end == m_buf->end()) {
-            // we are out of bytes. Discard the processed bytes and copy the
-            // remaining unprecessed bytes to the beginning of the buffer
-            std::copy(begin,end,m_buf->begin());
-            m_buf->resize(static_cast<std::string::size_type>(end-begin));
-
-            m_read += len;
-            m_header_bytes -= m_buf->size();
-
-            return len;
-        }
-
-        //the range [begin,end) now represents a line to be processed.
-
-        if (end-begin == 0) {
-            // we got a blank line
-            if (m_state == RESPONSE_LINE) {
-                throw exception("Incomplete Request",status_code::bad_request);
-            }
-
-            // TODO: grab content-length
-            std::string length = get_header("Content-Length");
-
-            if (length.empty()) {
-                // no content length found, read indefinitely
-                m_read = 0;
-            } else {
-                std::istringstream ss(length);
-
-                if ((ss >> m_read).fail()) {
-                    throw exception("Unable to parse Content-Length header",
-                                    status_code::bad_request);
-                }
-            }
-
-            m_state = BODY;
-
-            // calc header bytes processed (starting bytes - bytes left)
-            size_t read = (
-                len - static_cast<std::string::size_type>(m_buf->end() - end)
-                + sizeof(header_delimiter) - 1
-            );
-
-            // if there were bytes left process them as body bytes
-            if (read < len) {
-                read += this->process_body(buf+read,(len-read));
-            }
-
-            // frees memory used temporarily during header parsing
-            m_buf.reset();
-
-            return read;
-        } else {
-            if (m_state == RESPONSE_LINE) {
-                this->process(begin,end);
-                m_state = HEADERS;
-            } else {
-                this->process_header(begin,end);
-            }
-        }
-
-        begin = end+(sizeof(header_delimiter) - 1);
-    }
-}
-
-inline size_t response::consume(std::istream & s) {
-    char buf[istream_buffer];
-    size_t bytes_read;
-    size_t bytes_processed;
-    size_t total = 0;
-
-    while (s.good()) {
-        s.getline(buf,istream_buffer);
-        bytes_read = static_cast<size_t>(s.gcount());
-
-        if (s.fail() || s.eof()) {
-            bytes_processed = this->consume(buf,bytes_read);
-            total += bytes_processed;
-
-            if (bytes_processed != bytes_read) {
-                // problem
-                break;
-            }
-        } else if (s.bad()) {
-            // problem
-            break;
-        } else {
-            // the delimiting newline was found. Replace the trailing null with
-            // the newline that was discarded, since our raw consume function
-            // expects the newline to be be there.
-            buf[bytes_read-1] = '\n';
-            bytes_processed = this->consume(buf,bytes_read);
-            total += bytes_processed;
-
-            if (bytes_processed != bytes_read) {
-                // problem
-                break;
-            }
-        }
-    }
-
-    return total;
-}
-
-inline std::string response::raw() const {
-    // TODO: validation. Make sure all required fields have been set?
-
-    std::stringstream ret;
-
-    ret << get_version() << " " << m_status_code << " " << m_status_msg;
-    ret << "\r\n" << raw_headers() << "\r\n";
-
-    ret << m_body;
-
-    return ret.str();
-}
-
-inline void response::set_status(status_code::value code) {
-    // TODO: validation?
-    m_status_code = code;
-    m_status_msg = get_string(code);
-}
-
-inline void response::set_status(status_code::value code, std::string const &
-    msg)
-{
-    // TODO: validation?
-    m_status_code = code;
-    m_status_msg = msg;
-}
-
-inline void response::process(std::string::iterator begin,
-    std::string::iterator end)
-{
-    std::string::iterator cursor_start = begin;
-    std::string::iterator cursor_end = std::find(begin,end,' ');
-
-    if (cursor_end == end) {
-        throw exception("Invalid response line",status_code::bad_request);
-    }
-
-    set_version(std::string(cursor_start,cursor_end));
-
-    cursor_start = cursor_end+1;
-    cursor_end = std::find(cursor_start,end,' ');
-
-    if (cursor_end == end) {
-        throw exception("Invalid request line",status_code::bad_request);
-    }
-
-    int code;
-
-    std::istringstream ss(std::string(cursor_start,cursor_end));
-
-    if ((ss >> code).fail()) {
-        throw exception("Unable to parse response code",status_code::bad_request);
-    }
-
-    set_status(status_code::value(code),std::string(cursor_end+1,end));
-}
-
-inline size_t response::process_body(char const * buf, size_t len) {
-    // If no content length was set then we read forever and never set m_ready
-    if (m_read == 0) {
-        //m_body.append(buf,len);
-        //return len;
-        m_state = DONE;
-        return 0;
-    }
-
-    // Otherwise m_read is the number of bytes left.
-    size_t to_read;
-
-    if (len >= m_read) {
-        // if we have more bytes than we need read, read only the amount needed
-        // then set done state
-        to_read = m_read;
-        m_state = DONE;
-    } else {
-        // we need more bytes than are available, read them all
-        to_read = len;
-    }
-
-    m_body.append(buf,to_read);
-    m_read -= to_read;
-    return to_read;
-}
-
-} // namespace parser
-} // namespace http
-} // namespace websocketpp
-
-#endif // HTTP_PARSER_RESPONSE_IMPL_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/http/parser.hpp b/src/sioclient/lib/websocketpp/websocketpp/http/parser.hpp
deleted file mode 100644
index 9d309ec9..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/http/parser.hpp
+++ /dev/null
@@ -1,629 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef HTTP_PARSER_HPP
-#define HTTP_PARSER_HPP
-
-#include <algorithm>
-#include <map>
-#include <string>
-#include <utility>
-
-#include <websocketpp/utilities.hpp>
-#include <websocketpp/http/constants.hpp>
-
-namespace websocketpp {
-namespace http {
-namespace parser {
-
-namespace state {
-    enum value {
-        method,
-        resource,
-        version,
-        headers
-    };
-}
-
-namespace body_encoding {
-    enum value {
-        unknown,
-        plain,
-        chunked
-    };
-}
-
-typedef std::map<std::string, std::string, utility::ci_less > header_list;
-
-/// Read and return the next token in the stream
-/**
- * Read until a non-token character is found and then return the token and
- * iterator to the next character to read
- *
- * @param begin An iterator to the beginning of the sequence
- * @param end An iterator to the end of the sequence
- * @return A pair containing the token and an iterator to the next character in
- * the stream
- */
-template <typename InputIterator>
-std::pair<std::string,InputIterator> extract_token(InputIterator begin,
-    InputIterator end)
-{
-    InputIterator it = std::find_if(begin,end,&is_not_token_char);
-    return std::make_pair(std::string(begin,it),it);
-}
-
-/// Read and return the next quoted string in the stream
-/**
- * Read a double quoted string starting at `begin`. The quotes themselves are
- * stripped. The quoted value is returned along with an iterator to the next
- * character to read
- *
- * @param begin An iterator to the beginning of the sequence
- * @param end An iterator to the end of the sequence
- * @return A pair containing the string read and an iterator to the next
- * character in the stream
- */
-template <typename InputIterator>
-std::pair<std::string,InputIterator> extract_quoted_string(InputIterator begin,
-    InputIterator end)
-{
-    std::string s;
-
-    if (end == begin) {
-        return std::make_pair(s,begin);
-    }
-
-    if (*begin != '"') {
-        return std::make_pair(s,begin);
-    }
-
-    InputIterator cursor = begin+1;
-    InputIterator marker = cursor;
-
-    cursor = std::find(cursor,end,'"');
-
-    while (cursor != end) {
-        // either this is the end or a quoted string
-        if (*(cursor-1) == '\\') {
-            s.append(marker,cursor-1);
-            s.append(1,'"');
-            ++cursor;
-            marker = cursor;
-        } else {
-            s.append(marker,cursor);
-            ++cursor;
-            return std::make_pair(s,cursor);
-        }
-
-        cursor = std::find(cursor,end,'"');
-    }
-
-    return std::make_pair("",begin);
-}
-
-/// Read and discard one unit of linear whitespace
-/**
- * Read one unit of linear white space and return the iterator to the character
- * afterwards. If `begin` is returned, no whitespace was extracted.
- *
- * @param begin An iterator to the beginning of the sequence
- * @param end An iterator to the end of the sequence
- * @return An iterator to the character after the linear whitespace read
- */
-template <typename InputIterator>
-InputIterator extract_lws(InputIterator begin, InputIterator end) {
-    InputIterator it = begin;
-
-    // strip leading CRLF
-    if (end-begin > 2 && *begin == '\r' && *(begin+1) == '\n' &&
-        is_whitespace_char(static_cast<unsigned char>(*(begin+2))))
-    {
-        it+=3;
-    }
-
-    it = std::find_if(it,end,&is_not_whitespace_char);
-    return it;
-}
-
-/// Read and discard linear whitespace
-/**
- * Read linear white space until a non-lws character is read and return an
- * iterator to that character. If `begin` is returned, no whitespace was
- * extracted.
- *
- * @param begin An iterator to the beginning of the sequence
- * @param end An iterator to the end of the sequence
- * @return An iterator to the character after the linear whitespace read
- */
-template <typename InputIterator>
-InputIterator extract_all_lws(InputIterator begin, InputIterator end) {
-    InputIterator old_it;
-    InputIterator new_it = begin;
-
-    do {
-        // Pull value from previous iteration
-        old_it = new_it;
-
-        // look ahead another pass
-        new_it = extract_lws(old_it,end);
-    } while (new_it != end && old_it != new_it);
-
-    return new_it;
-}
-
-/// Extract HTTP attributes
-/**
- * An http attributes list is a semicolon delimited list of key value pairs in
- * the format: *( ";" attribute "=" value ) where attribute is a token and value
- * is a token or quoted string.
- *
- * Attributes extracted are appended to the supplied attributes list
- * `attributes`.
- *
- * @param [in] begin An iterator to the beginning of the sequence
- * @param [in] end An iterator to the end of the sequence
- * @param [out] attributes A reference to the attributes list to append
- * attribute/value pairs extracted to
- * @return An iterator to the character after the last atribute read
- */
-template <typename InputIterator>
-InputIterator extract_attributes(InputIterator begin, InputIterator end,
-    attribute_list & attributes)
-{
-    InputIterator cursor;
-    bool first = true;
-
-    if (begin == end) {
-        return begin;
-    }
-
-    cursor = begin;
-    std::pair<std::string,InputIterator> ret;
-
-    while (cursor != end) {
-        std::string name;
-
-        cursor = http::parser::extract_all_lws(cursor,end);
-        if (cursor == end) {
-            break;
-        }
-
-        if (first) {
-            // ignore this check for the very first pass
-            first = false;
-        } else {
-            if (*cursor == ';') {
-                // advance past the ';'
-                ++cursor;
-            } else {
-                // non-semicolon in this position indicates end end of the
-                // attribute list, break and return.
-                break;
-            }
-        }
-
-        cursor = http::parser::extract_all_lws(cursor,end);
-        ret = http::parser::extract_token(cursor,end);
-
-        if (ret.first.empty()) {
-            // error: expected a token
-            return begin;
-        } else {
-            name = ret.first;
-            cursor = ret.second;
-        }
-
-        cursor = http::parser::extract_all_lws(cursor,end);
-        if (cursor == end || *cursor != '=') {
-            // if there is an equals sign, read the attribute value. Otherwise
-            // record a blank value and continue
-            attributes[name].clear();
-            continue;
-        }
-
-        // advance past the '='
-        ++cursor;
-
-        cursor = http::parser::extract_all_lws(cursor,end);
-        if (cursor == end) {
-            // error: expected a token or quoted string
-            return begin;
-        }
-
-        ret = http::parser::extract_quoted_string(cursor,end);
-        if (ret.second != cursor) {
-            attributes[name] = ret.first;
-            cursor = ret.second;
-            continue;
-        }
-
-        ret = http::parser::extract_token(cursor,end);
-        if (ret.first.empty()) {
-            // error : expected token or quoted string
-            return begin;
-        } else {
-            attributes[name] = ret.first;
-            cursor = ret.second;
-        }
-    }
-
-    return cursor;
-}
-
-/// Extract HTTP parameters
-/**
- * An http parameters list is a comma delimited list of tokens followed by
- * optional semicolon delimited attributes lists.
- *
- * Parameters extracted are appended to the supplied parameters list
- * `parameters`.
- *
- * @param [in] begin An iterator to the beginning of the sequence
- * @param [in] end An iterator to the end of the sequence
- * @param [out] parameters A reference to the parameters list to append
- * paramter values extracted to
- * @return An iterator to the character after the last parameter read
- */
-template <typename InputIterator>
-InputIterator extract_parameters(InputIterator begin, InputIterator end,
-    parameter_list &parameters)
-{
-    InputIterator cursor;
-
-    if (begin == end) {
-        // error: expected non-zero length range
-        return begin;
-    }
-
-    cursor = begin;
-    std::pair<std::string,InputIterator> ret;
-
-    /**
-     * LWS
-     * token
-     * LWS
-     * *(";" method-param)
-     * LWS
-     * ,=loop again
-     */
-    while (cursor != end) {
-        std::string parameter_name;
-        attribute_list attributes;
-
-        // extract any stray whitespace
-        cursor = http::parser::extract_all_lws(cursor,end);
-        if (cursor == end) {break;}
-
-        ret = http::parser::extract_token(cursor,end);
-
-        if (ret.first.empty()) {
-            // error: expected a token
-            return begin;
-        } else {
-            parameter_name = ret.first;
-            cursor = ret.second;
-        }
-
-        // Safe break point, insert parameter with blank attributes and exit
-        cursor = http::parser::extract_all_lws(cursor,end);
-        if (cursor == end) {
-            //parameters[parameter_name] = attributes;
-            parameters.push_back(std::make_pair(parameter_name,attributes));
-            break;
-        }
-
-        // If there is an attribute list, read it in
-        if (*cursor == ';') {
-            InputIterator acursor;
-
-            ++cursor;
-            acursor = http::parser::extract_attributes(cursor,end,attributes);
-
-            if (acursor == cursor) {
-                // attribute extraction ended in syntax error
-                return begin;
-            }
-
-            cursor = acursor;
-        }
-
-        // insert parameter into output list
-        //parameters[parameter_name] = attributes;
-        parameters.push_back(std::make_pair(parameter_name,attributes));
-
-        cursor = http::parser::extract_all_lws(cursor,end);
-        if (cursor == end) {break;}
-
-        // if next char is ',' then read another parameter, else stop
-        if (*cursor != ',') {
-            break;
-        }
-
-        // advance past comma
-        ++cursor;
-
-        if (cursor == end) {
-            // expected more bytes after a comma
-            return begin;
-        }
-    }
-
-    return cursor;
-}
-
-inline std::string strip_lws(std::string const & input) {
-    std::string::const_iterator begin = extract_all_lws(input.begin(),input.end());
-    if (begin == input.end()) {
-        return std::string();
-    }
-
-    std::string::const_reverse_iterator rbegin = extract_all_lws(input.rbegin(),input.rend());
-    if (rbegin == input.rend()) {
-        return std::string();
-    }
-
-    return std::string(begin,rbegin.base());
-}
-
-/// Base HTTP parser
-/**
- * Includes methods and data elements common to all types of HTTP messages such
- * as headers, versions, bodies, etc.
- */
-class parser {
-public:
-    parser()
-      : m_header_bytes(0)
-      , m_body_bytes_needed(0)
-      , m_body_bytes_max(max_body_size)
-      , m_body_encoding(body_encoding::unknown) {}
-    
-    /// Get the HTTP version string
-    /**
-     * @return The version string for this parser
-     */
-    std::string const & get_version() const {
-        return m_version;
-    }
-
-    /// Set HTTP parser Version
-    /**
-     * Input should be in format: HTTP/x.y where x and y are positive integers.
-     * @todo Does this method need any validation?
-     *
-     * @param [in] version The value to set the HTTP version to.
-     */
-    void set_version(std::string const & version);
-
-    /// Get the value of an HTTP header
-    /**
-     * @todo Make this method case insensitive.
-     *
-     * @param [in] key The name/key of the header to get.
-     * @return The value associated with the given HTTP header key.
-     */
-    std::string const & get_header(std::string const & key) const;
-
-    /// Extract an HTTP parameter list from a parser header.
-    /**
-     * If the header requested doesn't exist or exists and is empty the
-     * parameter list is valid (but empty).
-     *
-     * @param [in] key The name/key of the HTTP header to use as input.
-     * @param [out] out The parameter list to store extracted parameters in.
-     * @return Whether or not the input was a valid parameter list.
-     */
-    bool get_header_as_plist(std::string const & key, parameter_list & out)
-        const;
-
-    /// Return a list of all HTTP headers
-    /**
-     * Return a list of all HTTP headers
-     *
-     * @since 0.8.0
-     *
-     * @return A list of all HTTP headers
-     */
-    header_list const & get_headers() const;
-
-    /// Append a value to an existing HTTP header
-    /**
-     * This method will set the value of the HTTP header `key` with the
-     * indicated value. If a header with the name `key` already exists, `val`
-     * will be appended to the existing value.
-     *
-     * @todo Make this method case insensitive.
-     * @todo Should there be any restrictions on which keys are allowed?
-     * @todo Exception free varient
-     *
-     * @see replace_header
-     *
-     * @param [in] key The name/key of the header to append to.
-     * @param [in] val The value to append.
-     */
-    void append_header(std::string const & key, std::string const & val);
-
-    /// Set a value for an HTTP header, replacing an existing value
-    /**
-     * This method will set the value of the HTTP header `key` with the
-     * indicated value. If a header with the name `key` already exists, `val`
-     * will replace the existing value.
-     *
-     * @todo Make this method case insensitive.
-     * @todo Should there be any restrictions on which keys are allowed?
-     * @todo Exception free varient
-     *
-     * @see append_header
-     *
-     * @param [in] key The name/key of the header to append to.
-     * @param [in] val The value to append.
-     */
-    void replace_header(std::string const & key, std::string const & val);
-
-    /// Remove a header from the parser
-    /**
-     * Removes the header entirely from the parser. This is different than
-     * setting the value of the header to blank.
-     *
-     * @todo Make this method case insensitive.
-     *
-     * @param [in] key The name/key of the header to remove.
-     */
-    void remove_header(std::string const & key);
-
-    /// Get HTTP body
-    /**
-     * Gets the body of the HTTP object
-     *
-     * @return The body of the HTTP message.
-     */
-    std::string const & get_body() const {
-        return m_body;
-    }
-
-    /// Set body content
-    /**
-     * Set the body content of the HTTP response to the parameter string. Note
-     * set_body will also set the Content-Length HTTP header to the appropriate
-     * value. If you want the Content-Length header to be something else, do so
-     * via replace_header("Content-Length") after calling set_body()
-     *
-     * @param value String data to include as the body content.
-     */
-    void set_body(std::string const & value);
-
-    /// Get body size limit
-    /**
-     * Retrieves the maximum number of bytes to parse & buffer before canceling
-     * a request.
-     *
-     * @since 0.5.0
-     *
-     * @return The maximum length of a message body.
-     */
-    size_t get_max_body_size() const {
-        return m_body_bytes_max;
-    }
-
-    /// Set body size limit
-    /**
-     * Set the maximum number of bytes to parse and buffer before canceling a
-     * request.
-     *
-     * @since 0.5.0
-     *
-     * @param value The size to set the max body length to.
-     */
-    void set_max_body_size(size_t value) {
-        m_body_bytes_max = value;
-    }
-
-    /// Extract an HTTP parameter list from a string.
-    /**
-     * @param [in] in The input string.
-     * @param [out] out The parameter list to store extracted parameters in.
-     * @return Whether or not the input was a valid parameter list.
-     */
-    bool parse_parameter_list(std::string const & in, parameter_list & out)
-        const;
-protected:
-    /// Process a header line
-    /**
-     * @todo Update this method to be exception free.
-     *
-     * @param [in] begin An iterator to the beginning of the sequence.
-     * @param [in] end An iterator to the end of the sequence.
-     */
-    void process_header(std::string::iterator begin, std::string::iterator end);
-
-    /// Prepare the parser to begin parsing body data
-    /**
-     * Inspects headers to determine if the message has a body that needs to be
-     * read. If so, sets up the necessary state, otherwise returns false. If
-     * this method returns true and loading the message body is desired call
-     * `process_body` until it returns zero bytes or an error.
-     *
-     * Must not be called until after all headers have been processed.
-     *
-     * @since 0.5.0
-     *
-     * @return True if more bytes are needed to load the body, false otherwise.
-     */
-    bool prepare_body();
-
-    /// Process body data
-    /**
-     * Parses body data.
-     *
-     * @since 0.5.0
-     *
-     * @param [in] begin An iterator to the beginning of the sequence.
-     * @param [in] end An iterator to the end of the sequence.
-     * @return The number of bytes processed
-     */
-    size_t process_body(char const * buf, size_t len);
-
-    /// Check if the parser is done parsing the body
-    /**
-     * Behavior before a call to `prepare_body` is undefined.
-     *
-     * @since 0.5.0
-     *
-     * @return True if the message body has been completed loaded.
-     */
-    bool body_ready() const {
-        return (m_body_bytes_needed == 0);
-    }
-
-    /// Generate and return the HTTP headers as a string
-    /**
-     * Each headers will be followed by the \r\n sequence including the last one.
-     * A second \r\n sequence (blank header) is not appended by this method
-     *
-     * @return The HTTP headers as a string.
-     */
-    std::string raw_headers() const;
-
-    std::string m_version;
-    header_list m_headers;
-    
-    size_t                  m_header_bytes;
-    
-    std::string             m_body;
-    size_t                  m_body_bytes_needed;
-    size_t                  m_body_bytes_max;
-    body_encoding::value    m_body_encoding;
-};
-
-} // namespace parser
-} // namespace http
-} // namespace websocketpp
-
-#include <websocketpp/http/impl/parser.hpp>
-
-#endif // HTTP_PARSER_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/http/request.hpp b/src/sioclient/lib/websocketpp/websocketpp/http/request.hpp
deleted file mode 100644
index 3355c99b..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/http/request.hpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef HTTP_PARSER_REQUEST_HPP
-#define HTTP_PARSER_REQUEST_HPP
-
-#include <string>
-
-#include <websocketpp/common/memory.hpp>
-#include <websocketpp/http/parser.hpp>
-
-namespace websocketpp {
-namespace http {
-namespace parser {
-
-/// Stores, parses, and manipulates HTTP requests
-/**
- * http::request provides the following functionality for working with HTTP
- * requests.
- *
- * - Initialize request via manually setting each element
- * - Initialize request via reading raw bytes and parsing
- * - Once initialized, access individual parsed elements
- * - Once initialized, read entire request as raw bytes
- */
-class request : public parser {
-public:
-    typedef request type;
-    typedef lib::shared_ptr<type> ptr;
-
-    request()
-      : m_buf(lib::make_shared<std::string>())
-      , m_ready(false) {}
-
-    /// Process bytes in the input buffer
-    /**
-     * Process up to len bytes from input buffer buf. Returns the number of
-     * bytes processed. Bytes left unprocessed means bytes left over after the
-     * final header delimiters.
-     *
-     * Consume is a streaming processor. It may be called multiple times on one
-     * request and the full headers need not be available before processing can
-     * begin. If the end of the request was reached during this call to consume
-     * the ready flag will be set. Further calls to consume once ready will be
-     * ignored.
-     *
-     * Consume will throw an http::exception in the case of an error. Typical
-     * error reasons include malformed requests, incomplete requests, and max
-     * header size being reached.
-     *
-     * @param buf Pointer to byte buffer
-     * @param len Size of byte buffer
-     * @return Number of bytes processed.
-     */
-    size_t consume(char const * buf, size_t len);
-
-    /// Returns whether or not the request is ready for reading.
-    bool ready() const {
-        return m_ready;
-    }
-
-    /// Returns the full raw request (including the body)
-    std::string raw() const;
-    
-    /// Returns the raw request headers only (similar to an HTTP HEAD request)
-    std::string raw_head() const;
-
-    /// Set the HTTP method. Must be a valid HTTP token
-    void set_method(std::string const & method);
-
-    /// Return the request method
-    std::string const & get_method() const {
-        return m_method;
-    }
-
-    /// Set the HTTP uri. Must be a valid HTTP uri
-    void set_uri(std::string const & uri);
-
-    /// Return the requested URI
-    std::string const & get_uri() const {
-        return m_uri;
-    }
-
-private:
-    /// Helper function for message::consume. Process request line
-    void process(std::string::iterator begin, std::string::iterator end);
-
-    lib::shared_ptr<std::string>    m_buf;
-    std::string                     m_method;
-    std::string                     m_uri;
-    bool                            m_ready;
-};
-
-} // namespace parser
-} // namespace http
-} // namespace websocketpp
-
-#include <websocketpp/http/impl/request.hpp>
-
-#endif // HTTP_PARSER_REQUEST_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/http/response.hpp b/src/sioclient/lib/websocketpp/websocketpp/http/response.hpp
deleted file mode 100644
index e724a3d3..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/http/response.hpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef HTTP_PARSER_RESPONSE_HPP
-#define HTTP_PARSER_RESPONSE_HPP
-
-#include <iostream>
-#include <string>
-
-#include <websocketpp/http/parser.hpp>
-
-namespace websocketpp {
-namespace http {
-namespace parser {
-
-/// Stores, parses, and manipulates HTTP responses
-/**
- * http::response provides the following functionality for working with HTTP
- * responses.
- *
- * - Initialize response via manually setting each element
- * - Initialize response via reading raw bytes and parsing
- * - Once initialized, access individual parsed elements
- * - Once initialized, read entire response as raw bytes
- *
- * http::response checks for header completeness separately from the full
- * response. Once the header is complete, the Content-Length header is read to
- * determine when to stop reading body bytes. If no Content-Length is present
- * ready() will never return true. It is the responsibility of the caller to
- * consume to determine when the response is complete (ie when the connection
- * terminates, or some other metric).
- */
-class response : public parser {
-public:
-    typedef response type;
-    typedef lib::shared_ptr<type> ptr;
-
-    response()
-      : m_read(0)
-      , m_buf(lib::make_shared<std::string>())
-      , m_status_code(status_code::uninitialized)
-      , m_state(RESPONSE_LINE) {}
-
-    /// Process bytes in the input buffer
-    /**
-     * Process up to len bytes from input buffer buf. Returns the number of
-     * bytes processed. Bytes left unprocessed means bytes left over after the
-     * final header delimiters.
-     *
-     * Consume is a streaming processor. It may be called multiple times on one
-     * response and the full headers need not be available before processing can
-     * begin. If the end of the response was reached during this call to consume
-     * the ready flag will be set. Further calls to consume once ready will be
-     * ignored.
-     *
-     * Consume will throw an http::exception in the case of an error. Typical
-     * error reasons include malformed responses, incomplete responses, and max
-     * header size being reached.
-     *
-     * @param buf Pointer to byte buffer
-     * @param len Size of byte buffer
-     * @return Number of bytes processed.
-     */
-    size_t consume(char const * buf, size_t len);
-
-    /// Process bytes in the input buffer (istream version)
-    /**
-     * Process bytes from istream s. Returns the number of bytes processed. 
-     * Bytes left unprocessed means bytes left over after the final header
-     * delimiters.
-     *
-     * Consume is a streaming processor. It may be called multiple times on one
-     * response and the full headers need not be available before processing can
-     * begin. If the end of the response was reached during this call to consume
-     * the ready flag will be set. Further calls to consume once ready will be
-     * ignored.
-     *
-     * Consume will throw an http::exception in the case of an error. Typical
-     * error reasons include malformed responses, incomplete responses, and max
-     * header size being reached.
-     *
-     * @param buf Pointer to byte buffer
-     * @param len Size of byte buffer
-     * @return Number of bytes processed.
-     */
-    size_t consume(std::istream & s);
-
-    /// Returns true if the response is ready.
-    /**
-     * @note will never return true if the content length header is not present
-     */
-    bool ready() const {
-        return m_state == DONE;
-    }
-
-    /// Returns true if the response headers are fully parsed.
-    bool headers_ready() const {
-        return (m_state == BODY || m_state == DONE);
-    }
-
-    /// Returns the full raw response
-    std::string raw() const;
-
-    /// Set response status code and message
-    /**
-     * Sets the response status code to `code` and looks up the corresponding
-     * message for standard codes. Non-standard codes will be entered as Unknown
-     * use set_status(status_code::value,std::string) overload to set both
-     * values explicitly.
-     *
-     * @param code Code to set
-     * @param msg Message to set
-     */
-    void set_status(status_code::value code);
-
-    /// Set response status code and message
-    /**
-     * Sets the response status code and message to independent custom values.
-     * use set_status(status_code::value) to set the code and have the standard
-     * message be automatically set.
-     *
-     * @param code Code to set
-     * @param msg Message to set
-     */
-    void set_status(status_code::value code, std::string const & msg);
-
-    /// Return the response status code
-    status_code::value get_status_code() const {
-        return m_status_code;
-    }
-
-    /// Return the response status message
-    const std::string& get_status_msg() const {
-        return m_status_msg;
-    }
-private:
-    /// Helper function for consume. Process response line
-    void process(std::string::iterator begin, std::string::iterator end);
-
-    /// Helper function for processing body bytes
-    size_t process_body(char const * buf, size_t len);
-
-    enum state {
-        RESPONSE_LINE = 0,
-        HEADERS = 1,
-        BODY = 2,
-        DONE = 3
-    };
-
-    std::string                     m_status_msg;
-    size_t                          m_read;
-    lib::shared_ptr<std::string>    m_buf;
-    status_code::value              m_status_code;
-    state                           m_state;
-
-};
-
-} // namespace parser
-} // namespace http
-} // namespace websocketpp
-
-#include <websocketpp/http/impl/response.hpp>
-
-#endif // HTTP_PARSER_RESPONSE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/impl/connection_impl.hpp b/src/sioclient/lib/websocketpp/websocketpp/impl/connection_impl.hpp
deleted file mode 100644
index bf88c955..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/impl/connection_impl.hpp
+++ /dev/null
@@ -1,2375 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CONNECTION_IMPL_HPP
-#define WEBSOCKETPP_CONNECTION_IMPL_HPP
-
-#include <websocketpp/processors/hybi00.hpp>
-#include <websocketpp/processors/hybi07.hpp>
-#include <websocketpp/processors/hybi08.hpp>
-#include <websocketpp/processors/hybi13.hpp>
-
-#include <websocketpp/processors/processor.hpp>
-
-#include <websocketpp/common/platforms.hpp>
-#include <websocketpp/common/system_error.hpp>
-
-#include <algorithm>
-#include <exception>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-namespace websocketpp {
-
-namespace istate = session::internal_state;
-
-template <typename config>
-void connection<config>::set_termination_handler(
-    termination_handler new_handler)
-{
-    m_alog->write(log::alevel::devel,
-        "connection set_termination_handler");
-
-    //scoped_lock_type lock(m_connection_state_lock);
-
-    m_termination_handler = new_handler;
-}
-
-template <typename config>
-std::string const & connection<config>::get_origin() const {
-    //scoped_lock_type lock(m_connection_state_lock);
-    return m_processor->get_origin(m_request);
-}
-
-template <typename config>
-size_t connection<config>::get_buffered_amount() const {
-    //scoped_lock_type lock(m_connection_state_lock);
-    return m_send_buffer_size;
-}
-
-template <typename config>
-session::state::value connection<config>::get_state() const {
-    //scoped_lock_type lock(m_connection_state_lock);
-    return m_state;
-}
-
-template <typename config>
-lib::error_code connection<config>::send(std::string const & payload,
-    frame::opcode::value op)
-{
-    message_ptr msg = m_msg_manager->get_message(op,payload.size());
-    msg->append_payload(payload);
-    msg->set_compressed(true);
-
-    return send(msg);
-}
-
-template <typename config>
-lib::error_code connection<config>::send(void const * payload, size_t len,
-    frame::opcode::value op)
-{
-    message_ptr msg = m_msg_manager->get_message(op,len);
-    msg->append_payload(payload,len);
-
-    return send(msg);
-}
-
-template <typename config>
-lib::error_code connection<config>::send(typename config::message_type::ptr msg)
-{
-    if (m_alog->static_test(log::alevel::devel)) {
-        m_alog->write(log::alevel::devel,"connection send");
-    }
-
-    {
-        scoped_lock_type lock(m_connection_state_lock);
-        if (m_state != session::state::open) {
-           return error::make_error_code(error::invalid_state);
-        }
-    }
-
-    message_ptr outgoing_msg;
-    bool needs_writing = false;
-
-    if (msg->get_prepared()) {
-        outgoing_msg = msg;
-
-        scoped_lock_type lock(m_write_lock);
-        write_push(outgoing_msg);
-        needs_writing = !m_write_flag && !m_send_queue.empty();
-    } else {
-        outgoing_msg = m_msg_manager->get_message();
-
-        if (!outgoing_msg) {
-            return error::make_error_code(error::no_outgoing_buffers);
-        }
-
-        scoped_lock_type lock(m_write_lock);
-        lib::error_code ec = m_processor->prepare_data_frame(msg,outgoing_msg);
-
-        if (ec) {
-            return ec;
-        }
-
-        write_push(outgoing_msg);
-        needs_writing = !m_write_flag && !m_send_queue.empty();
-    }
-
-    if (needs_writing) {
-        transport_con_type::dispatch(lib::bind(
-            &type::write_frame,
-            type::get_shared()
-        ));
-    }
-
-    return lib::error_code();
-}
-
-template <typename config>
-void connection<config>::ping(std::string const& payload, lib::error_code& ec) {
-    if (m_alog->static_test(log::alevel::devel)) {
-        m_alog->write(log::alevel::devel,"connection ping");
-    }
-
-    {
-        scoped_lock_type lock(m_connection_state_lock);
-        if (m_state != session::state::open) {
-            std::stringstream ss;
-            ss << "connection::ping called from invalid state " << m_state;
-            m_alog->write(log::alevel::devel,ss.str());
-            ec = error::make_error_code(error::invalid_state);
-            return;
-        }
-    }
-
-    message_ptr msg = m_msg_manager->get_message();
-    if (!msg) {
-        ec = error::make_error_code(error::no_outgoing_buffers);
-        return;
-    }
-
-    ec = m_processor->prepare_ping(payload,msg);
-    if (ec) {return;}
-
-    // set ping timer if we are listening for one
-    if (m_pong_timeout_handler) {
-        // Cancel any existing timers
-        if (m_ping_timer) {
-            m_ping_timer->cancel();
-        }
-
-        if (m_pong_timeout_dur > 0) {
-            m_ping_timer = transport_con_type::set_timer(
-                m_pong_timeout_dur,
-                lib::bind(
-                    &type::handle_pong_timeout,
-                    type::get_shared(),
-                    payload,
-                    lib::placeholders::_1
-                )
-            );
-        }
-
-        if (!m_ping_timer) {
-            // Our transport doesn't support timers
-            m_elog->write(log::elevel::warn,"Warning: a pong_timeout_handler is \
-                set but the transport in use does not support timeouts.");
-        }
-    }
-
-    bool needs_writing = false;
-    {
-        scoped_lock_type lock(m_write_lock);
-        write_push(msg);
-        needs_writing = !m_write_flag && !m_send_queue.empty();
-    }
-
-    if (needs_writing) {
-        transport_con_type::dispatch(lib::bind(
-            &type::write_frame,
-            type::get_shared()
-        ));
-    }
-
-    ec = lib::error_code();
-}
-
-template<typename config>
-void connection<config>::ping(std::string const & payload) {
-    lib::error_code ec;
-    ping(payload,ec);
-    if (ec) {
-        throw exception(ec);
-    }
-}
-
-template<typename config>
-void connection<config>::handle_pong_timeout(std::string payload,
-    lib::error_code const & ec)
-{
-    if (ec) {
-        if (ec == transport::error::operation_aborted) {
-            // ignore, this is expected
-            return;
-        }
-
-        m_elog->write(log::elevel::devel,"pong_timeout error: "+ec.message());
-        return;
-    }
-
-    if (m_pong_timeout_handler) {
-        m_pong_timeout_handler(m_connection_hdl,payload);
-    }
-}
-
-template <typename config>
-void connection<config>::pong(std::string const& payload, lib::error_code& ec) {
-    if (m_alog->static_test(log::alevel::devel)) {
-        m_alog->write(log::alevel::devel,"connection pong");
-    }
-
-    {
-        scoped_lock_type lock(m_connection_state_lock);
-        if (m_state != session::state::open) {
-            std::stringstream ss;
-            ss << "connection::pong called from invalid state " << m_state;
-            m_alog->write(log::alevel::devel,ss.str());
-            ec = error::make_error_code(error::invalid_state);
-            return;
-        }
-    }
-
-    message_ptr msg = m_msg_manager->get_message();
-    if (!msg) {
-        ec = error::make_error_code(error::no_outgoing_buffers);
-        return;
-    }
-
-    ec = m_processor->prepare_pong(payload,msg);
-    if (ec) {return;}
-
-    bool needs_writing = false;
-    {
-        scoped_lock_type lock(m_write_lock);
-        write_push(msg);
-        needs_writing = !m_write_flag && !m_send_queue.empty();
-    }
-
-    if (needs_writing) {
-        transport_con_type::dispatch(lib::bind(
-            &type::write_frame,
-            type::get_shared()
-        ));
-    }
-
-    ec = lib::error_code();
-}
-
-template<typename config>
-void connection<config>::pong(std::string const & payload) {
-    lib::error_code ec;
-    pong(payload,ec);
-    if (ec) {
-        throw exception(ec);
-    }
-}
-
-template <typename config>
-void connection<config>::close(close::status::value const code,
-    std::string const & reason, lib::error_code & ec)
-{
-    if (m_alog->static_test(log::alevel::devel)) {
-        m_alog->write(log::alevel::devel,"connection close");
-    }
-
-    // Truncate reason to maximum size allowable in a close frame.
-    std::string tr(reason,0,std::min<size_t>(reason.size(),
-        frame::limits::close_reason_size));
-
-    scoped_lock_type lock(m_connection_state_lock);
-
-    if (m_state != session::state::open) {
-       ec = error::make_error_code(error::invalid_state);
-       return;
-    }
-
-    ec = this->send_close_frame(code,tr,false,close::status::terminal(code));
-}
-
-template<typename config>
-void connection<config>::close(close::status::value const code,
-    std::string const & reason)
-{
-    lib::error_code ec;
-    close(code,reason,ec);
-    if (ec) {
-        throw exception(ec);
-    }
-}
-
-/// Trigger the on_interrupt handler
-/**
- * This is thread safe if the transport is thread safe
- */
-template <typename config>
-lib::error_code connection<config>::interrupt() {
-    m_alog->write(log::alevel::devel,"connection connection::interrupt");
-    return transport_con_type::interrupt(
-        lib::bind(
-            &type::handle_interrupt,
-            type::get_shared()
-        )
-    );
-}
-
-
-template <typename config>
-void connection<config>::handle_interrupt() {
-    if (m_interrupt_handler) {
-        m_interrupt_handler(m_connection_hdl);
-    }
-}
-
-template <typename config>
-lib::error_code connection<config>::pause_reading() {
-    m_alog->write(log::alevel::devel,"connection connection::pause_reading");
-    return transport_con_type::dispatch(
-        lib::bind(
-            &type::handle_pause_reading,
-            type::get_shared()
-        )
-    );
-}
-
-/// Pause reading handler. Not safe to call directly
-template <typename config>
-void connection<config>::handle_pause_reading() {
-    m_alog->write(log::alevel::devel,"connection connection::handle_pause_reading");
-    m_read_flag = false;
-}
-
-template <typename config>
-lib::error_code connection<config>::resume_reading() {
-    m_alog->write(log::alevel::devel,"connection connection::resume_reading");
-    return transport_con_type::dispatch(
-        lib::bind(
-            &type::handle_resume_reading,
-            type::get_shared()
-        )
-    );
-}
-
-/// Resume reading helper method. Not safe to call directly
-template <typename config>
-void connection<config>::handle_resume_reading() {
-   m_read_flag = true;
-   read_frame();
-}
-
-
-
-
-
-
-
-
-
-
-
-template <typename config>
-bool connection<config>::get_secure() const {
-    //scoped_lock_type lock(m_connection_state_lock);
-    return m_uri->get_secure();
-}
-
-template <typename config>
-std::string const & connection<config>::get_host() const {
-    //scoped_lock_type lock(m_connection_state_lock);
-    return m_uri->get_host();
-}
-
-template <typename config>
-std::string const & connection<config>::get_resource() const {
-    //scoped_lock_type lock(m_connection_state_lock);
-    return m_uri->get_resource();
-}
-
-template <typename config>
-uint16_t connection<config>::get_port() const {
-    //scoped_lock_type lock(m_connection_state_lock);
-    return m_uri->get_port();
-}
-
-template <typename config>
-uri_ptr connection<config>::get_uri() const {
-    //scoped_lock_type lock(m_connection_state_lock);
-    return m_uri;
-}
-
-template <typename config>
-void connection<config>::set_uri(uri_ptr uri) {
-    //scoped_lock_type lock(m_connection_state_lock);
-    m_uri = uri;
-}
-
-
-
-
-
-
-template <typename config>
-std::string const & connection<config>::get_subprotocol() const {
-    return m_subprotocol;
-}
-
-template <typename config>
-std::vector<std::string> const &
-connection<config>::get_requested_subprotocols() const {
-    return m_requested_subprotocols;
-}
-
-template <typename config>
-void connection<config>::add_subprotocol(std::string const & value,
-    lib::error_code & ec)
-{
-    if (m_is_server) {
-        ec = error::make_error_code(error::client_only);
-        return;
-    }
-
-    // If the value is empty or has a non-RFC2616 token character it is invalid.
-    if (value.empty() || std::find_if(value.begin(),value.end(),
-                                      http::is_not_token_char) != value.end())
-    {
-        ec = error::make_error_code(error::invalid_subprotocol);
-        return;
-    }
-
-    m_requested_subprotocols.push_back(value);
-}
-
-template <typename config>
-void connection<config>::add_subprotocol(std::string const & value) {
-    lib::error_code ec;
-    this->add_subprotocol(value,ec);
-    if (ec) {
-        throw exception(ec);
-    }
-}
-
-
-template <typename config>
-void connection<config>::select_subprotocol(std::string const & value,
-    lib::error_code & ec)
-{
-    if (!m_is_server) {
-        ec = error::make_error_code(error::server_only);
-        return;
-    }
-
-    if (value.empty()) {
-        ec = lib::error_code();
-        return;
-    }
-
-    std::vector<std::string>::iterator it;
-
-    it = std::find(m_requested_subprotocols.begin(),
-                   m_requested_subprotocols.end(),
-                   value);
-
-    if (it == m_requested_subprotocols.end()) {
-        ec = error::make_error_code(error::unrequested_subprotocol);
-        return;
-    }
-
-    m_subprotocol = value;
-}
-
-template <typename config>
-void connection<config>::select_subprotocol(std::string const & value) {
-    lib::error_code ec;
-    this->select_subprotocol(value,ec);
-    if (ec) {
-        throw exception(ec);
-    }
-}
-
-
-template <typename config>
-std::string const &
-connection<config>::get_request_header(std::string const & key) const {
-    return m_request.get_header(key);
-}
-
-template <typename config>
-std::string const &
-connection<config>::get_request_body() const {
-    return m_request.get_body();
-}
-
-template <typename config>
-std::string const &
-connection<config>::get_response_header(std::string const & key) const {
-    return m_response.get_header(key);
-}
-
-// TODO: EXCEPTION_FREE
-template <typename config>
-void connection<config>::set_status(http::status_code::value code)
-{
-    if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
-        throw exception("Call to set_status from invalid state",
-                      error::make_error_code(error::invalid_state));
-    }
-    m_response.set_status(code);
-}
-
-// TODO: EXCEPTION_FREE
-template <typename config>
-void connection<config>::set_status(http::status_code::value code,
-    std::string const & msg)
-{
-    if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
-        throw exception("Call to set_status from invalid state",
-                      error::make_error_code(error::invalid_state));
-    }
-
-    m_response.set_status(code,msg);
-}
-
-// TODO: EXCEPTION_FREE
-template <typename config>
-void connection<config>::set_body(std::string const & value) {
-    if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
-        throw exception("Call to set_status from invalid state",
-                      error::make_error_code(error::invalid_state));
-    }
-
-    m_response.set_body(value);
-}
-
-// TODO: EXCEPTION_FREE
-template <typename config>
-void connection<config>::append_header(std::string const & key,
-    std::string const & val)
-{
-    if (m_is_server) {
-        if (m_internal_state == istate::PROCESS_HTTP_REQUEST) {
-            // we are setting response headers for an incoming server connection
-            m_response.append_header(key,val);
-        } else {
-            throw exception("Call to append_header from invalid state",
-                      error::make_error_code(error::invalid_state));
-        }
-    } else {
-        if (m_internal_state == istate::USER_INIT) {
-            // we are setting initial headers for an outgoing client connection
-            m_request.append_header(key,val);
-        } else {
-            throw exception("Call to append_header from invalid state",
-                      error::make_error_code(error::invalid_state));
-        }
-    }
-}
-
-// TODO: EXCEPTION_FREE
-template <typename config>
-void connection<config>::replace_header(std::string const & key,
-    std::string const & val)
-{
-    if (m_is_server) {
-        if (m_internal_state == istate::PROCESS_HTTP_REQUEST) {
-            // we are setting response headers for an incoming server connection
-            m_response.replace_header(key,val);
-        } else {
-            throw exception("Call to replace_header from invalid state",
-                        error::make_error_code(error::invalid_state));
-        }
-    } else {
-        if (m_internal_state == istate::USER_INIT) {
-            // we are setting initial headers for an outgoing client connection
-            m_request.replace_header(key,val);
-        } else {
-            throw exception("Call to replace_header from invalid state",
-                        error::make_error_code(error::invalid_state));
-        }
-    }
-}
-
-// TODO: EXCEPTION_FREE
-template <typename config>
-void connection<config>::remove_header(std::string const & key)
-{
-    if (m_is_server) {
-        if (m_internal_state == istate::PROCESS_HTTP_REQUEST) {
-            // we are setting response headers for an incoming server connection
-            m_response.remove_header(key);
-        } else {
-            throw exception("Call to remove_header from invalid state",
-                        error::make_error_code(error::invalid_state));
-        }
-    } else {
-        if (m_internal_state == istate::USER_INIT) {
-            // we are setting initial headers for an outgoing client connection
-            m_request.remove_header(key);
-        } else {
-            throw exception("Call to remove_header from invalid state",
-                        error::make_error_code(error::invalid_state));
-        }
-    }
-}
-
-/// Defer HTTP Response until later
-/**
- * Used in the http handler to defer the HTTP response for this connection
- * until later. Handshake timers will be canceled and the connection will be
- * left open until `send_http_response` or an equivalent is called.
- *
- * Warning: deferred connections won't time out and as a result can tie up
- * resources.
- *
- * @return A status code, zero on success, non-zero otherwise
- */
-template <typename config>
-lib::error_code connection<config>::defer_http_response() {
-    // Cancel handshake timer, otherwise the connection will time out and we'll
-    // close the connection before the app has a chance to send a response.
-    if (m_handshake_timer) {
-        m_handshake_timer->cancel();
-        m_handshake_timer.reset();
-    }
-    
-    // Do something to signal deferral
-    m_http_state = session::http_state::deferred;
-    
-    return lib::error_code();
-}
-
-/// Send deferred HTTP Response (exception free)
-/**
- * Sends an http response to an HTTP connection that was deferred. This will
- * send a complete response including all headers, status line, and body
- * text. The connection will be closed afterwards.
- *
- * @since 0.6.0
- *
- * @param ec A status code, zero on success, non-zero otherwise
- */
-template <typename config>
-void connection<config>::send_http_response(lib::error_code & ec) {
-    {
-        scoped_lock_type lock(m_connection_state_lock);
-        if (m_http_state != session::http_state::deferred) {
-            ec = error::make_error_code(error::invalid_state);
-            return;
-        }
-    
-        m_http_state = session::http_state::body_written;
-    }
-    
-    this->write_http_response(lib::error_code());
-    ec = lib::error_code();
-}
-
-template <typename config>
-void connection<config>::send_http_response() {
-    lib::error_code ec;
-    this->send_http_response(ec);
-    if (ec) {
-        throw exception(ec);
-    }
-}
-
-
-
-
-/******** logic thread ********/
-
-template <typename config>
-void connection<config>::start() {
-    m_alog->write(log::alevel::devel,"connection start");
-
-    if (m_internal_state != istate::USER_INIT) {
-        m_alog->write(log::alevel::devel,"Start called in invalid state");
-        this->terminate(error::make_error_code(error::invalid_state));
-        return;
-    }
-
-    m_internal_state = istate::TRANSPORT_INIT;
-
-    // Depending on how the transport implements init this function may return
-    // immediately and call handle_transport_init later or call
-    // handle_transport_init from this function.
-    transport_con_type::init(
-        lib::bind(
-            &type::handle_transport_init,
-            type::get_shared(),
-            lib::placeholders::_1
-        )
-    );
-}
-
-template <typename config>
-void connection<config>::handle_transport_init(lib::error_code const & ec) {
-    m_alog->write(log::alevel::devel,"connection handle_transport_init");
-
-    lib::error_code ecm = ec;
-
-    if (m_internal_state != istate::TRANSPORT_INIT) {
-        m_alog->write(log::alevel::devel,
-          "handle_transport_init must be called from transport init state");
-        ecm = error::make_error_code(error::invalid_state);
-    }
-
-    if (ecm) {
-        std::stringstream s;
-        s << "handle_transport_init received error: "<< ecm.message();
-        m_elog->write(log::elevel::rerror,s.str());
-
-        this->terminate(ecm);
-        return;
-    }
-
-    // At this point the transport is ready to read and write bytes.
-    if (m_is_server) {
-        m_internal_state = istate::READ_HTTP_REQUEST;
-        this->read_handshake(1);
-    } else {
-        // We are a client. Set the processor to the version specified in the
-        // config file and send a handshake request.
-        m_internal_state = istate::WRITE_HTTP_REQUEST;
-        m_processor = get_processor(config::client_version);
-        this->send_http_request();
-    }
-}
-
-template <typename config>
-void connection<config>::read_handshake(size_t num_bytes) {
-    m_alog->write(log::alevel::devel,"connection read_handshake");
-
-    if (m_open_handshake_timeout_dur > 0) {
-        m_handshake_timer = transport_con_type::set_timer(
-            m_open_handshake_timeout_dur,
-            lib::bind(
-                &type::handle_open_handshake_timeout,
-                type::get_shared(),
-                lib::placeholders::_1
-            )
-        );
-    }
-
-    transport_con_type::async_read_at_least(
-        num_bytes,
-        m_buf,
-        config::connection_read_buffer_size,
-        lib::bind(
-            &type::handle_read_handshake,
-            type::get_shared(),
-            lib::placeholders::_1,
-            lib::placeholders::_2
-        )
-    );
-}
-
-// All exit paths for this function need to call write_http_response() or submit
-// a new read request with this function as the handler.
-template <typename config>
-void connection<config>::handle_read_handshake(lib::error_code const & ec,
-    size_t bytes_transferred)
-{
-    m_alog->write(log::alevel::devel,"connection handle_read_handshake");
-
-    lib::error_code ecm = ec;
-
-    if (!ecm) {
-        scoped_lock_type lock(m_connection_state_lock);
-        
-        if (m_state == session::state::connecting) {
-             if (m_internal_state != istate::READ_HTTP_REQUEST) {
-                ecm = error::make_error_code(error::invalid_state);
-             }
-        } else if (m_state == session::state::closed) {
-            // The connection was canceled while the response was being sent,
-            // usually by the handshake timer. This is basically expected
-            // (though hopefully rare) and there is nothing we can do so ignore.
-            m_alog->write(log::alevel::devel,
-                "handle_read_handshake invoked after connection was closed");
-            return;
-        } else {
-            ecm = error::make_error_code(error::invalid_state);
-        }
-    }
-
-    if (ecm) {
-        if (ecm == transport::error::eof && m_state == session::state::closed) {
-            // we expect to get eof if the connection is closed already
-            m_alog->write(log::alevel::devel,
-                    "got (expected) eof/state error from closed con");
-            return;
-        }
-        
-        log_err(log::elevel::rerror,"handle_read_handshake",ecm);
-        this->terminate(ecm);
-        return;
-    }
-
-    // Boundaries checking. TODO: How much of this should be done?
-    if (bytes_transferred > config::connection_read_buffer_size) {
-        m_elog->write(log::elevel::fatal,"Fatal boundaries checking error.");
-        this->terminate(make_error_code(error::general));
-        return;
-    }
-
-    size_t bytes_processed = 0;
-    try {
-        bytes_processed = m_request.consume(m_buf,bytes_transferred);
-    } catch (http::exception &e) {
-        // All HTTP exceptions will result in this request failing and an error
-        // response being returned. No more bytes will be read in this con.
-        m_response.set_status(e.m_error_code,e.m_error_msg);
-        this->write_http_response_error(error::make_error_code(error::http_parse_error));
-        return;
-    }
-
-    // More paranoid boundaries checking.
-    // TODO: Is this overkill?
-    if (bytes_processed > bytes_transferred) {
-        m_elog->write(log::elevel::fatal,"Fatal boundaries checking error.");
-        this->terminate(make_error_code(error::general));
-        return;
-    }
-
-    if (m_alog->static_test(log::alevel::devel)) {
-        std::stringstream s;
-        s << "bytes_transferred: " << bytes_transferred
-          << " bytes, bytes processed: " << bytes_processed << " bytes";
-        m_alog->write(log::alevel::devel,s.str());
-    }
-
-    if (m_request.ready()) {
-        lib::error_code processor_ec = this->initialize_processor();
-        if (processor_ec) {
-            this->write_http_response_error(processor_ec);
-            return;
-        }
-
-        if (m_processor && m_processor->get_version() == 0) {
-            // Version 00 has an extra requirement to read some bytes after the
-            // handshake
-            if (bytes_transferred-bytes_processed >= 8) {
-                m_request.replace_header(
-                    "Sec-WebSocket-Key3",
-                    std::string(m_buf+bytes_processed,m_buf+bytes_processed+8)
-                );
-                bytes_processed += 8;
-            } else {
-                // TODO: need more bytes
-                m_alog->write(log::alevel::devel,"short key3 read");
-                m_response.set_status(http::status_code::internal_server_error);
-                this->write_http_response_error(processor::error::make_error_code(processor::error::short_key3));
-                return;
-            }
-        }
-
-        if (m_alog->static_test(log::alevel::devel)) {
-            m_alog->write(log::alevel::devel,m_request.raw());
-            if (!m_request.get_header("Sec-WebSocket-Key3").empty()) {
-                m_alog->write(log::alevel::devel,
-                    utility::to_hex(m_request.get_header("Sec-WebSocket-Key3")));
-            }
-        }
-
-        // The remaining bytes in m_buf are frame data. Copy them to the
-        // beginning of the buffer and note the length. They will be read after
-        // the handshake completes and before more bytes are read.
-        std::copy(m_buf+bytes_processed,m_buf+bytes_transferred,m_buf);
-        m_buf_cursor = bytes_transferred-bytes_processed;
-
-
-        m_internal_state = istate::PROCESS_HTTP_REQUEST;
-        
-        // We have the complete request. Process it.
-        lib::error_code handshake_ec = this->process_handshake_request();
-        
-        // Write a response if this is a websocket connection or if it is an
-        // HTTP connection for which the response has not been deferred or
-        // started yet by a different system (i.e. still in init state).
-        if (!m_is_http || m_http_state == session::http_state::init) {
-            this->write_http_response(handshake_ec);
-        }
-    } else {
-        // read at least 1 more byte
-        transport_con_type::async_read_at_least(
-            1,
-            m_buf,
-            config::connection_read_buffer_size,
-            lib::bind(
-                &type::handle_read_handshake,
-                type::get_shared(),
-                lib::placeholders::_1,
-                lib::placeholders::_2
-            )
-        );
-    }
-}
-
-// write_http_response requires the request to be fully read and the connection
-// to be in the PROCESS_HTTP_REQUEST state. In some cases we can detect errors
-// before the request is fully read (specifically at a point where we aren't
-// sure if the hybi00 key3 bytes need to be read). This method sets the correct
-// state and calls write_http_response
-template <typename config>
-void connection<config>::write_http_response_error(lib::error_code const & ec) {
-    if (m_internal_state != istate::READ_HTTP_REQUEST) {
-        m_alog->write(log::alevel::devel,
-            "write_http_response_error called in invalid state");
-        this->terminate(error::make_error_code(error::invalid_state));
-        return;
-    }
-    
-    m_internal_state = istate::PROCESS_HTTP_REQUEST;
-    
-    this->write_http_response(ec);
-}
-
-// All exit paths for this function need to call write_http_response() or submit
-// a new read request with this function as the handler.
-template <typename config>
-void connection<config>::handle_read_frame(lib::error_code const & ec,
-    size_t bytes_transferred)
-{
-    //m_alog->write(log::alevel::devel,"connection handle_read_frame");
-
-    lib::error_code ecm = ec;
-
-    if (!ecm && m_internal_state != istate::PROCESS_CONNECTION) {
-        ecm = error::make_error_code(error::invalid_state);
-    }
-
-    if (ecm) {
-        log::level echannel = log::elevel::rerror;
-        
-        if (ecm == transport::error::eof) {
-            if (m_state == session::state::closed) {
-                // we expect to get eof if the connection is closed already
-                // just ignore it
-                m_alog->write(log::alevel::devel,"got eof from closed con");
-                return;
-            } else if (m_state == session::state::closing && !m_is_server) {
-                // If we are a client we expect to get eof in the closing state,
-                // this is a signal to terminate our end of the connection after
-                // the closing handshake
-                terminate(lib::error_code());
-                return;
-            }
-        } else if (ecm == error::invalid_state) {
-            // In general, invalid state errors in the closed state are the
-            // result of handlers that were in the system already when the state
-            // changed and should be ignored as they pose no problems and there
-            // is nothing useful that we can do about them.
-            if (m_state == session::state::closed) {
-                m_alog->write(log::alevel::devel,
-                    "handle_read_frame: got invalid istate in closed state");
-                return;
-            }
-        } else if (ecm == transport::error::action_after_shutdown) {
-            echannel = log::elevel::info;
-        } else {
-            // TODO: more generally should we do something different here in the
-            // case that m_state is cosed? Are errors after the connection is
-            // already closed really an rerror?
-        }
-        
-        
-        
-        log_err(echannel, "handle_read_frame", ecm);
-        this->terminate(ecm);
-        return;
-    }
-
-    // Boundaries checking. TODO: How much of this should be done?
-    /*if (bytes_transferred > config::connection_read_buffer_size) {
-        m_elog->write(log::elevel::fatal,"Fatal boundaries checking error");
-        this->terminate(make_error_code(error::general));
-        return;
-    }*/
-
-    size_t p = 0;
-
-    if (m_alog->static_test(log::alevel::devel)) {
-        std::stringstream s;
-        s << "p = " << p << " bytes transferred = " << bytes_transferred;
-        m_alog->write(log::alevel::devel,s.str());
-    }
-
-    while (p < bytes_transferred) {
-        if (m_alog->static_test(log::alevel::devel)) {
-            std::stringstream s;
-            s << "calling consume with " << bytes_transferred-p << " bytes";
-            m_alog->write(log::alevel::devel,s.str());
-        }
-
-        lib::error_code consume_ec;
-
-        if (m_alog->static_test(log::alevel::devel)) {
-            std::stringstream s;
-            s << "Processing Bytes: " << utility::to_hex(reinterpret_cast<uint8_t*>(m_buf)+p,bytes_transferred-p);
-            m_alog->write(log::alevel::devel,s.str());
-        }
-
-        p += m_processor->consume(
-            reinterpret_cast<uint8_t*>(m_buf)+p,
-            bytes_transferred-p,
-            consume_ec
-        );
-
-        if (m_alog->static_test(log::alevel::devel)) {
-            std::stringstream s;
-            s << "bytes left after consume: " << bytes_transferred-p;
-            m_alog->write(log::alevel::devel,s.str());
-        }
-        if (consume_ec) {
-            log_err(log::elevel::rerror, "consume", consume_ec);
-
-            if (config::drop_on_protocol_error) {
-                this->terminate(consume_ec);
-                return;
-            } else {
-                lib::error_code close_ec;
-                this->close(
-                    processor::error::to_ws(consume_ec),
-                    consume_ec.message(),
-                    close_ec
-                );
-
-                if (close_ec) {
-                    log_err(log::elevel::fatal, "Protocol error close frame ", close_ec);
-                    this->terminate(close_ec);
-                    return;
-                }
-            }
-            return;
-        }
-
-        if (m_processor->ready()) {
-            if (m_alog->static_test(log::alevel::devel)) {
-                std::stringstream s;
-                s << "Complete message received. Dispatching";
-                m_alog->write(log::alevel::devel,s.str());
-            }
-
-            message_ptr msg = m_processor->get_message();
-
-            if (!msg) {
-                m_alog->write(log::alevel::devel, "null message from m_processor");
-            } else if (!is_control(msg->get_opcode())) {
-                // data message, dispatch to user
-                if (m_state != session::state::open) {
-                    m_elog->write(log::elevel::warn, "got non-close frame while closing");
-                } else if (m_message_handler) {
-                    m_message_handler(m_connection_hdl, msg);
-                }
-            } else {
-                process_control_frame(msg);
-            }
-        }
-    }
-
-    read_frame();
-}
-
-/// Issue a new transport read unless reading is paused.
-template <typename config>
-void connection<config>::read_frame() {
-    if (!m_read_flag) {
-        return;
-    }
-    
-    transport_con_type::async_read_at_least(
-        // std::min wont work with undefined static const values.
-        // TODO: is there a more elegant way to do this?
-        // Need to determine if requesting 1 byte or the exact number of bytes
-        // is better here. 1 byte lets us be a bit more responsive at a
-        // potential expense of additional runs through handle_read_frame
-        /*(m_processor->get_bytes_needed() > config::connection_read_buffer_size ?
-         config::connection_read_buffer_size : m_processor->get_bytes_needed())*/
-        1,
-        m_buf,
-        config::connection_read_buffer_size,
-        m_handle_read_frame
-    );
-}
-
-template <typename config>
-lib::error_code connection<config>::initialize_processor() {
-    m_alog->write(log::alevel::devel,"initialize_processor");
-
-    // if it isn't a websocket handshake nothing to do.
-    if (!processor::is_websocket_handshake(m_request)) {
-        return lib::error_code();
-    }
-
-    int version = processor::get_websocket_version(m_request);
-
-    if (version < 0) {
-        m_alog->write(log::alevel::devel, "BAD REQUEST: can't determine version");
-        m_response.set_status(http::status_code::bad_request);
-        return error::make_error_code(error::invalid_version);
-    }
-
-    m_processor = get_processor(version);
-
-    // if the processor is not null we are done
-    if (m_processor) {
-        return lib::error_code();
-    }
-
-    // We don't have a processor for this version. Return bad request
-    // with Sec-WebSocket-Version header filled with values we do accept
-    m_alog->write(log::alevel::devel, "BAD REQUEST: no processor for version");
-    m_response.set_status(http::status_code::bad_request);
-
-    std::stringstream ss;
-    std::string sep;
-    std::vector<int>::const_iterator it;
-    for (it = versions_supported.begin(); it != versions_supported.end(); it++)
-    {
-        ss << sep << *it;
-        sep = ",";
-    }
-
-    m_response.replace_header("Sec-WebSocket-Version",ss.str());
-    return error::make_error_code(error::unsupported_version);
-}
-
-template <typename config>
-lib::error_code connection<config>::process_handshake_request() {
-    m_alog->write(log::alevel::devel,"process handshake request");
-
-    if (!processor::is_websocket_handshake(m_request)) {
-        // this is not a websocket handshake. Process as plain HTTP
-        m_alog->write(log::alevel::devel,"HTTP REQUEST");
-
-        // extract URI from request
-        m_uri = processor::get_uri_from_host(
-            m_request,
-            (transport_con_type::is_secure() ? "https" : "http")
-        );
-
-        if (!m_uri->get_valid()) {
-            m_alog->write(log::alevel::devel, "Bad request: failed to parse uri");
-            m_response.set_status(http::status_code::bad_request);
-            return error::make_error_code(error::invalid_uri);
-        }
-
-        if (m_http_handler) {
-            m_is_http = true;
-            m_http_handler(m_connection_hdl);
-            
-            if (m_state == session::state::closed) {
-                return error::make_error_code(error::http_connection_ended);
-            }
-        } else {
-            set_status(http::status_code::upgrade_required);
-            return error::make_error_code(error::upgrade_required);
-        }
-
-        return lib::error_code();
-    }
-
-    lib::error_code ec = m_processor->validate_handshake(m_request);
-
-    // Validate: make sure all required elements are present.
-    if (ec){
-        // Not a valid handshake request
-        m_alog->write(log::alevel::devel, "Bad request " + ec.message());
-        m_response.set_status(http::status_code::bad_request);
-        return ec;
-    }
-
-    // Read extension parameters and set up values necessary for the end user
-    // to complete extension negotiation.
-    std::pair<lib::error_code,std::string> neg_results;
-    neg_results = m_processor->negotiate_extensions(m_request);
-
-    if (neg_results.first == processor::error::make_error_code(processor::error::extension_parse_error)) {
-        // There was a fatal error in extension parsing that should result in
-        // a failed connection attempt.
-        m_elog->write(log::elevel::info, "Bad request: " + neg_results.first.message());
-        m_response.set_status(http::status_code::bad_request);
-        return neg_results.first;
-    } else if (neg_results.first) {
-        // There was a fatal error in extension processing that is probably our
-        // fault. Consider extension negotiation to have failed and continue as
-        // if extensions were not supported
-        m_elog->write(log::elevel::info, 
-            "Extension negotiation failed: " + neg_results.first.message());
-    } else {
-        // extension negotiation succeeded, set response header accordingly
-        // we don't send an empty extensions header because it breaks many
-        // clients.
-        if (neg_results.second.size() > 0) {
-            m_response.replace_header("Sec-WebSocket-Extensions",
-                neg_results.second);
-        }
-    }
-
-    // extract URI from request
-    m_uri = m_processor->get_uri(m_request);
-
-
-    if (!m_uri->get_valid()) {
-        m_alog->write(log::alevel::devel, "Bad request: failed to parse uri");
-        m_response.set_status(http::status_code::bad_request);
-        return error::make_error_code(error::invalid_uri);
-    }
-
-    // extract subprotocols
-    lib::error_code subp_ec = m_processor->extract_subprotocols(m_request,
-        m_requested_subprotocols);
-
-    if (subp_ec) {
-        // should we do anything?
-    }
-
-    // Ask application to validate the connection
-    if (!m_validate_handler || m_validate_handler(m_connection_hdl)) {
-        m_response.set_status(http::status_code::switching_protocols);
-
-        // Write the appropriate response headers based on request and
-        // processor version
-        ec = m_processor->process_handshake(m_request,m_subprotocol,m_response);
-
-        if (ec) {
-            std::stringstream s;
-            s << "Processing error: " << ec << "(" << ec.message() << ")";
-            m_alog->write(log::alevel::devel, s.str());
-
-            m_response.set_status(http::status_code::internal_server_error);
-            return ec;
-        }
-    } else {
-        // User application has rejected the handshake
-        m_alog->write(log::alevel::devel, "USER REJECT");
-
-        // Use Bad Request if the user handler did not provide a more
-        // specific http response error code.
-        // TODO: is there a better default?
-        if (m_response.get_status_code() == http::status_code::uninitialized) {
-            m_response.set_status(http::status_code::bad_request);
-        }
-        
-        return error::make_error_code(error::rejected);
-    }
-
-    return lib::error_code();
-}
-
-template <typename config>
-void connection<config>::write_http_response(lib::error_code const & ec) {
-    m_alog->write(log::alevel::devel,"connection write_http_response");
-
-    if (ec == error::make_error_code(error::http_connection_ended)) {
-        m_alog->write(log::alevel::http,"An HTTP handler took over the connection.");
-        return;
-    }
-
-    if (m_response.get_status_code() == http::status_code::uninitialized) {
-        m_response.set_status(http::status_code::internal_server_error);
-        m_ec = error::make_error_code(error::general);
-    } else {
-        m_ec = ec;
-    }
-
-    m_response.set_version("HTTP/1.1");
-
-    // Set server header based on the user agent settings
-    if (m_response.get_header("Server").empty()) {
-        if (!m_user_agent.empty()) {
-            m_response.replace_header("Server",m_user_agent);
-        } else {
-            m_response.remove_header("Server");
-        }
-    }
-
-    // have the processor generate the raw bytes for the wire (if it exists)
-    if (m_processor) {
-        m_handshake_buffer = m_processor->get_raw(m_response);
-    } else {
-        // a processor wont exist for raw HTTP responses.
-        m_handshake_buffer = m_response.raw();
-    }
-
-    if (m_alog->static_test(log::alevel::devel)) {
-        m_alog->write(log::alevel::devel,"Raw Handshake response:\n"+m_handshake_buffer);
-        if (!m_response.get_header("Sec-WebSocket-Key3").empty()) {
-            m_alog->write(log::alevel::devel,
-                utility::to_hex(m_response.get_header("Sec-WebSocket-Key3")));
-        }
-    }
-
-    // write raw bytes
-    transport_con_type::async_write(
-        m_handshake_buffer.data(),
-        m_handshake_buffer.size(),
-        lib::bind(
-            &type::handle_write_http_response,
-            type::get_shared(),
-            lib::placeholders::_1
-        )
-    );
-}
-
-template <typename config>
-void connection<config>::handle_write_http_response(lib::error_code const & ec) {
-    m_alog->write(log::alevel::devel,"handle_write_http_response");
-
-    lib::error_code ecm = ec;
-
-    if (!ecm) {
-        scoped_lock_type lock(m_connection_state_lock);
-        
-        if (m_state == session::state::connecting) {
-             if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
-                ecm = error::make_error_code(error::invalid_state);
-             }
-        } else if (m_state == session::state::closed) {
-            // The connection was canceled while the response was being sent,
-            // usually by the handshake timer. This is basically expected
-            // (though hopefully rare) and there is nothing we can do so ignore.
-            m_alog->write(log::alevel::devel,
-                "handle_write_http_response invoked after connection was closed");
-            return;
-        } else {
-            ecm = error::make_error_code(error::invalid_state);
-        }
-    }
-
-    if (ecm) {
-        if (ecm == transport::error::eof && m_state == session::state::closed) {
-            // we expect to get eof if the connection is closed already
-            m_alog->write(log::alevel::devel,
-                    "got (expected) eof/state error from closed con");
-            return;
-        }
-        
-        log_err(log::elevel::rerror,"handle_write_http_response",ecm);
-        this->terminate(ecm);
-        return;
-    }
-
-    if (m_handshake_timer) {
-        m_handshake_timer->cancel();
-        m_handshake_timer.reset();
-    }
-
-    if (m_response.get_status_code() != http::status_code::switching_protocols)
-    {
-        /*if (m_processor || m_ec == error::http_parse_error || 
-            m_ec == error::invalid_version || m_ec == error::unsupported_version
-            || m_ec == error::upgrade_required)
-        {*/
-        if (!m_is_http) {
-            std::stringstream s;
-            s << "Handshake ended with HTTP error: "
-              << m_response.get_status_code();
-            m_elog->write(log::elevel::rerror,s.str());
-        } else {
-            // if this was not a websocket connection, we have written
-            // the expected response and the connection can be closed.
-            
-            this->log_http_result();
-            
-            if (m_ec) {
-                m_alog->write(log::alevel::devel,
-                    "got to writing HTTP results with m_ec set: "+m_ec.message());
-            }
-            m_ec = make_error_code(error::http_connection_ended);
-        }        
-        
-        this->terminate(m_ec);
-        return;
-    }
-
-    this->log_open_result();
-
-    m_internal_state = istate::PROCESS_CONNECTION;
-    m_state = session::state::open;
-
-    if (m_open_handler) {
-        m_open_handler(m_connection_hdl);
-    }
-
-    this->handle_read_frame(lib::error_code(), m_buf_cursor);
-}
-
-template <typename config>
-void connection<config>::send_http_request() {
-    m_alog->write(log::alevel::devel,"connection send_http_request");
-
-    // TODO: origin header?
-
-    // Have the protocol processor fill in the appropriate fields based on the
-    // selected client version
-    if (m_processor) {
-        lib::error_code ec;
-        ec = m_processor->client_handshake_request(m_request,m_uri,
-            m_requested_subprotocols);
-
-        if (ec) {
-            log_err(log::elevel::fatal,"Internal library error: Processor",ec);
-            return;
-        }
-    } else {
-        m_elog->write(log::elevel::fatal,"Internal library error: missing processor");
-        return;
-    }
-
-    // Unless the user has overridden the user agent, send generic WS++ UA.
-    if (m_request.get_header("User-Agent").empty()) {
-        if (!m_user_agent.empty()) {
-            m_request.replace_header("User-Agent",m_user_agent);
-        } else {
-            m_request.remove_header("User-Agent");
-        }
-    }
-
-    m_handshake_buffer = m_request.raw();
-
-    if (m_alog->static_test(log::alevel::devel)) {
-        m_alog->write(log::alevel::devel,"Raw Handshake request:\n"+m_handshake_buffer);
-    }
-
-    if (m_open_handshake_timeout_dur > 0) {
-        m_handshake_timer = transport_con_type::set_timer(
-            m_open_handshake_timeout_dur,
-            lib::bind(
-                &type::handle_open_handshake_timeout,
-                type::get_shared(),
-                lib::placeholders::_1
-            )
-        );
-    }
-
-    transport_con_type::async_write(
-        m_handshake_buffer.data(),
-        m_handshake_buffer.size(),
-        lib::bind(
-            &type::handle_send_http_request,
-            type::get_shared(),
-            lib::placeholders::_1
-        )
-    );
-}
-
-template <typename config>
-void connection<config>::handle_send_http_request(lib::error_code const & ec) {
-    m_alog->write(log::alevel::devel,"handle_send_http_request");
-
-    lib::error_code ecm = ec;
-
-    if (!ecm) {
-        scoped_lock_type lock(m_connection_state_lock);
-        
-        if (m_state == session::state::connecting) {
-             if (m_internal_state != istate::WRITE_HTTP_REQUEST) {
-                ecm = error::make_error_code(error::invalid_state);
-             } else {
-                m_internal_state = istate::READ_HTTP_RESPONSE;
-             }
-        } else if (m_state == session::state::closed) {
-            // The connection was canceled while the response was being sent,
-            // usually by the handshake timer. This is basically expected
-            // (though hopefully rare) and there is nothing we can do so ignore.
-            m_alog->write(log::alevel::devel,
-                "handle_send_http_request invoked after connection was closed");
-            return;
-        } else {
-            ecm = error::make_error_code(error::invalid_state);
-        }
-    }
-
-    if (ecm) {
-        if (ecm == transport::error::eof && m_state == session::state::closed) {
-            // we expect to get eof if the connection is closed already
-            m_alog->write(log::alevel::devel,
-                    "got (expected) eof/state error from closed con");
-            return;
-        }
-        
-        log_err(log::elevel::rerror,"handle_send_http_request",ecm);
-        this->terminate(ecm);
-        return;
-    }
-
-    transport_con_type::async_read_at_least(
-        1,
-        m_buf,
-        config::connection_read_buffer_size,
-        lib::bind(
-            &type::handle_read_http_response,
-            type::get_shared(),
-            lib::placeholders::_1,
-            lib::placeholders::_2
-        )
-    );
-}
-
-template <typename config>
-void connection<config>::handle_read_http_response(lib::error_code const & ec,
-    size_t bytes_transferred)
-{
-    m_alog->write(log::alevel::devel,"handle_read_http_response");
-
-    lib::error_code ecm = ec;
-
-    if (!ecm) {
-        scoped_lock_type lock(m_connection_state_lock);
-        
-        if (m_state == session::state::connecting) {
-            if (m_internal_state != istate::READ_HTTP_RESPONSE) {
-                ecm = error::make_error_code(error::invalid_state);
-            }
-        } else if (m_state == session::state::closed) {
-            // The connection was canceled while the response was being sent,
-            // usually by the handshake timer. This is basically expected
-            // (though hopefully rare) and there is nothing we can do so ignore.
-            m_alog->write(log::alevel::devel,
-                "handle_read_http_response invoked after connection was closed");
-            return;
-        } else {
-            ecm = error::make_error_code(error::invalid_state);
-        }
-    }
-
-    if (ecm) {
-        if (ecm == transport::error::eof && m_state == session::state::closed) {
-            // we expect to get eof if the connection is closed already
-            m_alog->write(log::alevel::devel,
-                    "got (expected) eof/state error from closed con");
-            return;
-        }
-        
-        log_err(log::elevel::rerror,"handle_read_http_response",ecm);
-        this->terminate(ecm);
-        return;
-    }
-    
-    size_t bytes_processed = 0;
-    // TODO: refactor this to use error codes rather than exceptions
-    try {
-        bytes_processed = m_response.consume(m_buf,bytes_transferred);
-    } catch (http::exception & e) {
-        m_elog->write(log::elevel::rerror,
-            std::string("error in handle_read_http_response: ")+e.what());
-        this->terminate(make_error_code(error::general));
-        return;
-    }
-
-    m_alog->write(log::alevel::devel,std::string("Raw response: ")+m_response.raw());
-
-    if (m_response.headers_ready()) {
-        if (m_handshake_timer) {
-            m_handshake_timer->cancel();
-            m_handshake_timer.reset();
-        }
-
-        lib::error_code validate_ec = m_processor->validate_server_handshake_response(
-            m_request,
-            m_response
-        );
-        if (validate_ec) {
-            log_err(log::elevel::rerror,"Server handshake response",validate_ec);
-            this->terminate(validate_ec);
-            return;
-        }
-
-        // Read extension parameters and set up values necessary for the end
-        // user to complete extension negotiation.
-        std::pair<lib::error_code,std::string> neg_results;
-        neg_results = m_processor->negotiate_extensions(m_response);
-
-        if (neg_results.first) {
-            // There was a fatal error in extension negotiation. For the moment
-            // kill all connections that fail extension negotiation.
-            
-            // TODO: deal with cases where the response is well formed but 
-            // doesn't match the options requested by the client. Its possible
-            // that the best behavior in this cases is to log and continue with
-            // an unextended connection.
-            m_alog->write(log::alevel::devel, "Extension negotiation failed: "
-                + neg_results.first.message());
-            this->terminate(make_error_code(error::extension_neg_failed));
-            // TODO: close connection with reason 1010 (and list extensions)
-        }
-
-        // response is valid, connection can now be assumed to be open      
-        m_internal_state = istate::PROCESS_CONNECTION;
-        m_state = session::state::open;
-
-        this->log_open_result();
-
-        if (m_open_handler) {
-            m_open_handler(m_connection_hdl);
-        }
-
-        // The remaining bytes in m_buf are frame data. Copy them to the
-        // beginning of the buffer and note the length. They will be read after
-        // the handshake completes and before more bytes are read.
-        std::copy(m_buf+bytes_processed,m_buf+bytes_transferred,m_buf);
-        m_buf_cursor = bytes_transferred-bytes_processed;
-
-        this->handle_read_frame(lib::error_code(), m_buf_cursor);
-    } else {
-        transport_con_type::async_read_at_least(
-            1,
-            m_buf,
-            config::connection_read_buffer_size,
-            lib::bind(
-                &type::handle_read_http_response,
-                type::get_shared(),
-                lib::placeholders::_1,
-                lib::placeholders::_2
-            )
-        );
-    }
-}
-
-template <typename config>
-void connection<config>::handle_open_handshake_timeout(
-    lib::error_code const & ec)
-{
-    if (ec == transport::error::operation_aborted) {
-        m_alog->write(log::alevel::devel,"open handshake timer cancelled");
-    } else if (ec) {
-        m_alog->write(log::alevel::devel,
-            "open handle_open_handshake_timeout error: "+ec.message());
-        // TODO: ignore or fail here?
-    } else {
-        m_alog->write(log::alevel::devel,"open handshake timer expired");
-        terminate(make_error_code(error::open_handshake_timeout));
-    }
-}
-
-template <typename config>
-void connection<config>::handle_close_handshake_timeout(
-    lib::error_code const & ec)
-{
-    if (ec == transport::error::operation_aborted) {
-        m_alog->write(log::alevel::devel,"asio close handshake timer cancelled");
-    } else if (ec) {
-        m_alog->write(log::alevel::devel,
-            "asio open handle_close_handshake_timeout error: "+ec.message());
-        // TODO: ignore or fail here?
-    } else {
-        m_alog->write(log::alevel::devel, "asio close handshake timer expired");
-        terminate(make_error_code(error::close_handshake_timeout));
-    }
-}
-
-template <typename config>
-void connection<config>::terminate(lib::error_code const & ec) {
-    if (m_alog->static_test(log::alevel::devel)) {
-        m_alog->write(log::alevel::devel,"connection terminate");
-    }
-
-    // Cancel close handshake timer
-    if (m_handshake_timer) {
-        m_handshake_timer->cancel();
-        m_handshake_timer.reset();
-    }
-
-    terminate_status tstat = unknown;
-    if (ec) {
-        m_ec = ec;
-        m_local_close_code = close::status::abnormal_close;
-        m_local_close_reason = ec.message();
-    }
-
-    // TODO: does any of this need a mutex?
-    if (m_is_http) {
-        m_http_state = session::http_state::closed;
-    }
-    if (m_state == session::state::connecting) {
-        m_state = session::state::closed;
-        tstat = failed;
-        
-        // Log fail result here before socket is shut down and we can't get
-        // the remote address, etc anymore
-        if (m_ec != error::http_connection_ended) {
-            log_fail_result();
-        }
-    } else if (m_state != session::state::closed) {
-        m_state = session::state::closed;
-        tstat = closed;
-    } else {
-        m_alog->write(log::alevel::devel,
-            "terminate called on connection that was already terminated");
-        return;
-    }
-
-    // TODO: choose between shutdown and close based on error code sent
-
-    transport_con_type::async_shutdown(
-        lib::bind(
-            &type::handle_terminate,
-            type::get_shared(),
-            tstat,
-            lib::placeholders::_1
-        )
-    );
-}
-
-template <typename config>
-void connection<config>::handle_terminate(terminate_status tstat,
-    lib::error_code const & ec)
-{
-    if (m_alog->static_test(log::alevel::devel)) {
-        m_alog->write(log::alevel::devel,"connection handle_terminate");
-    }
-
-    if (ec) {
-        // there was an error actually shutting down the connection
-        log_err(log::elevel::devel,"handle_terminate",ec);
-    }
-
-    // clean shutdown
-    if (tstat == failed) {
-        if (m_ec != error::http_connection_ended) {
-            if (m_fail_handler) {
-                m_fail_handler(m_connection_hdl);
-            }
-        }
-    } else if (tstat == closed) {
-        if (m_close_handler) {
-            m_close_handler(m_connection_hdl);
-        }
-        log_close_result();
-    } else {
-        m_elog->write(log::elevel::rerror,"Unknown terminate_status");
-    }
-
-    // call the termination handler if it exists
-    // if it exists it might (but shouldn't) refer to a bad memory location.
-    // If it does, we don't care and should catch and ignore it.
-    if (m_termination_handler) {
-        try {
-            m_termination_handler(type::get_shared());
-        } catch (std::exception const & e) {
-            m_elog->write(log::elevel::warn,
-                std::string("termination_handler call failed. Reason was: ")+e.what());
-        }
-    }
-}
-
-template <typename config>
-void connection<config>::write_frame() {
-    //m_alog->write(log::alevel::devel,"connection write_frame");
-
-    {
-        scoped_lock_type lock(m_write_lock);
-
-        // Check the write flag. If true, there is an outstanding transport
-        // write already. In this case we just return. The write handler will
-        // start a new write if the write queue isn't empty. If false, we set
-        // the write flag and proceed to initiate a transport write.
-        if (m_write_flag) {
-            return;
-        }
-
-        // pull off all the messages that are ready to write.
-        // stop if we get a message marked terminal
-        message_ptr next_message = write_pop();
-        while (next_message) {
-            m_current_msgs.push_back(next_message);
-            if (!next_message->get_terminal()) {
-                next_message = write_pop();
-            } else {
-                next_message = message_ptr();
-            }
-        }
-        
-        if (m_current_msgs.empty()) {
-            // there was nothing to send
-            return;
-        } else {
-            // At this point we own the next messages to be sent and are
-            // responsible for holding the write flag until they are 
-            // successfully sent or there is some error
-            m_write_flag = true;
-        }
-    }
-
-    typename std::vector<message_ptr>::iterator it;
-    for (it = m_current_msgs.begin(); it != m_current_msgs.end(); ++it) {
-        std::string const & header = (*it)->get_header();
-        std::string const & payload = (*it)->get_payload();
-
-        m_send_buffer.push_back(transport::buffer(header.c_str(),header.size()));
-        m_send_buffer.push_back(transport::buffer(payload.c_str(),payload.size()));   
-    }
-
-    // Print detailed send stats if those log levels are enabled
-    if (m_alog->static_test(log::alevel::frame_header)) {
-    if (m_alog->dynamic_test(log::alevel::frame_header)) {
-        std::stringstream general,header,payload;
-        
-        general << "Dispatching write containing " << m_current_msgs.size()
-                <<" message(s) containing ";
-        header << "Header Bytes: \n";
-        payload << "Payload Bytes: \n";
-        
-        size_t hbytes = 0;
-        size_t pbytes = 0;
-        
-        for (size_t i = 0; i < m_current_msgs.size(); i++) {
-            hbytes += m_current_msgs[i]->get_header().size();
-            pbytes += m_current_msgs[i]->get_payload().size();
-
-            
-            header << "[" << i << "] (" 
-                   << m_current_msgs[i]->get_header().size() << ") " 
-                   << utility::to_hex(m_current_msgs[i]->get_header()) << "\n";
-
-            if (m_alog->static_test(log::alevel::frame_payload)) {
-            if (m_alog->dynamic_test(log::alevel::frame_payload)) {
-                payload << "[" << i << "] (" 
-                        << m_current_msgs[i]->get_payload().size() << ") ["<<m_current_msgs[i]->get_opcode()<<"] "
-                        << (m_current_msgs[i]->get_opcode() == frame::opcode::text ? 
-                                m_current_msgs[i]->get_payload() : 
-                                utility::to_hex(m_current_msgs[i]->get_payload())
-                           ) 
-                        << "\n";
-            }
-            }  
-        }
-        
-        general << hbytes << " header bytes and " << pbytes << " payload bytes";
-        
-        m_alog->write(log::alevel::frame_header,general.str());
-        m_alog->write(log::alevel::frame_header,header.str());
-        m_alog->write(log::alevel::frame_payload,payload.str());
-    }
-    }
-
-    transport_con_type::async_write(
-        m_send_buffer,
-        m_write_frame_handler
-    );
-}
-
-template <typename config>
-void connection<config>::handle_write_frame(lib::error_code const & ec)
-{
-    if (m_alog->static_test(log::alevel::devel)) {
-        m_alog->write(log::alevel::devel,"connection handle_write_frame");
-    }
-
-    bool terminal = m_current_msgs.back()->get_terminal();
-
-    m_send_buffer.clear();
-    m_current_msgs.clear();
-    // TODO: recycle instead of deleting
-
-    if (ec) {
-        log_err(log::elevel::fatal,"handle_write_frame",ec);
-        this->terminate(ec);
-        return;
-    }
-
-    if (terminal) {
-        this->terminate(lib::error_code());
-        return;
-    }
-
-    bool needs_writing = false;
-    {
-        scoped_lock_type lock(m_write_lock);
-
-        // release write flag
-        m_write_flag = false;
-
-        needs_writing = !m_send_queue.empty();
-    }
-
-    if (needs_writing) {
-        transport_con_type::dispatch(lib::bind(
-            &type::write_frame,
-            type::get_shared()
-        ));
-    }
-}
-
-template <typename config>
-std::vector<int> const & connection<config>::get_supported_versions() const
-{
-    return versions_supported;
-}
-
-template <typename config>
-void connection<config>::process_control_frame(typename config::message_type::ptr msg)
-{
-    m_alog->write(log::alevel::devel,"process_control_frame");
-
-    frame::opcode::value op = msg->get_opcode();
-    lib::error_code ec;
-
-    std::stringstream s;
-    s << "Control frame received with opcode " << op;
-    m_alog->write(log::alevel::control,s.str());
-
-    if (m_state == session::state::closed) {
-        m_elog->write(log::elevel::warn,"got frame in state closed");
-        return;
-    }
-    if (op != frame::opcode::CLOSE && m_state != session::state::open) {
-        m_elog->write(log::elevel::warn,"got non-close frame in state closing");
-        return;
-    }
-
-    if (op == frame::opcode::PING) {
-        bool should_reply = true;
-
-        if (m_ping_handler) {
-            should_reply = m_ping_handler(m_connection_hdl, msg->get_payload());
-        }
-
-        if (should_reply) {
-            this->pong(msg->get_payload(),ec);
-            if (ec) {
-                log_err(log::elevel::devel,"Failed to send response pong",ec);
-            }
-        }
-    } else if (op == frame::opcode::PONG) {
-        if (m_pong_handler) {
-            m_pong_handler(m_connection_hdl, msg->get_payload());
-        }
-        if (m_ping_timer) {
-            m_ping_timer->cancel();
-        }
-    } else if (op == frame::opcode::CLOSE) {
-        m_alog->write(log::alevel::devel,"got close frame");
-        // record close code and reason somewhere
-
-        m_remote_close_code = close::extract_code(msg->get_payload(),ec);
-        if (ec) {
-            s.str("");
-            if (config::drop_on_protocol_error) {
-                s << "Received invalid close code " << m_remote_close_code
-                  << " dropping connection per config.";
-                m_elog->write(log::elevel::devel,s.str());
-                this->terminate(ec);
-            } else {
-                s << "Received invalid close code " << m_remote_close_code
-                  << " sending acknowledgement and closing";
-                m_elog->write(log::elevel::devel,s.str());
-                ec = send_close_ack(close::status::protocol_error,
-                    "Invalid close code");
-                if (ec) {
-                    log_err(log::elevel::devel,"send_close_ack",ec);
-                }
-            }
-            return;
-        }
-
-        m_remote_close_reason = close::extract_reason(msg->get_payload(),ec);
-        if (ec) {
-            if (config::drop_on_protocol_error) {
-                m_elog->write(log::elevel::devel,
-                    "Received invalid close reason. Dropping connection per config");
-                this->terminate(ec);
-            } else {
-                m_elog->write(log::elevel::devel,
-                    "Received invalid close reason. Sending acknowledgement and closing");
-                ec = send_close_ack(close::status::protocol_error,
-                    "Invalid close reason");
-                if (ec) {
-                    log_err(log::elevel::devel,"send_close_ack",ec);
-                }
-            }
-            return;
-        }
-
-        if (m_state == session::state::open) {
-            s.str("");
-            s << "Received close frame with code " << m_remote_close_code
-              << " and reason " << m_remote_close_reason;
-            m_alog->write(log::alevel::devel,s.str());
-
-            ec = send_close_ack();
-            if (ec) {
-                log_err(log::elevel::devel,"send_close_ack",ec);
-            }
-        } else if (m_state == session::state::closing && !m_was_clean) {
-            // ack of our close
-            m_alog->write(log::alevel::devel, "Got acknowledgement of close");
-
-            m_was_clean = true;
-
-            // If we are a server terminate the connection now. Clients should
-            // leave the connection open to give the server an opportunity to
-            // initiate the TCP close. The client's timer will handle closing
-            // its side of the connection if the server misbehaves.
-            //
-            // TODO: different behavior if the underlying transport doesn't
-            // support timers?
-            if (m_is_server) {
-                terminate(lib::error_code());
-            }
-        } else {
-            // spurious, ignore
-            m_elog->write(log::elevel::devel, "Got close frame in wrong state");
-        }
-    } else {
-        // got an invalid control opcode
-        m_elog->write(log::elevel::devel, "Got control frame with invalid opcode");
-        // initiate protocol error shutdown
-    }
-}
-
-template <typename config>
-lib::error_code connection<config>::send_close_ack(close::status::value code,
-    std::string const & reason)
-{
-    return send_close_frame(code,reason,true,m_is_server);
-}
-
-template <typename config>
-lib::error_code connection<config>::send_close_frame(close::status::value code,
-    std::string const & reason, bool ack, bool terminal)
-{
-    m_alog->write(log::alevel::devel,"send_close_frame");
-
-    // check for special codes
-
-    // If silent close is set, respect it and blank out close information
-    // Otherwise use whatever has been specified in the parameters. If
-    // parameters specifies close::status::blank then determine what to do
-    // based on whether or not this is an ack. If it is not an ack just
-    // send blank info. If it is an ack then echo the close information from
-    // the remote endpoint.
-    if (config::silent_close) {
-        m_alog->write(log::alevel::devel,"closing silently");
-        m_local_close_code = close::status::no_status;
-        m_local_close_reason.clear();
-    } else if (code != close::status::blank) {
-        m_alog->write(log::alevel::devel,"closing with specified codes");
-        m_local_close_code = code;
-        m_local_close_reason = reason;
-    } else if (!ack) {
-        m_alog->write(log::alevel::devel,"closing with no status code");
-        m_local_close_code = close::status::no_status;
-        m_local_close_reason.clear();
-    } else if (m_remote_close_code == close::status::no_status) {
-        m_alog->write(log::alevel::devel,
-            "acknowledging a no-status close with normal code");
-        m_local_close_code = close::status::normal;
-        m_local_close_reason.clear();
-    } else {
-        m_alog->write(log::alevel::devel,"acknowledging with remote codes");
-        m_local_close_code = m_remote_close_code;
-        m_local_close_reason = m_remote_close_reason;
-    }
-
-    std::stringstream s;
-    s << "Closing with code: " << m_local_close_code << ", and reason: "
-      << m_local_close_reason;
-    m_alog->write(log::alevel::devel,s.str());
-
-    message_ptr msg = m_msg_manager->get_message();
-    if (!msg) {
-        return error::make_error_code(error::no_outgoing_buffers);
-    }
-
-    lib::error_code ec = m_processor->prepare_close(m_local_close_code,
-        m_local_close_reason,msg);
-    if (ec) {
-        return ec;
-    }
-
-    // Messages flagged terminal will result in the TCP connection being dropped
-    // after the message has been written. This is typically used when servers
-    // send an ack and when any endpoint encounters a protocol error
-    if (terminal) {
-        msg->set_terminal(true);
-    }
-
-    m_state = session::state::closing;
-
-    if (ack) {
-        m_was_clean = true;
-    }
-
-    // Start a timer so we don't wait forever for the acknowledgement close
-    // frame
-    if (m_close_handshake_timeout_dur > 0) {
-        m_handshake_timer = transport_con_type::set_timer(
-            m_close_handshake_timeout_dur,
-            lib::bind(
-                &type::handle_close_handshake_timeout,
-                type::get_shared(),
-                lib::placeholders::_1
-            )
-        );
-    }
-
-    bool needs_writing = false;
-    {
-        scoped_lock_type lock(m_write_lock);
-        write_push(msg);
-        needs_writing = !m_write_flag && !m_send_queue.empty();
-    }
-
-    if (needs_writing) {
-        transport_con_type::dispatch(lib::bind(
-            &type::write_frame,
-            type::get_shared()
-        ));
-    }
-
-    return lib::error_code();
-}
-
-template <typename config>
-typename connection<config>::processor_ptr
-connection<config>::get_processor(int version) const {
-    // TODO: allow disabling certain versions
-    
-    processor_ptr p;
-    
-    switch (version) {
-        case 0:
-            p = lib::make_shared<processor::hybi00<config> >(
-                transport_con_type::is_secure(),
-                m_is_server,
-                m_msg_manager
-            );
-            break;
-        case 7:
-            p = lib::make_shared<processor::hybi07<config> >(
-                transport_con_type::is_secure(),
-                m_is_server,
-                m_msg_manager,
-                lib::ref(m_rng)
-            );
-            break;
-        case 8:
-            p = lib::make_shared<processor::hybi08<config> >(
-                transport_con_type::is_secure(),
-                m_is_server,
-                m_msg_manager,
-                lib::ref(m_rng)
-            );
-            break;
-        case 13:
-            p = lib::make_shared<processor::hybi13<config> >(
-                transport_con_type::is_secure(),
-                m_is_server,
-                m_msg_manager,
-                lib::ref(m_rng)
-            );
-            break;
-        default:
-            return p;
-    }
-    
-    // Settings not configured by the constructor
-    p->set_max_message_size(m_max_message_size);
-    
-    return p;
-}
-
-template <typename config>
-void connection<config>::write_push(typename config::message_type::ptr msg)
-{
-    if (!msg) {
-        return;
-    }
-
-    m_send_buffer_size += msg->get_payload().size();
-    m_send_queue.push(msg);
-
-    if (m_alog->static_test(log::alevel::devel)) {
-        std::stringstream s;
-        s << "write_push: message count: " << m_send_queue.size()
-          << " buffer size: " << m_send_buffer_size;
-        m_alog->write(log::alevel::devel,s.str());
-    }
-}
-
-template <typename config>
-typename config::message_type::ptr connection<config>::write_pop()
-{
-    message_ptr msg;
-
-    if (m_send_queue.empty()) {
-        return msg;
-    }
-
-    msg = m_send_queue.front();
-
-    m_send_buffer_size -= msg->get_payload().size();
-    m_send_queue.pop();
-
-    if (m_alog->static_test(log::alevel::devel)) {
-        std::stringstream s;
-        s << "write_pop: message count: " << m_send_queue.size()
-          << " buffer size: " << m_send_buffer_size;
-        m_alog->write(log::alevel::devel,s.str());
-    }
-    return msg;
-}
-
-template <typename config>
-void connection<config>::log_open_result()
-{
-    std::stringstream s;
-
-    int version;
-    if (!processor::is_websocket_handshake(m_request)) {
-        version = -1;
-    } else {
-        version = processor::get_websocket_version(m_request);
-    }
-
-    // Connection Type
-    s << (version == -1 ? "HTTP" : "WebSocket") << " Connection ";
-
-    // Remote endpoint address
-    s << transport_con_type::get_remote_endpoint() << " ";
-
-    // Version string if WebSocket
-    if (version != -1) {
-        s << "v" << version << " ";
-    }
-
-    // User Agent
-    std::string ua = m_request.get_header("User-Agent");
-    if (ua.empty()) {
-        s << "\"\" ";
-    } else {
-        // check if there are any quotes in the user agent
-        s << "\"" << utility::string_replace_all(ua,"\"","\\\"") << "\" ";
-    }
-
-    // URI
-    s << (m_uri ? m_uri->get_resource() : "NULL") << " ";
-
-    // Status code
-    s << m_response.get_status_code();
-
-    m_alog->write(log::alevel::connect,s.str());
-}
-
-template <typename config>
-void connection<config>::log_close_result()
-{
-    std::stringstream s;
-
-    s << "Disconnect "
-      << "close local:[" << m_local_close_code
-      << (m_local_close_reason.empty() ? "" : ","+m_local_close_reason)
-      << "] remote:[" << m_remote_close_code
-      << (m_remote_close_reason.empty() ? "" : ","+m_remote_close_reason) << "]";
-
-    m_alog->write(log::alevel::disconnect,s.str());
-}
-
-template <typename config>
-void connection<config>::log_fail_result()
-{
-    std::stringstream s;
-    
-    int version = processor::get_websocket_version(m_request);
-
-    // Connection Type
-    s << "WebSocket Connection ";
-
-    // Remote endpoint address & WebSocket version
-    s << transport_con_type::get_remote_endpoint();
-    if (version < 0) {
-        s << " -";
-    } else {
-        s << " v" << version;
-    }
-
-    // User Agent
-    std::string ua = m_request.get_header("User-Agent");
-    if (ua.empty()) {
-        s << " \"\" ";
-    } else {
-        // check if there are any quotes in the user agent
-        s << " \"" << utility::string_replace_all(ua,"\"","\\\"") << "\" ";
-    }
-
-    // URI
-    s << (m_uri ? m_uri->get_resource() : "-");
-
-    // HTTP Status code
-    s  << " " << m_response.get_status_code();
-    
-    // WebSocket++ error code & reason
-    s << " " << m_ec << " " << m_ec.message();
-
-    m_alog->write(log::alevel::fail,s.str());
-}
-
-template <typename config>
-void connection<config>::log_http_result() {
-    std::stringstream s;
-
-    if (processor::is_websocket_handshake(m_request)) {
-        m_alog->write(log::alevel::devel,"Call to log_http_result for WebSocket");
-        return;
-    }  
-
-    // Connection Type
-    s << (m_request.get_header("host").empty() ? "-" : m_request.get_header("host"))
-      << " " << transport_con_type::get_remote_endpoint()
-      << " \"" << m_request.get_method() 
-      << " " << (m_uri ? m_uri->get_resource() : "-") 
-      << " " << m_request.get_version() << "\" " << m_response.get_status_code()
-      << " " << m_response.get_body().size();
-    
-    // User Agent
-    std::string ua = m_request.get_header("User-Agent");
-    if (ua.empty()) {
-        s << " \"\" ";
-    } else {
-        // check if there are any quotes in the user agent
-        s << " \"" << utility::string_replace_all(ua,"\"","\\\"") << "\" ";
-    }
-
-    m_alog->write(log::alevel::http,s.str());
-}
-
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_CONNECTION_IMPL_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/impl/endpoint_impl.hpp b/src/sioclient/lib/websocketpp/websocketpp/impl/endpoint_impl.hpp
deleted file mode 100644
index 2aac1d9d..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/impl/endpoint_impl.hpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_ENDPOINT_IMPL_HPP
-#define WEBSOCKETPP_ENDPOINT_IMPL_HPP
-
-#include <string>
-
-namespace websocketpp {
-
-template <typename connection, typename config>
-typename endpoint<connection,config>::connection_ptr
-endpoint<connection,config>::create_connection() {
-    m_alog->write(log::alevel::devel,"create_connection");
-    //scoped_lock_type lock(m_state_lock);
-
-    /*if (m_state == STOPPING || m_state == STOPPED) {
-        return connection_ptr();
-    }*/
-
-    //scoped_lock_type guard(m_mutex);
-    // Create a connection on the heap and manage it using a shared pointer
-    connection_ptr con = lib::make_shared<connection_type>(m_is_server,
-        m_user_agent, m_alog, m_elog, lib::ref(m_rng));
-
-    connection_weak_ptr w(con);
-
-    // Create a weak pointer on the heap using that shared_ptr.
-    // Cast that weak pointer to void* and manage it using another shared_ptr
-    // connection_hdl hdl(reinterpret_cast<void*>(new connection_weak_ptr(con)));
-
-    con->set_handle(w);
-
-    // Copy default handlers from the endpoint
-    con->set_open_handler(m_open_handler);
-    con->set_close_handler(m_close_handler);
-    con->set_fail_handler(m_fail_handler);
-    con->set_ping_handler(m_ping_handler);
-    con->set_pong_handler(m_pong_handler);
-    con->set_pong_timeout_handler(m_pong_timeout_handler);
-    con->set_interrupt_handler(m_interrupt_handler);
-    con->set_http_handler(m_http_handler);
-    con->set_validate_handler(m_validate_handler);
-    con->set_message_handler(m_message_handler);
-
-    if (m_open_handshake_timeout_dur != config::timeout_open_handshake) {
-        con->set_open_handshake_timeout(m_open_handshake_timeout_dur);
-    }
-    if (m_close_handshake_timeout_dur != config::timeout_close_handshake) {
-        con->set_close_handshake_timeout(m_close_handshake_timeout_dur);
-    }
-    if (m_pong_timeout_dur != config::timeout_pong) {
-        con->set_pong_timeout(m_pong_timeout_dur);
-    }
-    if (m_max_message_size != config::max_message_size) {
-        con->set_max_message_size(m_max_message_size);
-    }
-    con->set_max_http_body_size(m_max_http_body_size);
-
-    lib::error_code ec;
-
-    ec = transport_type::init(con);
-    if (ec) {
-        m_elog->write(log::elevel::fatal,ec.message());
-        return connection_ptr();
-    }
-
-    return con;
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::interrupt(connection_hdl hdl, lib::error_code & ec)
-{
-    connection_ptr con = get_con_from_hdl(hdl,ec);
-    if (ec) {return;}
-
-    m_alog->write(log::alevel::devel,"Interrupting connection");
-
-    ec = con->interrupt();
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::interrupt(connection_hdl hdl) {
-    lib::error_code ec;
-    interrupt(hdl,ec);
-    if (ec) { throw exception(ec); }
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::pause_reading(connection_hdl hdl, lib::error_code & ec)
-{
-    connection_ptr con = get_con_from_hdl(hdl,ec);
-    if (ec) {return;}
-
-    ec = con->pause_reading();
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::pause_reading(connection_hdl hdl) {
-    lib::error_code ec;
-    pause_reading(hdl,ec);
-    if (ec) { throw exception(ec); }
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::resume_reading(connection_hdl hdl, lib::error_code & ec)
-{
-    connection_ptr con = get_con_from_hdl(hdl,ec);
-    if (ec) {return;}
-
-    ec = con->resume_reading();
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::resume_reading(connection_hdl hdl) {
-    lib::error_code ec;
-    resume_reading(hdl,ec);
-    if (ec) { throw exception(ec); }
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::send_http_response(connection_hdl hdl,
-    lib::error_code & ec)
-{
-    connection_ptr con = get_con_from_hdl(hdl,ec);
-    if (ec) {return;}
-    con->send_http_response(ec);
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::send_http_response(connection_hdl hdl) {
-    lib::error_code ec;
-    send_http_response(hdl,ec);
-    if (ec) { throw exception(ec); }
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::send(connection_hdl hdl, std::string const & payload,
-    frame::opcode::value op, lib::error_code & ec)
-{
-    connection_ptr con = get_con_from_hdl(hdl,ec);
-    if (ec) {return;}
-
-    ec = con->send(payload,op);
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::send(connection_hdl hdl, std::string const & payload,
-    frame::opcode::value op)
-{
-    lib::error_code ec;
-    send(hdl,payload,op,ec);
-    if (ec) { throw exception(ec); }
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::send(connection_hdl hdl, void const * payload,
-    size_t len, frame::opcode::value op, lib::error_code & ec)
-{
-    connection_ptr con = get_con_from_hdl(hdl,ec);
-    if (ec) {return;}
-    ec = con->send(payload,len,op);
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::send(connection_hdl hdl, void const * payload,
-    size_t len, frame::opcode::value op)
-{
-    lib::error_code ec;
-    send(hdl,payload,len,op,ec);
-    if (ec) { throw exception(ec); }
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::send(connection_hdl hdl, message_ptr msg,
-    lib::error_code & ec)
-{
-    connection_ptr con = get_con_from_hdl(hdl,ec);
-    if (ec) {return;}
-    ec = con->send(msg);
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::send(connection_hdl hdl, message_ptr msg) {
-    lib::error_code ec;
-    send(hdl,msg,ec);
-    if (ec) { throw exception(ec); }
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::close(connection_hdl hdl, close::status::value
-    const code, std::string const & reason,
-    lib::error_code & ec)
-{
-    connection_ptr con = get_con_from_hdl(hdl,ec);
-    if (ec) {return;}
-    con->close(code,reason,ec);
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::close(connection_hdl hdl, close::status::value
-    const code, std::string const & reason)
-{
-    lib::error_code ec;
-    close(hdl,code,reason,ec);
-    if (ec) { throw exception(ec); }
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::ping(connection_hdl hdl, std::string const &
-    payload, lib::error_code & ec)
-{
-    connection_ptr con = get_con_from_hdl(hdl,ec);
-    if (ec) {return;}
-    con->ping(payload,ec);
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::ping(connection_hdl hdl, std::string const & payload)
-{
-    lib::error_code ec;
-    ping(hdl,payload,ec);
-    if (ec) { throw exception(ec); }
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::pong(connection_hdl hdl, std::string const & payload,
-    lib::error_code & ec)
-{
-    connection_ptr con = get_con_from_hdl(hdl,ec);
-    if (ec) {return;}
-    con->pong(payload,ec);
-}
-
-template <typename connection, typename config>
-void endpoint<connection,config>::pong(connection_hdl hdl, std::string const & payload)
-{
-    lib::error_code ec;
-    pong(hdl,payload,ec);
-    if (ec) { throw exception(ec); }
-}
-
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_ENDPOINT_IMPL_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/impl/utilities_impl.hpp b/src/sioclient/lib/websocketpp/websocketpp/impl/utilities_impl.hpp
deleted file mode 100644
index 6f86e22f..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/impl/utilities_impl.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_UTILITIES_IMPL_HPP
-#define WEBSOCKETPP_UTILITIES_IMPL_HPP
-
-#include <algorithm>
-#include <string>
-
-namespace websocketpp {
-namespace utility {
-
-inline std::string to_lower(std::string const & in) {
-    std::string out = in;
-    std::transform(out.begin(),out.end(),out.begin(),::tolower);
-    return out;
-}
-
-inline std::string to_hex(std::string const & input) {
-    std::string output;
-    std::string hex = "0123456789ABCDEF";
-
-    for (size_t i = 0; i < input.size(); i++) {
-        output += hex[(input[i] & 0xF0) >> 4];
-        output += hex[input[i] & 0x0F];
-        output += " ";
-    }
-
-    return output;
-}
-
-inline std::string to_hex(uint8_t const * input, size_t length) {
-    std::string output;
-    std::string hex = "0123456789ABCDEF";
-
-    for (size_t i = 0; i < length; i++) {
-        output += hex[(input[i] & 0xF0) >> 4];
-        output += hex[input[i] & 0x0F];
-        output += " ";
-    }
-
-    return output;
-}
-
-inline std::string to_hex(const char* input,size_t length) {
-    return to_hex(reinterpret_cast<const uint8_t*>(input),length);
-}
-
-inline std::string string_replace_all(std::string subject, std::string const &
-    search, std::string const & replace)
-{
-    size_t pos = 0;
-    while((pos = subject.find(search, pos)) != std::string::npos) {
-         subject.replace(pos, search.length(), replace);
-         pos += replace.length();
-    }
-    return subject;
-}
-
-} // namespace utility
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_UTILITIES_IMPL_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/logger/basic.hpp b/src/sioclient/lib/websocketpp/websocketpp/logger/basic.hpp
deleted file mode 100644
index 84514130..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/logger/basic.hpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_LOGGER_BASIC_HPP
-#define WEBSOCKETPP_LOGGER_BASIC_HPP
-
-/* Need a way to print a message to the log
- *
- * - timestamps
- * - channels
- * - thread safe
- * - output to stdout or file
- * - selective output channels, both compile time and runtime
- * - named channels
- * - ability to test whether a log message will be printed at compile time
- *
- */
-
-#include <websocketpp/logger/levels.hpp>
-
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/stdint.hpp>
-#include <websocketpp/common/time.hpp>
-
-#include <ctime>
-#include <iostream>
-#include <iomanip>
-#include <string>
-
-namespace websocketpp {
-namespace log {
-
-/// Basic logger that outputs to an ostream
-template <typename concurrency, typename names>
-class basic {
-public:
-    basic<concurrency,names>(channel_type_hint::value h =
-        channel_type_hint::access)
-      : m_static_channels(0xffffffff)
-      , m_dynamic_channels(0)
-      , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
-
-    basic<concurrency,names>(std::ostream * out)
-      : m_static_channels(0xffffffff)
-      , m_dynamic_channels(0)
-      , m_out(out) {}
-
-    basic<concurrency,names>(level c, channel_type_hint::value h =
-        channel_type_hint::access)
-      : m_static_channels(c)
-      , m_dynamic_channels(0)
-      , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
-
-    basic<concurrency,names>(level c, std::ostream * out)
-      : m_static_channels(c)
-      , m_dynamic_channels(0)
-      , m_out(out) {}
-
-    /// Destructor
-    ~basic<concurrency,names>() {}
-
-    /// Copy constructor
-    basic<concurrency,names>(basic<concurrency,names> const & other)
-     : m_static_channels(other.m_static_channels)
-     , m_dynamic_channels(other.m_dynamic_channels)
-     , m_out(other.m_out)
-    {}
-    
-#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-    // no copy assignment operator because of const member variables
-    basic<concurrency,names> & operator=(basic<concurrency,names> const &) = delete;
-#endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-
-#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
-    /// Move constructor
-    basic<concurrency,names>(basic<concurrency,names> && other)
-     : m_static_channels(other.m_static_channels)
-     , m_dynamic_channels(other.m_dynamic_channels)
-     , m_out(other.m_out)
-    {}
-
-#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-    // no move assignment operator because of const member variables
-    basic<concurrency,names> & operator=(basic<concurrency,names> &&) = delete;
-#endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-
-#endif // _WEBSOCKETPP_MOVE_SEMANTICS_
-
-    void set_ostream(std::ostream * out = &std::cout) {
-        m_out = out;
-    }
-
-    void set_channels(level channels) {
-        if (channels == names::none) {
-            clear_channels(names::all);
-            return;
-        }
-
-        scoped_lock_type lock(m_lock);
-        m_dynamic_channels |= (channels & m_static_channels);
-    }
-
-    void clear_channels(level channels) {
-        scoped_lock_type lock(m_lock);
-        m_dynamic_channels &= ~channels;
-    }
-
-    /// Write a string message to the given channel
-    /**
-     * @param channel The channel to write to
-     * @param msg The message to write
-     */
-    void write(level channel, std::string const & msg) {
-        scoped_lock_type lock(m_lock);
-        if (!this->dynamic_test(channel)) { return; }
-        *m_out << "[" << timestamp << "] "
-                  << "[" << names::channel_name(channel) << "] "
-                  << msg << "\n";
-        m_out->flush();
-    }
-
-    /// Write a cstring message to the given channel
-    /**
-     * @param channel The channel to write to
-     * @param msg The message to write
-     */
-    void write(level channel, char const * msg) {
-        scoped_lock_type lock(m_lock);
-        if (!this->dynamic_test(channel)) { return; }
-        *m_out << "[" << timestamp << "] "
-                  << "[" << names::channel_name(channel) << "] "
-                  << msg << "\n";
-        m_out->flush();
-    }
-
-    _WEBSOCKETPP_CONSTEXPR_TOKEN_ bool static_test(level channel) const {
-        return ((channel & m_static_channels) != 0);
-    }
-
-    bool dynamic_test(level channel) {
-        return ((channel & m_dynamic_channels) != 0);
-    }
-
-protected:
-    typedef typename concurrency::scoped_lock_type scoped_lock_type;
-    typedef typename concurrency::mutex_type mutex_type;
-    mutex_type m_lock;
-
-private:
-    // The timestamp does not include the time zone, because on Windows with the
-    // default registry settings, the time zone would be written out in full,
-    // which would be obnoxiously verbose.
-    //
-    // TODO: find a workaround for this or make this format user settable
-    static std::ostream & timestamp(std::ostream & os) {
-        std::time_t t = std::time(NULL);
-        std::tm lt = lib::localtime(t);
-        #ifdef _WEBSOCKETPP_PUTTIME_
-            return os << std::put_time(&lt,"%Y-%m-%d %H:%M:%S");
-        #else // Falls back to strftime, which requires a temporary copy of the string.
-            char buffer[20];
-            size_t result = std::strftime(buffer,sizeof(buffer),"%Y-%m-%d %H:%M:%S",&lt);
-            return os << (result == 0 ? "Unknown" : buffer);
-        #endif
-    }
-
-    level const m_static_channels;
-    level m_dynamic_channels;
-    std::ostream * m_out;
-};
-
-} // log
-} // websocketpp
-
-#endif // WEBSOCKETPP_LOGGER_BASIC_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/logger/levels.hpp b/src/sioclient/lib/websocketpp/websocketpp/logger/levels.hpp
deleted file mode 100644
index cd7ccd69..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/logger/levels.hpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_LOGGER_LEVELS_HPP
-#define WEBSOCKETPP_LOGGER_LEVELS_HPP
-
-#include <websocketpp/common/stdint.hpp>
-
-namespace websocketpp {
-namespace log {
-
-/// Type of a channel package
-typedef uint32_t level;
-
-/// Package of values for hinting at the nature of a given logger.
-/**
- * Used by the library to signal to the logging class a hint that it can use to
- * set itself up. For example, the `access` hint indicates that it is an access
- * log that might be suitable for being printed to an access log file or to cout
- * whereas `error` might be suitable for an error log file or cerr. 
- */
-struct channel_type_hint {
-    /// Type of a channel type hint value
-    typedef uint32_t value;
-    
-    /// No information
-    static value const none = 0;
-    /// Access log
-    static value const access = 1;
-    /// Error log
-    static value const error = 2;
-};
-
-/// Package of log levels for logging errors
-struct elevel {
-    /// Special aggregate value representing "no levels"
-    static level const none = 0x0;
-    /// Low level debugging information (warning: very chatty)
-    static level const devel = 0x1;
-    /// Information about unusual system states or other minor internal library
-    /// problems, less chatty than devel.
-    static level const library = 0x2;
-    /// Information about minor configuration problems or additional information
-    /// about other warnings.
-    static level const info = 0x4;
-    /// Information about important problems not severe enough to terminate
-    /// connections.
-    static level const warn = 0x8;
-    /// Recoverable error. Recovery may mean cleanly closing the connection with
-    /// an appropriate error code to the remote endpoint.
-    static level const rerror = 0x10;
-    /// Unrecoverable error. This error will trigger immediate unclean
-    /// termination of the connection or endpoint.
-    static level const fatal = 0x20;
-    /// Special aggregate value representing "all levels"
-    static level const all = 0xffffffff;
-
-    /// Get the textual name of a channel given a channel id
-    /**
-     * The id must be that of a single channel. Passing an aggregate channel
-     * package results in undefined behavior.
-     *
-     * @param channel The channel id to look up.
-     *
-     * @return The name of the specified channel.
-     */
-    static char const * channel_name(level channel) {
-        switch(channel) {
-            case devel:
-                return "devel";
-            case library:
-                return "library";
-            case info:
-                return "info";
-            case warn:
-                return "warning";
-            case rerror:
-                return "error";
-            case fatal:
-                return "fatal";
-            default:
-                return "unknown";
-        }
-    }
-};
-
-/// Package of log levels for logging access events
-struct alevel {
-    /// Special aggregate value representing "no levels"
-    static level const none = 0x0;
-    /// Information about new connections
-    /**
-     * One line for each new connection that includes a host of information
-     * including: the remote address, websocket version, requested resource,
-     * http code, remote user agent
-     */
-    static level const connect = 0x1;
-    /// One line for each closed connection. Includes closing codes and reasons.
-    static level const disconnect = 0x2;
-    /// One line per control frame
-    static level const control = 0x4;
-    /// One line per frame, includes the full frame header
-    static level const frame_header = 0x8;
-    /// One line per frame, includes the full message payload (warning: chatty)
-    static level const frame_payload = 0x10;
-    /// Reserved
-    static level const message_header = 0x20;
-    /// Reserved
-    static level const message_payload = 0x40;
-    /// Reserved
-    static level const endpoint = 0x80;
-    /// Extra information about opening handshakes
-    static level const debug_handshake = 0x100;
-    /// Extra information about closing handshakes
-    static level const debug_close = 0x200;
-    /// Development messages (warning: very chatty)
-    static level const devel = 0x400;
-    /// Special channel for application specific logs. Not used by the library.
-    static level const app = 0x800;
-    /// Access related to HTTP requests
-    static level const http = 0x1000;
-    /// One line for each failed WebSocket connection with details
-    static level const fail = 0x2000;
-    /// Aggregate package representing the commonly used core access channels
-    /// Connect, Disconnect, Fail, and HTTP
-    static level const access_core = 0x00003003;
-    /// Special aggregate value representing "all levels"
-    static level const all = 0xffffffff;
-
-    /// Get the textual name of a channel given a channel id
-    /**
-     * Get the textual name of a channel given a channel id. The id must be that
-     * of a single channel. Passing an aggregate channel package results in
-     * undefined behavior.
-     *
-     * @param channel The channelid to look up.
-     *
-     * @return The name of the specified channel.
-     */
-    static char const * channel_name(level channel) {
-        switch(channel) {
-            case connect:
-                return "connect";
-            case disconnect:
-                return "disconnect";
-            case control:
-                return "control";
-            case frame_header:
-                return "frame_header";
-            case frame_payload:
-                return "frame_payload";
-            case message_header:
-                return "message_header";
-            case message_payload:
-                return "message_payload";
-            case endpoint:
-                return "endpoint";
-            case debug_handshake:
-                return "debug_handshake";
-            case debug_close:
-                return "debug_close";
-            case devel:
-                return "devel";
-            case app:
-                return "application";
-            case http:
-                return "http";
-            case fail:
-                return "fail";
-            default:
-                return "unknown";
-        }
-    }
-};
-
-} // logger
-} // websocketpp
-
-#endif //WEBSOCKETPP_LOGGER_LEVELS_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/logger/stub.hpp b/src/sioclient/lib/websocketpp/websocketpp/logger/stub.hpp
deleted file mode 100644
index 2db6da7d..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/logger/stub.hpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_LOGGER_STUB_HPP
-#define WEBSOCKETPP_LOGGER_STUB_HPP
-
-#include <websocketpp/logger/levels.hpp>
-
-#include <websocketpp/common/cpp11.hpp>
-
-#include <string>
-
-namespace websocketpp {
-namespace log {
-
-/// Stub logger that ignores all input
-class stub {
-public:
-    /// Construct the logger
-    /**
-     * @param hint A channel type specific hint for how to construct the logger
-     */
-    explicit stub(channel_type_hint::value) {}
-
-    /// Construct the logger
-    /**
-     * @param default_channels A set of channels to statically enable
-     * @param hint A channel type specific hint for how to construct the logger
-     */
-    stub(level, channel_type_hint::value) {}
-    _WEBSOCKETPP_CONSTEXPR_TOKEN_ stub() {}
-
-    /// Dynamically enable the given list of channels
-    /**
-     * All operations on the stub logger are no-ops and all arguments are
-     * ignored
-     *
-     * @param channels The package of channels to enable
-     */
-    void set_channels(level) {}
-
-    /// Dynamically disable the given list of channels
-    /**
-     * All operations on the stub logger are no-ops and all arguments are
-     * ignored
-     *
-     * @param channels The package of channels to disable
-     */
-    void clear_channels(level) {}
-
-    /// Write a string message to the given channel
-    /**
-     * Writing on the stub logger is a no-op and all arguments are ignored
-     *
-     * @param channel The channel to write to
-     * @param msg The message to write
-     */
-    void write(level, std::string const &) {}
-
-    /// Write a cstring message to the given channel
-    /**
-     * Writing on the stub logger is a no-op and all arguments are ignored
-     *
-     * @param channel The channel to write to
-     * @param msg The message to write
-     */
-    void write(level, char const *) {}
-
-    /// Test whether a channel is statically enabled
-    /**
-     * The stub logger has no channels so all arguments are ignored and
-     * `static_test` always returns false.
-     *
-     * @param channel The package of channels to test
-     */
-    _WEBSOCKETPP_CONSTEXPR_TOKEN_ bool static_test(level) const {
-        return false;
-    }
-
-    /// Test whether a channel is dynamically enabled
-    /**
-     * The stub logger has no channels so all arguments are ignored and
-     * `dynamic_test` always returns false.
-     *
-     * @param channel The package of channels to test
-     */
-    bool dynamic_test(level) {
-        return false;
-    }
-};
-
-} // log
-} // websocketpp
-
-#endif // WEBSOCKETPP_LOGGER_STUB_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/logger/syslog.hpp b/src/sioclient/lib/websocketpp/websocketpp/logger/syslog.hpp
deleted file mode 100644
index 513abee4..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/logger/syslog.hpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- * The initial version of this logging policy was contributed to the WebSocket++
- * project by Tom Hughes.
- */
-
-#ifndef WEBSOCKETPP_LOGGER_SYSLOG_HPP
-#define WEBSOCKETPP_LOGGER_SYSLOG_HPP
-
-#include <syslog.h>
-
-#include <websocketpp/logger/basic.hpp>
-
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/logger/levels.hpp>
-
-namespace websocketpp {
-namespace log {
-
-/// Basic logger that outputs to syslog
-template <typename concurrency, typename names>
-class syslog : public basic<concurrency, names> {
-public:
-    typedef basic<concurrency, names> base;
-
-    /// Construct the logger
-    /**
-     * @param hint A channel type specific hint for how to construct the logger
-     */
-    syslog<concurrency,names>(channel_type_hint::value hint =
-        channel_type_hint::access)
-      : basic<concurrency,names>(hint), m_channel_type_hint(hint) {}
-
-    /// Construct the logger
-    /**
-     * @param channels A set of channels to statically enable
-     * @param hint A channel type specific hint for how to construct the logger
-     */
-    syslog<concurrency,names>(level channels, channel_type_hint::value hint =
-        channel_type_hint::access)
-      : basic<concurrency,names>(channels, hint), m_channel_type_hint(hint) {}
-
-    /// Write a string message to the given channel
-    /**
-     * @param channel The channel to write to
-     * @param msg The message to write
-     */
-    void write(level channel, std::string const & msg) {
-        write(channel, msg.c_str());
-    }
-
-    /// Write a cstring message to the given channel
-    /**
-     * @param channel The channel to write to
-     * @param msg The message to write
-     */
-    void write(level channel, char const * msg) {
-        scoped_lock_type lock(base::m_lock);
-        if (!this->dynamic_test(channel)) { return; }
-        ::syslog(syslog_priority(channel), "[%s] %s",
-            names::channel_name(channel), msg);
-    }
-private:
-    typedef typename base::scoped_lock_type scoped_lock_type;
-
-    /// The default level is used for all access logs and any error logs that
-    /// don't trivially map to one of the standard syslog levels.
-    static int const default_level = LOG_INFO;
-
-    /// retrieve the syslog priority code given a WebSocket++ channel
-    /**
-     * @param channel The level to look up
-     * @return The syslog level associated with `channel`
-     */
-    int syslog_priority(level channel) const {
-        if (m_channel_type_hint == channel_type_hint::access) {
-            return syslog_priority_access(channel);
-        } else {
-            return syslog_priority_error(channel);
-        }
-    }
-
-    /// retrieve the syslog priority code given a WebSocket++ error channel
-    /**
-     * @param channel The level to look up
-     * @return The syslog level associated with `channel`
-     */
-    int syslog_priority_error(level channel) const {
-        switch (channel) {
-            case elevel::devel:
-                return LOG_DEBUG;
-            case elevel::library:
-                return LOG_DEBUG;
-            case elevel::info:
-                return LOG_INFO;
-            case elevel::warn:
-                return LOG_WARNING;
-            case elevel::rerror:
-                return LOG_ERR;
-            case elevel::fatal:
-                return LOG_CRIT;
-            default:
-                return default_level;
-        }
-    }
-
-    /// retrieve the syslog priority code given a WebSocket++ access channel
-    /**
-     * @param channel The level to look up
-     * @return The syslog level associated with `channel`
-     */
-    _WEBSOCKETPP_CONSTEXPR_TOKEN_ int syslog_priority_access(level) const {
-        return default_level;
-    }
-
-    channel_type_hint::value m_channel_type_hint;
-};
-
-} // log
-} // websocketpp
-
-#endif // WEBSOCKETPP_LOGGER_SYSLOG_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/message_buffer/alloc.hpp b/src/sioclient/lib/websocketpp/websocketpp/message_buffer/alloc.hpp
deleted file mode 100644
index 75d89766..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/message_buffer/alloc.hpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
-#define WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
-
-#include <websocketpp/common/memory.hpp>
-#include <websocketpp/frame.hpp>
-
-namespace websocketpp {
-namespace message_buffer {
-namespace alloc {
-
-/// A connection message manager that allocates a new message for each
-/// request.
-template <typename message>
-class con_msg_manager
-  : public lib::enable_shared_from_this<con_msg_manager<message> >
-{
-public:
-    typedef con_msg_manager<message> type;
-    typedef lib::shared_ptr<con_msg_manager> ptr;
-    typedef lib::weak_ptr<con_msg_manager> weak_ptr;
-
-    typedef typename message::ptr message_ptr;
-
-    /// Get an empty message buffer
-    /**
-     * @return A shared pointer to an empty new message
-     */
-    message_ptr get_message() {
-        return message_ptr(lib::make_shared<message>(type::shared_from_this()));
-    }
-
-    /// Get a message buffer with specified size and opcode
-    /**
-     * @param op The opcode to use
-     * @param size Minimum size in bytes to request for the message payload.
-     *
-     * @return A shared pointer to a new message with specified size.
-     */
-    message_ptr get_message(frame::opcode::value op,size_t size) {
-        return message_ptr(lib::make_shared<message>(type::shared_from_this(),op,size));
-    }
-
-    /// Recycle a message
-    /**
-     * This method shouldn't be called. If it is, return false to indicate an
-     * error. The rest of the method recycle chain should notice this and free
-     * the memory.
-     *
-     * @param msg The message to be recycled.
-     *
-     * @return true if the message was successfully recycled, false otherwse.
-     */
-    bool recycle(message *) {
-        return false;
-    }
-};
-
-/// An endpoint message manager that allocates a new manager for each
-/// connection.
-template <typename con_msg_manager>
-class endpoint_msg_manager {
-public:
-    typedef typename con_msg_manager::ptr con_msg_man_ptr;
-
-    /// Get a pointer to a connection message manager
-    /**
-     * @return A pointer to the requested connection message manager.
-     */
-    con_msg_man_ptr get_manager() const {
-        return con_msg_man_ptr(lib::make_shared<con_msg_manager>());
-    }
-};
-
-} // namespace alloc
-} // namespace message_buffer
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/message_buffer/message.hpp b/src/sioclient/lib/websocketpp/websocketpp/message_buffer/message.hpp
deleted file mode 100644
index da36e200..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/message_buffer/message.hpp
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_MESSAGE_BUFFER_MESSAGE_HPP
-#define WEBSOCKETPP_MESSAGE_BUFFER_MESSAGE_HPP
-
-#include <websocketpp/common/memory.hpp>
-#include <websocketpp/frame.hpp>
-
-#include <string>
-
-namespace websocketpp {
-namespace message_buffer {
-
-/* # message:
- * object that stores a message while it is being sent or received. Contains
- * the message payload itself, the message header, the extension data, and the
- * opcode.
- *
- * # connection_message_manager:
- * An object that manages all of the message_buffers associated with a given
- * connection. Implements the get_message_buffer(size) method that returns
- * a message buffer at least size bytes long.
- *
- * Message buffers are reference counted with shared ownership semantics. Once
- * requested from the manager the requester and it's associated downstream code
- * may keep a pointer to the message indefinitely at a cost of extra resource
- * usage. Once the reference count drops to the point where the manager is the
- * only reference the messages is recycled using whatever method is implemented
- * in the manager.
- *
- * # endpoint_message_manager:
- * An object that manages connection_message_managers. Implements the
- * get_message_manager() method. This is used once by each connection to
- * request the message manager that they are supposed to use to manage message
- * buffers for their own use.
- *
- * TYPES OF CONNECTION_MESSAGE_MANAGERS
- * - allocate a message with the exact size every time one is requested
- * - maintain a pool of pre-allocated messages and return one when needed.
- *   Recycle previously used messages back into the pool
- *
- * TYPES OF ENDPOINT_MESSAGE_MANAGERS
- *  - allocate a new connection manager for each connection. Message pools
- *    become connection specific. This increases memory usage but improves
- *    concurrency.
- *  - allocate a single connection manager and share a pointer to it with all
- *    connections created by this endpoint. The message pool will be shared
- *    among all connections, improving memory usage and performance at the cost
- *    of reduced concurrency
- */
-
-
-/// Represents a buffer for a single WebSocket message.
-/**
- *
- *
- */
-template <template<class> class con_msg_manager>
-class message {
-public:
-    typedef lib::shared_ptr<message> ptr;
-
-    typedef con_msg_manager<message> con_msg_man_type;
-    typedef typename con_msg_man_type::ptr con_msg_man_ptr;
-    typedef typename con_msg_man_type::weak_ptr con_msg_man_weak_ptr;
-
-    /// Construct an empty message
-    /**
-     * Construct an empty message
-     */
-    message(const con_msg_man_ptr manager)
-      : m_manager(manager)
-      , m_prepared(false)
-      , m_fin(true)
-      , m_terminal(false)
-      , m_compressed(false) {}
-
-    /// Construct a message and fill in some values
-    /**
-     *
-     */
-    message(const con_msg_man_ptr manager, frame::opcode::value op, size_t size = 128)
-      : m_manager(manager)
-      , m_opcode(op)
-      , m_prepared(false)
-      , m_fin(true)
-      , m_terminal(false)
-      , m_compressed(false)
-    {
-        m_payload.reserve(size);
-    }
-
-    /// Return whether or not the message has been prepared for sending
-    /**
-     * The prepared flag indicates that the message has been prepared by a
-     * websocket protocol processor and is ready to be written to the wire.
-     *
-     * @return whether or not the message has been prepared for sending
-     */
-    bool get_prepared() const {
-        return m_prepared;
-    }
-
-    /// Set or clear the flag that indicates that the message has been prepared
-    /**
-     * This flag should not be set by end user code without a very good reason.
-     *
-     * @param value The value to set the prepared flag to
-     */
-    void set_prepared(bool value) {
-        m_prepared = value;
-    }
-
-    /// Return whether or not the message is flagged as compressed
-    /**
-     * @return whether or not the message is/should be compressed
-     */
-    bool get_compressed() const {
-        return m_compressed;
-    }
-
-    /// Set or clear the compression flag
-    /**
-     * Setting the compression flag indicates that the data in this message
-     * would benefit from compression. If both endpoints negotiate a compression
-     * extension WebSocket++ will attempt to compress messages with this flag.
-     * Setting this flag does not guarantee that the message will be compressed.
-     *
-     * @param value The value to set the compressed flag to
-     */
-    void set_compressed(bool value) {
-        m_compressed = value;
-    }
-
-    /// Get whether or not the message is terminal
-    /**
-     * Messages can be flagged as terminal, which results in the connection
-     * being close after they are written rather than the implementation going
-     * on to the next message in the queue. This is typically used internally
-     * for close messages only.
-     *
-     * @return Whether or not this message is marked terminal
-     */
-    bool get_terminal() const {
-        return m_terminal;
-    }
-
-    /// Set the terminal flag
-    /**
-     * This flag should not be set by end user code without a very good reason.
-     *
-     * @see get_terminal()
-     *
-     * @param value The value to set the terminal flag to.
-     */
-    void set_terminal(bool value) {
-        m_terminal = value;
-    }
-    /// Read the fin bit
-    /**
-     * A message with the fin bit set will be sent as the last message of its
-     * sequence. A message with the fin bit cleared will require subsequent
-     * frames of opcode continuation until one of them has the fin bit set.
-     *
-     * The remote end likely will not deliver any bytes until the frame with the fin
-     * bit set has been received.
-     *
-     * @return Whether or not the fin bit is set
-     */
-    bool get_fin() const {
-        return m_fin;
-    }
-
-    /// Set the fin bit
-    /**
-     * @see get_fin for a more detailed explaination of the fin bit
-     *
-     * @param value The value to set the fin bit to.
-     */
-    void set_fin(bool value) {
-        m_fin = value;
-    }
-
-    /// Return the message opcode
-    frame::opcode::value get_opcode() const {
-        return m_opcode;
-    }
-
-    /// Set the opcode
-    void set_opcode(frame::opcode::value op) {
-        m_opcode = op;
-    }
-
-    /// Return the prepared frame header
-    /**
-     * This value is typically set by a websocket protocol processor
-     * and shouldn't be tampered with.
-     */
-    std::string const & get_header() const {
-        return m_header;
-    }
-
-    /// Set prepared frame header
-    /**
-     * Under normal circumstances this should not be called by end users
-     *
-     * @param header A string to set the header to.
-     */
-    void set_header(std::string const & header) {
-        m_header = header;
-    }
-
-    std::string const & get_extension_data() const {
-        return m_extension_data;
-    }
-
-    /// Get a reference to the payload string
-    /**
-     * @return A const reference to the message's payload string
-     */
-    std::string const & get_payload() const {
-        return m_payload;
-    }
-
-    /// Get a non-const reference to the payload string
-    /**
-     * @return A reference to the message's payload string
-     */
-    std::string & get_raw_payload() {
-        return m_payload;
-    }
-
-    /// Set payload data
-    /**
-     * Set the message buffer's payload to the given value.
-     *
-     * @param payload A string to set the payload to.
-     */
-    void set_payload(std::string const & payload) {
-        m_payload = payload;
-    }
-
-    /// Set payload data
-    /**
-     * Set the message buffer's payload to the given value.
-     *
-     * @param payload A pointer to a data array to set to.
-     * @param len The length of new payload in bytes.
-     */
-    void set_payload(void const * payload, size_t len) {
-        m_payload.reserve(len);
-        char const * pl = static_cast<char const *>(payload);
-        m_payload.assign(pl, pl + len);
-    }
-
-    /// Append payload data
-    /**
-     * Append data to the message buffer's payload.
-     *
-     * @param payload A string containing the data array to append.
-     */
-    void append_payload(std::string const & payload) {
-        m_payload.append(payload);
-    }
-
-    /// Append payload data
-    /**
-     * Append data to the message buffer's payload.
-     *
-     * @param payload A pointer to a data array to append
-     * @param len The length of payload in bytes
-     */
-    void append_payload(void const * payload, size_t len) {
-        m_payload.reserve(m_payload.size()+len);
-        m_payload.append(static_cast<char const *>(payload),len);
-    }
-
-    /// Recycle the message
-    /**
-     * A request to recycle this message was received. Forward that request to
-     * the connection message manager for processing. Errors and exceptions
-     * from the manager's recycle member function should be passed back up the
-     * call chain. The caller to message::recycle will deal with them.
-     *
-     * Recycle must *only* be called by the message shared_ptr's destructor.
-     * Once recycled successfully, ownership of the memory has been passed to
-     * another system and must not be accessed again.
-     *
-     * @return true if the message was successfully recycled, false otherwise.
-     */
-    bool recycle() {
-        con_msg_man_ptr shared = m_manager.lock();
-
-        if (shared) {
-            return shared->recycle(this);
-        } else {
-            return false;
-        }
-    }
-private:
-    con_msg_man_weak_ptr        m_manager;
-    std::string                 m_header;
-    std::string                 m_extension_data;
-    std::string                 m_payload;
-    frame::opcode::value        m_opcode;
-    bool                        m_prepared;
-    bool                        m_fin;
-    bool                        m_terminal;
-    bool                        m_compressed;
-};
-
-} // namespace message_buffer
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_MESSAGE_BUFFER_MESSAGE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/message_buffer/pool.hpp b/src/sioclient/lib/websocketpp/websocketpp/message_buffer/pool.hpp
deleted file mode 100644
index 3af9e02a..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/message_buffer/pool.hpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
-#define WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
-
-#include <websocketpp/common/memory.hpp>
-
-#include <string>
-
-namespace websocketpp {
-namespace message_buffer {
-
-/* # message:
- * object that stores a message while it is being sent or received. Contains
- * the message payload itself, the message header, the extension data, and the
- * opcode.
- *
- * # connection_message_manager:
- * An object that manages all of the message_buffers associated with a given
- * connection. Implements the get_message_buffer(size) method that returns
- * a message buffer at least size bytes long.
- *
- * Message buffers are reference counted with shared ownership semantics. Once
- * requested from the manager the requester and it's associated downstream code
- * may keep a pointer to the message indefinitely at a cost of extra resource
- * usage. Once the reference count drops to the point where the manager is the
- * only reference the messages is recycled using whatever method is implemented
- * in the manager.
- *
- * # endpoint_message_manager:
- * An object that manages connection_message_managers. Implements the
- * get_message_manager() method. This is used once by each connection to
- * request the message manager that they are supposed to use to manage message
- * buffers for their own use.
- *
- * TYPES OF CONNECTION_MESSAGE_MANAGERS
- * - allocate a message with the exact size every time one is requested
- * - maintain a pool of pre-allocated messages and return one when needed.
- *   Recycle previously used messages back into the pool
- *
- * TYPES OF ENDPOINT_MESSAGE_MANAGERS
- *  - allocate a new connection manager for each connection. Message pools
- *    become connection specific. This increases memory usage but improves
- *    concurrency.
- *  - allocate a single connection manager and share a pointer to it with all
- *    connections created by this endpoint. The message pool will be shared
- *    among all connections, improving memory usage and performance at the cost
- *    of reduced concurrency
- */
-
-/// Custom deleter for use in shared_ptrs to message.
-/**
- * This is used to catch messages about to be deleted and offer the manager the
- * ability to recycle them instead. Message::recycle will return true if it was
- * successfully recycled and false otherwise. In the case of exceptions or error
- * this deleter frees the memory.
- */
-template <typename T>
-void message_deleter(T* msg) {
-    try {
-        if (!msg->recycle()) {
-            delete msg;
-        }
-    } catch (...) {
-        // TODO: is there a better way to ensure this function doesn't throw?
-        delete msg;
-    }
-}
-
-/// Represents a buffer for a single WebSocket message.
-/**
- *
- *
- */
-template <typename con_msg_manager>
-class message {
-public:
-    typedef lib::shared_ptr<message> ptr;
-
-    typedef typename con_msg_manager::weak_ptr con_msg_man_ptr;
-
-    message(con_msg_man_ptr manager, size_t size = 128)
-      : m_manager(manager)
-      , m_payload(size) {}
-
-    frame::opcode::value get_opcode() const {
-        return m_opcode;
-    }
-    const std::string& get_header() const {
-        return m_header;
-    }
-    const std::string& get_extension_data() const {
-        return m_extension_data;
-    }
-    const std::string& get_payload() const {
-        return m_payload;
-    }
-
-    /// Recycle the message
-    /**
-     * A request to recycle this message was received. Forward that request to
-     * the connection message manager for processing. Errors and exceptions
-     * from the manager's recycle member function should be passed back up the
-     * call chain. The caller to message::recycle will deal with them.
-     *
-     * Recycle must *only* be called by the message shared_ptr's destructor.
-     * Once recycled successfully, ownership of the memory has been passed to
-     * another system and must not be accessed again.
-     *
-     * @return true if the message was successfully recycled, false otherwise.
-     */
-    bool recycle() {
-        typename con_msg_manager::ptr shared = m_manager.lock();
-
-        if (shared) {
-            return shared->(recycle(this));
-        } else {
-            return false;
-        }
-    }
-private:
-    con_msg_man_ptr             m_manager;
-
-    frame::opcode::value        m_opcode;
-    std::string                 m_header;
-    std::string                 m_extension_data;
-    std::string                 m_payload;
-};
-
-namespace alloc {
-
-/// A connection message manager that allocates a new message for each
-/// request.
-template <typename message>
-class con_msg_manager {
-public:
-    typedef lib::shared_ptr<con_msg_manager> ptr;
-    typedef lib::weak_ptr<con_msg_manager> weak_ptr;
-
-    typedef typename message::ptr message_ptr;
-
-    /// Get a message buffer with specified size
-    /**
-     * @param size Minimum size in bytes to request for the message payload.
-     *
-     * @return A shared pointer to a new message with specified size.
-     */
-    message_ptr get_message(size_t size) const {
-        return lib::make_shared<message>(size);
-    }
-
-    /// Recycle a message
-    /**
-     * This method shouldn't be called. If it is, return false to indicate an
-     * error. The rest of the method recycle chain should notice this and free
-     * the memory.
-     *
-     * @param msg The message to be recycled.
-     *
-     * @return true if the message was successfully recycled, false otherwse.
-     */
-    bool recycle(message * msg) {
-        return false;
-    }
-};
-
-/// An endpoint message manager that allocates a new manager for each
-/// connection.
-template <typename con_msg_manager>
-class endpoint_msg_manager {
-public:
-    typedef typename con_msg_manager::ptr con_msg_man_ptr;
-
-    /// Get a pointer to a connection message manager
-    /**
-     * @return A pointer to the requested connection message manager.
-     */
-    con_msg_man_ptr get_manager() const {
-        return lib::make_shared<con_msg_manager>();
-    }
-};
-
-} // namespace alloc
-
-namespace pool {
-
-/// A connection messages manager that maintains a pool of messages that is
-/// used to fulfill get_message requests.
-class con_msg_manager {
-
-};
-
-/// An endpoint manager that maintains a shared pool of connection managers
-/// and returns an appropriate one for the requesting connection.
-class endpoint_msg_manager {
-
-};
-
-} // namespace pool
-
-} // namespace message_buffer
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/processors/base.hpp b/src/sioclient/lib/websocketpp/websocketpp/processors/base.hpp
deleted file mode 100644
index 4c123dfa..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/processors/base.hpp
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_PROCESSOR_BASE_HPP
-#define WEBSOCKETPP_PROCESSOR_BASE_HPP
-
-#include <websocketpp/close.hpp>
-#include <websocketpp/utilities.hpp>
-#include <websocketpp/uri.hpp>
-
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/system_error.hpp>
-
-#include <string>
-
-namespace websocketpp {
-namespace processor {
-
-/// Constants related to processing WebSocket connections
-namespace constants {
-
-static char const upgrade_token[] = "websocket";
-static char const connection_token[] = "Upgrade";
-static char const handshake_guid[] = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-
-} // namespace constants
-
-
-/// Processor class related error codes
-namespace error_cat {
-enum value {
-    BAD_REQUEST = 0, // Error was the result of improperly formatted user input
-    INTERNAL_ERROR = 1, // Error was a logic error internal to WebSocket++
-    PROTOCOL_VIOLATION = 2,
-    MESSAGE_TOO_BIG = 3,
-    PAYLOAD_VIOLATION = 4 // Error was due to receiving invalid payload data
-};
-} // namespace error_cat
-
-/// Error code category and codes used by all processor types
-namespace error {
-enum processor_errors {
-    /// Catch-all error for processor policy errors that don't fit in other
-    /// categories
-    general = 1,
-
-    /// Error was the result of improperly formatted user input
-    bad_request,
-
-    /// Processor encountered a protocol violation in an incoming message
-    protocol_violation,
-
-    /// Processor encountered a message that was too large
-    message_too_big,
-
-    /// Processor encountered invalid payload data.
-    invalid_payload,
-
-    /// The processor method was called with invalid arguments
-    invalid_arguments,
-
-    /// Opcode was invalid for requested operation
-    invalid_opcode,
-
-    /// Control frame too large
-    control_too_big,
-
-    /// Illegal use of reserved bit
-    invalid_rsv_bit,
-
-    /// Fragmented control message
-    fragmented_control,
-
-    /// Continuation without message
-    invalid_continuation,
-
-    /// Clients may not send unmasked frames
-    masking_required,
-
-    /// Servers may not send masked frames
-    masking_forbidden,
-
-    /// Payload length not minimally encoded
-    non_minimal_encoding,
-
-    /// Not supported on 32 bit systems
-    requires_64bit,
-
-    /// Invalid UTF-8 encoding
-    invalid_utf8,
-
-    /// Operation required not implemented functionality
-    not_implemented,
-
-    /// Invalid HTTP method
-    invalid_http_method,
-
-    /// Invalid HTTP version
-    invalid_http_version,
-
-    /// Invalid HTTP status
-    invalid_http_status,
-
-    /// Missing Required Header
-    missing_required_header,
-
-    /// Embedded SHA-1 library error
-    sha1_library,
-
-    /// No support for this feature in this protocol version.
-    no_protocol_support,
-
-    /// Reserved close code used
-    reserved_close_code,
-
-    /// Invalid close code used
-    invalid_close_code,
-
-    /// Using a reason requires a close code
-    reason_requires_code,
-
-    /// Error parsing subprotocols
-    subprotocol_parse_error,
-
-    /// Error parsing extensions
-    extension_parse_error,
-
-    /// Extension related operation was ignored because extensions are disabled
-    extensions_disabled,
-    
-    /// Short Ke3 read. Hybi00 requires a third key to be read from the 8 bytes
-    /// after the handshake. Less than 8 bytes were read.
-    short_key3
-};
-
-/// Category for processor errors
-class processor_category : public lib::error_category {
-public:
-    processor_category() {}
-
-    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
-        return "websocketpp.processor";
-    }
-
-    std::string message(int value) const {
-        switch(value) {
-            case error::general:
-                return "Generic processor error";
-            case error::bad_request:
-                return "invalid user input";
-            case error::protocol_violation:
-                return "Generic protocol violation";
-            case error::message_too_big:
-                return "A message was too large";
-            case error::invalid_payload:
-                return "A payload contained invalid data";
-            case error::invalid_arguments:
-                return "invalid function arguments";
-            case error::invalid_opcode:
-                return "invalid opcode";
-            case error::control_too_big:
-                return "Control messages are limited to fewer than 125 characters";
-            case error::invalid_rsv_bit:
-                return "Invalid use of reserved bits";
-            case error::fragmented_control:
-                return "Control messages cannot be fragmented";
-            case error::invalid_continuation:
-                return "Invalid message continuation";
-            case error::masking_required:
-                return "Clients may not send unmasked frames";
-            case error::masking_forbidden:
-                return "Servers may not send masked frames";
-            case error::non_minimal_encoding:
-                return "Payload length was not minimally encoded";
-            case error::requires_64bit:
-                return "64 bit frames are not supported on 32 bit systems";
-            case error::invalid_utf8:
-                return "Invalid UTF8 encoding";
-            case error::not_implemented:
-                return "Operation required not implemented functionality";
-            case error::invalid_http_method:
-                return "Invalid HTTP method.";
-            case error::invalid_http_version:
-                return "Invalid HTTP version.";
-            case error::invalid_http_status:
-                return "Invalid HTTP status.";
-            case error::missing_required_header:
-                return "A required HTTP header is missing";
-            case error::sha1_library:
-                return "SHA-1 library error";
-            case error::no_protocol_support:
-                return "The WebSocket protocol version in use does not support this feature";
-            case error::reserved_close_code:
-                return "Reserved close code used";
-            case error::invalid_close_code:
-                return "Invalid close code used";
-            case error::reason_requires_code:
-                return "Using a close reason requires a valid close code";
-            case error::subprotocol_parse_error:
-                return "Error parsing subprotocol header";
-            case error::extension_parse_error:
-                return "Error parsing extension header";
-            case error::extensions_disabled:
-                return "Extensions are disabled";
-            case error::short_key3:
-                return "Short Hybi00 Key 3 read";
-            default:
-                return "Unknown";
-        }
-    }
-};
-
-/// Get a reference to a static copy of the processor error category
-inline lib::error_category const & get_processor_category() {
-    static processor_category instance;
-    return instance;
-}
-
-/// Create an error code with the given value and the processor category
-inline lib::error_code make_error_code(error::processor_errors e) {
-    return lib::error_code(static_cast<int>(e), get_processor_category());
-}
-
-/// Converts a processor error_code into a websocket close code
-/**
- * Looks up the appropriate WebSocket close code that should be sent after an
- * error of this sort occurred.
- *
- * If the error is not in the processor category close::status::blank is
- * returned.
- *
- * If the error isn't normally associated with reasons to close a connection
- * (such as errors intended to be used internally or delivered to client
- * applications, ex: invalid arguments) then
- * close::status::internal_endpoint_error is returned.
- */
-inline close::status::value to_ws(lib::error_code ec) {
-    if (ec.category() != get_processor_category()) {
-        return close::status::blank;
-    }
-
-    switch (ec.value()) {
-        case error::protocol_violation:
-        case error::control_too_big:
-        case error::invalid_opcode:
-        case error::invalid_rsv_bit:
-        case error::fragmented_control:
-        case error::invalid_continuation:
-        case error::masking_required:
-        case error::masking_forbidden:
-        case error::reserved_close_code:
-        case error::invalid_close_code:
-            return close::status::protocol_error;
-        case error::invalid_payload:
-        case error::invalid_utf8:
-            return close::status::invalid_payload;
-        case error::message_too_big:
-            return close::status::message_too_big;
-        default:
-            return close::status::internal_endpoint_error;
-    }
-}
-
-} // namespace error
-} // namespace processor
-} // namespace websocketpp
-
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
-template<> struct is_error_code_enum<websocketpp::processor::error::processor_errors>
-{
-    static bool const value = true;
-};
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
-
-#endif //WEBSOCKETPP_PROCESSOR_BASE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/processors/hybi00.hpp b/src/sioclient/lib/websocketpp/websocketpp/processors/hybi00.hpp
deleted file mode 100644
index 95ad9dfa..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/processors/hybi00.hpp
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_PROCESSOR_HYBI00_HPP
-#define WEBSOCKETPP_PROCESSOR_HYBI00_HPP
-
-#include <websocketpp/frame.hpp>
-#include <websocketpp/http/constants.hpp>
-
-#include <websocketpp/utf8_validator.hpp>
-#include <websocketpp/common/network.hpp>
-#include <websocketpp/common/md5.hpp>
-#include <websocketpp/common/platforms.hpp>
-
-#include <websocketpp/processors/processor.hpp>
-
-#include <algorithm>
-#include <cstdlib>
-#include <string>
-#include <vector>
-
-namespace websocketpp {
-namespace processor {
-
-/// Processor for Hybi Draft version 00
-/**
- * There are many differences between Hybi 00 and Hybi 13
- */
-template <typename config>
-class hybi00 : public processor<config> {
-public:
-    typedef processor<config> base;
-
-    typedef typename config::request_type request_type;
-    typedef typename config::response_type response_type;
-
-    typedef typename config::message_type message_type;
-    typedef typename message_type::ptr message_ptr;
-
-    typedef typename config::con_msg_manager_type::ptr msg_manager_ptr;
-
-    explicit hybi00(bool secure, bool p_is_server, msg_manager_ptr manager)
-      : processor<config>(secure, p_is_server)
-      , msg_hdr(0x00)
-      , msg_ftr(0xff)
-      , m_state(HEADER)
-      , m_msg_manager(manager) {}
-
-    int get_version() const {
-        return 0;
-    }
-
-    lib::error_code validate_handshake(request_type const & r) const {
-        if (r.get_method() != "GET") {
-            return make_error_code(error::invalid_http_method);
-        }
-
-        if (r.get_version() != "HTTP/1.1") {
-            return make_error_code(error::invalid_http_version);
-        }
-
-        // required headers
-        // Host is required by HTTP/1.1
-        // Connection is required by is_websocket_handshake
-        // Upgrade is required by is_websocket_handshake
-        if (r.get_header("Sec-WebSocket-Key1").empty() ||
-            r.get_header("Sec-WebSocket-Key2").empty() ||
-            r.get_header("Sec-WebSocket-Key3").empty())
-        {
-            return make_error_code(error::missing_required_header);
-        }
-
-        return lib::error_code();
-    }
-
-    lib::error_code process_handshake(request_type const & req,
-        std::string const & subprotocol, response_type & res) const
-    {
-        char key_final[16];
-
-        // copy key1 into final key
-        decode_client_key(req.get_header("Sec-WebSocket-Key1"), &key_final[0]);
-
-        // copy key2 into final key
-        decode_client_key(req.get_header("Sec-WebSocket-Key2"), &key_final[4]);
-
-        // copy key3 into final key
-        // key3 should be exactly 8 bytes. If it is more it will be truncated
-        // if it is less the final key will almost certainly be wrong.
-        // TODO: decide if it is best to silently fail here or produce some sort
-        //       of warning or exception.
-        std::string const & key3 = req.get_header("Sec-WebSocket-Key3");
-        std::copy(key3.c_str(),
-                  key3.c_str()+(std::min)(static_cast<size_t>(8), key3.size()),
-                  &key_final[8]);
-
-        res.append_header(
-            "Sec-WebSocket-Key3",
-            md5::md5_hash_string(std::string(key_final,16))
-        );
-
-        res.append_header("Upgrade","WebSocket");
-        res.append_header("Connection","Upgrade");
-
-        // Echo back client's origin unless our local application set a
-        // more restrictive one.
-        if (res.get_header("Sec-WebSocket-Origin").empty()) {
-            res.append_header("Sec-WebSocket-Origin",req.get_header("Origin"));
-        }
-
-        // Echo back the client's request host unless our local application
-        // set a different one.
-        if (res.get_header("Sec-WebSocket-Location").empty()) {
-            uri_ptr uri = get_uri(req);
-            res.append_header("Sec-WebSocket-Location",uri->str());
-        }
-
-        if (!subprotocol.empty()) {
-            res.replace_header("Sec-WebSocket-Protocol",subprotocol);
-        }
-
-        return lib::error_code();
-    }
-
-    /// Fill in a set of request headers for a client connection request
-    /**
-     * The Hybi 00 processor only implements incoming connections so this will
-     * always return an error.
-     *
-     * @param [out] req  Set of headers to fill in
-     * @param [in] uri The uri being connected to
-     * @param [in] subprotocols The list of subprotocols to request
-     */
-    lib::error_code client_handshake_request(request_type &, uri_ptr,
-        std::vector<std::string> const &) const
-    {
-        return error::make_error_code(error::no_protocol_support);
-    }
-
-    /// Validate the server's response to an outgoing handshake request
-    /**
-     * The Hybi 00 processor only implements incoming connections so this will
-     * always return an error.
-     *
-     * @param req The original request sent
-     * @param res The reponse to generate
-     * @return An error code, 0 on success, non-zero for other errors
-     */
-    lib::error_code validate_server_handshake_response(request_type const &,
-        response_type &) const
-    {
-        return error::make_error_code(error::no_protocol_support);
-    }
-
-    std::string get_raw(response_type const & res) const {
-        response_type temp = res;
-        temp.remove_header("Sec-WebSocket-Key3");
-        return temp.raw() + res.get_header("Sec-WebSocket-Key3");
-    }
-
-    std::string const & get_origin(request_type const & r) const {
-        return r.get_header("Origin");
-    }
-
-    /// Extracts requested subprotocols from a handshake request
-    /**
-     * hybi00 does support subprotocols
-     * https://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-00#section-1.9
-     *
-     * @param [in] req The request to extract from
-     * @param [out] subprotocol_list A reference to a vector of strings to store
-     * the results in.
-     */
-    lib::error_code extract_subprotocols(request_type const & req,
-        std::vector<std::string> & subprotocol_list)
-    {
-        if (!req.get_header("Sec-WebSocket-Protocol").empty()) {
-            http::parameter_list p;
-
-             if (!req.get_header_as_plist("Sec-WebSocket-Protocol",p)) {
-                 http::parameter_list::const_iterator it;
-
-                 for (it = p.begin(); it != p.end(); ++it) {
-                     subprotocol_list.push_back(it->first);
-                 }
-             } else {
-                 return error::make_error_code(error::subprotocol_parse_error);
-             }
-        }
-        return lib::error_code();
-    }
-
-    uri_ptr get_uri(request_type const & request) const {
-        std::string h = request.get_header("Host");
-
-        size_t last_colon = h.rfind(":");
-        size_t last_sbrace = h.rfind("]");
-
-        // no : = hostname with no port
-        // last : before ] = ipv6 literal with no port
-        // : with no ] = hostname with port
-        // : after ] = ipv6 literal with port
-
-        if (last_colon == std::string::npos ||
-            (last_sbrace != std::string::npos && last_sbrace > last_colon))
-        {
-            return lib::make_shared<uri>(base::m_secure, h, request.get_uri());
-        } else {
-            return lib::make_shared<uri>(base::m_secure,
-                                   h.substr(0,last_colon),
-                                   h.substr(last_colon+1),
-                                   request.get_uri());
-        }
-
-        // TODO: check if get_uri is a full uri
-    }
-
-    /// Get hybi00 handshake key3
-    /**
-     * @todo This doesn't appear to be used anymore. It might be able to be
-     * removed
-     */
-    std::string get_key3() const {
-        return "";
-    }
-
-    /// Process new websocket connection bytes
-    size_t consume(uint8_t * buf, size_t len, lib::error_code & ec) {
-        // if in state header we are expecting a 0x00 byte, if we don't get one
-        // it is a fatal error
-        size_t p = 0; // bytes processed
-        size_t l = 0;
-
-        ec = lib::error_code();
-
-        while (p < len) {
-            if (m_state == HEADER) {
-                if (buf[p] == msg_hdr) {
-                    p++;
-                    m_msg_ptr = m_msg_manager->get_message(frame::opcode::text,1);
-
-                    if (!m_msg_ptr) {
-                        ec = make_error_code(websocketpp::error::no_incoming_buffers);
-                        m_state = FATAL_ERROR;
-                    } else {
-                        m_state = PAYLOAD;
-                    }
-                } else {
-                    ec = make_error_code(error::protocol_violation);
-                    m_state = FATAL_ERROR;
-                }
-            } else if (m_state == PAYLOAD) {
-                uint8_t *it = std::find(buf+p,buf+len,msg_ftr);
-
-                // 0    1    2    3    4    5
-                // 0x00 0x23 0x23 0x23 0xff 0xXX
-
-                // Copy payload bytes into message
-                l = static_cast<size_t>(it-(buf+p));
-                m_msg_ptr->append_payload(buf+p,l);
-                p += l;
-
-                if (it != buf+len) {
-                    // message is done, copy it and the trailing
-                    p++;
-                    // TODO: validation
-                    m_state = READY;
-                }
-            } else {
-                // TODO
-                break;
-            }
-        }
-        // If we get one, we create a new message and move to application state
-
-        // if in state application we are copying bytes into the output message
-        // and validating them for UTF8 until we hit a 0xff byte. Once we hit
-        // 0x00, the message is complete and is dispatched. Then we go back to
-        // header state.
-
-        //ec = make_error_code(error::not_implemented);
-        return p;
-    }
-
-    bool ready() const {
-        return (m_state == READY);
-    }
-
-    bool get_error() const {
-        return false;
-    }
-
-    message_ptr get_message() {
-        message_ptr ret = m_msg_ptr;
-        m_msg_ptr = message_ptr();
-        m_state = HEADER;
-        return ret;
-    }
-
-    /// Prepare a message for writing
-    /**
-     * Performs validation, masking, compression, etc. will return an error if
-     * there was an error, otherwise msg will be ready to be written
-     */
-    virtual lib::error_code prepare_data_frame(message_ptr in, message_ptr out)
-    {
-        if (!in || !out) {
-            return make_error_code(error::invalid_arguments);
-        }
-
-        // TODO: check if the message is prepared already
-
-        // validate opcode
-        if (in->get_opcode() != frame::opcode::text) {
-            return make_error_code(error::invalid_opcode);
-        }
-
-        std::string& i = in->get_raw_payload();
-        //std::string& o = out->get_raw_payload();
-
-        // validate payload utf8
-        if (!utf8_validator::validate(i)) {
-            return make_error_code(error::invalid_payload);
-        }
-
-        // generate header
-        out->set_header(std::string(reinterpret_cast<char const *>(&msg_hdr),1));
-
-        // process payload
-        out->set_payload(i);
-        out->append_payload(std::string(reinterpret_cast<char const *>(&msg_ftr),1));
-
-        // hybi00 doesn't support compression
-        // hybi00 doesn't have masking
-
-        out->set_prepared(true);
-
-        return lib::error_code();
-    }
-
-    /// Prepare a ping frame
-    /**
-     * Hybi 00 doesn't support pings so this will always return an error
-     *
-     * @param in The string to use for the ping payload
-     * @param out The message buffer to prepare the ping in.
-     * @return Status code, zero on success, non-zero on failure
-     */
-    lib::error_code prepare_ping(std::string const &, message_ptr) const
-    {
-        return lib::error_code(error::no_protocol_support);
-    }
-
-    /// Prepare a pong frame
-    /**
-     * Hybi 00 doesn't support pongs so this will always return an error
-     *
-     * @param in The string to use for the pong payload
-     * @param out The message buffer to prepare the pong in.
-     * @return Status code, zero on success, non-zero on failure
-     */
-    lib::error_code prepare_pong(std::string const &, message_ptr) const
-    {
-        return lib::error_code(error::no_protocol_support);
-    }
-
-    /// Prepare a close frame
-    /**
-     * Hybi 00 doesn't support the close code or reason so these parameters are
-     * ignored.
-     *
-     * @param code The close code to send
-     * @param reason The reason string to send
-     * @param out The message buffer to prepare the fame in
-     * @return Status code, zero on success, non-zero on failure
-     */
-    lib::error_code prepare_close(close::status::value, std::string const &, 
-        message_ptr out) const
-    {
-        if (!out) {
-            return lib::error_code(error::invalid_arguments);
-        }
-
-        std::string val;
-        val.append(1,'\xff');
-        val.append(1,'\x00');
-        out->set_payload(val);
-        out->set_prepared(true);
-
-        return lib::error_code();
-    }
-private:
-    void decode_client_key(std::string const & key, char * result) const {
-        unsigned int spaces = 0;
-        std::string digits;
-        uint32_t num;
-
-        // key2
-        for (size_t i = 0; i < key.size(); i++) {
-            if (key[i] == ' ') {
-                spaces++;
-            } else if (key[i] >= '0' && key[i] <= '9') {
-                digits += key[i];
-            }
-        }
-
-        num = static_cast<uint32_t>(strtoul(digits.c_str(), NULL, 10));
-        if (spaces > 0 && num > 0) {
-            num = htonl(num/spaces);
-            std::copy(reinterpret_cast<char*>(&num),
-                      reinterpret_cast<char*>(&num)+4,
-                      result);
-        } else {
-            std::fill(result,result+4,0);
-        }
-    }
-
-    enum state {
-        HEADER = 0,
-        PAYLOAD = 1,
-        READY = 2,
-        FATAL_ERROR = 3
-    };
-
-    uint8_t const msg_hdr;
-    uint8_t const msg_ftr;
-
-    state m_state;
-
-    msg_manager_ptr m_msg_manager;
-    message_ptr m_msg_ptr;
-    utf8_validator::validator m_validator;
-};
-
-} // namespace processor
-} // namespace websocketpp
-
-#endif //WEBSOCKETPP_PROCESSOR_HYBI00_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/processors/hybi07.hpp b/src/sioclient/lib/websocketpp/websocketpp/processors/hybi07.hpp
deleted file mode 100644
index 14b67c21..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/processors/hybi07.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_PROCESSOR_HYBI07_HPP
-#define WEBSOCKETPP_PROCESSOR_HYBI07_HPP
-
-#include <websocketpp/processors/hybi08.hpp>
-
-#include <string>
-#include <vector>
-
-namespace websocketpp {
-namespace processor {
-
-/// Processor for Hybi Draft version 07
-/**
- * The primary difference between 07 and 08 is a version number.
- */
-template <typename config>
-class hybi07 : public hybi08<config> {
-public:
-    typedef typename config::request_type request_type;
-
-    typedef typename config::con_msg_manager_type::ptr msg_manager_ptr;
-    typedef typename config::rng_type rng_type;
-
-    explicit hybi07(bool secure, bool p_is_server, msg_manager_ptr manager, rng_type& rng)
-      : hybi08<config>(secure, p_is_server, manager, rng) {}
-
-    /// Fill in a set of request headers for a client connection request
-    /**
-     * The Hybi 07 processor only implements incoming connections so this will
-     * always return an error.
-     *
-     * @param [out] req  Set of headers to fill in
-     * @param [in] uri The uri being connected to
-     * @param [in] subprotocols The list of subprotocols to request
-     */
-    lib::error_code client_handshake_request(request_type &, uri_ptr,
-        std::vector<std::string> const &) const
-    {
-        return error::make_error_code(error::no_protocol_support);
-    }
-
-    int get_version() const {
-        return 7;
-    }
-private:
-};
-
-} // namespace processor
-} // namespace websocketpp
-
-#endif //WEBSOCKETPP_PROCESSOR_HYBI07_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/processors/hybi08.hpp b/src/sioclient/lib/websocketpp/websocketpp/processors/hybi08.hpp
deleted file mode 100644
index 15f6e658..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/processors/hybi08.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_PROCESSOR_HYBI08_HPP
-#define WEBSOCKETPP_PROCESSOR_HYBI08_HPP
-
-#include <websocketpp/processors/hybi13.hpp>
-
-#include <string>
-#include <vector>
-
-namespace websocketpp {
-namespace processor {
-
-/// Processor for Hybi Draft version 08
-/**
- * The primary difference between 08 and 13 is a different origin header name
- */
-template <typename config>
-class hybi08 : public hybi13<config> {
-public:
-    typedef hybi08<config> type;
-    typedef typename config::request_type request_type;
-
-    typedef typename config::con_msg_manager_type::ptr msg_manager_ptr;
-    typedef typename config::rng_type rng_type;
-
-    explicit hybi08(bool secure, bool p_is_server, msg_manager_ptr manager, rng_type& rng)
-      : hybi13<config>(secure, p_is_server, manager, rng) {}
-
-    /// Fill in a set of request headers for a client connection request
-    /**
-     * The Hybi 08 processor only implements incoming connections so this will
-     * always return an error.
-     *
-     * @param [out] req  Set of headers to fill in
-     * @param [in] uri The uri being connected to
-     * @param [in] subprotocols The list of subprotocols to request
-     */
-    lib::error_code client_handshake_request(request_type &, uri_ptr,
-        std::vector<std::string> const &) const
-    {
-        return error::make_error_code(error::no_protocol_support);
-    }
-
-    int get_version() const {
-        return 8;
-    }
-
-    std::string const & get_origin(request_type const & r) const {
-        return r.get_header("Sec-WebSocket-Origin");
-    }
-private:
-};
-
-} // namespace processor
-} // namespace websocketpp
-
-#endif //WEBSOCKETPP_PROCESSOR_HYBI08_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/processors/hybi13.hpp b/src/sioclient/lib/websocketpp/websocketpp/processors/hybi13.hpp
deleted file mode 100644
index ca124392..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/processors/hybi13.hpp
+++ /dev/null
@@ -1,1078 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_PROCESSOR_HYBI13_HPP
-#define WEBSOCKETPP_PROCESSOR_HYBI13_HPP
-
-#include <websocketpp/processors/processor.hpp>
-
-#include <websocketpp/frame.hpp>
-#include <websocketpp/http/constants.hpp>
-
-#include <websocketpp/utf8_validator.hpp>
-#include <websocketpp/sha1/sha1.hpp>
-#include <websocketpp/base64/base64.hpp>
-
-#include <websocketpp/common/network.hpp>
-#include <websocketpp/common/platforms.hpp>
-
-#include <algorithm>
-#include <cassert>
-#include <string>
-#include <vector>
-#include <utility>
-
-namespace websocketpp {
-namespace processor {
-
-/// Processor for Hybi version 13 (RFC6455)
-template <typename config>
-class hybi13 : public processor<config> {
-public:
-    typedef processor<config> base;
-
-    typedef typename config::request_type request_type;
-    typedef typename config::response_type response_type;
-
-    typedef typename config::message_type message_type;
-    typedef typename message_type::ptr message_ptr;
-
-    typedef typename config::con_msg_manager_type msg_manager_type;
-    typedef typename msg_manager_type::ptr msg_manager_ptr;
-    typedef typename config::rng_type rng_type;
-
-    typedef typename config::permessage_deflate_type permessage_deflate_type;
-
-    typedef std::pair<lib::error_code,std::string> err_str_pair;
-
-    explicit hybi13(bool secure, bool p_is_server, msg_manager_ptr manager, rng_type& rng)
-      : processor<config>(secure, p_is_server)
-      , m_msg_manager(manager)
-      , m_rng(rng)
-    {
-        reset_headers();
-    }
-
-    int get_version() const {
-        return 13;
-    }
-
-    bool has_permessage_deflate() const {
-        return m_permessage_deflate.is_implemented();
-    }
-
-    err_str_pair negotiate_extensions(request_type const & request) {
-        return negotiate_extensions_helper(request);
-    }
-    
-    err_str_pair negotiate_extensions(response_type const & response) {
-        return negotiate_extensions_helper(response);
-    }
-    
-    /// Extension negotiation helper function
-    /**
-     * This exists mostly because the code for requests and responses is
-     * identical and I can't have virtual template methods.
-     */
-    template <typename header_type>
-    err_str_pair negotiate_extensions_helper(header_type const & header) {
-        err_str_pair ret;
-
-        // Respect blanket disabling of all extensions and don't even parse
-        // the extension header
-        if (!config::enable_extensions) {
-            ret.first = make_error_code(error::extensions_disabled);
-            return ret;
-        }
-
-        http::parameter_list p;
-
-        bool error = header.get_header_as_plist("Sec-WebSocket-Extensions",p);
-
-        if (error) {
-            ret.first = make_error_code(error::extension_parse_error);
-            return ret;
-        }
-
-        // If there are no extensions parsed then we are done!
-        if (p.size() == 0) {
-            return ret;
-        }
-
-        http::parameter_list::const_iterator it;
-
-        // look through the list of extension requests to find the first
-        // one that we can accept.
-        if (m_permessage_deflate.is_implemented()) {
-            err_str_pair neg_ret;
-            for (it = p.begin(); it != p.end(); ++it) {
-                // not a permessage-deflate extension request, ignore
-                if (it->first != "permessage-deflate") {
-                    continue;
-                }
-
-                // if we have already successfully negotiated this extension
-                // then skip any other requests to negotiate the same one
-                // with different parameters 
-                if (m_permessage_deflate.is_enabled()) {
-                    continue;
-                }
-                
-                // attempt to negotiate this offer
-                neg_ret = m_permessage_deflate.negotiate(it->second);
-
-                if (neg_ret.first) {
-                    // negotiation offer failed. Do nothing. We will continue
-                    // searching for a permessage-deflate config that succeeds
-                    continue;
-                }
-
-                // Negotiation tentatively succeeded
-
-                // Actually try to initialize the extension before we
-                // deem negotiation complete
-                lib::error_code ec = m_permessage_deflate.init(base::m_server);
-
-                if (ec) {
-                    // Negotiation succeeded but initialization failed this is 
-                    // an error that should stop negotiation of permessage 
-                    // deflate. Return the reason for the init failure
-
-                    ret.first = ec;
-                    break;
-                } else {
-                    // Successfully initialized, push the negotiated response into
-                    // the reply and stop looking for additional permessage-deflate
-                    // extensions
-                    ret.second += neg_ret.second;
-                    break;
-                }
-            }
-        }
-
-        // support for future extensions would go here. Should check the value of 
-        // ret.first before continuing. Might need to consider whether failure of
-        // negotiation of an earlier extension should stop negotiation of subsequent
-        // ones
-
-        return ret;
-    }
-
-    lib::error_code validate_handshake(request_type const & r) const {
-        if (r.get_method() != "GET") {
-            return make_error_code(error::invalid_http_method);
-        }
-
-        if (r.get_version() != "HTTP/1.1") {
-            return make_error_code(error::invalid_http_version);
-        }
-
-        // required headers
-        // Host is required by HTTP/1.1
-        // Connection is required by is_websocket_handshake
-        // Upgrade is required by is_websocket_handshake
-        if (r.get_header("Sec-WebSocket-Key").empty()) {
-            return make_error_code(error::missing_required_header);
-        }
-
-        return lib::error_code();
-    }
-
-    /* TODO: the 'subprotocol' parameter may need to be expanded into a more
-     * generic struct if other user input parameters to the processed handshake
-     * are found.
-     */
-    lib::error_code process_handshake(request_type const & request, 
-        std::string const & subprotocol, response_type & response) const
-    {
-        std::string server_key = request.get_header("Sec-WebSocket-Key");
-
-        lib::error_code ec = process_handshake_key(server_key);
-
-        if (ec) {
-            return ec;
-        }
-
-        response.replace_header("Sec-WebSocket-Accept",server_key);
-        response.append_header("Upgrade",constants::upgrade_token);
-        response.append_header("Connection",constants::connection_token);
-
-        if (!subprotocol.empty()) {
-            response.replace_header("Sec-WebSocket-Protocol",subprotocol);
-        }
-
-        return lib::error_code();
-    }
-
-    /// Fill in a set of request headers for a client connection request
-    /**
-     * @param [out] req  Set of headers to fill in
-     * @param [in] uri The uri being connected to
-     * @param [in] subprotocols The list of subprotocols to request
-     */
-    lib::error_code client_handshake_request(request_type & req, uri_ptr
-        uri, std::vector<std::string> const & subprotocols) const
-    {
-        req.set_method("GET");
-        req.set_uri(uri->get_resource());
-        req.set_version("HTTP/1.1");
-
-        req.append_header("Upgrade","websocket");
-        req.append_header("Connection","Upgrade");
-        req.replace_header("Sec-WebSocket-Version","13");
-        req.replace_header("Host",uri->get_host_port());
-
-        if (!subprotocols.empty()) {
-            std::ostringstream result;
-            std::vector<std::string>::const_iterator it = subprotocols.begin();
-            result << *it++;
-            while (it != subprotocols.end()) {
-                result << ", " << *it++;
-            }
-
-            req.replace_header("Sec-WebSocket-Protocol",result.str());
-        }
-
-        // Generate handshake key
-        frame::uint32_converter conv;
-        unsigned char raw_key[16];
-
-        for (int i = 0; i < 4; i++) {
-            conv.i = m_rng();
-            std::copy(conv.c,conv.c+4,&raw_key[i*4]);
-        }
-
-        req.replace_header("Sec-WebSocket-Key",base64_encode(raw_key, 16));
-
-        if (m_permessage_deflate.is_implemented()) {
-            std::string offer = m_permessage_deflate.generate_offer();
-            if (!offer.empty()) {
-                req.replace_header("Sec-WebSocket-Extensions",offer);
-            }
-        }
-
-        return lib::error_code();
-    }
-
-    /// Validate the server's response to an outgoing handshake request
-    /**
-     * @param req The original request sent
-     * @param res The reponse to generate
-     * @return An error code, 0 on success, non-zero for other errors
-     */
-    lib::error_code validate_server_handshake_response(request_type const & req,
-        response_type& res) const
-    {
-        // A valid response has an HTTP 101 switching protocols code
-        if (res.get_status_code() != http::status_code::switching_protocols) {
-            return error::make_error_code(error::invalid_http_status);
-        }
-
-        // And the upgrade token in an upgrade header
-        std::string const & upgrade_header = res.get_header("Upgrade");
-        if (utility::ci_find_substr(upgrade_header, constants::upgrade_token,
-            sizeof(constants::upgrade_token)-1) == upgrade_header.end())
-        {
-            return error::make_error_code(error::missing_required_header);
-        }
-
-        // And the websocket token in the connection header
-        std::string const & con_header = res.get_header("Connection");
-        if (utility::ci_find_substr(con_header, constants::connection_token,
-            sizeof(constants::connection_token)-1) == con_header.end())
-        {
-            return error::make_error_code(error::missing_required_header);
-        }
-
-        // And has a valid Sec-WebSocket-Accept value
-        std::string key = req.get_header("Sec-WebSocket-Key");
-        lib::error_code ec = process_handshake_key(key);
-
-        if (ec || key != res.get_header("Sec-WebSocket-Accept")) {
-            return error::make_error_code(error::missing_required_header);
-        }
-
-        // check extensions
-
-        return lib::error_code();
-    }
-
-    std::string get_raw(response_type const & res) const {
-        return res.raw();
-    }
-
-    std::string const & get_origin(request_type const & r) const {
-        return r.get_header("Origin");
-    }
-
-    lib::error_code extract_subprotocols(request_type const & req,
-        std::vector<std::string> & subprotocol_list)
-    {
-        if (!req.get_header("Sec-WebSocket-Protocol").empty()) {
-            http::parameter_list p;
-
-             if (!req.get_header_as_plist("Sec-WebSocket-Protocol",p)) {
-                 http::parameter_list::const_iterator it;
-
-                 for (it = p.begin(); it != p.end(); ++it) {
-                     subprotocol_list.push_back(it->first);
-                 }
-             } else {
-                 return error::make_error_code(error::subprotocol_parse_error);
-             }
-        }
-        return lib::error_code();
-    }
-
-    uri_ptr get_uri(request_type const & request) const {
-        return get_uri_from_host(request,(base::m_secure ? "wss" : "ws"));
-    }
-
-    /// Process new websocket connection bytes
-    /**
-     *
-     * Hybi 13 data streams represent a series of variable length frames. Each
-     * frame is made up of a series of fixed length fields. The lengths of later
-     * fields are contained in earlier fields. The first field length is fixed
-     * by the spec.
-     *
-     * This processor represents a state machine that keeps track of what field
-     * is presently being read and how many more bytes are needed to complete it
-     *
-     *
-     *
-     *
-     * Read two header bytes
-     *   Extract full frame length.
-     *   Read extra header bytes
-     * Validate frame header (including extension validate)
-     * Read extension data into extension message state object
-     * Read payload data into payload
-     *
-     * @param buf Input buffer
-     *
-     * @param len Length of input buffer
-     *
-     * @return Number of bytes processed or zero on error
-     */
-    size_t consume(uint8_t * buf, size_t len, lib::error_code & ec) {
-        size_t p = 0;
-
-        ec = lib::error_code();
-
-        //std::cout << "consume: " << utility::to_hex(buf,len) << std::endl;
-
-        // Loop while we don't have a message ready and we still have bytes
-        // left to process.
-        while (m_state != READY && m_state != FATAL_ERROR &&
-               (p < len || m_bytes_needed == 0))
-        {
-            if (m_state == HEADER_BASIC) {
-                p += this->copy_basic_header_bytes(buf+p,len-p);
-
-                if (m_bytes_needed > 0) {
-                    continue;
-                }
-
-                ec = this->validate_incoming_basic_header(
-                    m_basic_header, base::m_server, !m_data_msg.msg_ptr
-                );
-                if (ec) {break;}
-
-                // extract full header size and adjust consume state accordingly
-                m_state = HEADER_EXTENDED;
-                m_cursor = 0;
-                m_bytes_needed = frame::get_header_len(m_basic_header) -
-                    frame::BASIC_HEADER_LENGTH;
-            } else if (m_state == HEADER_EXTENDED) {
-                p += this->copy_extended_header_bytes(buf+p,len-p);
-
-                if (m_bytes_needed > 0) {
-                    continue;
-                }
-
-                ec = validate_incoming_extended_header(m_basic_header,m_extended_header);
-                if (ec){break;}
-
-                m_state = APPLICATION;
-                m_bytes_needed = static_cast<size_t>(get_payload_size(m_basic_header,m_extended_header));
-
-                // check if this frame is the start of a new message and set up
-                // the appropriate message metadata.
-                frame::opcode::value op = frame::get_opcode(m_basic_header);
-
-                // TODO: get_message failure conditions
-
-                if (frame::opcode::is_control(op)) {
-                    m_control_msg = msg_metadata(
-                        m_msg_manager->get_message(op,m_bytes_needed),
-                        frame::get_masking_key(m_basic_header,m_extended_header)
-                    );
-
-                    m_current_msg = &m_control_msg;
-                } else {
-                    if (!m_data_msg.msg_ptr) {
-                        if (m_bytes_needed > base::m_max_message_size) {
-                            ec = make_error_code(error::message_too_big);
-                            break;
-                        }
-                        
-                        m_data_msg = msg_metadata(
-                            m_msg_manager->get_message(op,m_bytes_needed),
-                            frame::get_masking_key(m_basic_header,m_extended_header)
-                        );
-                        
-                        if (m_permessage_deflate.is_enabled()) {
-                            m_data_msg.msg_ptr->set_compressed(frame::get_rsv1(m_basic_header));
-                        }
-                    } else {
-                        // Fetch the underlying payload buffer from the data message we
-                        // are writing into.
-                        std::string & out = m_data_msg.msg_ptr->get_raw_payload();
-                        
-                        if (out.size() + m_bytes_needed > base::m_max_message_size) {
-                            ec = make_error_code(error::message_too_big);
-                            break;
-                        }
-                        
-                        // Each frame starts a new masking key. All other state
-                        // remains between frames.
-                        m_data_msg.prepared_key = prepare_masking_key(
-                            frame::get_masking_key(
-                                m_basic_header,
-                                m_extended_header
-                            )
-                        );
-                        
-                        out.reserve(out.size() + m_bytes_needed);
-                    }
-                    m_current_msg = &m_data_msg;
-                }
-            } else if (m_state == EXTENSION) {
-                m_state = APPLICATION;
-            } else if (m_state == APPLICATION) {
-                size_t bytes_to_process = (std::min)(m_bytes_needed,len-p);
-
-                if (bytes_to_process > 0) {
-                    p += this->process_payload_bytes(buf+p,bytes_to_process,ec);
-
-                    if (ec) {break;}
-                }
-
-                if (m_bytes_needed > 0) {
-                    continue;
-                }
-
-                // If this was the last frame in the message set the ready flag.
-                // Otherwise, reset processor state to read additional frames.
-                if (frame::get_fin(m_basic_header)) {
-                    ec = finalize_message();
-                    if (ec) {
-                        break;
-                    }
-                } else {
-                    this->reset_headers();
-                }
-            } else {
-                // shouldn't be here
-                ec = make_error_code(error::general);
-                return 0;
-            }
-        }
-
-        return p;
-    }
-
-    /// Perform any finalization actions on an incoming message
-    /**
-     * Called after the full message is received. Provides the opportunity for
-     * extensions to complete any data post processing as well as final UTF8
-     * validation checks for text messages.
-     *
-     * @return A code indicating errors, if any
-     */
-    lib::error_code finalize_message() {
-        std::string & out = m_current_msg->msg_ptr->get_raw_payload();
-
-        // if the frame is compressed, append the compression
-        // trailer and flush the compression buffer.
-        if (m_permessage_deflate.is_enabled()
-            && m_current_msg->msg_ptr->get_compressed())
-        {
-            uint8_t trailer[4] = {0x00, 0x00, 0xff, 0xff};
-
-            // Decompress current buffer into the message buffer
-            lib::error_code ec;
-            ec = m_permessage_deflate.decompress(trailer,4,out);
-            if (ec) {
-                return ec;
-            }
-        }
-
-        // ensure that text messages end on a valid UTF8 code point
-        if (frame::get_opcode(m_basic_header) == frame::opcode::TEXT) {
-            if (!m_current_msg->validator.complete()) {
-                return make_error_code(error::invalid_utf8);
-            }
-        }
-
-        m_state = READY;
-
-        return lib::error_code();
-    }
-
-    void reset_headers() {
-        m_state = HEADER_BASIC;
-        m_bytes_needed = frame::BASIC_HEADER_LENGTH;
-
-        m_basic_header.b0 = 0x00;
-        m_basic_header.b1 = 0x00;
-
-        std::fill_n(
-            m_extended_header.bytes,
-            frame::MAX_EXTENDED_HEADER_LENGTH,
-            0x00
-        );
-    }
-
-    /// Test whether or not the processor has a message ready
-    bool ready() const {
-        return (m_state == READY);
-    }
-
-    message_ptr get_message() {
-        if (!ready()) {
-            return message_ptr();
-        }
-        message_ptr ret = m_current_msg->msg_ptr;
-        m_current_msg->msg_ptr.reset();
-
-        if (frame::opcode::is_control(ret->get_opcode())) {
-            m_control_msg.msg_ptr.reset();
-        } else {
-            m_data_msg.msg_ptr.reset();
-        }
-
-        this->reset_headers();
-
-        return ret;
-    }
-
-    /// Test whether or not the processor is in a fatal error state.
-    bool get_error() const {
-        return m_state == FATAL_ERROR;
-    }
-
-    size_t get_bytes_needed() const {
-        return m_bytes_needed;
-    }
-
-    /// Prepare a user data message for writing
-    /**
-     * Performs validation, masking, compression, etc. will return an error if
-     * there was an error, otherwise msg will be ready to be written
-     *
-     * TODO: tests
-     *
-     * @param in An unprepared message to prepare
-     * @param out A message to be overwritten with the prepared message
-     * @return error code
-     */
-    virtual lib::error_code prepare_data_frame(message_ptr in, message_ptr out)
-    {
-        if (!in || !out) {
-            return make_error_code(error::invalid_arguments);
-        }
-
-        frame::opcode::value op = in->get_opcode();
-
-        // validate opcode: only regular data frames
-        if (frame::opcode::is_control(op)) {
-            return make_error_code(error::invalid_opcode);
-        }
-
-        std::string& i = in->get_raw_payload();
-        std::string& o = out->get_raw_payload();
-
-        // validate payload utf8
-        if (op == frame::opcode::TEXT && !utf8_validator::validate(i)) {
-            return make_error_code(error::invalid_payload);
-        }
-
-        frame::masking_key_type key;
-        bool masked = !base::m_server;
-        bool compressed = m_permessage_deflate.is_enabled()
-                          && in->get_compressed();
-        bool fin = in->get_fin();
-
-        if (masked) {
-            // Generate masking key.
-            key.i = m_rng();
-        } else {
-            key.i = 0;
-        }
-
-        // prepare payload
-        if (compressed) {
-            // compress and store in o after header.
-            m_permessage_deflate.compress(i,o);
-
-            if (o.size() < 4) {
-                return make_error_code(error::general);
-            }
-
-            // Strip trailing 4 0x00 0x00 0xff 0xff bytes before writing to the
-            // wire
-            o.resize(o.size()-4);
-
-            // mask in place if necessary
-            if (masked) {
-                this->masked_copy(o,o,key);
-            }
-        } else {
-            // no compression, just copy data into the output buffer
-            o.resize(i.size());
-
-            // if we are masked, have the masking function write to the output
-            // buffer directly to avoid another copy. If not masked, copy
-            // directly without masking.
-            if (masked) {
-                this->masked_copy(i,o,key);
-            } else {
-                std::copy(i.begin(),i.end(),o.begin());
-            }
-        }
-
-        // generate header
-        frame::basic_header h(op,o.size(),fin,masked,compressed);
-
-        if (masked) {
-            frame::extended_header e(o.size(),key.i);
-            out->set_header(frame::prepare_header(h,e));
-        } else {
-            frame::extended_header e(o.size());
-            out->set_header(frame::prepare_header(h,e));
-        }
-
-        out->set_prepared(true);
-        out->set_opcode(op);
-
-        return lib::error_code();
-    }
-
-    /// Get URI
-    lib::error_code prepare_ping(std::string const & in, message_ptr out) const {
-        return this->prepare_control(frame::opcode::PING,in,out);
-    }
-
-    lib::error_code prepare_pong(std::string const & in, message_ptr out) const {
-        return this->prepare_control(frame::opcode::PONG,in,out);
-    }
-
-    virtual lib::error_code prepare_close(close::status::value code,
-        std::string const & reason, message_ptr out) const
-    {
-        if (close::status::reserved(code)) {
-            return make_error_code(error::reserved_close_code);
-        }
-
-        if (close::status::invalid(code) && code != close::status::no_status) {
-            return make_error_code(error::invalid_close_code);
-        }
-
-        if (code == close::status::no_status && reason.size() > 0) {
-            return make_error_code(error::reason_requires_code);
-        }
-
-        if (reason.size() > frame:: limits::payload_size_basic-2) {
-            return make_error_code(error::control_too_big);
-        }
-
-        std::string payload;
-
-        if (code != close::status::no_status) {
-            close::code_converter val;
-            val.i = htons(code);
-
-            payload.resize(reason.size()+2);
-
-            payload[0] = val.c[0];
-            payload[1] = val.c[1];
-
-            std::copy(reason.begin(),reason.end(),payload.begin()+2);
-        }
-
-        return this->prepare_control(frame::opcode::CLOSE,payload,out);
-    }
-protected:
-    /// Convert a client handshake key into a server response key in place
-    lib::error_code process_handshake_key(std::string & key) const {
-        key.append(constants::handshake_guid);
-
-        unsigned char message_digest[20];
-        sha1::calc(key.c_str(),key.length(),message_digest);
-        key = base64_encode(message_digest,20);
-
-        return lib::error_code();
-    }
-
-    /// Reads bytes from buf into m_basic_header
-    size_t copy_basic_header_bytes(uint8_t const * buf, size_t len) {
-        if (len == 0 || m_bytes_needed == 0) {
-            return 0;
-        }
-
-        if (len > 1) {
-            // have at least two bytes
-            if (m_bytes_needed == 2) {
-                m_basic_header.b0 = buf[0];
-                m_basic_header.b1 = buf[1];
-                m_bytes_needed -= 2;
-                return 2;
-            } else {
-                m_basic_header.b1 = buf[0];
-                m_bytes_needed--;
-                return 1;
-            }
-        } else {
-            // have exactly one byte
-            if (m_bytes_needed == 2) {
-                m_basic_header.b0 = buf[0];
-                m_bytes_needed--;
-                return 1;
-            } else {
-                m_basic_header.b1 = buf[0];
-                m_bytes_needed--;
-                return 1;
-            }
-        }
-    }
-
-    /// Reads bytes from buf into m_extended_header
-    size_t copy_extended_header_bytes(uint8_t const * buf, size_t len) {
-        size_t bytes_to_read = (std::min)(m_bytes_needed,len);
-
-        std::copy(buf,buf+bytes_to_read,m_extended_header.bytes+m_cursor);
-        m_cursor += bytes_to_read;
-        m_bytes_needed -= bytes_to_read;
-
-        return bytes_to_read;
-    }
-
-    /// Reads bytes from buf into message payload
-    /**
-     * This function performs unmasking and uncompression, validates the
-     * decoded bytes, and writes them to the appropriate message buffer.
-     *
-     * This member function will use the input buffer as stratch space for its
-     * work. The raw input bytes will not be preserved. This applies only to the
-     * bytes actually needed. At most min(m_bytes_needed,len) will be processed.
-     *
-     * @param buf Input/working buffer
-     * @param len Length of buf
-     * @return Number of bytes processed or zero in case of an error
-     */
-    size_t process_payload_bytes(uint8_t * buf, size_t len, lib::error_code& ec)
-    {
-        // unmask if masked
-        if (frame::get_masked(m_basic_header)) {
-            m_current_msg->prepared_key = frame::byte_mask_circ(
-                buf, len, m_current_msg->prepared_key);
-            // TODO: SIMD masking
-        }
-
-        std::string & out = m_current_msg->msg_ptr->get_raw_payload();
-        size_t offset = out.size();
-
-        // decompress message if needed.
-        if (m_permessage_deflate.is_enabled()
-            && m_current_msg->msg_ptr->get_compressed())
-        {
-            // Decompress current buffer into the message buffer
-            ec = m_permessage_deflate.decompress(buf,len,out);
-            if (ec) {
-                return 0;
-            }
-        } else {
-            // No compression, straight copy
-            out.append(reinterpret_cast<char *>(buf),len);
-        }
-
-        // validate unmasked, decompressed values
-        if (m_current_msg->msg_ptr->get_opcode() == frame::opcode::TEXT) {
-            if (!m_current_msg->validator.decode(out.begin()+offset,out.end())) {
-                ec = make_error_code(error::invalid_utf8);
-                return 0;
-            }
-        }
-
-        m_bytes_needed -= len;
-
-        return len;
-    }
-
-    /// Validate an incoming basic header
-    /**
-     * Validates an incoming hybi13 basic header.
-     *
-     * @param h The basic header to validate
-     * @param is_server Whether or not the endpoint that received this frame
-     * is a server.
-     * @param new_msg Whether or not this is the first frame of the message
-     * @return 0 on success or a non-zero error code on failure
-     */
-    lib::error_code validate_incoming_basic_header(frame::basic_header const & h,
-        bool is_server, bool new_msg) const
-    {
-        frame::opcode::value op = frame::get_opcode(h);
-
-        // Check control frame size limit
-        if (frame::opcode::is_control(op) &&
-            frame::get_basic_size(h) > frame::limits::payload_size_basic)
-        {
-            return make_error_code(error::control_too_big);
-        }
-
-        // Check that RSV bits are clear
-        // The only RSV bits allowed are rsv1 if the permessage_compress
-        // extension is enabled for this connection and the message is not
-        // a control message.
-        //
-        // TODO: unit tests for this
-        if (frame::get_rsv1(h) && (!m_permessage_deflate.is_enabled()
-                || frame::opcode::is_control(op)))
-        {
-            return make_error_code(error::invalid_rsv_bit);
-        }
-
-        if (frame::get_rsv2(h) || frame::get_rsv3(h)) {
-            return make_error_code(error::invalid_rsv_bit);
-        }
-
-        // Check for reserved opcodes
-        if (frame::opcode::reserved(op)) {
-            return make_error_code(error::invalid_opcode);
-        }
-
-        // Check for invalid opcodes
-        // TODO: unit tests for this?
-        if (frame::opcode::invalid(op)) {
-            return make_error_code(error::invalid_opcode);
-        }
-
-        // Check for fragmented control message
-        if (frame::opcode::is_control(op) && !frame::get_fin(h)) {
-            return make_error_code(error::fragmented_control);
-        }
-
-        // Check for continuation without an active message
-        if (new_msg && op == frame::opcode::CONTINUATION) {
-            return make_error_code(error::invalid_continuation);
-        }
-
-        // Check for new data frame when expecting continuation
-        if (!new_msg && !frame::opcode::is_control(op) &&
-            op != frame::opcode::CONTINUATION)
-        {
-            return make_error_code(error::invalid_continuation);
-        }
-
-        // Servers should reject any unmasked frames from clients.
-        // Clients should reject any masked frames from servers.
-        if (is_server && !frame::get_masked(h)) {
-            return make_error_code(error::masking_required);
-        } else if (!is_server && frame::get_masked(h)) {
-            return make_error_code(error::masking_forbidden);
-        }
-
-        return lib::error_code();
-    }
-
-    /// Validate an incoming extended header
-    /**
-     * Validates an incoming hybi13 full header.
-     *
-     * @todo unit test for the >32 bit frames on 32 bit systems case
-     *
-     * @param h The basic header to validate
-     * @param e The extended header to validate
-     * @return An error_code, non-zero values indicate why the validation
-     * failed
-     */
-    lib::error_code validate_incoming_extended_header(frame::basic_header h,
-        frame::extended_header e) const
-    {
-        uint8_t basic_size = frame::get_basic_size(h);
-        uint64_t payload_size = frame::get_payload_size(h,e);
-
-        // Check for non-minimally encoded payloads
-        if (basic_size == frame::payload_size_code_16bit &&
-            payload_size <= frame::limits::payload_size_basic)
-        {
-            return make_error_code(error::non_minimal_encoding);
-        }
-
-        if (basic_size == frame::payload_size_code_64bit &&
-            payload_size <= frame::limits::payload_size_extended)
-        {
-            return make_error_code(error::non_minimal_encoding);
-        }
-
-        // Check for >32bit frames on 32 bit systems
-        if (sizeof(size_t) == 4 && (payload_size >> 32)) {
-            return make_error_code(error::requires_64bit);
-        }
-
-        return lib::error_code();
-    }
-
-    /// Copy and mask/unmask in one operation
-    /**
-     * Reads input from one string and writes unmasked output to another.
-     *
-     * @param [in] i The input string.
-     * @param [out] o The output string.
-     * @param [in] key The masking key to use for masking/unmasking
-     */
-    void masked_copy (std::string const & i, std::string & o,
-        frame::masking_key_type key) const
-    {
-        frame::byte_mask(i.begin(),i.end(),o.begin(),key);
-        // TODO: SIMD masking
-    }
-
-    /// Generic prepare control frame with opcode and payload.
-    /**
-     * Internal control frame building method. Handles validation, masking, etc
-     *
-     * @param op The control opcode to use
-     * @param payload The payload to use
-     * @param out The message buffer to store the prepared frame in
-     * @return Status code, zero on success, non-zero on error
-     */
-    lib::error_code prepare_control(frame::opcode::value op,
-        std::string const & payload, message_ptr out) const
-    {
-        if (!out) {
-            return make_error_code(error::invalid_arguments);
-        }
-
-        if (!frame::opcode::is_control(op)) {
-            return make_error_code(error::invalid_opcode);
-        }
-
-        if (payload.size() > frame::limits::payload_size_basic) {
-            return make_error_code(error::control_too_big);
-        }
-
-        frame::masking_key_type key;
-        bool masked = !base::m_server;
-
-        frame::basic_header h(op,payload.size(),true,masked);
-
-        std::string & o = out->get_raw_payload();
-        o.resize(payload.size());
-
-        if (masked) {
-            // Generate masking key.
-            key.i = m_rng();
-
-            frame::extended_header e(payload.size(),key.i);
-            out->set_header(frame::prepare_header(h,e));
-            this->masked_copy(payload,o,key);
-        } else {
-            frame::extended_header e(payload.size());
-            out->set_header(frame::prepare_header(h,e));
-            std::copy(payload.begin(),payload.end(),o.begin());
-        }
-    
-        out->set_opcode(op);
-        out->set_prepared(true);
-
-        return lib::error_code();
-    }
-
-    enum state {
-        HEADER_BASIC = 0,
-        HEADER_EXTENDED = 1,
-        EXTENSION = 2,
-        APPLICATION = 3,
-        READY = 4,
-        FATAL_ERROR = 5
-    };
-
-    /// This data structure holds data related to processing a message, such as
-    /// the buffer it is being written to, its masking key, its UTF8 validation
-    /// state, and sometimes its compression state.
-    struct msg_metadata {
-        msg_metadata() {}
-        msg_metadata(message_ptr m, size_t p) : msg_ptr(m),prepared_key(p) {}
-        msg_metadata(message_ptr m, frame::masking_key_type p)
-          : msg_ptr(m)
-          , prepared_key(prepare_masking_key(p)) {}
-
-        message_ptr msg_ptr;        // pointer to the message data buffer
-        size_t      prepared_key;   // prepared masking key
-        utf8_validator::validator validator; // utf8 validation state
-    };
-
-    // Basic header of the frame being read
-    frame::basic_header m_basic_header;
-
-    // Pointer to a manager that can create message buffers for us.
-    msg_manager_ptr m_msg_manager;
-
-    // Number of bytes needed to complete the current operation
-    size_t m_bytes_needed;
-
-    // Number of extended header bytes read
-    size_t m_cursor;
-
-    // Metadata for the current data msg
-    msg_metadata m_data_msg;
-    // Metadata for the current control msg
-    msg_metadata m_control_msg;
-
-    // Pointer to the metadata associated with the frame being read
-    msg_metadata * m_current_msg;
-
-    // Extended header of current frame
-    frame::extended_header m_extended_header;
-
-    rng_type & m_rng;
-
-    // Overall state of the processor
-    state m_state;
-
-    // Extensions
-    permessage_deflate_type m_permessage_deflate;
-};
-
-} // namespace processor
-} // namespace websocketpp
-
-#endif //WEBSOCKETPP_PROCESSOR_HYBI13_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/processors/processor.hpp b/src/sioclient/lib/websocketpp/websocketpp/processors/processor.hpp
deleted file mode 100644
index 5131cc45..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/processors/processor.hpp
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_PROCESSOR_HPP
-#define WEBSOCKETPP_PROCESSOR_HPP
-
-#include <websocketpp/processors/base.hpp>
-#include <websocketpp/common/system_error.hpp>
-
-#include <websocketpp/close.hpp>
-#include <websocketpp/utilities.hpp>
-#include <websocketpp/uri.hpp>
-
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-namespace websocketpp {
-/// Processors encapsulate the protocol rules specific to each WebSocket version
-/**
- * The processors namespace includes a number of free functions that operate on
- * various WebSocket related data structures and perform processing that is not
- * related to specific versions of the protocol.
- *
- * It also includes the abstract interface for the protocol specific processing
- * engines. These engines wrap all of the logic necessary for parsing and
- * validating WebSocket handshakes and messages of specific protocol version
- * and set of allowed extensions.
- *
- * An instance of a processor represents the state of a single WebSocket
- * connection of the associated version. One processor instance is needed per
- * logical WebSocket connection.
- */
-namespace processor {
-
-/// Determine whether or not a generic HTTP request is a WebSocket handshake
-/**
- * @param r The HTTP request to read.
- *
- * @return True if the request is a WebSocket handshake, false otherwise
- */
-template <typename request_type>
-bool is_websocket_handshake(request_type& r) {
-    using utility::ci_find_substr;
-
-    std::string const & upgrade_header = r.get_header("Upgrade");
-
-    if (ci_find_substr(upgrade_header, constants::upgrade_token,
-        sizeof(constants::upgrade_token)-1) == upgrade_header.end())
-    {
-        return false;
-    }
-
-    std::string const & con_header = r.get_header("Connection");
-
-    if (ci_find_substr(con_header, constants::connection_token,
-        sizeof(constants::connection_token)-1) == con_header.end())
-    {
-        return false;
-    }
-
-    return true;
-}
-
-/// Extract the version from a WebSocket handshake request
-/**
- * A blank version header indicates a spec before versions were introduced.
- * The only such versions in shipping products are Hixie Draft 75 and Hixie
- * Draft 76. Draft 75 is present in Chrome 4-5 and Safari 5.0.0, Draft 76 (also
- * known as hybi 00 is present in Chrome 6-13 and Safari 5.0.1+. As
- * differentiating between these two sets of browsers is very difficult and
- * Safari 5.0.1+ accounts for the vast majority of cases in the wild this
- * function assumes that all handshakes without a valid version header are
- * Hybi 00.
- *
- * @param r The WebSocket handshake request to read.
- *
- * @return The WebSocket handshake version or -1 if there was an extraction
- * error.
- */
-template <typename request_type>
-int get_websocket_version(request_type& r) {
-    if (!r.ready()) {
-        return -2;
-    }
-    
-    if (r.get_header("Sec-WebSocket-Version").empty()) {
-        return 0;
-    }
-
-    int version;
-    std::istringstream ss(r.get_header("Sec-WebSocket-Version"));
-
-    if ((ss >> version).fail()) {
-        return -1;
-    }
-
-    return version;
-}
-
-/// Extract a URI ptr from the host header of the request
-/**
- * @param request The request to extract the Host header from.
- *
- * @param scheme The scheme under which this request was received (ws, wss,
- * http, https, etc)
- *
- * @return A uri_pointer that encodes the value of the host header.
- */
-template <typename request_type>
-uri_ptr get_uri_from_host(request_type & request, std::string scheme) {
-    std::string h = request.get_header("Host");
-
-    size_t last_colon = h.rfind(":");
-    size_t last_sbrace = h.rfind("]");
-
-    // no : = hostname with no port
-    // last : before ] = ipv6 literal with no port
-    // : with no ] = hostname with port
-    // : after ] = ipv6 literal with port
-    if (last_colon == std::string::npos ||
-        (last_sbrace != std::string::npos && last_sbrace > last_colon))
-    {
-        return lib::make_shared<uri>(scheme, h, request.get_uri());
-    } else {
-        return lib::make_shared<uri>(scheme,
-                               h.substr(0,last_colon),
-                               h.substr(last_colon+1),
-                               request.get_uri());
-    }
-}
-
-/// WebSocket protocol processor abstract base class
-template <typename config>
-class processor {
-public:
-    typedef processor<config> type;
-    typedef typename config::request_type request_type;
-    typedef typename config::response_type response_type;
-    typedef typename config::message_type::ptr message_ptr;
-    typedef std::pair<lib::error_code,std::string> err_str_pair;
-
-    explicit processor(bool secure, bool p_is_server)
-      : m_secure(secure)
-      , m_server(p_is_server)
-      , m_max_message_size(config::max_message_size)
-    {}
-
-    virtual ~processor() {}
-
-    /// Get the protocol version of this processor
-    virtual int get_version() const = 0;
-
-    /// Get maximum message size
-    /**
-     * Get maximum message size. Maximum message size determines the point at which the
-     * processor will fail a connection with the message_too_big protocol error.
-     *
-     * The default is retrieved from the max_message_size value from the template config
-     *
-     * @since 0.3.0
-     */
-    size_t get_max_message_size() const {
-        return m_max_message_size;
-    }
-    
-    /// Set maximum message size
-    /**
-     * Set maximum message size. Maximum message size determines the point at which the
-     * processor will fail a connection with the message_too_big protocol error.
-     *
-     * The default is retrieved from the max_message_size value from the template config
-     *
-     * @since 0.3.0
-     *
-     * @param new_value The value to set as the maximum message size.
-     */
-    void set_max_message_size(size_t new_value) {
-        m_max_message_size = new_value;
-    }
-
-    /// Returns whether or not the permessage_compress extension is implemented
-    /**
-     * Compile time flag that indicates whether this processor has implemented
-     * the permessage_compress extension. By default this is false.
-     */
-    virtual bool has_permessage_compress() const {
-        return false;
-    }
-
-    /// Initializes extensions based on the Sec-WebSocket-Extensions header
-    /**
-     * Reads the Sec-WebSocket-Extensions header and determines if any of the
-     * requested extensions are supported by this processor. If they are their
-     * settings data is initialized and an extension string to send to the
-     * is returned.
-     *
-     * @param request The request or response headers to look at.
-     */
-    virtual err_str_pair negotiate_extensions(request_type const &) {
-        return err_str_pair();
-    }
-    
-    /// Initializes extensions based on the Sec-WebSocket-Extensions header
-    /**
-     * Reads the Sec-WebSocket-Extensions header and determines if any of the
-     * requested extensions were accepted by the server. If they are their
-     * settings data is initialized. If they are not a list of required
-     * extensions (if any) is returned. This list may be sent back to the server
-     * as a part of the 1010/Extension required close code.
-     *
-     * @param response The request or response headers to look at.
-     */
-    virtual err_str_pair negotiate_extensions(response_type const &) {
-        return err_str_pair();
-    }
-
-    /// validate a WebSocket handshake request for this version
-    /**
-     * @param request The WebSocket handshake request to validate.
-     * is_websocket_handshake(request) must be true and
-     * get_websocket_version(request) must equal this->get_version().
-     *
-     * @return A status code, 0 on success, non-zero for specific sorts of
-     * failure
-     */
-    virtual lib::error_code validate_handshake(request_type const & request) const = 0;
-
-    /// Calculate the appropriate response for this websocket request
-    /**
-     * @param req The request to process
-     *
-     * @param subprotocol The subprotocol in use
-     *
-     * @param res The response to store the processed response in
-     *
-     * @return An error code, 0 on success, non-zero for other errors
-     */
-    virtual lib::error_code process_handshake(request_type const & req,
-        std::string const & subprotocol, response_type& res) const = 0;
-
-    /// Fill in an HTTP request for an outgoing connection handshake
-    /**
-     * @param req The request to process.
-     *
-     * @return An error code, 0 on success, non-zero for other errors
-     */
-    virtual lib::error_code client_handshake_request(request_type & req,
-        uri_ptr uri, std::vector<std::string> const & subprotocols) const = 0;
-
-    /// Validate the server's response to an outgoing handshake request
-    /**
-     * @param req The original request sent
-     * @param res The reponse to generate
-     * @return An error code, 0 on success, non-zero for other errors
-     */
-    virtual lib::error_code validate_server_handshake_response(request_type
-        const & req, response_type & res) const = 0;
-
-    /// Given a completed response, get the raw bytes to put on the wire
-    virtual std::string get_raw(response_type const & request) const = 0;
-
-    /// Return the value of the header containing the CORS origin.
-    virtual std::string const & get_origin(request_type const & request) const = 0;
-
-    /// Extracts requested subprotocols from a handshake request
-    /**
-     * Extracts a list of all subprotocols that the client has requested in the
-     * given opening handshake request.
-     *
-     * @param [in] req The request to extract from
-     * @param [out] subprotocol_list A reference to a vector of strings to store
-     * the results in.
-     */
-    virtual lib::error_code extract_subprotocols(const request_type & req,
-        std::vector<std::string> & subprotocol_list) = 0;
-
-    /// Extracts client uri from a handshake request
-    virtual uri_ptr get_uri(request_type const & request) const = 0;
-
-    /// process new websocket connection bytes
-    /**
-     * WebSocket connections are a continous stream of bytes that must be
-     * interpreted by a protocol processor into discrete frames.
-     *
-     * @param buf Buffer from which bytes should be read.
-     * @param len Length of buffer
-     * @param ec Reference to an error code to return any errors in
-     * @return Number of bytes processed
-     */
-    virtual size_t consume(uint8_t *buf, size_t len, lib::error_code & ec) = 0;
-
-    /// Checks if there is a message ready
-    /**
-     * Checks if the most recent consume operation processed enough bytes to
-     * complete a new WebSocket message. The message can be retrieved by calling
-     * get_message() which will reset the internal state to not-ready and allow
-     * consume to read more bytes.
-     *
-     * @return Whether or not a message is ready.
-     */
-    virtual bool ready() const = 0;
-
-    /// Retrieves the most recently processed message
-    /**
-     * Retrieves a shared pointer to the recently completed message if there is
-     * one. If ready() returns true then there is a message available.
-     * Retrieving the message with get_message will reset the state of ready.
-     * As such, each new message may be retrieved only once. Calling get_message
-     * when there is no message available will result in a null pointer being
-     * returned.
-     *
-     * @return A pointer to the most recently processed message or a null shared
-     *         pointer.
-     */
-    virtual message_ptr get_message() = 0;
-
-    /// Tests whether the processor is in a fatal error state
-    virtual bool get_error() const = 0;
-
-    /// Retrieves the number of bytes presently needed by the processor
-    /// This value may be used as a hint to the transport layer as to how many
-    /// bytes to wait for before running consume again.
-    virtual size_t get_bytes_needed() const {
-        return 1;
-    }
-
-    /// Prepare a data message for writing
-    /**
-     * Performs validation, masking, compression, etc. will return an error if
-     * there was an error, otherwise msg will be ready to be written
-     */
-    virtual lib::error_code prepare_data_frame(message_ptr in, message_ptr out) = 0;
-
-    /// Prepare a ping frame
-    /**
-     * Ping preparation is entirely state free. There is no payload validation
-     * other than length. Payload need not be UTF-8.
-     *
-     * @param in The string to use for the ping payload
-     * @param out The message buffer to prepare the ping in.
-     * @return Status code, zero on success, non-zero on failure
-     */
-    virtual lib::error_code prepare_ping(std::string const & in, message_ptr out) const 
-        = 0;
-
-    /// Prepare a pong frame
-    /**
-     * Pong preparation is entirely state free. There is no payload validation
-     * other than length. Payload need not be UTF-8.
-     *
-     * @param in The string to use for the pong payload
-     * @param out The message buffer to prepare the pong in.
-     * @return Status code, zero on success, non-zero on failure
-     */
-    virtual lib::error_code prepare_pong(std::string const & in, message_ptr out) const 
-        = 0;
-
-    /// Prepare a close frame
-    /**
-     * Close preparation is entirely state free. The code and reason are both
-     * subject to validation. Reason must be valid UTF-8. Code must be a valid
-     * un-reserved WebSocket close code. Use close::status::no_status to
-     * indicate no code. If no code is supplied a reason may not be specified.
-     *
-     * @param code The close code to send
-     * @param reason The reason string to send
-     * @param out The message buffer to prepare the fame in
-     * @return Status code, zero on success, non-zero on failure
-     */
-    virtual lib::error_code prepare_close(close::status::value code,
-        std::string const & reason, message_ptr out) const = 0;
-protected:
-    bool const m_secure;
-    bool const m_server;
-    size_t m_max_message_size;
-};
-
-} // namespace processor
-} // namespace websocketpp
-
-#endif //WEBSOCKETPP_PROCESSOR_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/random/none.hpp b/src/sioclient/lib/websocketpp/websocketpp/random/none.hpp
deleted file mode 100644
index 2163e6f4..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/random/none.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_RANDOM_NONE_HPP
-#define WEBSOCKETPP_RANDOM_NONE_HPP
-
-namespace websocketpp {
-/// Random number generation policies
-namespace random {
-/// Stub RNG policy that always returns 0
-namespace none {
-
-/// Thread safe stub "random" integer generator.
-/**
- * This template class provides a random integer stub. The interface mimics the
- * WebSocket++ RNG generator classes but the generater function always returns
- * zero. This can be used to stub out the RNG for unit and performance testing.
- *
- * Call operator() to generate the next number
- */
-template <typename int_type>
-class int_generator {
-    public:
-        int_generator() {}
-
-        /// advances the engine's state and returns the generated value
-        int_type operator()() {
-            return 0;
-        }
-};
-
-} // namespace none
-} // namespace random
-} // namespace websocketpp
-
-#endif //WEBSOCKETPP_RANDOM_NONE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/random/random_device.hpp b/src/sioclient/lib/websocketpp/websocketpp/random/random_device.hpp
deleted file mode 100644
index 91e7dd16..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/random/random_device.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_RANDOM_RANDOM_DEVICE_HPP
-#define WEBSOCKETPP_RANDOM_RANDOM_DEVICE_HPP
-
-#include <websocketpp/common/random.hpp>
-
-namespace websocketpp {
-namespace random {
-/// RNG policy based on std::random_device or boost::random_device
-namespace random_device {
-
-/// Thread safe non-deterministic random integer generator.
-/**
- * This template class provides thread safe non-deterministic random integer
- * generation. Numbers are produced in a uniformly distributed range from the
- * smallest to largest value that int_type can store.
- *
- * Thread-safety is provided via locking based on the concurrency template
- * parameter.
- *
- * Non-deterministic RNG is provided via websocketpp::lib which uses either
- * C++11 or Boost 1.47+'s random_device class.
- *
- * Call operator() to generate the next number
- */
-template <typename int_type, typename concurrency>
-class int_generator {
-    public:
-        typedef typename concurrency::scoped_lock_type scoped_lock_type;
-        typedef typename concurrency::mutex_type mutex_type;
-
-        /// constructor
-        //mac TODO: figure out if signed types present a range problem
-        int_generator() {}
-
-        /// advances the engine's state and returns the generated value
-        int_type operator()() {
-            scoped_lock_type guard(m_lock);
-            return m_dis(m_rng);
-        }
-    private:
-
-
-        lib::random_device m_rng;
-        lib::uniform_int_distribution<int_type> m_dis;
-
-        mutex_type m_lock;
-};
-
-} // namespace random_device
-} // namespace random
-} // namespace websocketpp
-
-#endif //WEBSOCKETPP_RANDOM_RANDOM_DEVICE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/roles/client_endpoint.hpp b/src/sioclient/lib/websocketpp/websocketpp/roles/client_endpoint.hpp
deleted file mode 100644
index 4d0c433b..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/roles/client_endpoint.hpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_CLIENT_ENDPOINT_HPP
-#define WEBSOCKETPP_CLIENT_ENDPOINT_HPP
-
-#include <websocketpp/endpoint.hpp>
-#include <websocketpp/uri.hpp>
-
-#include <websocketpp/logger/levels.hpp>
-
-#include <websocketpp/common/system_error.hpp>
-
-#include <string>
-
-namespace websocketpp {
-
-/// Client endpoint role based on the given config
-/**
- *
- */
-template <typename config>
-class client : public endpoint<connection<config>,config> {
-public:
-    /// Type of this endpoint
-    typedef client<config> type;
-
-    /// Type of the endpoint concurrency component
-    typedef typename config::concurrency_type concurrency_type;
-    /// Type of the endpoint transport component
-    typedef typename config::transport_type transport_type;
-
-    /// Type of the connections this server will create
-    typedef connection<config> connection_type;
-    /// Type of a shared pointer to the connections this server will create
-    typedef typename connection_type::ptr connection_ptr;
-
-    /// Type of the connection transport component
-    typedef typename transport_type::transport_con_type transport_con_type;
-    /// Type of a shared pointer to the connection transport component
-    typedef typename transport_con_type::ptr transport_con_ptr;
-
-    /// Type of the endpoint component of this server
-    typedef endpoint<connection_type,config> endpoint_type;
-
-    friend class connection<config>;
-
-    explicit client() : endpoint_type(false)
-    {
-        endpoint_type::m_alog->write(log::alevel::devel, "client constructor");
-    }
-
-    /// Get a new connection
-    /**
-     * Creates and returns a pointer to a new connection to the given URI
-     * suitable for passing to connect(connection_ptr). This method allows
-     * applying connection specific settings before performing the opening
-     * handshake.
-     *
-     * @param [in] location URI to open the connection to as a uri_ptr
-     * @param [out] ec An status code indicating failure reasons, if any
-     *
-     * @return A connection_ptr to the new connection
-     */
-    connection_ptr get_connection(uri_ptr location, lib::error_code & ec) {
-        if (location->get_secure() && !transport_type::is_secure()) {
-            ec = error::make_error_code(error::endpoint_not_secure);
-            return connection_ptr();
-        }
-
-        connection_ptr con = endpoint_type::create_connection();
-
-        if (!con) {
-            ec = error::make_error_code(error::con_creation_failed);
-            return con;
-        }
-
-        con->set_uri(location);
-
-        ec = lib::error_code();
-        return con;
-    }
-
-    /// Get a new connection (string version)
-    /**
-     * Creates and returns a pointer to a new connection to the given URI
-     * suitable for passing to connect(connection_ptr). This overload allows
-     * default construction of the uri_ptr from a standard string.
-     *
-     * @param [in] u URI to open the connection to as a string
-     * @param [out] ec An status code indicating failure reasons, if any
-     *
-     * @return A connection_ptr to the new connection
-     */
-    connection_ptr get_connection(std::string const & u, lib::error_code & ec) {
-        uri_ptr location = lib::make_shared<uri>(u);
-
-        if (!location->get_valid()) {
-            ec = error::make_error_code(error::invalid_uri);
-            return connection_ptr();
-        }
-
-        return get_connection(location, ec);
-    }
-
-    /// Begin the connection process for the given connection
-    /**
-     * Initiates the opening connection handshake for connection con. Exact
-     * behavior depends on the underlying transport policy.
-     *
-     * @param con The connection to connect
-     *
-     * @return The pointer to the connection originally passed in.
-     */
-    connection_ptr connect(connection_ptr con) {
-        // Ask transport to perform a connection
-        transport_type::async_connect(
-            lib::static_pointer_cast<transport_con_type>(con),
-            con->get_uri(),
-            lib::bind(
-                &type::handle_connect,
-                this,
-                con,
-                lib::placeholders::_1
-            )
-        );
-
-        return con;
-    }
-private:
-    // handle_connect
-    void handle_connect(connection_ptr con, lib::error_code const & ec) {
-        if (ec) {
-            con->terminate(ec);
-
-            endpoint_type::m_elog->write(log::elevel::rerror,
-                    "handle_connect error: "+ec.message());
-        } else {
-            endpoint_type::m_alog->write(log::alevel::connect,
-                "Successful connection");
-
-            con->start();
-        }
-    }
-};
-
-} // namespace websocketpp
-
-#endif //WEBSOCKETPP_CLIENT_ENDPOINT_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/roles/server_endpoint.hpp b/src/sioclient/lib/websocketpp/websocketpp/roles/server_endpoint.hpp
deleted file mode 100644
index 9cc652f7..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/roles/server_endpoint.hpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_SERVER_ENDPOINT_HPP
-#define WEBSOCKETPP_SERVER_ENDPOINT_HPP
-
-#include <websocketpp/endpoint.hpp>
-
-#include <websocketpp/logger/levels.hpp>
-
-#include <websocketpp/common/system_error.hpp>
-
-namespace websocketpp {
-
-/// Server endpoint role based on the given config
-/**
- *
- */
-template <typename config>
-class server : public endpoint<connection<config>,config> {
-public:
-    /// Type of this endpoint
-    typedef server<config> type;
-
-    /// Type of the endpoint concurrency component
-    typedef typename config::concurrency_type concurrency_type;
-    /// Type of the endpoint transport component
-    typedef typename config::transport_type transport_type;
-
-    /// Type of the connections this server will create
-    typedef connection<config> connection_type;
-    /// Type of a shared pointer to the connections this server will create
-    typedef typename connection_type::ptr connection_ptr;
-
-    /// Type of the connection transport component
-    typedef typename transport_type::transport_con_type transport_con_type;
-    /// Type of a shared pointer to the connection transport component
-    typedef typename transport_con_type::ptr transport_con_ptr;
-
-    /// Type of the endpoint component of this server
-    typedef endpoint<connection_type,config> endpoint_type;
-
-    friend class connection<config>;
-
-    explicit server() : endpoint_type(true)
-    {
-        endpoint_type::m_alog->write(log::alevel::devel, "server constructor");
-    }
-
-    /// Destructor
-    ~server<config>() {}
-
-#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-    // no copy constructor because endpoints are not copyable
-    server<config>(server<config> &) = delete;
-
-    // no copy assignment operator because endpoints are not copyable
-    server<config> & operator=(server<config> const &) = delete;
-#endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-
-#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
-    /// Move constructor
-    server<config>(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
-
-#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-    // no move assignment operator because of const member variables
-    server<config> & operator=(server<config> &&) = delete;
-#endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-
-#endif // _WEBSOCKETPP_MOVE_SEMANTICS_
-
-    /// Create and initialize a new connection
-    /**
-     * The connection will be initialized and ready to begin. Call its start()
-     * method to begin the processing loop.
-     *
-     * Note: The connection must either be started or terminated using
-     * connection::terminate in order to avoid memory leaks.
-     *
-     * @return A pointer to the new connection.
-     */
-    connection_ptr get_connection() {
-        return endpoint_type::create_connection();
-    }
-
-    /// Starts the server's async connection acceptance loop (exception free)
-    /**
-     * Initiates the server connection acceptance loop. Must be called after
-     * listen. This method will have no effect until the underlying io_service
-     * starts running. It may be called after the io_service is already running.
-     *
-     * Refer to documentation for the transport policy you are using for
-     * instructions on how to stop this acceptance loop.
-     *
-     * @param [out] ec A status code indicating an error, if any.
-     */
-    void start_accept(lib::error_code & ec) {
-        if (!transport_type::is_listening()) {
-            ec = error::make_error_code(error::async_accept_not_listening);
-            return;
-        }
-        
-        ec = lib::error_code();
-        connection_ptr con = get_connection();
-
-        if (!con) {
-          ec = error::make_error_code(error::con_creation_failed);
-          return;
-        }
-
-        transport_type::async_accept(
-            lib::static_pointer_cast<transport_con_type>(con),
-            lib::bind(&type::handle_accept,this,con,lib::placeholders::_1),
-            ec
-        );
-
-        if (ec && con) {
-            // If the connection was constructed but the accept failed,
-            // terminate the connection to prevent memory leaks
-            con->terminate(lib::error_code());
-        }
-    }
-
-    /// Starts the server's async connection acceptance loop
-    /**
-     * Initiates the server connection acceptance loop. Must be called after
-     * listen. This method will have no effect until the underlying io_service
-     * starts running. It may be called after the io_service is already running.
-     *
-     * Refer to documentation for the transport policy you are using for
-     * instructions on how to stop this acceptance loop.
-     */
-    void start_accept() {
-        lib::error_code ec;
-        start_accept(ec);
-        if (ec) {
-            throw exception(ec);
-        }
-    }
-
-    /// Handler callback for start_accept
-    void handle_accept(connection_ptr con, lib::error_code const & ec) {
-        if (ec) {
-            con->terminate(ec);
-
-            if (ec == error::operation_canceled) {
-                endpoint_type::m_elog->write(log::elevel::info,
-                    "handle_accept error: "+ec.message());
-            } else {
-                endpoint_type::m_elog->write(log::elevel::rerror,
-                    "handle_accept error: "+ec.message());
-            }
-        } else {
-            con->start();
-        }
-
-        lib::error_code start_ec;
-        start_accept(start_ec);
-        if (start_ec == error::async_accept_not_listening) {
-            endpoint_type::m_elog->write(log::elevel::info,
-                "Stopping acceptance of new connections because the underlying transport is no longer listening.");
-        } else if (start_ec) {
-            endpoint_type::m_elog->write(log::elevel::rerror,
-                "Restarting async_accept loop failed: "+ec.message());
-        }
-    }
-};
-
-} // namespace websocketpp
-
-#endif //WEBSOCKETPP_SERVER_ENDPOINT_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/server.hpp b/src/sioclient/lib/websocketpp/websocketpp/server.hpp
deleted file mode 100644
index 342fa8c5..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/server.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_SERVER_HPP
-#define WEBSOCKETPP_SERVER_HPP
-
-#include <websocketpp/roles/server_endpoint.hpp>
-
-#endif //WEBSOCKETPP_SERVER_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/sha1/sha1.hpp b/src/sioclient/lib/websocketpp/websocketpp/sha1/sha1.hpp
deleted file mode 100644
index 6b48d957..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/sha1/sha1.hpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-*****
-sha1.hpp is a repackaging of the sha1.cpp and sha1.h files from the smallsha1
-library (http://code.google.com/p/smallsha1/) into a single header suitable for
-use as a header only library. This conversion was done by Peter Thorson
-(webmaster@zaphoyd.com) in 2013. All modifications to the code are redistributed
-under the same license as the original, which is listed below.
-*****
-
- Copyright (c) 2011, Micael Hildenborg
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of Micael Hildenborg nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY Micael Hildenborg ''AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL Micael Hildenborg BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SHA1_DEFINED
-#define SHA1_DEFINED
-
-namespace websocketpp {
-namespace sha1 {
-
-namespace { // local
-
-// Rotate an integer value to left.
-inline unsigned int rol(unsigned int value, unsigned int steps) {
-    return ((value << steps) | (value >> (32 - steps)));
-}
-
-// Sets the first 16 integers in the buffert to zero.
-// Used for clearing the W buffert.
-inline void clearWBuffert(unsigned int * buffert)
-{
-    for (int pos = 16; --pos >= 0;)
-    {
-        buffert[pos] = 0;
-    }
-}
-
-inline void innerHash(unsigned int * result, unsigned int * w)
-{
-    unsigned int a = result[0];
-    unsigned int b = result[1];
-    unsigned int c = result[2];
-    unsigned int d = result[3];
-    unsigned int e = result[4];
-
-    int round = 0;
-
-    #define sha1macro(func,val) \
-    { \
-        const unsigned int t = rol(a, 5) + (func) + e + val + w[round]; \
-        e = d; \
-        d = c; \
-        c = rol(b, 30); \
-        b = a; \
-        a = t; \
-    }
-
-    while (round < 16)
-    {
-        sha1macro((b & c) | (~b & d), 0x5a827999)
-        ++round;
-    }
-    while (round < 20)
-    {
-        w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1);
-        sha1macro((b & c) | (~b & d), 0x5a827999)
-        ++round;
-    }
-    while (round < 40)
-    {
-        w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1);
-        sha1macro(b ^ c ^ d, 0x6ed9eba1)
-        ++round;
-    }
-    while (round < 60)
-    {
-        w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1);
-        sha1macro((b & c) | (b & d) | (c & d), 0x8f1bbcdc)
-        ++round;
-    }
-    while (round < 80)
-    {
-        w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1);
-        sha1macro(b ^ c ^ d, 0xca62c1d6)
-        ++round;
-    }
-
-    #undef sha1macro
-
-    result[0] += a;
-    result[1] += b;
-    result[2] += c;
-    result[3] += d;
-    result[4] += e;
-}
-
-} // namespace
-
-/// Calculate a SHA1 hash
-/**
- * @param src points to any kind of data to be hashed.
- * @param bytelength the number of bytes to hash from the src pointer.
- * @param hash should point to a buffer of at least 20 bytes of size for storing
- * the sha1 result in.
- */
-inline void calc(void const * src, size_t bytelength, unsigned char * hash) {
-    // Init the result array.
-    unsigned int result[5] = { 0x67452301, 0xefcdab89, 0x98badcfe,
-                               0x10325476, 0xc3d2e1f0 };
-
-    // Cast the void src pointer to be the byte array we can work with.
-    unsigned char const * sarray = (unsigned char const *) src;
-
-    // The reusable round buffer
-    unsigned int w[80];
-
-    // Loop through all complete 64byte blocks.
-
-    size_t endCurrentBlock;
-    size_t currentBlock = 0;
-
-    if (bytelength >= 64) {
-        size_t const endOfFullBlocks = bytelength - 64;
-
-        while (currentBlock <= endOfFullBlocks) {
-            endCurrentBlock = currentBlock + 64;
-
-            // Init the round buffer with the 64 byte block data.
-            for (int roundPos = 0; currentBlock < endCurrentBlock; currentBlock += 4)
-            {
-                // This line will swap endian on big endian and keep endian on
-                // little endian.
-                w[roundPos++] = (unsigned int) sarray[currentBlock + 3]
-                        | (((unsigned int) sarray[currentBlock + 2]) << 8)
-                        | (((unsigned int) sarray[currentBlock + 1]) << 16)
-                        | (((unsigned int) sarray[currentBlock]) << 24);
-            }
-            innerHash(result, w);
-        }
-    }
-
-    // Handle the last and not full 64 byte block if existing.
-    endCurrentBlock = bytelength - currentBlock;
-    clearWBuffert(w);
-    size_t lastBlockBytes = 0;
-    for (;lastBlockBytes < endCurrentBlock; ++lastBlockBytes) {
-        w[lastBlockBytes >> 2] |= (unsigned int) sarray[lastBlockBytes + currentBlock] << ((3 - (lastBlockBytes & 3)) << 3);
-    }
-
-    w[lastBlockBytes >> 2] |= 0x80 << ((3 - (lastBlockBytes & 3)) << 3);
-    if (endCurrentBlock >= 56) {
-        innerHash(result, w);
-        clearWBuffert(w);
-    }
-    w[15] = bytelength << 3;
-    innerHash(result, w);
-
-    // Store hash in result pointer, and make sure we get in in the correct
-    // order on both endian models.
-    for (int hashByte = 20; --hashByte >= 0;) {
-        hash[hashByte] = (result[hashByte >> 2] >> (((3 - hashByte) & 0x3) << 3)) & 0xff;
-    }
-}
-
-} // namespace sha1
-} // namespace websocketpp
-
-#endif // SHA1_DEFINED
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/asio/base.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/asio/base.hpp
deleted file mode 100644
index b945fe11..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/asio/base.hpp
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_ASIO_BASE_HPP
-#define WEBSOCKETPP_TRANSPORT_ASIO_BASE_HPP
-
-#include <websocketpp/common/asio.hpp>
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/functional.hpp>
-#include <websocketpp/common/system_error.hpp>
-#include <websocketpp/common/type_traits.hpp>
-
-#include <string>
-
-namespace websocketpp {
-namespace transport {
-/// Transport policy that uses asio
-/**
- * This policy uses a single asio io_service to provide transport
- * services to a WebSocket++ endpoint.
- */
-namespace asio {
-
-// Class to manage the memory to be used for handler-based custom allocation.
-// It contains a single block of memory which may be returned for allocation
-// requests. If the memory is in use when an allocation request is made, the
-// allocator delegates allocation to the global heap.
-class handler_allocator {
-public:
-    static const size_t size = 1024;
-    
-    handler_allocator() : m_in_use(false) {}
-
-#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-	handler_allocator(handler_allocator const & cpy) = delete;
-	handler_allocator & operator =(handler_allocator const &) = delete;
-#endif
-
-    void * allocate(std::size_t memsize) {
-        if (!m_in_use && memsize < size) {
-            m_in_use = true;
-            return static_cast<void*>(&m_storage);
-        } else {
-            return ::operator new(memsize);
-        }
-    }
-
-    void deallocate(void * pointer) {
-        if (pointer == &m_storage) {
-            m_in_use = false;
-        } else {
-            ::operator delete(pointer);
-        }
-    }
-
-private:
-    // Storage space used for handler-based custom memory allocation.
-    lib::aligned_storage<size>::type m_storage;
-
-    // Whether the handler-based custom allocation storage has been used.
-    bool m_in_use;
-};
-
-// Wrapper class template for handler objects to allow handler memory
-// allocation to be customised. Calls to operator() are forwarded to the
-// encapsulated handler.
-template <typename Handler>
-class custom_alloc_handler {
-public:
-    custom_alloc_handler(handler_allocator& a, Handler h)
-      : allocator_(a),
-        handler_(h)
-    {}
-
-    template <typename Arg1>
-    void operator()(Arg1 arg1) {
-        handler_(arg1);
-    }
-
-    template <typename Arg1, typename Arg2>
-    void operator()(Arg1 arg1, Arg2 arg2) {
-        handler_(arg1, arg2);
-    }
-
-    friend void* asio_handler_allocate(std::size_t size,
-        custom_alloc_handler<Handler> * this_handler)
-    {
-        return this_handler->allocator_.allocate(size);
-    }
-
-    friend void asio_handler_deallocate(void* pointer, std::size_t /*size*/,
-        custom_alloc_handler<Handler> * this_handler)
-    {
-        this_handler->allocator_.deallocate(pointer);
-    }
-
-private:
-    handler_allocator & allocator_;
-    Handler handler_;
-};
-
-// Helper function to wrap a handler object to add custom allocation.
-template <typename Handler>
-inline custom_alloc_handler<Handler> make_custom_alloc_handler(
-    handler_allocator & a, Handler h)
-{
-    return custom_alloc_handler<Handler>(a, h);
-}
-
-
-
-
-
-
-
-// Forward declaration of class endpoint so that it can be friended/referenced
-// before being included.
-template <typename config>
-class endpoint;
-
-typedef lib::function<void (lib::asio::error_code const & ec,
-    size_t bytes_transferred)> async_read_handler;
-
-typedef lib::function<void (lib::asio::error_code const & ec,
-    size_t bytes_transferred)> async_write_handler;
-
-typedef lib::function<void (lib::error_code const & ec)> pre_init_handler;
-
-// handle_timer: dynamic parameters, multiple copies
-// handle_proxy_write
-// handle_proxy_read
-// handle_async_write
-// handle_pre_init
-
-
-/// Asio transport errors
-namespace error {
-enum value {
-    /// Catch-all error for transport policy errors that don't fit in other
-    /// categories
-    general = 1,
-
-    /// async_read_at_least call requested more bytes than buffer can store
-    invalid_num_bytes,
-
-    /// there was an error in the underlying transport library
-    pass_through,
-
-    /// The connection to the requested proxy server failed
-    proxy_failed,
-
-    /// Invalid Proxy URI
-    proxy_invalid,
-
-    /// Invalid host or service
-    invalid_host_service
-};
-
-/// Asio transport error category
-class category : public lib::error_category {
-public:
-    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
-        return "websocketpp.transport.asio";
-    }
-
-    std::string message(int value) const {
-        switch(value) {
-            case error::general:
-                return "Generic asio transport policy error";
-            case error::invalid_num_bytes:
-                return "async_read_at_least call requested more bytes than buffer can store";
-            case error::pass_through:
-                return "Underlying Transport Error";
-            case error::proxy_failed:
-                return "Proxy connection failed";
-            case error::proxy_invalid:
-                return "Invalid proxy URI";
-            case error::invalid_host_service:
-                return "Invalid host or service";
-            default:
-                return "Unknown";
-        }
-    }
-};
-
-/// Get a reference to a static copy of the asio transport error category
-inline lib::error_category const & get_category() {
-    static category instance;
-    return instance;
-}
-
-/// Create an error code with the given value and the asio transport category
-inline lib::error_code make_error_code(error::value e) {
-    return lib::error_code(static_cast<int>(e), get_category());
-}
-
-} // namespace error
-} // namespace asio
-} // namespace transport
-} // namespace websocketpp
-
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
-template<> struct is_error_code_enum<websocketpp::transport::asio::error::value>
-{
-    static bool const value = true;
-};
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
-#endif // WEBSOCKETPP_TRANSPORT_ASIO_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/asio/connection.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/asio/connection.hpp
deleted file mode 100644
index 60f88a79..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/asio/connection.hpp
+++ /dev/null
@@ -1,1197 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_ASIO_CON_HPP
-#define WEBSOCKETPP_TRANSPORT_ASIO_CON_HPP
-
-#include <websocketpp/transport/asio/base.hpp>
-
-#include <websocketpp/transport/base/connection.hpp>
-
-#include <websocketpp/logger/levels.hpp>
-#include <websocketpp/http/constants.hpp>
-
-#include <websocketpp/base64/base64.hpp>
-#include <websocketpp/error.hpp>
-#include <websocketpp/uri.hpp>
-
-#include <websocketpp/common/asio.hpp>
-#include <websocketpp/common/chrono.hpp>
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/memory.hpp>
-#include <websocketpp/common/functional.hpp>
-#include <websocketpp/common/connection_hdl.hpp>
-
-#include <istream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-namespace websocketpp {
-namespace transport {
-namespace asio {
-
-typedef lib::function<void(connection_hdl)> tcp_init_handler;
-
-/// Asio based connection transport component
-/**
- * transport::asio::connection implements a connection transport component using
- * Asio that works with the transport::asio::endpoint endpoint transport
- * component.
- */
-template <typename config>
-class connection : public config::socket_type::socket_con_type {
-public:
-    /// Type of this connection transport component
-    typedef connection<config> type;
-    /// Type of a shared pointer to this connection transport component
-    typedef lib::shared_ptr<type> ptr;
-
-    /// Type of the socket connection component
-    typedef typename config::socket_type::socket_con_type socket_con_type;
-    /// Type of a shared pointer to the socket connection component
-    typedef typename socket_con_type::ptr socket_con_ptr;
-    /// Type of this transport's access logging policy
-    typedef typename config::alog_type alog_type;
-    /// Type of this transport's error logging policy
-    typedef typename config::elog_type elog_type;
-
-    typedef typename config::request_type request_type;
-    typedef typename request_type::ptr request_ptr;
-    typedef typename config::response_type response_type;
-    typedef typename response_type::ptr response_ptr;
-
-    /// Type of a pointer to the Asio io_service being used
-    typedef lib::asio::io_service * io_service_ptr;
-    /// Type of a pointer to the Asio io_service::strand being used
-    typedef lib::shared_ptr<lib::asio::io_service::strand> strand_ptr;
-    /// Type of a pointer to the Asio timer class
-    typedef lib::shared_ptr<lib::asio::steady_timer> timer_ptr;
-
-    // connection is friends with its associated endpoint to allow the endpoint
-    // to call private/protected utility methods that we don't want to expose
-    // to the public api.
-    friend class endpoint<config>;
-
-    // generate and manage our own io_service
-    explicit connection(bool is_server, const lib::shared_ptr<alog_type> & alog, const lib::shared_ptr<elog_type> & elog)
-      : m_is_server(is_server)
-      , m_alog(alog)
-      , m_elog(elog)
-    {
-        m_alog->write(log::alevel::devel,"asio con transport constructor");
-    }
-
-    /// Get a shared pointer to this component
-    ptr get_shared() {
-        return lib::static_pointer_cast<type>(socket_con_type::get_shared());
-    }
-
-    bool is_secure() const {
-        return socket_con_type::is_secure();
-    }
-
-    /// Set uri hook
-    /**
-     * Called by the endpoint as a connection is being established to provide
-     * the uri being connected to to the transport layer.
-     *
-     * This transport policy doesn't use the uri except to forward it to the 
-     * socket layer.
-     *
-     * @since 0.6.0
-     *
-     * @param u The uri to set
-     */
-    void set_uri(uri_ptr u) {
-        socket_con_type::set_uri(u);
-    }
-
-    /// Sets the tcp pre init handler
-    /**
-     * The tcp pre init handler is called after the raw tcp connection has been
-     * established but before any additional wrappers (proxy connects, TLS
-     * handshakes, etc) have been performed.
-     *
-     * @since 0.3.0
-     *
-     * @param h The handler to call on tcp pre init.
-     */
-    void set_tcp_pre_init_handler(tcp_init_handler h) {
-        m_tcp_pre_init_handler = h;
-    }
-
-    /// Sets the tcp pre init handler (deprecated)
-    /**
-     * The tcp pre init handler is called after the raw tcp connection has been
-     * established but before any additional wrappers (proxy connects, TLS
-     * handshakes, etc) have been performed.
-     *
-     * @deprecated Use set_tcp_pre_init_handler instead
-     *
-     * @param h The handler to call on tcp pre init.
-     */
-    void set_tcp_init_handler(tcp_init_handler h) {
-        set_tcp_pre_init_handler(h);
-    }
-
-    /// Sets the tcp post init handler
-    /**
-     * The tcp post init handler is called after the tcp connection has been
-     * established and all additional wrappers (proxy connects, TLS handshakes,
-     * etc have been performed. This is fired before any bytes are read or any
-     * WebSocket specific handshake logic has been performed.
-     *
-     * @since 0.3.0
-     *
-     * @param h The handler to call on tcp post init.
-     */
-    void set_tcp_post_init_handler(tcp_init_handler h) {
-        m_tcp_post_init_handler = h;
-    }
-
-    /// Set the proxy to connect through (exception free)
-    /**
-     * The URI passed should be a complete URI including scheme. For example:
-     * http://proxy.example.com:8080/
-     *
-     * The proxy must be set up as an explicit (CONNECT) proxy allowed to
-     * connect to the port you specify. Traffic to the proxy is not encrypted.
-     *
-     * @param uri The full URI of the proxy to connect to.
-     *
-     * @param ec A status value
-     */
-    void set_proxy(std::string const & uri, lib::error_code & ec) {
-        // TODO: return errors for illegal URIs here?
-        // TODO: should https urls be illegal for the moment?
-        m_proxy = uri;
-        m_proxy_data = lib::make_shared<proxy_data>();
-        ec = lib::error_code();
-    }
-
-    /// Set the proxy to connect through (exception)
-    void set_proxy(std::string const & uri) {
-        lib::error_code ec;
-        set_proxy(uri,ec);
-        if (ec) { throw exception(ec); }
-    }
-
-    /// Set the basic auth credentials to use (exception free)
-    /**
-     * The URI passed should be a complete URI including scheme. For example:
-     * http://proxy.example.com:8080/
-     *
-     * The proxy must be set up as an explicit proxy
-     *
-     * @param username The username to send
-     *
-     * @param password The password to send
-     *
-     * @param ec A status value
-     */
-    void set_proxy_basic_auth(std::string const & username, std::string const &
-        password, lib::error_code & ec)
-    {
-        if (!m_proxy_data) {
-            ec = make_error_code(websocketpp::error::invalid_state);
-            return;
-        }
-
-        // TODO: username can't contain ':'
-        std::string val = "Basic "+base64_encode(username + ":" + password);
-        m_proxy_data->req.replace_header("Proxy-Authorization",val);
-        ec = lib::error_code();
-    }
-
-    /// Set the basic auth credentials to use (exception)
-    void set_proxy_basic_auth(std::string const & username, std::string const &
-        password)
-    {
-        lib::error_code ec;
-        set_proxy_basic_auth(username,password,ec);
-        if (ec) { throw exception(ec); }
-    }
-
-    /// Set the proxy timeout duration (exception free)
-    /**
-     * Duration is in milliseconds. Default value is based on the transport
-     * config
-     *
-     * @param duration The number of milliseconds to wait before aborting the
-     * proxy connection.
-     *
-     * @param ec A status value
-     */
-    void set_proxy_timeout(long duration, lib::error_code & ec) {
-        if (!m_proxy_data) {
-            ec = make_error_code(websocketpp::error::invalid_state);
-            return;
-        }
-
-        m_proxy_data->timeout_proxy = duration;
-        ec = lib::error_code();
-    }
-
-    /// Set the proxy timeout duration (exception)
-    void set_proxy_timeout(long duration) {
-        lib::error_code ec;
-        set_proxy_timeout(duration,ec);
-        if (ec) { throw exception(ec); }
-    }
-
-    std::string const & get_proxy() const {
-        return m_proxy;
-    }
-
-    /// Get the remote endpoint address
-    /**
-     * The iostream transport has no information about the ultimate remote
-     * endpoint. It will return the string "iostream transport". To indicate
-     * this.
-     *
-     * TODO: allow user settable remote endpoint addresses if this seems useful
-     *
-     * @return A string identifying the address of the remote endpoint
-     */
-    std::string get_remote_endpoint() const {
-        lib::error_code ec;
-
-        std::string ret = socket_con_type::get_remote_endpoint(ec);
-
-        if (ec) {
-            m_elog->write(log::elevel::info,ret);
-            return "Unknown";
-        } else {
-            return ret;
-        }
-    }
-
-    /// Get the connection handle
-    connection_hdl get_handle() const {
-        return m_connection_hdl;
-    }
-
-    /// Call back a function after a period of time.
-    /**
-     * Sets a timer that calls back a function after the specified period of
-     * milliseconds. Returns a handle that can be used to cancel the timer.
-     * A cancelled timer will return the error code error::operation_aborted
-     * A timer that expired will return no error.
-     *
-     * @param duration Length of time to wait in milliseconds
-     *
-     * @param callback The function to call back when the timer has expired
-     *
-     * @return A handle that can be used to cancel the timer if it is no longer
-     * needed.
-     */
-    timer_ptr set_timer(long duration, timer_handler callback) {
-        timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
-            lib::ref(*m_io_service),
-            lib::asio::milliseconds(duration)
-        );
-
-        if (config::enable_multithreading) {
-            new_timer->async_wait(m_strand->wrap(lib::bind(
-                &type::handle_timer, get_shared(),
-                new_timer,
-                callback,
-                lib::placeholders::_1
-            )));
-        } else {
-            new_timer->async_wait(lib::bind(
-                &type::handle_timer, get_shared(),
-                new_timer,
-                callback,
-                lib::placeholders::_1
-            ));
-        }
-
-        return new_timer;
-    }
-
-    /// Timer callback
-    /**
-     * The timer pointer is included to ensure the timer isn't destroyed until
-     * after it has expired.
-     *
-     * TODO: candidate for protected status
-     *
-     * @param post_timer Pointer to the timer in question
-     * @param callback The function to call back
-     * @param ec The status code
-     */
-    void handle_timer(timer_ptr, timer_handler callback,
-        lib::asio::error_code const & ec)
-    {
-        if (ec) {
-            if (ec == lib::asio::error::operation_aborted) {
-                callback(make_error_code(transport::error::operation_aborted));
-            } else {
-                log_err(log::elevel::info,"asio handle_timer",ec);
-                callback(make_error_code(error::pass_through));
-            }
-        } else {
-            callback(lib::error_code());
-        }
-    }
-
-    /// Get a pointer to this connection's strand
-    strand_ptr get_strand() {
-        return m_strand;
-    }
-
-    /// Get the internal transport error code for a closed/failed connection
-    /**
-     * Retrieves a machine readable detailed error code indicating the reason
-     * that the connection was closed or failed. Valid only after the close or
-     * fail handler is called.
-     *
-     * Primarily used if you are using mismatched asio / system_error
-     * implementations such as `boost::asio` with `std::system_error`. In these
-     * cases the transport error type is different than the library error type
-     * and some WebSocket++ functions that return transport errors via the 
-     * library error code type will be coerced into a catch all `pass_through`
-     * or `tls_error` error. This method will return the original machine 
-     * readable transport error in the native type.
-     *
-     * @since 0.7.0
-     *
-     * @return Error code indicating the reason the connection was closed or 
-     * failed
-     */
-    lib::asio::error_code get_transport_ec() const {
-        return m_tec;
-    }
-
-    /// Initialize transport for reading
-    /**
-     * init_asio is called once immediately after construction to initialize
-     * Asio components to the io_service
-     *
-     * The transport initialization sequence consists of the following steps:
-     * - Pre-init: the underlying socket is initialized to the point where
-     * bytes may be written. No bytes are actually written in this stage
-     * - Proxy negotiation: if a proxy is set, a request is made to it to start
-     * a tunnel to the final destination. This stage ends when the proxy is
-     * ready to forward the
-     * next byte to the remote endpoint.
-     * - Post-init: Perform any i/o with the remote endpoint, such as setting up
-     * tunnels for encryption. This stage ends when the connection is ready to
-     * read or write the WebSocket handshakes. At this point the original
-     * callback function is called.
-     */
-protected:
-    void init(init_handler callback) {
-        if (m_alog->static_test(log::alevel::devel)) {
-            m_alog->write(log::alevel::devel,"asio connection init");
-        }
-
-        // TODO: pre-init timeout. Right now no implemented socket policies
-        // actually have an asyncronous pre-init
-
-        socket_con_type::pre_init(
-            lib::bind(
-                &type::handle_pre_init,
-                get_shared(),
-                callback,
-                lib::placeholders::_1
-            )
-        );
-    }
-
-    /// initialize the proxy buffers and http parsers
-    /**
-     *
-     * @param authority The address of the server we want the proxy to tunnel to
-     * in the format of a URI authority (host:port)
-     *
-     * @return Status code indicating what errors occurred, if any
-     */
-    lib::error_code proxy_init(std::string const & authority) {
-        if (!m_proxy_data) {
-            return websocketpp::error::make_error_code(
-                websocketpp::error::invalid_state);
-        }
-        m_proxy_data->req.set_version("HTTP/1.1");
-        m_proxy_data->req.set_method("CONNECT");
-
-        m_proxy_data->req.set_uri(authority);
-        m_proxy_data->req.replace_header("Host",authority);
-
-        return lib::error_code();
-    }
-
-    /// Finish constructing the transport
-    /**
-     * init_asio is called once immediately after construction to initialize
-     * Asio components to the io_service.
-     *
-     * @param io_service A pointer to the io_service to register with this
-     * connection
-     *
-     * @return Status code for the success or failure of the initialization
-     */
-    lib::error_code init_asio (io_service_ptr io_service) {
-        m_io_service = io_service;
-
-        if (config::enable_multithreading) {
-            m_strand = lib::make_shared<lib::asio::io_service::strand>(
-                lib::ref(*io_service));
-        }
-
-        lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
-            m_is_server);
-
-        return ec;
-    }
-
-    void handle_pre_init(init_handler callback, lib::error_code const & ec) {
-        if (m_alog->static_test(log::alevel::devel)) {
-            m_alog->write(log::alevel::devel,"asio connection handle pre_init");
-        }
-
-        if (m_tcp_pre_init_handler) {
-            m_tcp_pre_init_handler(m_connection_hdl);
-        }
-
-        if (ec) {
-            callback(ec);
-        }
-
-        // If we have a proxy set issue a proxy connect, otherwise skip to
-        // post_init
-        if (!m_proxy.empty()) {
-            proxy_write(callback);
-        } else {
-            post_init(callback);
-        }
-    }
-
-    void post_init(init_handler callback) {
-        if (m_alog->static_test(log::alevel::devel)) {
-            m_alog->write(log::alevel::devel,"asio connection post_init");
-        }
-
-        timer_ptr post_timer;
-        
-        if (config::timeout_socket_post_init > 0) {
-            post_timer = set_timer(
-                config::timeout_socket_post_init,
-                lib::bind(
-                    &type::handle_post_init_timeout,
-                    get_shared(),
-                    post_timer,
-                    callback,
-                    lib::placeholders::_1
-                )
-            );
-        }
-
-        socket_con_type::post_init(
-            lib::bind(
-                &type::handle_post_init,
-                get_shared(),
-                post_timer,
-                callback,
-                lib::placeholders::_1
-            )
-        );
-    }
-
-    /// Post init timeout callback
-    /**
-     * The timer pointer is included to ensure the timer isn't destroyed until
-     * after it has expired.
-     *
-     * @param post_timer Pointer to the timer in question
-     * @param callback The function to call back
-     * @param ec The status code
-     */
-    void handle_post_init_timeout(timer_ptr, init_handler callback,
-        lib::error_code const & ec)
-    {
-        lib::error_code ret_ec;
-
-        if (ec) {
-            if (ec == transport::error::operation_aborted) {
-                m_alog->write(log::alevel::devel,
-                    "asio post init timer cancelled");
-                return;
-            }
-
-            log_err(log::elevel::devel,"asio handle_post_init_timeout",ec);
-            ret_ec = ec;
-        } else {
-            if (socket_con_type::get_ec()) {
-                ret_ec = socket_con_type::get_ec();
-            } else {
-                ret_ec = make_error_code(transport::error::timeout);
-            }
-        }
-
-        m_alog->write(log::alevel::devel, "Asio transport post-init timed out");
-        cancel_socket_checked();
-        callback(ret_ec);
-    }
-
-    /// Post init timeout callback
-    /**
-     * The timer pointer is included to ensure the timer isn't destroyed until
-     * after it has expired.
-     *
-     * @param post_timer Pointer to the timer in question
-     * @param callback The function to call back
-     * @param ec The status code
-     */
-    void handle_post_init(timer_ptr post_timer, init_handler callback,
-        lib::error_code const & ec)
-    {
-        if (ec == transport::error::operation_aborted ||
-            (post_timer && lib::asio::is_neg(post_timer->expires_from_now())))
-        {
-            m_alog->write(log::alevel::devel,"post_init cancelled");
-            return;
-        }
-
-        if (post_timer) {
-            post_timer->cancel();
-        }
-
-        if (m_alog->static_test(log::alevel::devel)) {
-            m_alog->write(log::alevel::devel,"asio connection handle_post_init");
-        }
-
-        if (m_tcp_post_init_handler) {
-            m_tcp_post_init_handler(m_connection_hdl);
-        }
-
-        callback(ec);
-    }
-
-    void proxy_write(init_handler callback) {
-        if (m_alog->static_test(log::alevel::devel)) {
-            m_alog->write(log::alevel::devel,"asio connection proxy_write");
-        }
-
-        if (!m_proxy_data) {
-            m_elog->write(log::elevel::library,
-                "assertion failed: !m_proxy_data in asio::connection::proxy_write");
-            callback(make_error_code(error::general));
-            return;
-        }
-
-        m_proxy_data->write_buf = m_proxy_data->req.raw();
-
-        m_bufs.push_back(lib::asio::buffer(m_proxy_data->write_buf.data(),
-                                           m_proxy_data->write_buf.size()));
-
-        m_alog->write(log::alevel::devel,m_proxy_data->write_buf);
-
-        // Set a timer so we don't wait forever for the proxy to respond
-        m_proxy_data->timer = this->set_timer(
-            m_proxy_data->timeout_proxy,
-            lib::bind(
-                &type::handle_proxy_timeout,
-                get_shared(),
-                callback,
-                lib::placeholders::_1
-            )
-        );
-
-        // Send proxy request
-        if (config::enable_multithreading) {
-            lib::asio::async_write(
-                socket_con_type::get_next_layer(),
-                m_bufs,
-                m_strand->wrap(lib::bind(
-                    &type::handle_proxy_write, get_shared(),
-                    callback,
-                    lib::placeholders::_1
-                ))
-            );
-        } else {
-            lib::asio::async_write(
-                socket_con_type::get_next_layer(),
-                m_bufs,
-                lib::bind(
-                    &type::handle_proxy_write, get_shared(),
-                    callback,
-                    lib::placeholders::_1
-                )
-            );
-        }
-    }
-
-    void handle_proxy_timeout(init_handler callback, lib::error_code const & ec)
-    {
-        if (ec == transport::error::operation_aborted) {
-            m_alog->write(log::alevel::devel,
-                "asio handle_proxy_write timer cancelled");
-            return;
-        } else if (ec) {
-            log_err(log::elevel::devel,"asio handle_proxy_write",ec);
-            callback(ec);
-        } else {
-            m_alog->write(log::alevel::devel,
-                "asio handle_proxy_write timer expired");
-            cancel_socket_checked();
-            callback(make_error_code(transport::error::timeout));
-        }
-    }
-
-    void handle_proxy_write(init_handler callback,
-        lib::asio::error_code const & ec)
-    {
-        if (m_alog->static_test(log::alevel::devel)) {
-            m_alog->write(log::alevel::devel,
-                "asio connection handle_proxy_write");
-        }
-
-        m_bufs.clear();
-
-        // Timer expired or the operation was aborted for some reason.
-        // Whatever aborted it will be issuing the callback so we are safe to
-        // return
-        if (ec == lib::asio::error::operation_aborted ||
-            lib::asio::is_neg(m_proxy_data->timer->expires_from_now()))
-        {
-            m_elog->write(log::elevel::devel,"write operation aborted");
-            return;
-        }
-
-        if (ec) {
-            log_err(log::elevel::info,"asio handle_proxy_write",ec);
-            m_proxy_data->timer->cancel();
-            callback(make_error_code(error::pass_through));
-            return;
-        }
-
-        proxy_read(callback);
-    }
-
-    void proxy_read(init_handler callback) {
-        if (m_alog->static_test(log::alevel::devel)) {
-            m_alog->write(log::alevel::devel,"asio connection proxy_read");
-        }
-
-        if (!m_proxy_data) {
-            m_elog->write(log::elevel::library,
-                "assertion failed: !m_proxy_data in asio::connection::proxy_read");
-            m_proxy_data->timer->cancel();
-            callback(make_error_code(error::general));
-            return;
-        }
-
-        if (config::enable_multithreading) {
-            lib::asio::async_read_until(
-                socket_con_type::get_next_layer(),
-                m_proxy_data->read_buf,
-                "\r\n\r\n",
-                m_strand->wrap(lib::bind(
-                    &type::handle_proxy_read, get_shared(),
-                    callback,
-                    lib::placeholders::_1, lib::placeholders::_2
-                ))
-            );
-        } else {
-            lib::asio::async_read_until(
-                socket_con_type::get_next_layer(),
-                m_proxy_data->read_buf,
-                "\r\n\r\n",
-                lib::bind(
-                    &type::handle_proxy_read, get_shared(),
-                    callback,
-                    lib::placeholders::_1, lib::placeholders::_2
-                )
-            );
-        }
-    }
-
-    /// Proxy read callback
-    /**
-     * @param init_handler The function to call back
-     * @param ec The status code
-     * @param bytes_transferred The number of bytes read
-     */
-    void handle_proxy_read(init_handler callback,
-        lib::asio::error_code const & ec, size_t)
-    {
-        if (m_alog->static_test(log::alevel::devel)) {
-            m_alog->write(log::alevel::devel,
-                "asio connection handle_proxy_read");
-        }
-
-        // Timer expired or the operation was aborted for some reason.
-        // Whatever aborted it will be issuing the callback so we are safe to
-        // return
-        if (ec == lib::asio::error::operation_aborted ||
-            lib::asio::is_neg(m_proxy_data->timer->expires_from_now()))
-        {
-            m_elog->write(log::elevel::devel,"read operation aborted");
-            return;
-        }
-
-        // At this point there is no need to wait for the timer anymore
-        m_proxy_data->timer->cancel();
-
-        if (ec) {
-            m_elog->write(log::elevel::info,
-                "asio handle_proxy_read error: "+ec.message());
-            callback(make_error_code(error::pass_through));
-        } else {
-            if (!m_proxy_data) {
-                m_elog->write(log::elevel::library,
-                    "assertion failed: !m_proxy_data in asio::connection::handle_proxy_read");
-                callback(make_error_code(error::general));
-                return;
-            }
-
-            std::istream input(&m_proxy_data->read_buf);
-
-            m_proxy_data->res.consume(input);
-
-            if (!m_proxy_data->res.headers_ready()) {
-                // we read until the headers were done in theory but apparently
-                // they aren't. Internal endpoint error.
-                callback(make_error_code(error::general));
-                return;
-            }
-
-            m_alog->write(log::alevel::devel,m_proxy_data->res.raw());
-
-            if (m_proxy_data->res.get_status_code() != http::status_code::ok) {
-                // got an error response back
-                // TODO: expose this error in a programmatically accessible way?
-                // if so, see below for an option on how to do this.
-                std::stringstream s;
-                s << "Proxy connection error: "
-                  << m_proxy_data->res.get_status_code()
-                  << " ("
-                  << m_proxy_data->res.get_status_msg()
-                  << ")";
-                m_elog->write(log::elevel::info,s.str());
-                callback(make_error_code(error::proxy_failed));
-                return;
-            }
-
-            // we have successfully established a connection to the proxy, now
-            // we can continue and the proxy will transparently forward the
-            // WebSocket connection.
-
-            // TODO: decide if we want an on_proxy callback that would allow
-            // access to the proxy response.
-
-            // free the proxy buffers and req/res objects as they aren't needed
-            // anymore
-            m_proxy_data.reset();
-
-            // Continue with post proxy initialization
-            post_init(callback);
-        }
-    }
-
-    /// read at least num_bytes bytes into buf and then call handler.
-    void async_read_at_least(size_t num_bytes, char *buf, size_t len,
-        read_handler handler)
-    {
-        if (m_alog->static_test(log::alevel::devel)) {
-            std::stringstream s;
-            s << "asio async_read_at_least: " << num_bytes;
-            m_alog->write(log::alevel::devel,s.str());
-        }
-
-        // TODO: safety vs speed ?
-        // maybe move into an if devel block
-        /*if (num_bytes > len) {
-            m_elog->write(log::elevel::devel,
-                "asio async_read_at_least error::invalid_num_bytes");
-            handler(make_error_code(transport::error::invalid_num_bytes),
-                size_t(0));
-            return;
-        }*/
-
-        if (config::enable_multithreading) {
-            lib::asio::async_read(
-                socket_con_type::get_socket(),
-                lib::asio::buffer(buf,len),
-                lib::asio::transfer_at_least(num_bytes),
-                m_strand->wrap(make_custom_alloc_handler(
-                    m_read_handler_allocator,
-                    lib::bind(
-                        &type::handle_async_read, get_shared(),
-                        handler,
-                        lib::placeholders::_1, lib::placeholders::_2
-                    )
-                ))
-            );
-        } else {
-            lib::asio::async_read(
-                socket_con_type::get_socket(),
-                lib::asio::buffer(buf,len),
-                lib::asio::transfer_at_least(num_bytes),
-                make_custom_alloc_handler(
-                    m_read_handler_allocator,
-                    lib::bind(
-                        &type::handle_async_read, get_shared(),
-                        handler,
-                        lib::placeholders::_1, lib::placeholders::_2
-                    )
-                )
-            );    
-        }
-        
-    }
-
-    void handle_async_read(read_handler handler, lib::asio::error_code const & ec,
-        size_t bytes_transferred)
-    {
-        m_alog->write(log::alevel::devel, "asio con handle_async_read");
-
-        // translate asio error codes into more lib::error_codes
-        lib::error_code tec;
-        if (ec == lib::asio::error::eof) {
-            tec = make_error_code(transport::error::eof);
-        } else if (ec) {
-            // We don't know much more about the error at this point. As our
-            // socket/security policy if it knows more:
-            tec = socket_con_type::translate_ec(ec);
-            m_tec = ec;
-
-            if (tec == transport::error::tls_error ||
-                tec == transport::error::pass_through)
-            {
-                // These are aggregate/catch all errors. Log some human readable
-                // information to the info channel to give library users some
-                // more details about why the upstream method may have failed.
-                log_err(log::elevel::info,"asio async_read_at_least",ec);
-            }
-        }
-        if (handler) {
-            handler(tec,bytes_transferred);
-        } else {
-            // This can happen in cases where the connection is terminated while
-            // the transport is waiting on a read.
-            m_alog->write(log::alevel::devel,
-                "handle_async_read called with null read handler");
-        }
-    }
-
-    /// Initiate a potentially asyncronous write of the given buffer
-    void async_write(const char* buf, size_t len, write_handler handler) {
-        m_bufs.push_back(lib::asio::buffer(buf,len));
-
-        if (config::enable_multithreading) {
-            lib::asio::async_write(
-                socket_con_type::get_socket(),
-                m_bufs,
-                m_strand->wrap(make_custom_alloc_handler(
-                    m_write_handler_allocator,
-                    lib::bind(
-                        &type::handle_async_write, get_shared(),
-                        handler,
-                        lib::placeholders::_1, lib::placeholders::_2
-                    )
-                ))
-            );
-        } else {
-            lib::asio::async_write(
-                socket_con_type::get_socket(),
-                m_bufs,
-                make_custom_alloc_handler(
-                    m_write_handler_allocator,
-                    lib::bind(
-                        &type::handle_async_write, get_shared(),
-                        handler,
-                        lib::placeholders::_1, lib::placeholders::_2
-                    )
-                )
-            );
-        }
-    }
-
-    /// Initiate a potentially asyncronous write of the given buffers
-    void async_write(std::vector<buffer> const & bufs, write_handler handler) {
-        std::vector<buffer>::const_iterator it;
-
-        for (it = bufs.begin(); it != bufs.end(); ++it) {
-            m_bufs.push_back(lib::asio::buffer((*it).buf,(*it).len));
-        }
-
-        if (config::enable_multithreading) {
-            lib::asio::async_write(
-                socket_con_type::get_socket(),
-                m_bufs,
-                m_strand->wrap(make_custom_alloc_handler(
-                    m_write_handler_allocator,
-                    lib::bind(
-                        &type::handle_async_write, get_shared(),
-                        handler,
-                        lib::placeholders::_1, lib::placeholders::_2
-                    )
-                ))
-            );
-        } else {
-            lib::asio::async_write(
-                socket_con_type::get_socket(),
-                m_bufs,
-                make_custom_alloc_handler(
-                    m_write_handler_allocator,
-                    lib::bind(
-                        &type::handle_async_write, get_shared(),
-                        handler,
-                        lib::placeholders::_1, lib::placeholders::_2
-                    )
-                )
-            );
-        }
-    }
-
-    /// Async write callback
-    /**
-     * @param ec The status code
-     * @param bytes_transferred The number of bytes read
-     */
-    void handle_async_write(write_handler handler, lib::asio::error_code const & ec, size_t) {
-        m_bufs.clear();
-        lib::error_code tec;
-        if (ec) {
-            log_err(log::elevel::info,"asio async_write",ec);
-            tec = make_error_code(transport::error::pass_through);
-        }
-        if (handler) {
-            handler(tec);
-        } else {
-            // This can happen in cases where the connection is terminated while
-            // the transport is waiting on a read.
-            m_alog->write(log::alevel::devel,
-                "handle_async_write called with null write handler");
-        }
-    }
-
-    /// Set Connection Handle
-    /**
-     * See common/connection_hdl.hpp for information
-     *
-     * @param hdl A connection_hdl that the transport will use to refer
-     * to itself
-     */
-    void set_handle(connection_hdl hdl) {
-        m_connection_hdl = hdl;
-        socket_con_type::set_handle(hdl);
-    }
-
-    /// Trigger the on_interrupt handler
-    /**
-     * This needs to be thread safe
-     */
-    lib::error_code interrupt(interrupt_handler handler) {
-        if (config::enable_multithreading) {
-            m_io_service->post(m_strand->wrap(handler));
-        } else {
-            m_io_service->post(handler);
-        }
-        return lib::error_code();
-    }
-
-    lib::error_code dispatch(dispatch_handler handler) {
-        if (config::enable_multithreading) {
-            m_io_service->post(m_strand->wrap(handler));
-        } else {
-            m_io_service->post(handler);
-        }
-        return lib::error_code();
-    }
-
-    /*void handle_interrupt(interrupt_handler handler) {
-        handler();
-    }*/
-
-    /// close and clean up the underlying socket
-    void async_shutdown(shutdown_handler callback) {
-        if (m_alog->static_test(log::alevel::devel)) {
-            m_alog->write(log::alevel::devel,"asio connection async_shutdown");
-        }
-
-        timer_ptr shutdown_timer;
-        shutdown_timer = set_timer(
-            config::timeout_socket_shutdown,
-            lib::bind(
-                &type::handle_async_shutdown_timeout,
-                get_shared(),
-                shutdown_timer,
-                callback,
-                lib::placeholders::_1
-            )
-        );
-
-        socket_con_type::async_shutdown(
-            lib::bind(
-                &type::handle_async_shutdown,
-                get_shared(),
-                shutdown_timer,
-                callback,
-                lib::placeholders::_1
-            )
-        );
-    }
-
-    /// Async shutdown timeout handler
-    /**
-     * @param shutdown_timer A pointer to the timer to keep it in scope
-     * @param callback The function to call back
-     * @param ec The status code
-     */
-    void handle_async_shutdown_timeout(timer_ptr, init_handler callback, 
-        lib::error_code const & ec)
-    {
-        lib::error_code ret_ec;
-
-        if (ec) {
-            if (ec == transport::error::operation_aborted) {
-                m_alog->write(log::alevel::devel,
-                    "asio socket shutdown timer cancelled");
-                return;
-            }
-
-            log_err(log::elevel::devel,"asio handle_async_shutdown_timeout",ec);
-            ret_ec = ec;
-        } else {
-            ret_ec = make_error_code(transport::error::timeout);
-        }
-
-        m_alog->write(log::alevel::devel,
-            "Asio transport socket shutdown timed out");
-        cancel_socket_checked();
-        callback(ret_ec);
-    }
-
-    void handle_async_shutdown(timer_ptr shutdown_timer, shutdown_handler
-        callback, lib::asio::error_code const & ec)
-    {
-        if (ec == lib::asio::error::operation_aborted ||
-            lib::asio::is_neg(shutdown_timer->expires_from_now()))
-        {
-            m_alog->write(log::alevel::devel,"async_shutdown cancelled");
-            return;
-        }
-
-        shutdown_timer->cancel();
-
-        lib::error_code tec;
-        if (ec) {
-            if (ec == lib::asio::error::not_connected) {
-                // The socket was already closed when we tried to close it. This
-                // happens periodically (usually if a read or write fails
-                // earlier and if it is a real error will be caught at another
-                // level of the stack.
-            } else {
-                // We don't know anything more about this error, give our
-                // socket/security policy a crack at it.
-                tec = socket_con_type::translate_ec(ec);
-                m_tec = ec;
-
-                // all other errors are effectively pass through errors of
-				// some sort so print some detail on the info channel for
-				// library users to look up if needed.
-				log_err(log::elevel::info,"asio async_shutdown",ec);
-            }
-        } else {
-            if (m_alog->static_test(log::alevel::devel)) {
-                m_alog->write(log::alevel::devel,
-                    "asio con handle_async_shutdown");
-            }
-        }
-        callback(tec);
-    }
-
-    /// Cancel the underlying socket and log any errors
-    void cancel_socket_checked() {
-        lib::asio::error_code cec = socket_con_type::cancel_socket();
-        if (cec) {
-            if (cec == lib::asio::error::operation_not_supported) {
-                // cancel not supported on this OS, ignore and log at dev level
-                m_alog->write(log::alevel::devel, "socket cancel not supported");
-            } else {
-                log_err(log::elevel::warn, "socket cancel failed", cec);
-            }
-        }
-    }
-
-private:
-    /// Convenience method for logging the code and message for an error_code
-    template <typename error_type>
-    void log_err(log::level l, const char * msg, const error_type & ec) {
-        std::stringstream s;
-        s << msg << " error: " << ec << " (" << ec.message() << ")";
-        m_elog->write(l,s.str());
-    }
-
-    // static settings
-    const bool m_is_server;
-    lib::shared_ptr<alog_type> m_alog;
-    lib::shared_ptr<elog_type> m_elog;
-
-    struct proxy_data {
-        proxy_data() : timeout_proxy(config::timeout_proxy) {}
-
-        request_type req;
-        response_type res;
-        std::string write_buf;
-        lib::asio::streambuf read_buf;
-        long timeout_proxy;
-        timer_ptr timer;
-    };
-
-    std::string m_proxy;
-    lib::shared_ptr<proxy_data> m_proxy_data;
-
-    // transport resources
-    io_service_ptr  m_io_service;
-    strand_ptr      m_strand;
-    connection_hdl  m_connection_hdl;
-
-    std::vector<lib::asio::const_buffer> m_bufs;
-
-    /// Detailed internal error code
-    lib::asio::error_code m_tec;
-
-    // Handlers
-    tcp_init_handler    m_tcp_pre_init_handler;
-    tcp_init_handler    m_tcp_post_init_handler;
-
-    handler_allocator   m_read_handler_allocator;
-    handler_allocator   m_write_handler_allocator;
-};
-
-
-} // namespace asio
-} // namespace transport
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_TRANSPORT_ASIO_CON_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/asio/endpoint.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/asio/endpoint.hpp
deleted file mode 100644
index ddab2c74..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/asio/endpoint.hpp
+++ /dev/null
@@ -1,1186 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_ASIO_HPP
-#define WEBSOCKETPP_TRANSPORT_ASIO_HPP
-
-#include <websocketpp/transport/base/endpoint.hpp>
-#include <websocketpp/transport/asio/connection.hpp>
-#include <websocketpp/transport/asio/security/none.hpp>
-
-#include <websocketpp/uri.hpp>
-#include <websocketpp/logger/levels.hpp>
-
-#include <websocketpp/common/asio.hpp>
-#include <websocketpp/common/functional.hpp>
-
-#include <sstream>
-#include <string>
-
-namespace websocketpp {
-namespace transport {
-namespace asio {
-
-/// Asio based endpoint transport component
-/**
- * transport::asio::endpoint implements an endpoint transport component using
- * Asio.
- */
-template <typename config>
-class endpoint : public config::socket_type {
-public:
-    /// Type of this endpoint transport component
-    typedef endpoint<config> type;
-
-    /// Type of the concurrency policy
-    typedef typename config::concurrency_type concurrency_type;
-    /// Type of the socket policy
-    typedef typename config::socket_type socket_type;
-    /// Type of the error logging policy
-    typedef typename config::elog_type elog_type;
-    /// Type of the access logging policy
-    typedef typename config::alog_type alog_type;
-
-    /// Type of the socket connection component
-    typedef typename socket_type::socket_con_type socket_con_type;
-    /// Type of a shared pointer to the socket connection component
-    typedef typename socket_con_type::ptr socket_con_ptr;
-
-    /// Type of the connection transport component associated with this
-    /// endpoint transport component
-    typedef asio::connection<config> transport_con_type;
-    /// Type of a shared pointer to the connection transport component
-    /// associated with this endpoint transport component
-    typedef typename transport_con_type::ptr transport_con_ptr;
-
-    /// Type of a pointer to the ASIO io_service being used
-    typedef lib::asio::io_service * io_service_ptr;
-    /// Type of a shared pointer to the acceptor being used
-    typedef lib::shared_ptr<lib::asio::ip::tcp::acceptor> acceptor_ptr;
-    /// Type of a shared pointer to the resolver being used
-    typedef lib::shared_ptr<lib::asio::ip::tcp::resolver> resolver_ptr;
-    /// Type of timer handle
-    typedef lib::shared_ptr<lib::asio::steady_timer> timer_ptr;
-    /// Type of a shared pointer to an io_service work object
-    typedef lib::shared_ptr<lib::asio::io_service::work> work_ptr;
-
-    /// Type of socket pre-bind handler
-    typedef lib::function<lib::error_code(acceptor_ptr)> tcp_pre_bind_handler;
-
-    // generate and manage our own io_service
-    explicit endpoint()
-      : m_io_service(NULL)
-      , m_external_io_service(false)
-      , m_listen_backlog(lib::asio::socket_base::max_connections)
-      , m_reuse_addr(false)
-      , m_state(UNINITIALIZED)
-    {
-        //std::cout << "transport::asio::endpoint constructor" << std::endl;
-    }
-
-    ~endpoint() {
-        // clean up our io_service if we were initialized with an internal one.
-
-        // Explicitly destroy local objects
-        m_acceptor.reset();
-        m_resolver.reset();
-        m_work.reset();
-        if (m_state != UNINITIALIZED && !m_external_io_service) {
-            delete m_io_service;
-        }
-    }
-
-    /// transport::asio objects are moveable but not copyable or assignable.
-    /// The following code sets this situation up based on whether or not we
-    /// have C++11 support or not
-#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-    endpoint(const endpoint & src) = delete;
-    endpoint& operator= (const endpoint & rhs) = delete;
-#else
-private:
-    endpoint(const endpoint & src);
-    endpoint & operator= (const endpoint & rhs);
-public:
-#endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
-
-#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
-    endpoint (endpoint && src)
-      : config::socket_type(std::move(src))
-      , m_tcp_pre_init_handler(src.m_tcp_pre_init_handler)
-      , m_tcp_post_init_handler(src.m_tcp_post_init_handler)
-      , m_io_service(src.m_io_service)
-      , m_external_io_service(src.m_external_io_service)
-      , m_acceptor(src.m_acceptor)
-      , m_listen_backlog(lib::asio::socket_base::max_connections)
-      , m_reuse_addr(src.m_reuse_addr)
-      , m_elog(src.m_elog)
-      , m_alog(src.m_alog)
-      , m_state(src.m_state)
-    {
-        src.m_io_service = NULL;
-        src.m_external_io_service = false;
-        src.m_acceptor = NULL;
-        src.m_state = UNINITIALIZED;
-    }
-
-    /*endpoint & operator= (const endpoint && rhs) {
-        if (this != &rhs) {
-            m_io_service = rhs.m_io_service;
-            m_external_io_service = rhs.m_external_io_service;
-            m_acceptor = rhs.m_acceptor;
-            m_listen_backlog = rhs.m_listen_backlog;
-            m_reuse_addr = rhs.m_reuse_addr;
-            m_state = rhs.m_state;
-
-            rhs.m_io_service = NULL;
-            rhs.m_external_io_service = false;
-            rhs.m_acceptor = NULL;
-            rhs.m_listen_backlog = lib::asio::socket_base::max_connections;
-            rhs.m_state = UNINITIALIZED;
-            
-            // TODO: this needs to be updated
-        }
-        return *this;
-    }*/
-#endif // _WEBSOCKETPP_MOVE_SEMANTICS_
-
-    /// Return whether or not the endpoint produces secure connections.
-    bool is_secure() const {
-        return socket_type::is_secure();
-    }
-
-    /// initialize asio transport with external io_service (exception free)
-    /**
-     * Initialize the ASIO transport policy for this endpoint using the provided
-     * io_service object. asio_init must be called exactly once on any endpoint
-     * that uses transport::asio before it can be used.
-     *
-     * @param ptr A pointer to the io_service to use for asio events
-     * @param ec Set to indicate what error occurred, if any.
-     */
-    void init_asio(io_service_ptr ptr, lib::error_code & ec) {
-        if (m_state != UNINITIALIZED) {
-            m_elog->write(log::elevel::library,
-                "asio::init_asio called from the wrong state");
-            using websocketpp::error::make_error_code;
-            ec = make_error_code(websocketpp::error::invalid_state);
-            return;
-        }
-
-        m_alog->write(log::alevel::devel,"asio::init_asio");
-
-        m_io_service = ptr;
-        m_external_io_service = true;
-        m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
-            lib::ref(*m_io_service));
-
-        m_state = READY;
-        ec = lib::error_code();
-    }
-
-    /// initialize asio transport with external io_service
-    /**
-     * Initialize the ASIO transport policy for this endpoint using the provided
-     * io_service object. asio_init must be called exactly once on any endpoint
-     * that uses transport::asio before it can be used.
-     *
-     * @param ptr A pointer to the io_service to use for asio events
-     */
-    void init_asio(io_service_ptr ptr) {
-        lib::error_code ec;
-        init_asio(ptr,ec);
-        if (ec) { throw exception(ec); }
-    }
-
-    /// Initialize asio transport with internal io_service (exception free)
-    /**
-     * This method of initialization will allocate and use an internally managed
-     * io_service.
-     *
-     * @see init_asio(io_service_ptr ptr)
-     *
-     * @param ec Set to indicate what error occurred, if any.
-     */
-    void init_asio(lib::error_code & ec) {
-        // Use a smart pointer until the call is successful and ownership has 
-        // successfully been taken. Use unique_ptr when available.
-        // TODO: remove the use of auto_ptr when C++98/03 support is no longer
-        //       necessary.
-#ifdef _WEBSOCKETPP_CPP11_MEMORY_
-        lib::unique_ptr<lib::asio::io_service> service(new lib::asio::io_service());
-#else
-        lib::auto_ptr<lib::asio::io_service> service(new lib::asio::io_service());
-#endif
-        init_asio(service.get(), ec);
-        if( !ec ) service.release(); // Call was successful, transfer ownership
-        m_external_io_service = false;
-    }
-
-    /// Initialize asio transport with internal io_service
-    /**
-     * This method of initialization will allocate and use an internally managed
-     * io_service.
-     *
-     * @see init_asio(io_service_ptr ptr)
-     */
-    void init_asio() {
-        // Use a smart pointer until the call is successful and ownership has 
-        // successfully been taken. Use unique_ptr when available.
-        // TODO: remove the use of auto_ptr when C++98/03 support is no longer
-        //       necessary.
-#ifdef _WEBSOCKETPP_CPP11_MEMORY_
-        lib::unique_ptr<lib::asio::io_service> service(new lib::asio::io_service());
-#else
-        lib::auto_ptr<lib::asio::io_service> service(new lib::asio::io_service());
-#endif
-        init_asio( service.get() );
-        // If control got this far without an exception, then ownership has successfully been taken
-        service.release();
-        m_external_io_service = false;
-    }
-
-    /// Sets the tcp pre bind handler
-    /**
-     * The tcp pre bind handler is called after the listen acceptor has
-     * been created but before the socket bind is performed.
-     *
-     * @since 0.8.0
-     *
-     * @param h The handler to call on tcp pre bind init.
-     */
-    void set_tcp_pre_bind_handler(tcp_pre_bind_handler h) {
-        m_tcp_pre_bind_handler = h;
-    }
-
-    /// Sets the tcp pre init handler
-    /**
-     * The tcp pre init handler is called after the raw tcp connection has been
-     * established but before any additional wrappers (proxy connects, TLS
-     * handshakes, etc) have been performed.
-     *
-     * @since 0.3.0
-     *
-     * @param h The handler to call on tcp pre init.
-     */
-    void set_tcp_pre_init_handler(tcp_init_handler h) {
-        m_tcp_pre_init_handler = h;
-    }
-
-    /// Sets the tcp pre init handler (deprecated)
-    /**
-     * The tcp pre init handler is called after the raw tcp connection has been
-     * established but before any additional wrappers (proxy connects, TLS
-     * handshakes, etc) have been performed.
-     *
-     * @deprecated Use set_tcp_pre_init_handler instead
-     *
-     * @param h The handler to call on tcp pre init.
-     */
-    void set_tcp_init_handler(tcp_init_handler h) {
-        set_tcp_pre_init_handler(h);
-    }
-
-    /// Sets the tcp post init handler
-    /**
-     * The tcp post init handler is called after the tcp connection has been
-     * established and all additional wrappers (proxy connects, TLS handshakes,
-     * etc have been performed. This is fired before any bytes are read or any
-     * WebSocket specific handshake logic has been performed.
-     *
-     * @since 0.3.0
-     *
-     * @param h The handler to call on tcp post init.
-     */
-    void set_tcp_post_init_handler(tcp_init_handler h) {
-        m_tcp_post_init_handler = h;
-    }
-
-    /// Sets the maximum length of the queue of pending connections.
-    /**
-     * Sets the maximum length of the queue of pending connections. Increasing
-     * this will allow WebSocket++ to queue additional incoming connections.
-     * Setting it higher may prevent failed connections at high connection rates
-     * but may cause additional latency.
-     *
-     * For this value to take effect you may need to adjust operating system
-     * settings.
-     *
-     * New values affect future calls to listen only.
-     *
-     * The default value is specified as *::asio::socket_base::max_connections
-     * which uses the operating system defined maximum queue length. Your OS
-     * may restrict or silently lower this value. A value of zero may cause
-     * all connections to be rejected.
-     *
-     * @since 0.3.0
-     *
-     * @param backlog The maximum length of the queue of pending connections
-     */
-    void set_listen_backlog(int backlog) {
-        m_listen_backlog = backlog;
-    }
-
-    /// Sets whether to use the SO_REUSEADDR flag when opening listening sockets
-    /**
-     * Specifies whether or not to use the SO_REUSEADDR TCP socket option. What
-     * this flag does depends on your operating system.
-     *
-     * Please consult operating system documentation for more details. There
-     * may be security consequences to enabling this option.
-     *
-     * New values affect future calls to listen only so set this value prior to
-     * calling listen.
-     *
-     * The default is false.
-     *
-     * @since 0.3.0
-     *
-     * @param value Whether or not to use the SO_REUSEADDR option
-     */
-    void set_reuse_addr(bool value) {
-        m_reuse_addr = value;
-    }
-
-    /// Retrieve a reference to the endpoint's io_service
-    /**
-     * The io_service may be an internal or external one. This may be used to
-     * call methods of the io_service that are not explicitly wrapped by the
-     * endpoint.
-     *
-     * This method is only valid after the endpoint has been initialized with
-     * `init_asio`. No error will be returned if it isn't.
-     *
-     * @return A reference to the endpoint's io_service
-     */
-    lib::asio::io_service & get_io_service() {
-        return *m_io_service;
-    }
-    
-    /// Get local TCP endpoint
-    /**
-     * Extracts the local endpoint from the acceptor. This represents the
-     * address that WebSocket++ is listening on.
-     *
-     * Sets a bad_descriptor error if the acceptor is not currently listening
-     * or otherwise unavailable.
-     * 
-     * @since 0.7.0
-     *
-     * @param ec Set to indicate what error occurred, if any.
-     * @return The local endpoint
-     */
-    lib::asio::ip::tcp::endpoint get_local_endpoint(lib::asio::error_code & ec) {
-        if (m_acceptor) {
-            return m_acceptor->local_endpoint(ec);
-        } else {
-            ec = lib::asio::error::make_error_code(lib::asio::error::bad_descriptor);
-            return lib::asio::ip::tcp::endpoint();
-        }
-    }
-
-    /// Set up endpoint for listening manually (exception free)
-    /**
-     * Bind the internal acceptor using the specified settings. The endpoint
-     * must have been initialized by calling init_asio before listening.
-     *
-     * @param ep An endpoint to read settings from
-     * @param ec Set to indicate what error occurred, if any.
-     */
-    void listen(lib::asio::ip::tcp::endpoint const & ep, lib::error_code & ec)
-    {
-        if (m_state != READY) {
-            m_elog->write(log::elevel::library,
-                "asio::listen called from the wrong state");
-            using websocketpp::error::make_error_code;
-            ec = make_error_code(websocketpp::error::invalid_state);
-            return;
-        }
-
-        m_alog->write(log::alevel::devel,"asio::listen");
-
-        lib::asio::error_code bec;
-
-        m_acceptor->open(ep.protocol(),bec);
-        if (bec) {ec = clean_up_listen_after_error(bec);return;}
-        
-        m_acceptor->set_option(lib::asio::socket_base::reuse_address(m_reuse_addr),bec);
-        if (bec) {ec = clean_up_listen_after_error(bec);return;}
-        
-        // if a TCP pre-bind handler is present, run it
-        if (m_tcp_pre_bind_handler) {
-            ec = m_tcp_pre_bind_handler(m_acceptor);
-            if (ec) {
-                ec = clean_up_listen_after_error(ec);
-                return;
-            }
-        }
-        
-        m_acceptor->bind(ep,bec);
-        if (bec) {ec = clean_up_listen_after_error(bec);return;}
-        
-        m_acceptor->listen(m_listen_backlog,bec);
-        if (bec) {ec = clean_up_listen_after_error(bec);return;}
-        
-        // Success
-        m_state = LISTENING;
-        ec = lib::error_code();
-    }
-
-
-
-    /// Set up endpoint for listening manually
-    /**
-     * Bind the internal acceptor using the settings specified by the endpoint e
-     *
-     * @param ep An endpoint to read settings from
-     */
-    void listen(lib::asio::ip::tcp::endpoint const & ep) {
-        lib::error_code ec;
-        listen(ep,ec);
-        if (ec) { throw exception(ec); }
-    }
-
-    /// Set up endpoint for listening with protocol and port (exception free)
-    /**
-     * Bind the internal acceptor using the given internet protocol and port.
-     * The endpoint must have been initialized by calling init_asio before
-     * listening.
-     *
-     * Common options include:
-     * - IPv6 with mapped IPv4 for dual stack hosts lib::asio::ip::tcp::v6()
-     * - IPv4 only: lib::asio::ip::tcp::v4()
-     *
-     * @param internet_protocol The internet protocol to use.
-     * @param port The port to listen on.
-     * @param ec Set to indicate what error occurred, if any.
-     */
-    template <typename InternetProtocol>
-    void listen(InternetProtocol const & internet_protocol, uint16_t port,
-        lib::error_code & ec)
-    {
-        lib::asio::ip::tcp::endpoint ep(internet_protocol, port);
-        listen(ep,ec);
-    }
-
-    /// Set up endpoint for listening with protocol and port
-    /**
-     * Bind the internal acceptor using the given internet protocol and port.
-     * The endpoint must have been initialized by calling init_asio before
-     * listening.
-     *
-     * Common options include:
-     * - IPv6 with mapped IPv4 for dual stack hosts lib::asio::ip::tcp::v6()
-     * - IPv4 only: lib::asio::ip::tcp::v4()
-     *
-     * @param internet_protocol The internet protocol to use.
-     * @param port The port to listen on.
-     */
-    template <typename InternetProtocol>
-    void listen(InternetProtocol const & internet_protocol, uint16_t port)
-    {
-        lib::asio::ip::tcp::endpoint ep(internet_protocol, port);
-        listen(ep);
-    }
-
-    /// Set up endpoint for listening on a port (exception free)
-    /**
-     * Bind the internal acceptor using the given port. The IPv6 protocol with
-     * mapped IPv4 for dual stack hosts will be used. If you need IPv4 only use
-     * the overload that allows specifying the protocol explicitly.
-     *
-     * The endpoint must have been initialized by calling init_asio before
-     * listening.
-     *
-     * @param port The port to listen on.
-     * @param ec Set to indicate what error occurred, if any.
-     */
-    void listen(uint16_t port, lib::error_code & ec) {
-        listen(lib::asio::ip::tcp::v6(), port, ec);
-    }
-
-    /// Set up endpoint for listening on a port
-    /**
-     * Bind the internal acceptor using the given port. The IPv6 protocol with
-     * mapped IPv4 for dual stack hosts will be used. If you need IPv4 only use
-     * the overload that allows specifying the protocol explicitly.
-     *
-     * The endpoint must have been initialized by calling init_asio before
-     * listening.
-     *
-     * @param port The port to listen on.
-     * @param ec Set to indicate what error occurred, if any.
-     */
-    void listen(uint16_t port) {
-        listen(lib::asio::ip::tcp::v6(), port);
-    }
-
-    /// Set up endpoint for listening on a host and service (exception free)
-    /**
-     * Bind the internal acceptor using the given host and service. More details
-     * about what host and service can be are available in the Asio
-     * documentation for ip::basic_resolver_query::basic_resolver_query's
-     * constructors.
-     *
-     * The endpoint must have been initialized by calling init_asio before
-     * listening.
-     *
-     * @param host A string identifying a location. May be a descriptive name or
-     * a numeric address string.
-     * @param service A string identifying the requested service. This may be a
-     * descriptive name or a numeric string corresponding to a port number.
-     * @param ec Set to indicate what error occurred, if any.
-     */
-    void listen(std::string const & host, std::string const & service,
-        lib::error_code & ec)
-    {
-        using lib::asio::ip::tcp;
-        tcp::resolver r(*m_io_service);
-        tcp::resolver::query query(host, service);
-        tcp::resolver::iterator endpoint_iterator = r.resolve(query);
-        tcp::resolver::iterator end;
-        if (endpoint_iterator == end) {
-            m_elog->write(log::elevel::library,
-                "asio::listen could not resolve the supplied host or service");
-            ec = make_error_code(error::invalid_host_service);
-            return;
-        }
-        listen(*endpoint_iterator,ec);
-    }
-
-    /// Set up endpoint for listening on a host and service
-    /**
-     * Bind the internal acceptor using the given host and service. More details
-     * about what host and service can be are available in the Asio
-     * documentation for ip::basic_resolver_query::basic_resolver_query's
-     * constructors.
-     *
-     * The endpoint must have been initialized by calling init_asio before
-     * listening.
-     *
-     * @param host A string identifying a location. May be a descriptive name or
-     * a numeric address string.
-     * @param service A string identifying the requested service. This may be a
-     * descriptive name or a numeric string corresponding to a port number.
-     * @param ec Set to indicate what error occurred, if any.
-     */
-    void listen(std::string const & host, std::string const & service)
-    {
-        lib::error_code ec;
-        listen(host,service,ec);
-        if (ec) { throw exception(ec); }
-    }
-
-    /// Stop listening (exception free)
-    /**
-     * Stop listening and accepting new connections. This will not end any
-     * existing connections.
-     *
-     * @since 0.3.0-alpha4
-     * @param ec A status code indicating an error, if any.
-     */
-    void stop_listening(lib::error_code & ec) {
-        if (m_state != LISTENING) {
-            m_elog->write(log::elevel::library,
-                "asio::listen called from the wrong state");
-            using websocketpp::error::make_error_code;
-            ec = make_error_code(websocketpp::error::invalid_state);
-            return;
-        }
-
-        m_acceptor->close();
-        m_state = READY;
-        ec = lib::error_code();
-    }
-
-    /// Stop listening
-    /**
-     * Stop listening and accepting new connections. This will not end any
-     * existing connections.
-     *
-     * @since 0.3.0-alpha4
-     */
-    void stop_listening() {
-        lib::error_code ec;
-        stop_listening(ec);
-        if (ec) { throw exception(ec); }
-    }
-
-    /// Check if the endpoint is listening
-    /**
-     * @return Whether or not the endpoint is listening.
-     */
-    bool is_listening() const {
-        return (m_state == LISTENING);
-    }
-
-    /// wraps the run method of the internal io_service object
-    std::size_t run() {
-        return m_io_service->run();
-    }
-
-    /// wraps the run_one method of the internal io_service object
-    /**
-     * @since 0.3.0-alpha4
-     */
-    std::size_t run_one() {
-        return m_io_service->run_one();
-    }
-
-    /// wraps the stop method of the internal io_service object
-    void stop() {
-        m_io_service->stop();
-    }
-
-    /// wraps the poll method of the internal io_service object
-    std::size_t poll() {
-        return m_io_service->poll();
-    }
-
-    /// wraps the poll_one method of the internal io_service object
-    std::size_t poll_one() {
-        return m_io_service->poll_one();
-    }
-
-    /// wraps the reset method of the internal io_service object
-    void reset() {
-        m_io_service->reset();
-    }
-
-    /// wraps the stopped method of the internal io_service object
-    bool stopped() const {
-        return m_io_service->stopped();
-    }
-
-    /// Marks the endpoint as perpetual, stopping it from exiting when empty
-    /**
-     * Marks the endpoint as perpetual. Perpetual endpoints will not
-     * automatically exit when they run out of connections to process. To stop
-     * a perpetual endpoint call `end_perpetual`.
-     *
-     * An endpoint may be marked perpetual at any time by any thread. It must be
-     * called either before the endpoint has run out of work or before it was
-     * started
-     *
-     * @since 0.3.0
-     */
-    void start_perpetual() {
-        m_work = lib::make_shared<lib::asio::io_service::work>(
-            lib::ref(*m_io_service)
-        );
-    }
-
-    /// Clears the endpoint's perpetual flag, allowing it to exit when empty
-    /**
-     * Clears the endpoint's perpetual flag. This will cause the endpoint's run
-     * method to exit normally when it runs out of connections. If there are
-     * currently active connections it will not end until they are complete.
-     *
-     * @since 0.3.0
-     */
-    void stop_perpetual() {
-        m_work.reset();
-    }
-
-    /// Call back a function after a period of time.
-    /**
-     * Sets a timer that calls back a function after the specified period of
-     * milliseconds. Returns a handle that can be used to cancel the timer.
-     * A cancelled timer will return the error code error::operation_aborted
-     * A timer that expired will return no error.
-     *
-     * @param duration Length of time to wait in milliseconds
-     * @param callback The function to call back when the timer has expired
-     * @return A handle that can be used to cancel the timer if it is no longer
-     * needed.
-     */
-    timer_ptr set_timer(long duration, timer_handler callback) {
-        timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
-            *m_io_service,
-             lib::asio::milliseconds(duration)
-        );
-
-        new_timer->async_wait(
-            lib::bind(
-                &type::handle_timer,
-                this,
-                new_timer,
-                callback,
-                lib::placeholders::_1
-            )
-        );
-
-        return new_timer;
-    }
-
-    /// Timer handler
-    /**
-     * The timer pointer is included to ensure the timer isn't destroyed until
-     * after it has expired.
-     *
-     * @param t Pointer to the timer in question
-     * @param callback The function to call back
-     * @param ec A status code indicating an error, if any.
-     */
-    void handle_timer(timer_ptr, timer_handler callback,
-        lib::asio::error_code const & ec)
-    {
-        if (ec) {
-            if (ec == lib::asio::error::operation_aborted) {
-                callback(make_error_code(transport::error::operation_aborted));
-            } else {
-                m_elog->write(log::elevel::info,
-                    "asio handle_timer error: "+ec.message());
-                log_err(log::elevel::info,"asio handle_timer",ec);
-                callback(socket_con_type::translate_ec(ec));
-            }
-        } else {
-            callback(lib::error_code());
-        }
-    }
-
-    /// Accept the next connection attempt and assign it to con (exception free)
-    /**
-     * @param tcon The connection to accept into.
-     * @param callback The function to call when the operation is complete.
-     * @param ec A status code indicating an error, if any.
-     */
-    void async_accept(transport_con_ptr tcon, accept_handler callback,
-        lib::error_code & ec)
-    {
-        if (m_state != LISTENING || !m_acceptor) {
-            using websocketpp::error::make_error_code;
-            ec = make_error_code(websocketpp::error::async_accept_not_listening);
-            return;
-        }
-
-        m_alog->write(log::alevel::devel, "asio::async_accept");
-
-        if (config::enable_multithreading) {
-            m_acceptor->async_accept(
-                tcon->get_raw_socket(),
-                tcon->get_strand()->wrap(lib::bind(
-                    &type::handle_accept,
-                    this,
-                    callback,
-                    lib::placeholders::_1
-                ))
-            );
-        } else {
-            m_acceptor->async_accept(
-                tcon->get_raw_socket(),
-                lib::bind(
-                    &type::handle_accept,
-                    this,
-                    callback,
-                    lib::placeholders::_1
-                )
-            );
-        }
-    }
-
-    /// Accept the next connection attempt and assign it to con.
-    /**
-     * @param tcon The connection to accept into.
-     * @param callback The function to call when the operation is complete.
-     */
-    void async_accept(transport_con_ptr tcon, accept_handler callback) {
-        lib::error_code ec;
-        async_accept(tcon,callback,ec);
-        if (ec) { throw exception(ec); }
-    }
-protected:
-    /// Initialize logging
-    /**
-     * The loggers are located in the main endpoint class. As such, the
-     * transport doesn't have direct access to them. This method is called
-     * by the endpoint constructor to allow shared logging from the transport
-     * component. These are raw pointers to member variables of the endpoint.
-     * In particular, they cannot be used in the transport constructor as they
-     * haven't been constructed yet, and cannot be used in the transport
-     * destructor as they will have been destroyed by then.
-     */
-    void init_logging(const lib::shared_ptr<alog_type>& a, const lib::shared_ptr<elog_type>& e) {
-        m_alog = a;
-        m_elog = e;
-    }
-
-    void handle_accept(accept_handler callback, lib::asio::error_code const & 
-        asio_ec)
-    {
-        lib::error_code ret_ec;
-
-        m_alog->write(log::alevel::devel, "asio::handle_accept");
-
-        if (asio_ec) {
-            if (asio_ec == lib::asio::errc::operation_canceled) {
-                ret_ec = make_error_code(websocketpp::error::operation_canceled);
-            } else {
-                log_err(log::elevel::info,"asio handle_accept",asio_ec);
-                ret_ec = socket_con_type::translate_ec(asio_ec);
-            }
-        }
-
-        callback(ret_ec);
-    }
-
-    /// Initiate a new connection
-    // TODO: there have to be some more failure conditions here
-    void async_connect(transport_con_ptr tcon, uri_ptr u, connect_handler cb) {
-        using namespace lib::asio::ip;
-
-        // Create a resolver
-        if (!m_resolver) {
-            m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
-                lib::ref(*m_io_service));
-        }
-
-        tcon->set_uri(u);
-
-        std::string proxy = tcon->get_proxy();
-        std::string host;
-        std::string port;
-
-        if (proxy.empty()) {
-            host = u->get_host();
-            port = u->get_port_str();
-        } else {
-            lib::error_code ec;
-
-            uri_ptr pu = lib::make_shared<uri>(proxy);
-
-            if (!pu->get_valid()) {
-                cb(make_error_code(error::proxy_invalid));
-                return;
-            }
-
-            ec = tcon->proxy_init(u->get_authority());
-            if (ec) {
-                cb(ec);
-                return;
-            }
-
-            host = pu->get_host();
-            port = pu->get_port_str();
-        }
-
-        tcp::resolver::query query(host,port);
-
-        if (m_alog->static_test(log::alevel::devel)) {
-            m_alog->write(log::alevel::devel,
-                "starting async DNS resolve for "+host+":"+port);
-        }
-
-        timer_ptr dns_timer;
-
-        dns_timer = tcon->set_timer(
-            config::timeout_dns_resolve,
-            lib::bind(
-                &type::handle_resolve_timeout,
-                this,
-                dns_timer,
-                cb,
-                lib::placeholders::_1
-            )
-        );
-
-        if (config::enable_multithreading) {
-            m_resolver->async_resolve(
-                query,
-                tcon->get_strand()->wrap(lib::bind(
-                    &type::handle_resolve,
-                    this,
-                    tcon,
-                    dns_timer,
-                    cb,
-                    lib::placeholders::_1,
-                    lib::placeholders::_2
-                ))
-            );
-        } else {
-            m_resolver->async_resolve(
-                query,
-                lib::bind(
-                    &type::handle_resolve,
-                    this,
-                    tcon,
-                    dns_timer,
-                    cb,
-                    lib::placeholders::_1,
-                    lib::placeholders::_2
-                )
-            );
-        }
-    }
-
-    /// DNS resolution timeout handler
-    /**
-     * The timer pointer is included to ensure the timer isn't destroyed until
-     * after it has expired.
-     *
-     * @param dns_timer Pointer to the timer in question
-     * @param callback The function to call back
-     * @param ec A status code indicating an error, if any.
-     */
-    void handle_resolve_timeout(timer_ptr, connect_handler callback,
-        lib::error_code const & ec)
-    {
-        lib::error_code ret_ec;
-
-        if (ec) {
-            if (ec == transport::error::operation_aborted) {
-                m_alog->write(log::alevel::devel,
-                    "asio handle_resolve_timeout timer cancelled");
-                return;
-            }
-
-            log_err(log::elevel::devel,"asio handle_resolve_timeout",ec);
-            ret_ec = ec;
-        } else {
-            ret_ec = make_error_code(transport::error::timeout);
-        }
-
-        m_alog->write(log::alevel::devel,"DNS resolution timed out");
-        m_resolver->cancel();
-        callback(ret_ec);
-    }
-
-    void handle_resolve(transport_con_ptr tcon, timer_ptr dns_timer,
-        connect_handler callback, lib::asio::error_code const & ec,
-        lib::asio::ip::tcp::resolver::iterator iterator)
-    {
-        if (ec == lib::asio::error::operation_aborted ||
-            lib::asio::is_neg(dns_timer->expires_from_now()))
-        {
-            m_alog->write(log::alevel::devel,"async_resolve cancelled");
-            return;
-        }
-
-        dns_timer->cancel();
-
-        if (ec) {
-            log_err(log::elevel::info,"asio async_resolve",ec);
-            callback(socket_con_type::translate_ec(ec));
-            return;
-        }
-
-        if (m_alog->static_test(log::alevel::devel)) {
-            std::stringstream s;
-            s << "Async DNS resolve successful. Results: ";
-
-            lib::asio::ip::tcp::resolver::iterator it, end;
-            for (it = iterator; it != end; ++it) {
-                s << (*it).endpoint() << " ";
-            }
-
-            m_alog->write(log::alevel::devel,s.str());
-        }
-
-        m_alog->write(log::alevel::devel,"Starting async connect");
-
-        timer_ptr con_timer;
-
-        con_timer = tcon->set_timer(
-            config::timeout_connect,
-            lib::bind(
-                &type::handle_connect_timeout,
-                this,
-                tcon,
-                con_timer,
-                callback,
-                lib::placeholders::_1
-            )
-        );
-
-        if (config::enable_multithreading) {
-            lib::asio::async_connect(
-                tcon->get_raw_socket(),
-                iterator,
-                tcon->get_strand()->wrap(lib::bind(
-                    &type::handle_connect,
-                    this,
-                    tcon,
-                    con_timer,
-                    callback,
-                    lib::placeholders::_1
-                ))
-            );
-        } else {
-            lib::asio::async_connect(
-                tcon->get_raw_socket(),
-                iterator,
-                lib::bind(
-                    &type::handle_connect,
-                    this,
-                    tcon,
-                    con_timer,
-                    callback,
-                    lib::placeholders::_1
-                )
-            );
-        }
-    }
-
-    /// Asio connect timeout handler
-    /**
-     * The timer pointer is included to ensure the timer isn't destroyed until
-     * after it has expired.
-     *
-     * @param tcon Pointer to the transport connection that is being connected
-     * @param con_timer Pointer to the timer in question
-     * @param callback The function to call back
-     * @param ec A status code indicating an error, if any.
-     */
-    void handle_connect_timeout(transport_con_ptr tcon, timer_ptr,
-        connect_handler callback, lib::error_code const & ec)
-    {
-        lib::error_code ret_ec;
-
-        if (ec) {
-            if (ec == transport::error::operation_aborted) {
-                m_alog->write(log::alevel::devel,
-                    "asio handle_connect_timeout timer cancelled");
-                return;
-            }
-
-            log_err(log::elevel::devel,"asio handle_connect_timeout",ec);
-            ret_ec = ec;
-        } else {
-            ret_ec = make_error_code(transport::error::timeout);
-        }
-
-        m_alog->write(log::alevel::devel,"TCP connect timed out");
-        tcon->cancel_socket_checked();
-        callback(ret_ec);
-    }
-
-    void handle_connect(transport_con_ptr tcon, timer_ptr con_timer,
-        connect_handler callback, lib::asio::error_code const & ec)
-    {
-        if (ec == lib::asio::error::operation_aborted ||
-            lib::asio::is_neg(con_timer->expires_from_now()))
-        {
-            m_alog->write(log::alevel::devel,"async_connect cancelled");
-            return;
-        }
-
-        con_timer->cancel();
-
-        if (ec) {
-            log_err(log::elevel::info,"asio async_connect",ec);
-            callback(socket_con_type::translate_ec(ec));
-            return;
-        }
-
-        if (m_alog->static_test(log::alevel::devel)) {
-            m_alog->write(log::alevel::devel,
-                "Async connect to "+tcon->get_remote_endpoint()+" successful.");
-        }
-
-        callback(lib::error_code());
-    }
-
-    /// Initialize a connection
-    /**
-     * init is called by an endpoint once for each newly created connection.
-     * It's purpose is to give the transport policy the chance to perform any
-     * transport specific initialization that couldn't be done via the default
-     * constructor.
-     *
-     * @param tcon A pointer to the transport portion of the connection.
-     *
-     * @return A status code indicating the success or failure of the operation
-     */
-    lib::error_code init(transport_con_ptr tcon) {
-        m_alog->write(log::alevel::devel, "transport::asio::init");
-
-        // Initialize the connection socket component
-        socket_type::init(lib::static_pointer_cast<socket_con_type,
-            transport_con_type>(tcon));
-
-        lib::error_code ec;
-
-        ec = tcon->init_asio(m_io_service);
-        if (ec) {return ec;}
-
-        tcon->set_tcp_pre_init_handler(m_tcp_pre_init_handler);
-        tcon->set_tcp_post_init_handler(m_tcp_post_init_handler);
-
-        return lib::error_code();
-    }
-private:
-    /// Convenience method for logging the code and message for an error_code
-    template <typename error_type>
-    void log_err(log::level l, char const * msg, error_type const & ec) {
-        std::stringstream s;
-        s << msg << " error: " << ec << " (" << ec.message() << ")";
-        m_elog->write(l,s.str());
-    }
-
-    /// Helper for cleaning up in the listen method after an error
-    template <typename error_type>
-    lib::error_code clean_up_listen_after_error(error_type const & ec) {
-        if (m_acceptor->is_open()) {
-            m_acceptor->close();
-        }
-        log_err(log::elevel::info,"asio listen",ec);
-        return socket_con_type::translate_ec(ec);
-    }
-
-    enum state {
-        UNINITIALIZED = 0,
-        READY = 1,
-        LISTENING = 2
-    };
-
-    // Handlers
-    tcp_pre_bind_handler    m_tcp_pre_bind_handler;
-    tcp_init_handler    m_tcp_pre_init_handler;
-    tcp_init_handler    m_tcp_post_init_handler;
-
-    // Network Resources
-    io_service_ptr      m_io_service;
-    bool                m_external_io_service;
-    acceptor_ptr        m_acceptor;
-    resolver_ptr        m_resolver;
-    work_ptr            m_work;
-
-    // Network constants
-    int                 m_listen_backlog;
-    bool                m_reuse_addr;
-
-    lib::shared_ptr<elog_type> m_elog;
-    lib::shared_ptr<alog_type> m_alog;
-
-    // Transport state
-    state               m_state;
-};
-
-} // namespace asio
-} // namespace transport
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_TRANSPORT_ASIO_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/asio/security/base.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/asio/security/base.hpp
deleted file mode 100644
index 0f08f404..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/asio/security/base.hpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_ASIO_SOCKET_BASE_HPP
-#define WEBSOCKETPP_TRANSPORT_ASIO_SOCKET_BASE_HPP
-
-#include <websocketpp/common/asio.hpp>
-#include <websocketpp/common/memory.hpp>
-#include <websocketpp/common/functional.hpp>
-#include <websocketpp/common/system_error.hpp>
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/connection_hdl.hpp>
-
-#include <string>
-
-// Interface that sockets/security policies must implement
-
-/*
- * Endpoint Interface
- *
- * bool is_secure() const;
- * @return Whether or not the endpoint creates secure connections
- *
- * lib::error_code init(socket_con_ptr scon);
- * Called by the transport after a new connection is created to initialize
- * the socket component of the connection.
- * @param scon Pointer to the socket component of the connection
- * @return Error code (empty on success)
- */
-
-
-// Connection
-// TODO
-// set_hostname(std::string hostname)
-// pre_init(init_handler);
-// post_init(init_handler);
-
-namespace websocketpp {
-namespace transport {
-namespace asio {
-namespace socket {
-
-typedef lib::function<void(lib::asio::error_code const &)> shutdown_handler;
-
-/**
- * The transport::asio::socket::* classes are a set of security/socket related
- * policies and support code for the ASIO transport types.
- */
-
-/// Errors related to asio transport sockets
-namespace error {
-    enum value {
-        /// Catch-all error for security policy errors that don't fit in other
-        /// categories
-        security = 1,
-
-        /// Catch-all error for socket component errors that don't fit in other
-        /// categories
-        socket,
-
-        /// A function was called in a state that it was illegal to do so.
-        invalid_state,
-
-        /// The application was prompted to provide a TLS context and it was
-        /// empty or otherwise invalid
-        invalid_tls_context,
-
-        /// TLS Handshake Timeout
-        tls_handshake_timeout,
-
-        /// pass_through from underlying library
-        pass_through,
-
-        /// Required tls_init handler not present
-        missing_tls_init_handler,
-
-        /// TLS Handshake Failed
-        tls_handshake_failed,
-        
-        /// Failed to set TLS SNI hostname
-        tls_failed_sni_hostname
-    };
-} // namespace error
-
-/// Error category related to asio transport socket policies
-class socket_category : public lib::error_category {
-public:
-    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
-        return "websocketpp.transport.asio.socket";
-    }
-
-    std::string message(int value) const {
-        switch(value) {
-            case error::security:
-                return "Security policy error";
-            case error::socket:
-                return "Socket component error";
-            case error::invalid_state:
-                return "Invalid state";
-            case error::invalid_tls_context:
-                return "Invalid or empty TLS context supplied";
-            case error::tls_handshake_timeout:
-                return "TLS handshake timed out";
-            case error::pass_through:
-                return "Pass through from socket policy";
-            case error::missing_tls_init_handler:
-                return "Required tls_init handler not present.";
-            case error::tls_handshake_failed:
-                return "TLS handshake failed";
-            case error::tls_failed_sni_hostname:
-                return "Failed to set TLS SNI hostname";
-            default:
-                return "Unknown";
-        }
-    }
-};
-
-inline lib::error_category const & get_socket_category() {
-    static socket_category instance;
-    return instance;
-}
-
-inline lib::error_code make_error_code(error::value e) {
-    return lib::error_code(static_cast<int>(e), get_socket_category());
-}
-
-/// Type of asio transport socket policy initialization handlers
-typedef lib::function<void(const lib::error_code&)> init_handler;
-
-} // namespace socket
-} // namespace asio
-} // namespace transport
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_TRANSPORT_ASIO_SOCKET_BASE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/asio/security/none.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/asio/security/none.hpp
deleted file mode 100644
index 5c8293db..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/asio/security/none.hpp
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_SECURITY_NONE_HPP
-#define WEBSOCKETPP_TRANSPORT_SECURITY_NONE_HPP
-
-#include <websocketpp/uri.hpp>
-
-#include <websocketpp/transport/base/connection.hpp>
-#include <websocketpp/transport/asio/security/base.hpp>
-
-#include <websocketpp/common/asio.hpp>
-#include <websocketpp/common/memory.hpp>
-
-#include <sstream>
-#include <string>
-
-namespace websocketpp {
-namespace transport {
-namespace asio {
-/// A socket policy for the asio transport that implements a plain, unencrypted
-/// socket
-namespace basic_socket {
-
-/// The signature of the socket init handler for this socket policy
-typedef lib::function<void(connection_hdl,lib::asio::ip::tcp::socket&)>
-    socket_init_handler;
-
-/// Basic Asio connection socket component
-/**
- * transport::asio::basic_socket::connection implements a connection socket
- * component using Asio ip::tcp::socket.
- */
-class connection : public lib::enable_shared_from_this<connection> {
-public:
-    /// Type of this connection socket component
-    typedef connection type;
-    /// Type of a shared pointer to this connection socket component
-    typedef lib::shared_ptr<type> ptr;
-
-    /// Type of a pointer to the Asio io_service being used
-    typedef lib::asio::io_service* io_service_ptr;
-    /// Type of a pointer to the Asio io_service strand being used
-    typedef lib::shared_ptr<lib::asio::io_service::strand> strand_ptr;
-    /// Type of the ASIO socket being used
-    typedef lib::asio::ip::tcp::socket socket_type;
-    /// Type of a shared pointer to the socket being used.
-    typedef lib::shared_ptr<socket_type> socket_ptr;
-
-    explicit connection() : m_state(UNINITIALIZED) {
-        //std::cout << "transport::asio::basic_socket::connection constructor"
-        //          << std::endl;
-    }
-
-    /// Get a shared pointer to this component
-    ptr get_shared() {
-        return shared_from_this();
-    }
-
-    /// Check whether or not this connection is secure
-    /**
-     * @return Whether or not this connection is secure
-     */
-    bool is_secure() const {
-        return false;
-    }
-
-    /// Set the socket initialization handler
-    /**
-     * The socket initialization handler is called after the socket object is
-     * created but before it is used. This gives the application a chance to
-     * set any Asio socket options it needs.
-     *
-     * @param h The new socket_init_handler
-     */
-    void set_socket_init_handler(socket_init_handler h) {
-        m_socket_init_handler = h;
-    }
-
-    /// Retrieve a pointer to the underlying socket
-    /**
-     * This is used internally. It can also be used to set socket options, etc
-     */
-    lib::asio::ip::tcp::socket & get_socket() {
-        return *m_socket;
-    }
-
-    /// Retrieve a pointer to the underlying socket
-    /**
-     * This is used internally.
-     */
-    lib::asio::ip::tcp::socket & get_next_layer() {
-        return *m_socket;
-    }
-
-    /// Retrieve a pointer to the underlying socket
-    /**
-     * This is used internally. It can also be used to set socket options, etc
-     */
-    lib::asio::ip::tcp::socket & get_raw_socket() {
-        return *m_socket;
-    }
-
-    /// Get the remote endpoint address
-    /**
-     * The iostream transport has no information about the ultimate remote
-     * endpoint. It will return the string "iostream transport". To indicate
-     * this.
-     *
-     * TODO: allow user settable remote endpoint addresses if this seems useful
-     *
-     * @return A string identifying the address of the remote endpoint
-     */
-    std::string get_remote_endpoint(lib::error_code & ec) const {
-        std::stringstream s;
-
-        lib::asio::error_code aec;
-        lib::asio::ip::tcp::endpoint ep = m_socket->remote_endpoint(aec);
-
-        if (aec) {
-            ec = error::make_error_code(error::pass_through);
-            s << "Error getting remote endpoint: " << aec
-               << " (" << aec.message() << ")";
-            return s.str();
-        } else {
-            ec = lib::error_code();
-            s << ep;
-            return s.str();
-        }
-    }
-protected:
-    /// Perform one time initializations
-    /**
-     * init_asio is called once immediately after construction to initialize
-     * Asio components to the io_service
-     *
-     * @param service A pointer to the endpoint's io_service
-     * @param strand A shared pointer to the connection's asio strand
-     * @param is_server Whether or not the endpoint is a server or not.
-     */
-    lib::error_code init_asio (io_service_ptr service, strand_ptr, bool)
-    {
-        if (m_state != UNINITIALIZED) {
-            return socket::make_error_code(socket::error::invalid_state);
-        }
-
-        m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
-            lib::ref(*service));
-
-        if (m_socket_init_handler) {
-            m_socket_init_handler(m_hdl, *m_socket);
-        }
-
-        m_state = READY;
-
-        return lib::error_code();
-    }
-
-    /// Set uri hook
-    /**
-     * Called by the transport as a connection is being established to provide
-     * the uri being connected to to the security/socket layer.
-     *
-     * This socket policy doesn't use the uri so it is ignored.
-     *
-     * @since 0.6.0
-     *
-     * @param u The uri to set
-     */
-    void set_uri(uri_ptr) {}
-
-    /// Pre-initialize security policy
-    /**
-     * Called by the transport after a new connection is created to initialize
-     * the socket component of the connection. This method is not allowed to
-     * write any bytes to the wire. This initialization happens before any
-     * proxies or other intermediate wrappers are negotiated.
-     *
-     * @param callback Handler to call back with completion information
-     */
-    void pre_init(init_handler callback) {
-        if (m_state != READY) {
-            callback(socket::make_error_code(socket::error::invalid_state));
-            return;
-        }
-
-        m_state = READING;
-
-        callback(lib::error_code());
-    }
-
-    /// Post-initialize security policy
-    /**
-     * Called by the transport after all intermediate proxies have been
-     * negotiated. This gives the security policy the chance to talk with the
-     * real remote endpoint for a bit before the websocket handshake.
-     *
-     * @param callback Handler to call back with completion information
-     */
-    void post_init(init_handler callback) {
-        callback(lib::error_code());
-    }
-
-    /// Sets the connection handle
-    /**
-     * The connection handle is passed to any handlers to identify the
-     * connection
-     *
-     * @param hdl The new handle
-     */
-    void set_handle(connection_hdl hdl) {
-        m_hdl = hdl;
-    }
-
-    /// Cancel all async operations on this socket
-    /**
-     * Attempts to cancel all async operations on this socket and reports any
-     * failures.
-     *
-     * NOTE: Windows XP and earlier do not support socket cancellation.
-     *
-     * @return The error that occurred, if any.
-     */
-    lib::asio::error_code cancel_socket() {
-        lib::asio::error_code ec;
-        m_socket->cancel(ec);
-        return ec;
-    }
-
-    void async_shutdown(socket::shutdown_handler h) {
-        lib::asio::error_code ec;
-        m_socket->shutdown(lib::asio::ip::tcp::socket::shutdown_both, ec);
-        h(ec);
-    }
-
-    lib::error_code get_ec() const {
-        return lib::error_code();
-    }
-
-public:
-    /// Translate any security policy specific information about an error code
-    /**
-     * Translate_ec takes an Asio error code and attempts to convert its value 
-     * to an appropriate websocketpp error code. In the case that the Asio and
-     * Websocketpp error types are the same (such as using boost::asio and
-     * boost::system_error or using standalone asio and std::system_error the
-     * code will be passed through natively.
-     *
-     * In the case of a mismatch (boost::asio with std::system_error) a
-     * translated code will be returned. The plain socket policy does not have 
-     * any additional information so all such errors will be reported as the
-     * generic transport pass_through error.
-     *
-     * @since 0.3.0
-     *
-     * @param ec The error code to translate_ec
-     * @return The translated error code
-     */
-    template <typename ErrorCodeType>
-    static
-    lib::error_code translate_ec(ErrorCodeType) {
-        // We don't know any more information about this error so pass through
-        return make_error_code(transport::error::pass_through);
-    }
-
-    static
-    /// Overload of translate_ec to catch cases where lib::error_code is the 
-    /// same type as lib::asio::error_code
-    lib::error_code translate_ec(lib::error_code ec) {
-        // We don't know any more information about this error, but the error is
-        // the same type as the one we are translating to, so pass through
-        // untranslated.
-        return ec;
-    }
-private:
-    enum state {
-        UNINITIALIZED = 0,
-        READY = 1,
-        READING = 2
-    };
-
-    socket_ptr          m_socket;
-    state               m_state;
-
-    connection_hdl      m_hdl;
-    socket_init_handler m_socket_init_handler;
-};
-
-/// Basic ASIO endpoint socket component
-/**
- * transport::asio::basic_socket::endpoint implements an endpoint socket
- * component that uses Boost ASIO's ip::tcp::socket.
- */
-class endpoint {
-public:
-    /// The type of this endpoint socket component
-    typedef endpoint type;
-
-    /// The type of the corresponding connection socket component
-    typedef connection socket_con_type;
-    /// The type of a shared pointer to the corresponding connection socket
-    /// component.
-    typedef socket_con_type::ptr socket_con_ptr;
-
-    explicit endpoint() {}
-
-    /// Checks whether the endpoint creates secure connections
-    /**
-     * @return Whether or not the endpoint creates secure connections
-     */
-    bool is_secure() const {
-        return false;
-    }
-
-    /// Set socket init handler
-    /**
-     * The socket init handler is called after a connection's socket is created
-     * but before it is used. This gives the end application an opportunity to
-     * set asio socket specific parameters.
-     *
-     * @param h The new socket_init_handler
-     */
-    void set_socket_init_handler(socket_init_handler h) {
-        m_socket_init_handler = h;
-    }
-protected:
-    /// Initialize a connection
-    /**
-     * Called by the transport after a new connection is created to initialize
-     * the socket component of the connection.
-     *
-     * @param scon Pointer to the socket component of the connection
-     *
-     * @return Error code (empty on success)
-     */
-    lib::error_code init(socket_con_ptr scon) {
-        scon->set_socket_init_handler(m_socket_init_handler);
-        return lib::error_code();
-    }
-private:
-    socket_init_handler m_socket_init_handler;
-};
-
-} // namespace basic_socket
-} // namespace asio
-} // namespace transport
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_TRANSPORT_SECURITY_NONE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/asio/security/tls.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/asio/security/tls.hpp
deleted file mode 100644
index c76fd9aa..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/asio/security/tls.hpp
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_SECURITY_TLS_HPP
-#define WEBSOCKETPP_TRANSPORT_SECURITY_TLS_HPP
-
-#include <websocketpp/transport/asio/security/base.hpp>
-
-#include <websocketpp/uri.hpp>
-
-#include <websocketpp/common/asio_ssl.hpp>
-#include <websocketpp/common/asio.hpp>
-#include <websocketpp/common/connection_hdl.hpp>
-#include <websocketpp/common/functional.hpp>
-#include <websocketpp/common/memory.hpp>
-
-#include <sstream>
-#include <string>
-
-namespace websocketpp {
-namespace transport {
-namespace asio {
-/// A socket policy for the asio transport that implements a TLS encrypted
-/// socket by wrapping with an asio::ssl::stream
-namespace tls_socket {
-
-/// The signature of the socket_init_handler for this socket policy
-typedef lib::function<void(connection_hdl,lib::asio::ssl::stream<
-    lib::asio::ip::tcp::socket>&)> socket_init_handler;
-/// The signature of the tls_init_handler for this socket policy
-typedef lib::function<lib::shared_ptr<lib::asio::ssl::context>(connection_hdl)>
-    tls_init_handler;
-
-/// TLS enabled Asio connection socket component
-/**
- * transport::asio::tls_socket::connection implements a secure connection socket
- * component that uses Asio's ssl::stream to wrap an ip::tcp::socket.
- */
-class connection : public lib::enable_shared_from_this<connection> {
-public:
-    /// Type of this connection socket component
-    typedef connection type;
-    /// Type of a shared pointer to this connection socket component
-    typedef lib::shared_ptr<type> ptr;
-
-    /// Type of the ASIO socket being used
-    typedef lib::asio::ssl::stream<lib::asio::ip::tcp::socket> socket_type;
-    /// Type of a shared pointer to the ASIO socket being used
-    typedef lib::shared_ptr<socket_type> socket_ptr;
-    /// Type of a pointer to the ASIO io_service being used
-    typedef lib::asio::io_service * io_service_ptr;
-    /// Type of a pointer to the ASIO io_service strand being used
-    typedef lib::shared_ptr<lib::asio::io_service::strand> strand_ptr;
-    /// Type of a shared pointer to the ASIO TLS context being used
-    typedef lib::shared_ptr<lib::asio::ssl::context> context_ptr;
-
-    explicit connection() {
-        //std::cout << "transport::asio::tls_socket::connection constructor"
-        //          << std::endl;
-    }
-
-    /// Get a shared pointer to this component
-    ptr get_shared() {
-        return shared_from_this();
-    }
-
-    /// Check whether or not this connection is secure
-    /**
-     * @return Whether or not this connection is secure
-     */
-    bool is_secure() const {
-        return true;
-    }
-
-    /// Retrieve a pointer to the underlying socket
-    /**
-     * This is used internally. It can also be used to set socket options, etc
-     */
-    socket_type::lowest_layer_type & get_raw_socket() {
-        return m_socket->lowest_layer();
-    }
-
-    /// Retrieve a pointer to the layer below the ssl stream
-    /**
-     * This is used internally.
-     */
-    socket_type::next_layer_type & get_next_layer() {
-        return m_socket->next_layer();
-    }
-
-    /// Retrieve a pointer to the wrapped socket
-    /**
-     * This is used internally.
-     */
-    socket_type & get_socket() {
-        return *m_socket;
-    }
-
-    /// Set the socket initialization handler
-    /**
-     * The socket initialization handler is called after the socket object is
-     * created but before it is used. This gives the application a chance to
-     * set any ASIO socket options it needs.
-     *
-     * @param h The new socket_init_handler
-     */
-    void set_socket_init_handler(socket_init_handler h) {
-        m_socket_init_handler = h;
-    }
-
-    /// Set TLS init handler
-    /**
-     * The tls init handler is called when needed to request a TLS context for
-     * the library to use. A TLS init handler must be set and it must return a
-     * valid TLS context in order for this endpoint to be able to initialize
-     * TLS connections
-     *
-     * @param h The new tls_init_handler
-     */
-    void set_tls_init_handler(tls_init_handler h) {
-        m_tls_init_handler = h;
-    }
-
-    /// Get the remote endpoint address
-    /**
-     * The iostream transport has no information about the ultimate remote
-     * endpoint. It will return the string "iostream transport". To indicate
-     * this.
-     *
-     * TODO: allow user settable remote endpoint addresses if this seems useful
-     *
-     * @return A string identifying the address of the remote endpoint
-     */
-    std::string get_remote_endpoint(lib::error_code & ec) const {
-        std::stringstream s;
-
-        lib::asio::error_code aec;
-        lib::asio::ip::tcp::endpoint ep = m_socket->lowest_layer().remote_endpoint(aec);
-
-        if (aec) {
-            ec = error::make_error_code(error::pass_through);
-            s << "Error getting remote endpoint: " << aec
-               << " (" << aec.message() << ")";
-            return s.str();
-        } else {
-            ec = lib::error_code();
-            s << ep;
-            return s.str();
-        }
-    }
-protected:
-    /// Perform one time initializations
-    /**
-     * init_asio is called once immediately after construction to initialize
-     * Asio components to the io_service
-     *
-     * @param service A pointer to the endpoint's io_service
-     * @param strand A pointer to the connection's strand
-     * @param is_server Whether or not the endpoint is a server or not.
-     */
-    lib::error_code init_asio (io_service_ptr service, strand_ptr strand,
-        bool is_server)
-    {
-        if (!m_tls_init_handler) {
-            return socket::make_error_code(socket::error::missing_tls_init_handler);
-        }
-        m_context = m_tls_init_handler(m_hdl);
-
-        if (!m_context) {
-            return socket::make_error_code(socket::error::invalid_tls_context);
-        }
-        m_socket = lib::make_shared<socket_type>(
-            _WEBSOCKETPP_REF(*service),lib::ref(*m_context));
-
-        if (m_socket_init_handler) {
-            m_socket_init_handler(m_hdl, get_socket());
-        }
-
-        m_io_service = service;
-        m_strand = strand;
-        m_is_server = is_server;
-
-        return lib::error_code();
-    }
-
-    /// Set hostname hook
-    /**
-     * Called by the transport as a connection is being established to provide
-     * the hostname being connected to to the security/socket layer.
-     *
-     * This socket policy uses the hostname to set the appropriate TLS SNI
-     * header.
-     *
-     * @since 0.6.0
-     *
-     * @param u The uri to set
-     */
-    void set_uri(uri_ptr u) {
-        m_uri = u;
-    }
-
-    /// Pre-initialize security policy
-    /**
-     * Called by the transport after a new connection is created to initialize
-     * the socket component of the connection. This method is not allowed to
-     * write any bytes to the wire. This initialization happens before any
-     * proxies or other intermediate wrappers are negotiated.
-     *
-     * @param callback Handler to call back with completion information
-     */
-    void pre_init(init_handler callback) {
-        // TODO: is this the best way to check whether this function is 
-        //       available in the version of OpenSSL being used?
-        // TODO: consider case where host is an IP address
-#if OPENSSL_VERSION_NUMBER >= 0x90812f
-        if (!m_is_server) {
-            // For clients on systems with a suitable OpenSSL version, set the
-            // TLS SNI hostname header so connecting to TLS servers using SNI
-            // will work.
-            long res = SSL_set_tlsext_host_name(
-                get_socket().native_handle(), m_uri->get_host().c_str());
-            if (!(1 == res)) {
-                callback(socket::make_error_code(socket::error::tls_failed_sni_hostname));
-            }
-        }
-#endif
-
-        callback(lib::error_code());
-    }
-
-    /// Post-initialize security policy
-    /**
-     * Called by the transport after all intermediate proxies have been
-     * negotiated. This gives the security policy the chance to talk with the
-     * real remote endpoint for a bit before the websocket handshake.
-     *
-     * @param callback Handler to call back with completion information
-     */
-    void post_init(init_handler callback) {
-        m_ec = socket::make_error_code(socket::error::tls_handshake_timeout);
-
-        // TLS handshake
-        if (m_strand) {
-            m_socket->async_handshake(
-                get_handshake_type(),
-                m_strand->wrap(lib::bind(
-                    &type::handle_init, get_shared(),
-                    callback,
-                    lib::placeholders::_1
-                ))
-            );
-        } else {
-            m_socket->async_handshake(
-                get_handshake_type(),
-                lib::bind(
-                    &type::handle_init, get_shared(),
-                    callback,
-                    lib::placeholders::_1
-                )
-            );
-        }
-    }
-
-    /// Sets the connection handle
-    /**
-     * The connection handle is passed to any handlers to identify the
-     * connection
-     *
-     * @param hdl The new handle
-     */
-    void set_handle(connection_hdl hdl) {
-        m_hdl = hdl;
-    }
-
-    void handle_init(init_handler callback,lib::asio::error_code const & ec) {
-        if (ec) {
-            m_ec = socket::make_error_code(socket::error::tls_handshake_failed);
-        } else {
-            m_ec = lib::error_code();
-        }
-
-        callback(m_ec);
-    }
-
-    lib::error_code get_ec() const {
-        return m_ec;
-    }
-
-    /// Cancel all async operations on this socket
-    /**
-     * Attempts to cancel all async operations on this socket and reports any
-     * failures.
-     *
-     * NOTE: Windows XP and earlier do not support socket cancellation.
-     *
-     * @return The error that occurred, if any.
-     */
-    lib::asio::error_code cancel_socket() {
-        lib::asio::error_code ec;
-        get_raw_socket().cancel(ec);
-        return ec;
-    }
-
-    void async_shutdown(socket::shutdown_handler callback) {
-        if (m_strand) {
-            m_socket->async_shutdown(m_strand->wrap(callback));
-        } else {
-            m_socket->async_shutdown(callback);
-        }
-    }
-
-public:
-    /// Translate any security policy specific information about an error code
-    /**
-     * Translate_ec takes an Asio error code and attempts to convert its value
-     * to an appropriate websocketpp error code. In the case that the Asio and
-     * Websocketpp error types are the same (such as using boost::asio and
-     * boost::system_error or using standalone asio and std::system_error the
-     * code will be passed through natively.
-     *
-     * In the case of a mismatch (boost::asio with std::system_error) a
-     * translated code will be returned. Any error that is determined to be
-     * related to TLS but does not have a more specific websocketpp error code
-     * is returned under the catch all error `tls_error`. Non-TLS related errors
-     * are returned as the transport generic error `pass_through`
-     *
-     * @since 0.3.0
-     *
-     * @param ec The error code to translate_ec
-     * @return The translated error code
-     */
-    template <typename ErrorCodeType>
-    static
-    lib::error_code translate_ec(ErrorCodeType ec) {
-        if (ec.category() == lib::asio::error::get_ssl_category()) {
-            // We know it is a TLS related error, but otherwise don't know more.
-            // Pass through as TLS generic.
-            return make_error_code(transport::error::tls_error);
-        } else {
-            // We don't know any more information about this error so pass
-            // through
-            return make_error_code(transport::error::pass_through);
-        }
-    }
-
-    static
-    /// Overload of translate_ec to catch cases where lib::error_code is the
-    /// same type as lib::asio::error_code
-    lib::error_code translate_ec(lib::error_code ec) {
-        return ec;
-    }
-private:
-    socket_type::handshake_type get_handshake_type() {
-        if (m_is_server) {
-            return lib::asio::ssl::stream_base::server;
-        } else {
-            return lib::asio::ssl::stream_base::client;
-        }
-    }
-
-    io_service_ptr      m_io_service;
-    strand_ptr          m_strand;
-    context_ptr         m_context;
-    socket_ptr          m_socket;
-    uri_ptr             m_uri;
-    bool                m_is_server;
-
-    lib::error_code     m_ec;
-
-    connection_hdl      m_hdl;
-    socket_init_handler m_socket_init_handler;
-    tls_init_handler    m_tls_init_handler;
-};
-
-/// TLS enabled Asio endpoint socket component
-/**
- * transport::asio::tls_socket::endpoint implements a secure endpoint socket
- * component that uses Asio's ssl::stream to wrap an ip::tcp::socket.
- */
-class endpoint {
-public:
-    /// The type of this endpoint socket component
-    typedef endpoint type;
-
-    /// The type of the corresponding connection socket component
-    typedef connection socket_con_type;
-    /// The type of a shared pointer to the corresponding connection socket
-    /// component.
-    typedef socket_con_type::ptr socket_con_ptr;
-
-    explicit endpoint() {}
-
-    /// Checks whether the endpoint creates secure connections
-    /**
-     * @return Whether or not the endpoint creates secure connections
-     */
-    bool is_secure() const {
-        return true;
-    }
-
-    /// Set socket init handler
-    /**
-     * The socket init handler is called after a connection's socket is created
-     * but before it is used. This gives the end application an opportunity to
-     * set asio socket specific parameters.
-     *
-     * @param h The new socket_init_handler
-     */
-    void set_socket_init_handler(socket_init_handler h) {
-        m_socket_init_handler = h;
-    }
-
-    /// Set TLS init handler
-    /**
-     * The tls init handler is called when needed to request a TLS context for
-     * the library to use. A TLS init handler must be set and it must return a
-     * valid TLS context in order for this endpoint to be able to initialize
-     * TLS connections
-     *
-     * @param h The new tls_init_handler
-     */
-    void set_tls_init_handler(tls_init_handler h) {
-        m_tls_init_handler = h;
-    }
-protected:
-    /// Initialize a connection
-    /**
-     * Called by the transport after a new connection is created to initialize
-     * the socket component of the connection.
-     *
-     * @param scon Pointer to the socket component of the connection
-     *
-     * @return Error code (empty on success)
-     */
-    lib::error_code init(socket_con_ptr scon) {
-        scon->set_socket_init_handler(m_socket_init_handler);
-        scon->set_tls_init_handler(m_tls_init_handler);
-        return lib::error_code();
-    }
-
-private:
-    socket_init_handler m_socket_init_handler;
-    tls_init_handler m_tls_init_handler;
-};
-
-} // namespace tls_socket
-} // namespace asio
-} // namespace transport
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_TRANSPORT_SECURITY_TLS_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/base/connection.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/base/connection.hpp
deleted file mode 100644
index f76d4091..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/base/connection.hpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_BASE_CON_HPP
-#define WEBSOCKETPP_TRANSPORT_BASE_CON_HPP
-
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/connection_hdl.hpp>
-#include <websocketpp/common/functional.hpp>
-#include <websocketpp/common/system_error.hpp>
-
-#include <string>
-
-namespace websocketpp {
-/// Transport policies provide network connectivity and timers
-/**
- * ### Connection Interface
- *
- * Transport connection components needs to provide:
- *
- * **init**\n
- * `void init(init_handler handler)`\n
- * Called once shortly after construction to give the policy the chance to
- * perform one time initialization. When complete, the policy must call the
- * supplied `init_handler` to continue setup. The handler takes one argument
- * with the error code if any. If an error is returned here setup will fail and
- * the connection will be aborted or terminated.
- *
- * WebSocket++ will call init only once. The transport must call `handler`
- * exactly once.
- *
- * **async_read_at_least**\n
- * `void async_read_at_least(size_t num_bytes, char *buf, size_t len,
- * read_handler handler)`\n
- * start an async read for at least num_bytes and at most len
- * bytes into buf. Call handler when done with number of bytes read.
- *
- * WebSocket++ promises to have only one async_read_at_least in flight at a
- * time. The transport must promise to only call read_handler once per async
- * read.
- *
- * **async_write**\n
- * `void async_write(const char* buf, size_t len, write_handler handler)`\n
- * `void async_write(std::vector<buffer> & bufs, write_handler handler)`\n
- * Start a write of all of the data in buf or bufs. In second case data is
- * written sequentially and in place without copying anything to a temporary
- * location.
- *
- * Websocket++ promises to have only one async_write in flight at a time.
- * The transport must promise to only call the write_handler once per async
- * write
- *
- * **set_handle**\n
- * `void set_handle(connection_hdl hdl)`\n
- * Called by WebSocket++ to let this policy know the hdl to the connection. It
- * may be stored for later use or ignored/discarded. This handle should be used
- * if the policy adds any connection handlers. Connection handlers must be
- * called with the handle as the first argument so that the handler code knows
- * which connection generated the callback.
- *
- * **set_timer**\n
- * `timer_ptr set_timer(long duration, timer_handler handler)`\n
- * WebSocket++ uses the timers provided by the transport policy as the
- * implementation of timers is often highly coupled with the implementation of
- * the networking event loops.
- *
- * Transport timer support is an optional feature. A transport method may elect
- * to implement a dummy timer object and have this method return an empty
- * pointer. If so, all timer related features of WebSocket++ core will be
- * disabled. This includes many security features designed to prevent denial of
- * service attacks. Use timer-free transport policies with caution.
- *
- * **get_remote_endpoint**\n
- * `std::string get_remote_endpoint()`\n
- * retrieve address of remote endpoint
- *
- * **is_secure**\n
- * `void is_secure()`\n
- * whether or not the connection to the remote endpoint is secure
- *
- * **dispatch**\n
- * `lib::error_code dispatch(dispatch_handler handler)`: invoke handler within
- * the transport's event system if it uses one. Otherwise, this method should
- * simply call `handler` immediately.
- *
- * **async_shutdown**\n
- * `void async_shutdown(shutdown_handler handler)`\n
- * Perform any cleanup necessary (if any). Call `handler` when complete.
- */
-namespace transport {
-
-/// The type and signature of the callback passed to the init hook
-typedef lib::function<void(lib::error_code const &)> init_handler;
-
-/// The type and signature of the callback passed to the read method
-typedef lib::function<void(lib::error_code const &,size_t)> read_handler;
-
-/// The type and signature of the callback passed to the write method
-typedef lib::function<void(lib::error_code const &)> write_handler;
-
-/// The type and signature of the callback passed to the read method
-typedef lib::function<void(lib::error_code const &)> timer_handler;
-
-/// The type and signature of the callback passed to the shutdown method
-typedef lib::function<void(lib::error_code const &)> shutdown_handler;
-
-/// The type and signature of the callback passed to the interrupt method
-typedef lib::function<void()> interrupt_handler;
-
-/// The type and signature of the callback passed to the dispatch method
-typedef lib::function<void()> dispatch_handler;
-
-/// A simple utility buffer class
-struct buffer {
-    buffer(char const * b, size_t l) : buf(b),len(l) {}
-
-    char const * buf;
-    size_t len;
-};
-
-/// Generic transport related errors
-namespace error {
-enum value {
-    /// Catch-all error for transport policy errors that don't fit in other
-    /// categories
-    general = 1,
-
-    /// underlying transport pass through
-    pass_through,
-
-    /// async_read_at_least call requested more bytes than buffer can store
-    invalid_num_bytes,
-
-    /// async_read called while another async_read was in progress
-    double_read,
-
-    /// Operation aborted
-    operation_aborted,
-
-    /// Operation not supported
-    operation_not_supported,
-
-    /// End of file
-    eof,
-
-    /// TLS short read
-    tls_short_read,
-
-    /// Timer expired
-    timeout,
-
-    /// read or write after shutdown
-    action_after_shutdown,
-
-    /// Other TLS error
-    tls_error
-};
-
-class category : public lib::error_category {
-    public:
-    category() {}
-
-    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
-        return "websocketpp.transport";
-    }
-
-    std::string message(int value) const {
-        switch(value) {
-            case general:
-                return "Generic transport policy error";
-            case pass_through:
-                return "Underlying Transport Error";
-            case invalid_num_bytes:
-                return "async_read_at_least call requested more bytes than buffer can store";
-            case operation_aborted:
-                return "The operation was aborted";
-            case operation_not_supported:
-                return "The operation is not supported by this transport";
-            case eof:
-                return "End of File";
-            case tls_short_read:
-                return "TLS Short Read";
-            case timeout:
-                return "Timer Expired";
-            case action_after_shutdown:
-                return "A transport action was requested after shutdown";
-            case tls_error:
-                return "Generic TLS related error";
-            default:
-                return "Unknown";
-        }
-    }
-};
-
-inline lib::error_category const & get_category() {
-    static category instance;
-    return instance;
-}
-
-inline lib::error_code make_error_code(error::value e) {
-    return lib::error_code(static_cast<int>(e), get_category());
-}
-
-} // namespace error
-} // namespace transport
-} // namespace websocketpp
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
-template<> struct is_error_code_enum<websocketpp::transport::error::value>
-{
-    static bool const value = true;
-};
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
-
-#endif // WEBSOCKETPP_TRANSPORT_BASE_CON_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/base/endpoint.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/base/endpoint.hpp
deleted file mode 100644
index 4ed3e70f..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/base/endpoint.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_BASE_HPP
-#define WEBSOCKETPP_TRANSPORT_BASE_HPP
-
-#include <websocketpp/common/functional.hpp>
-#include <websocketpp/common/system_error.hpp>
-
-namespace websocketpp {
-/// Transport policies provide network connectivity and timers
-/**
- * ### Endpoint Interface
- *
- * Transport endpoint components needs to provide:
- *
- * **init**\n
- * `lib::error_code init(transport_con_ptr tcon)`\n
- * init is called by an endpoint once for each newly created connection.
- * It's purpose is to give the transport policy the chance to perform any
- * transport specific initialization that couldn't be done via the default
- * constructor.
- *
- * **is_secure**\n
- * `bool is_secure() const`\n
- * Test whether the transport component of this endpoint is capable of secure
- * connections.
- *
- * **async_connect**\n
- * `void async_connect(transport_con_ptr tcon, uri_ptr location,
- *  connect_handler handler)`\n
- * Initiate a connection to `location` using the given connection `tcon`. `tcon`
- * is a pointer to the transport connection component of the connection. When
- * complete, `handler` should be called with the the connection's
- * `connection_hdl` and any error that occurred.
- *
- * **init_logging**
- * `void init_logging(const lib::shared_ptr<alog_type>& a, const lib::shared_ptr<elog_type>& e)`\n
- * Called once after construction to provide pointers to the endpoint's access
- * and error loggers. These may be stored and used to log messages or ignored.
- */
-namespace transport {
-
-/// The type and signature of the callback passed to the accept method
-typedef lib::function<void(lib::error_code const &)> accept_handler;
-
-/// The type and signature of the callback passed to the connect method
-typedef lib::function<void(lib::error_code const &)> connect_handler;
-
-} // namespace transport
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_TRANSPORT_BASE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/debug/base.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/debug/base.hpp
deleted file mode 100644
index 2e477b50..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/debug/base.hpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_DEBUG_BASE_HPP
-#define WEBSOCKETPP_TRANSPORT_DEBUG_BASE_HPP
-
-#include <websocketpp/common/system_error.hpp>
-#include <websocketpp/common/cpp11.hpp>
-
-#include <string>
-
-namespace websocketpp {
-namespace transport {
-/// Debug transport policy that is used for various mocking and stubbing duties
-/// in unit tests.
-namespace debug {
-
-/// debug transport errors
-namespace error {
-enum value {
-    /// Catch-all error for transport policy errors that don't fit in other
-    /// categories
-    general = 1,
-
-    /// not implemented
-    not_implemented,
-    
-    invalid_num_bytes,
-    
-    double_read
-};
-
-/// debug transport error category
-class category : public lib::error_category {
-    public:
-    category() {}
-
-    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
-        return "websocketpp.transport.debug";
-    }
-
-    std::string message(int value) const {
-        switch(value) {
-            case general:
-                return "Generic stub transport policy error";
-            case not_implemented:
-                return "feature not implemented";
-            case invalid_num_bytes:
-                return "Invalid number of bytes";
-            case double_read:
-                return "Read while another read was outstanding";
-            default:
-                return "Unknown";
-        }
-    }
-};
-
-/// Get a reference to a static copy of the debug transport error category
-inline lib::error_category const & get_category() {
-    static category instance;
-    return instance;
-}
-
-/// Get an error code with the given value and the debug transport category
-inline lib::error_code make_error_code(error::value e) {
-    return lib::error_code(static_cast<int>(e), get_category());
-}
-
-} // namespace error
-} // namespace debug
-} // namespace transport
-} // namespace websocketpp
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
-template<> struct is_error_code_enum<websocketpp::transport::debug::error::value>
-{
-    static bool const value = true;
-};
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
-
-#endif // WEBSOCKETPP_TRANSPORT_DEBUG_BASE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/debug/connection.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/debug/connection.hpp
deleted file mode 100644
index ce13969b..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/debug/connection.hpp
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_DEBUG_CON_HPP
-#define WEBSOCKETPP_TRANSPORT_DEBUG_CON_HPP
-
-#include <websocketpp/transport/debug/base.hpp>
-
-#include <websocketpp/transport/base/connection.hpp>
-
-#include <websocketpp/uri.hpp>
-#include <websocketpp/logger/levels.hpp>
-
-#include <websocketpp/common/connection_hdl.hpp>
-#include <websocketpp/common/memory.hpp>
-#include <websocketpp/common/platforms.hpp>
-
-#include <string>
-#include <vector>
-
-namespace websocketpp {
-namespace transport {
-namespace debug {
-
-/// Empty timer class to stub out for timer functionality that stub
-/// transport doesn't support
-struct timer {
-    void cancel() {}
-};
-
-template <typename config>
-class connection : public lib::enable_shared_from_this< connection<config> > {
-public:
-    /// Type of this connection transport component
-    typedef connection<config> type;
-    /// Type of a shared pointer to this connection transport component
-    typedef lib::shared_ptr<type> ptr;
-
-    /// transport concurrency policy
-    typedef typename config::concurrency_type concurrency_type;
-    /// Type of this transport's access logging policy
-    typedef typename config::alog_type alog_type;
-    /// Type of this transport's error logging policy
-    typedef typename config::elog_type elog_type;
-
-    // Concurrency policy types
-    typedef typename concurrency_type::scoped_lock_type scoped_lock_type;
-    typedef typename concurrency_type::mutex_type mutex_type;
-
-    typedef lib::shared_ptr<timer> timer_ptr;
-
-    explicit connection(bool is_server, const lib::shared_ptr<alog_type> & alog, const lib::shared_ptr<elog_type> & elog)
-      : m_reading(false), m_is_server(is_server), m_alog(alog), m_elog(elog)
-    {
-        m_alog->write(log::alevel::devel,"debug con transport constructor");
-    }
-
-    /// Get a shared pointer to this component
-    ptr get_shared() {
-        return type::shared_from_this();
-    }
-
-    /// Set whether or not this connection is secure
-    /**
-     * Todo: docs
-     *
-     * @since 0.3.0-alpha4
-     *
-     * @param value Whether or not this connection is secure.
-     */
-    void set_secure(bool) {}
-
-    /// Tests whether or not the underlying transport is secure
-    /**
-     * TODO: docs
-     *
-     * @return Whether or not the underlying transport is secure
-     */
-    bool is_secure() const {
-        return false;
-    }
-
-    /// Set uri hook
-    /**
-     * Called by the endpoint as a connection is being established to provide
-     * the uri being connected to to the transport layer.
-     *
-     * Implementation is optional and can be ignored if the transport has no
-     * need for this information.
-     *
-     * @since 0.6.0
-     *
-     * @param u The uri to set
-     */
-    void set_uri(uri_ptr) {}
-
-    /// Set human readable remote endpoint address
-    /**
-     * Sets the remote endpoint address returned by `get_remote_endpoint`. This
-     * value should be a human readable string that describes the remote
-     * endpoint. Typically an IP address or hostname, perhaps with a port. But
-     * may be something else depending on the nature of the underlying
-     * transport.
-     *
-     * If none is set a default is returned.
-     *
-     * @since 0.3.0-alpha4
-     *
-     * @param value The remote endpoint address to set.
-     */
-    void set_remote_endpoint(std::string) {}
-
-    /// Get human readable remote endpoint address
-    /**
-     * TODO: docs
-     *
-     * This value is used in access and error logs and is available to the end
-     * application for including in user facing interfaces and messages.
-     *
-     * @return A string identifying the address of the remote endpoint
-     */
-    std::string get_remote_endpoint() const {
-        return "unknown (debug transport)";
-    }
-
-    /// Get the connection handle
-    /**
-     * @return The handle for this connection.
-     */
-    connection_hdl get_handle() const {
-        return connection_hdl();
-    }
-
-    /// Call back a function after a period of time.
-    /**
-     * Timers are not implemented in this transport. The timer pointer will
-     * always be empty. The handler will never be called.
-     *
-     * @param duration Length of time to wait in milliseconds
-     * @param callback The function to call back when the timer has expired
-     * @return A handle that can be used to cancel the timer if it is no longer
-     * needed.
-     */
-    timer_ptr set_timer(long, timer_handler handler) {
-        m_alog->write(log::alevel::devel,"debug connection set timer");
-        m_timer_handler = handler;
-        return timer_ptr();
-    }
-    
-    /// Manual input supply (read all)
-    /**
-     * Similar to read_some, but continues to read until all bytes in the
-     * supplied buffer have been read or the connection runs out of read
-     * requests.
-     *
-     * This method still may not read all of the bytes in the input buffer. if
-     * it doesn't it indicates that the connection was most likely closed or
-     * is in an error state where it is no longer accepting new input.
-     *
-     * @since 0.3.0
-     *
-     * @param buf Char buffer to read into the websocket
-     * @param len Length of buf
-     * @return The number of characters from buf actually read.
-     */
-    size_t read_all(char const * buf, size_t len) {        
-        size_t total_read = 0;
-        size_t temp_read = 0;
-
-        do {
-            temp_read = this->read_some_impl(buf+total_read,len-total_read);
-            total_read += temp_read;
-        } while (temp_read != 0 && total_read < len);
-
-        return total_read;
-    }
-    
-    // debug stuff to invoke the async handlers
-    void expire_timer(lib::error_code const & ec) {
-        m_timer_handler(ec);
-    }
-    
-    void fullfil_write() {
-        m_write_handler(lib::error_code());
-    }
-protected:
-    /// Initialize the connection transport
-    /**
-     * Initialize the connection's transport component.
-     *
-     * @param handler The `init_handler` to call when initialization is done
-     */
-    void init(init_handler handler) {
-        m_alog->write(log::alevel::devel,"debug connection init");
-        handler(lib::error_code());
-    }
-
-    /// Initiate an async_read for at least num_bytes bytes into buf
-    /**
-     * Initiates an async_read request for at least num_bytes bytes. The input
-     * will be read into buf. A maximum of len bytes will be input. When the
-     * operation is complete, handler will be called with the status and number
-     * of bytes read.
-     *
-     * This method may or may not call handler from within the initial call. The
-     * application should be prepared to accept either.
-     *
-     * The application should never call this method a second time before it has
-     * been called back for the first read. If this is done, the second read
-     * will be called back immediately with a double_read error.
-     *
-     * If num_bytes or len are zero handler will be called back immediately
-     * indicating success.
-     *
-     * @param num_bytes Don't call handler until at least this many bytes have
-     * been read.
-     * @param buf The buffer to read bytes into
-     * @param len The size of buf. At maximum, this many bytes will be read.
-     * @param handler The callback to invoke when the operation is complete or
-     * ends in an error
-     */
-    void async_read_at_least(size_t num_bytes, char * buf, size_t len,
-        read_handler handler)
-    {
-        std::stringstream s;
-        s << "debug_con async_read_at_least: " << num_bytes;
-        m_alog->write(log::alevel::devel,s.str());
-
-        if (num_bytes > len) {
-            handler(make_error_code(error::invalid_num_bytes),size_t(0));
-            return;
-        }
-
-        if (m_reading == true) {
-            handler(make_error_code(error::double_read),size_t(0));
-            return;
-        }
-
-        if (num_bytes == 0 || len == 0) {
-            handler(lib::error_code(),size_t(0));
-            return;
-        }
-
-        m_buf = buf;
-        m_len = len;
-        m_bytes_needed = num_bytes;
-        m_read_handler = handler;
-        m_cursor = 0;
-        m_reading = true;
-    }
-
-    /// Asyncronous Transport Write
-    /**
-     * Write len bytes in buf to the output stream. Call handler to report
-     * success or failure. handler may or may not be called during async_write,
-     * but it must be safe for this to happen.
-     *
-     * Will return 0 on success.
-     *
-     * @param buf buffer to read bytes from
-     * @param len number of bytes to write
-     * @param handler Callback to invoke with operation status.
-     */
-    void async_write(char const *, size_t, write_handler handler) {
-        m_alog->write(log::alevel::devel,"debug_con async_write");
-        m_write_handler = handler;
-    }
-
-    /// Asyncronous Transport Write (scatter-gather)
-    /**
-     * Write a sequence of buffers to the output stream. Call handler to report
-     * success or failure. handler may or may not be called during async_write,
-     * but it must be safe for this to happen.
-     *
-     * Will return 0 on success.
-     *
-     * @param bufs vector of buffers to write
-     * @param handler Callback to invoke with operation status.
-     */
-    void async_write(std::vector<buffer> const &, write_handler handler) {
-        m_alog->write(log::alevel::devel,"debug_con async_write buffer list");
-        m_write_handler = handler;
-    }
-
-    /// Set Connection Handle
-    /**
-     * @param hdl The new handle
-     */
-    void set_handle(connection_hdl) {}
-
-    /// Call given handler back within the transport's event system (if present)
-    /**
-     * Invoke a callback within the transport's event system if it has one. If
-     * it doesn't, the handler will be invoked immediately before this function
-     * returns.
-     *
-     * @param handler The callback to invoke
-     *
-     * @return Whether or not the transport was able to register the handler for
-     * callback.
-     */
-    lib::error_code dispatch(dispatch_handler handler) {
-        handler();
-        return lib::error_code();
-    }
-
-    /// Perform cleanup on socket shutdown_handler
-    /**
-     * @param h The `shutdown_handler` to call back when complete
-     */
-    void async_shutdown(shutdown_handler handler) {
-        handler(lib::error_code());
-    }
-    
-    size_t read_some_impl(char const * buf, size_t len) {
-        m_alog->write(log::alevel::devel,"debug_con read_some");
-
-        if (!m_reading) {
-            m_elog->write(log::elevel::devel,"write while not reading");
-            return 0;
-        }
-
-        size_t bytes_to_copy = (std::min)(len,m_len-m_cursor);
-
-        std::copy(buf,buf+bytes_to_copy,m_buf+m_cursor);
-
-        m_cursor += bytes_to_copy;
-
-        if (m_cursor >= m_bytes_needed) {
-            complete_read(lib::error_code());
-        }
-
-        return bytes_to_copy;
-    }
-
-    /// Signal that a requested read is complete
-    /**
-     * Sets the reading flag to false and returns the handler that should be
-     * called back with the result of the read. The cursor position that is sent
-     * is whatever the value of m_cursor is.
-     *
-     * It MUST NOT be called when m_reading is false.
-     * it MUST be called while holding the read lock
-     *
-     * It is important to use this method rather than directly setting/calling
-     * m_read_handler back because this function makes sure to delete the
-     * locally stored handler which contains shared pointers that will otherwise
-     * cause circular reference based memory leaks.
-     *
-     * @param ec The error code to forward to the read handler
-     */
-    void complete_read(lib::error_code const & ec) {
-        m_reading = false;
-
-        read_handler handler = m_read_handler;
-        m_read_handler = read_handler();
-
-        handler(ec,m_cursor);
-    }
-private:
-    timer_handler m_timer_handler;
-    
-    // Read space (Protected by m_read_mutex)
-    char *          m_buf;
-    size_t          m_len;
-    size_t          m_bytes_needed;
-    read_handler    m_read_handler;
-    size_t          m_cursor;
-
-    // transport resources
-    connection_hdl  m_connection_hdl;
-    write_handler   m_write_handler;
-    shutdown_handler    m_shutdown_handler;
-
-    bool            m_reading;
-    bool const      m_is_server;
-    bool            m_is_secure;
-    lib::shared_ptr<alog_type>     m_alog;
-    lib::shared_ptr<elog_type>     m_elog;
-    std::string     m_remote_endpoint;
-};
-
-
-} // namespace debug
-} // namespace transport
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_TRANSPORT_DEBUG_CON_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/debug/endpoint.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/debug/endpoint.hpp
deleted file mode 100644
index adc89b38..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/debug/endpoint.hpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_DEBUG_HPP
-#define WEBSOCKETPP_TRANSPORT_DEBUG_HPP
-
-#include <websocketpp/common/memory.hpp>
-#include <websocketpp/logger/levels.hpp>
-
-#include <websocketpp/transport/base/endpoint.hpp>
-#include <websocketpp/transport/debug/connection.hpp>
-
-namespace websocketpp {
-namespace transport {
-namespace debug {
-
-template <typename config>
-class endpoint {
-public:
-    /// Type of this endpoint transport component
-    typedef endpoint type;
-    /// Type of a pointer to this endpoint transport component
-    typedef lib::shared_ptr<type> ptr;
-
-    /// Type of this endpoint's concurrency policy
-    typedef typename config::concurrency_type concurrency_type;
-    /// Type of this endpoint's error logging policy
-    typedef typename config::elog_type elog_type;
-    /// Type of this endpoint's access logging policy
-    typedef typename config::alog_type alog_type;
-
-    /// Type of this endpoint transport component's associated connection
-    /// transport component.
-    typedef debug::connection<config> transport_con_type;
-    /// Type of a shared pointer to this endpoint transport component's
-    /// associated connection transport component
-    typedef typename transport_con_type::ptr transport_con_ptr;
-
-    // generate and manage our own io_service
-    explicit endpoint()
-    {
-        //std::cout << "transport::iostream::endpoint constructor" << std::endl;
-    }
-
-    /// Set whether or not endpoint can create secure connections
-    /**
-     * TODO: docs
-     *
-     * Setting this value only indicates whether or not the endpoint is capable
-     * of producing and managing secure connections. Connections produced by
-     * this endpoint must also be individually flagged as secure if they are.
-     *
-     * @since 0.3.0-alpha4
-     *
-     * @param value Whether or not the endpoint can create secure connections.
-     */
-    void set_secure(bool) {}
-
-    /// Tests whether or not the underlying transport is secure
-    /**
-     * TODO: docs
-     *
-     * @return Whether or not the underlying transport is secure
-     */
-    bool is_secure() const {
-        return false;
-    }
-protected:
-    /// Initialize logging
-    /**
-     * The loggers are located in the main endpoint class. As such, the
-     * transport doesn't have direct access to them. This method is called
-     * by the endpoint constructor to allow shared logging from the transport
-     * component. These are raw pointers to member variables of the endpoint.
-     * In particular, they cannot be used in the transport constructor as they
-     * haven't been constructed yet, and cannot be used in the transport
-     * destructor as they will have been destroyed by then.
-     *
-     * @param a A pointer to the access logger to use.
-     * @param e A pointer to the error logger to use.
-     */
-    void init_logging(lib::shared_ptr<alog_type>, lib::shared_ptr<elog_type>) {}
-
-    /// Initiate a new connection
-    /**
-     * @param tcon A pointer to the transport connection component of the
-     * connection to connect.
-     * @param u A URI pointer to the URI to connect to.
-     * @param cb The function to call back with the results when complete.
-     */
-    void async_connect(transport_con_ptr, uri_ptr, connect_handler cb) {
-        cb(lib::error_code());
-    }
-
-    /// Initialize a connection
-    /**
-     * Init is called by an endpoint once for each newly created connection.
-     * It's purpose is to give the transport policy the chance to perform any
-     * transport specific initialization that couldn't be done via the default
-     * constructor.
-     *
-     * @param tcon A pointer to the transport portion of the connection.
-     * @return A status code indicating the success or failure of the operation
-     */
-    lib::error_code init(transport_con_ptr) {
-        return lib::error_code();
-    }
-private:
-
-};
-
-} // namespace debug
-} // namespace transport
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_TRANSPORT_DEBUG_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/iostream/base.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/iostream/base.hpp
deleted file mode 100644
index f8783987..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/iostream/base.hpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_IOSTREAM_BASE_HPP
-#define WEBSOCKETPP_TRANSPORT_IOSTREAM_BASE_HPP
-
-#include <websocketpp/common/system_error.hpp>
-#include <websocketpp/common/cpp11.hpp>
-#include <websocketpp/common/functional.hpp>
-#include <websocketpp/common/connection_hdl.hpp>
-
-#include <websocketpp/transport/base/connection.hpp>
-
-#include <string>
-#include <vector>
-
-namespace websocketpp {
-namespace transport {
-/// Transport policy that uses STL iostream for I/O and does not support timers
-namespace iostream {
-
-/// The type and signature of the callback used by iostream transport to write
-typedef lib::function<lib::error_code(connection_hdl, char const *, size_t)>
-    write_handler;
-
-/// The type and signature of the callback used by iostream transport to perform
-/// vectored writes.
-/**
- * If a vectored write handler is not set the standard write handler will be
- * called multiple times.
- */
-typedef lib::function<lib::error_code(connection_hdl, std::vector<transport::buffer> const
-    & bufs)> vector_write_handler;
-
-/// The type and signature of the callback used by iostream transport to signal
-/// a transport shutdown.
-typedef lib::function<lib::error_code(connection_hdl)> shutdown_handler;
-
-/// iostream transport errors
-namespace error {
-enum value {
-    /// Catch-all error for transport policy errors that don't fit in other
-    /// categories
-    general = 1,
-
-    /// async_read_at_least call requested more bytes than buffer can store
-    invalid_num_bytes,
-
-    /// async_read called while another async_read was in progress
-    double_read,
-
-    /// An operation that requires an output stream was attempted before
-    /// setting one.
-    output_stream_required,
-
-    /// stream error
-    bad_stream
-};
-
-/// iostream transport error category
-class category : public lib::error_category {
-    public:
-    category() {}
-
-    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
-        return "websocketpp.transport.iostream";
-    }
-
-    std::string message(int value) const {
-        switch(value) {
-            case general:
-                return "Generic iostream transport policy error";
-            case invalid_num_bytes:
-                return "async_read_at_least call requested more bytes than buffer can store";
-            case double_read:
-                return "Async read already in progress";
-            case output_stream_required:
-                return "An output stream to be set before async_write can be used";
-            case bad_stream:
-                return "A stream operation returned ios::bad";
-            default:
-                return "Unknown";
-        }
-    }
-};
-
-/// Get a reference to a static copy of the iostream transport error category
-inline lib::error_category const & get_category() {
-    static category instance;
-    return instance;
-}
-
-/// Get an error code with the given value and the iostream transport category
-inline lib::error_code make_error_code(error::value e) {
-    return lib::error_code(static_cast<int>(e), get_category());
-}
-
-} // namespace error
-} // namespace iostream
-} // namespace transport
-} // namespace websocketpp
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
-template<> struct is_error_code_enum<websocketpp::transport::iostream::error::value>
-{
-    static bool const value = true;
-};
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
-
-#endif // WEBSOCKETPP_TRANSPORT_IOSTREAM_BASE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/iostream/connection.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/iostream/connection.hpp
deleted file mode 100644
index 899a3e25..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/iostream/connection.hpp
+++ /dev/null
@@ -1,714 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_IOSTREAM_CON_HPP
-#define WEBSOCKETPP_TRANSPORT_IOSTREAM_CON_HPP
-
-#include <websocketpp/transport/iostream/base.hpp>
-
-#include <websocketpp/transport/base/connection.hpp>
-
-#include <websocketpp/uri.hpp>
-
-#include <websocketpp/logger/levels.hpp>
-
-#include <websocketpp/common/connection_hdl.hpp>
-#include <websocketpp/common/memory.hpp>
-#include <websocketpp/common/platforms.hpp>
-
-#include <algorithm>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-namespace websocketpp {
-namespace transport {
-namespace iostream {
-
-/// Empty timer class to stub out for timer functionality that iostream
-/// transport doesn't support
-struct timer {
-    void cancel() {}
-};
-
-template <typename config>
-class connection : public lib::enable_shared_from_this< connection<config> > {
-public:
-    /// Type of this connection transport component
-    typedef connection<config> type;
-    /// Type of a shared pointer to this connection transport component
-    typedef lib::shared_ptr<type> ptr;
-
-    /// transport concurrency policy
-    typedef typename config::concurrency_type concurrency_type;
-    /// Type of this transport's access logging policy
-    typedef typename config::alog_type alog_type;
-    /// Type of this transport's error logging policy
-    typedef typename config::elog_type elog_type;
-
-    // Concurrency policy types
-    typedef typename concurrency_type::scoped_lock_type scoped_lock_type;
-    typedef typename concurrency_type::mutex_type mutex_type;
-
-    typedef lib::shared_ptr<timer> timer_ptr;
-
-    explicit connection(bool is_server, const lib::shared_ptr<alog_type> & alog, const lib::shared_ptr<elog_type> & elog)
-      : m_output_stream(NULL)
-      , m_reading(false)
-      , m_is_server(is_server)
-      , m_is_secure(false)
-      , m_alog(alog)
-      , m_elog(elog)
-      , m_remote_endpoint("iostream transport")
-    {
-        m_alog->write(log::alevel::devel,"iostream con transport constructor");
-    }
-
-    /// Get a shared pointer to this component
-    ptr get_shared() {
-        return type::shared_from_this();
-    }
-
-    /// Register a std::ostream with the transport for writing output
-    /**
-     * Register a std::ostream with the transport. All future writes will be
-     * done to this output stream.
-     *
-     * @param o A pointer to the ostream to use for output.
-     */
-    void register_ostream(std::ostream * o) {
-        // TODO: lock transport state?
-        scoped_lock_type lock(m_read_mutex);
-        m_output_stream = o;
-    }
-
-    /// Set uri hook
-    /**
-     * Called by the endpoint as a connection is being established to provide
-     * the uri being connected to to the transport layer.
-     *
-     * This transport policy doesn't use the uri so it is ignored.
-     *
-     * @since 0.6.0
-     *
-     * @param u The uri to set
-     */
-    void set_uri(uri_ptr) {}
-
-    /// Overloaded stream input operator
-    /**
-     * Attempts to read input from the given stream into the transport. Bytes
-     * will be extracted from the input stream to fulfill any pending reads.
-     * Input in this manner will only read until the current read buffer has
-     * been filled. Then it will signal the library to process the input. If the
-     * library's input handler adds a new async_read, additional bytes will be
-     * read, otherwise the input operation will end.
-     *
-     * When this function returns one of the following conditions is true:
-     * - There is no outstanding read operation
-     * - There are no more bytes available in the input stream
-     *
-     * You can use tellg() on the input stream to determine if all of the input
-     * bytes were read or not.
-     *
-     * If there is no pending read operation when the input method is called, it
-     * will return immediately and tellg() will not have changed.
-     */
-    friend std::istream & operator>> (std::istream & in, type & t) {
-        // this serializes calls to external read.
-        scoped_lock_type lock(t.m_read_mutex);
-
-        t.read(in);
-
-        return in;
-    }
-
-    /// Manual input supply (read some)
-    /**
-     * Copies bytes from buf into WebSocket++'s input buffers. Bytes will be
-     * copied from the supplied buffer to fulfill any pending library reads. It
-     * will return the number of bytes successfully processed. If there are no
-     * pending reads read_some will return immediately. Not all of the bytes may
-     * be able to be read in one call.
-     *
-     * @since 0.3.0-alpha4
-     *
-     * @param buf Char buffer to read into the websocket
-     * @param len Length of buf
-     * @return The number of characters from buf actually read.
-     */
-    size_t read_some(char const * buf, size_t len) {
-        // this serializes calls to external read.
-        scoped_lock_type lock(m_read_mutex);
-
-        return this->read_some_impl(buf,len);
-    }
-
-    /// Manual input supply (read all)
-    /**
-     * Similar to read_some, but continues to read until all bytes in the
-     * supplied buffer have been read or the connection runs out of read
-     * requests.
-     *
-     * This method still may not read all of the bytes in the input buffer. if
-     * it doesn't it indicates that the connection was most likely closed or
-     * is in an error state where it is no longer accepting new input.
-     *
-     * @since 0.3.0
-     *
-     * @param buf Char buffer to read into the websocket
-     * @param len Length of buf
-     * @return The number of characters from buf actually read.
-     */
-    size_t read_all(char const * buf, size_t len) {
-        // this serializes calls to external read.
-        scoped_lock_type lock(m_read_mutex);
-
-        size_t total_read = 0;
-        size_t temp_read = 0;
-
-        do {
-            temp_read = this->read_some_impl(buf+total_read,len-total_read);
-            total_read += temp_read;
-        } while (temp_read != 0 && total_read < len);
-
-        return total_read;
-    }
-
-    /// Manual input supply (DEPRECATED)
-    /**
-     * @deprecated DEPRECATED in favor of read_some()
-     * @see read_some()
-     */
-    size_t readsome(char const * buf, size_t len) {
-        return this->read_some(buf,len);
-    }
-
-    /// Signal EOF
-    /**
-     * Signals to the transport that data stream being read has reached EOF and
-     * that no more bytes may be read or written to/from the transport.
-     *
-     * @since 0.3.0-alpha4
-     */
-    void eof() {
-        // this serializes calls to external read.
-        scoped_lock_type lock(m_read_mutex);
-
-        if (m_reading) {
-            complete_read(make_error_code(transport::error::eof));
-        }
-    }
-
-    /// Signal transport error
-    /**
-     * Signals to the transport that a fatal data stream error has occurred and
-     * that no more bytes may be read or written to/from the transport.
-     *
-     * @since 0.3.0-alpha4
-     */
-    void fatal_error() {
-        // this serializes calls to external read.
-        scoped_lock_type lock(m_read_mutex);
-
-        if (m_reading) {
-            complete_read(make_error_code(transport::error::pass_through));
-        }
-    }
-
-    /// Set whether or not this connection is secure
-    /**
-     * The iostream transport does not provide any security features. As such
-     * it defaults to returning false when `is_secure` is called. However, the
-     * iostream transport may be used to wrap an external socket API that may
-     * provide secure transport. This method allows that external API to flag
-     * whether or not this connection is secure so that users of the WebSocket++
-     * API will get more accurate information.
-     *
-     * @since 0.3.0-alpha4
-     *
-     * @param value Whether or not this connection is secure.
-     */
-    void set_secure(bool value) {
-        m_is_secure = value;
-    }
-
-    /// Tests whether or not the underlying transport is secure
-    /**
-     * iostream transport will return false always because it has no information
-     * about the ultimate remote endpoint. This may or may not be accurate
-     * depending on the real source of bytes being input. The `set_secure`
-     * method may be used to flag connections that are secured by an external
-     * API
-     *
-     * @return Whether or not the underlying transport is secure
-     */
-    bool is_secure() const {
-        return m_is_secure;
-    }
-
-    /// Set human readable remote endpoint address
-    /**
-     * Sets the remote endpoint address returned by `get_remote_endpoint`. This
-     * value should be a human readable string that describes the remote
-     * endpoint. Typically an IP address or hostname, perhaps with a port. But
-     * may be something else depending on the nature of the underlying
-     * transport.
-     *
-     * If none is set the default is "iostream transport".
-     *
-     * @since 0.3.0-alpha4
-     *
-     * @param value The remote endpoint address to set.
-     */
-    void set_remote_endpoint(std::string value) {
-        m_remote_endpoint = value;
-    }
-
-    /// Get human readable remote endpoint address
-    /**
-     * The iostream transport has no information about the ultimate remote
-     * endpoint. It will return the string "iostream transport". The
-     * `set_remote_endpoint` method may be used by external network code to set
-     * a more accurate value.
-     *
-     * This value is used in access and error logs and is available to the end
-     * application for including in user facing interfaces and messages.
-     *
-     * @return A string identifying the address of the remote endpoint
-     */
-    std::string get_remote_endpoint() const {
-        return m_remote_endpoint;
-    }
-
-    /// Get the connection handle
-    /**
-     * @return The handle for this connection.
-     */
-    connection_hdl get_handle() const {
-        return m_connection_hdl;
-    }
-
-    /// Call back a function after a period of time.
-    /**
-     * Timers are not implemented in this transport. The timer pointer will
-     * always be empty. The handler will never be called.
-     *
-     * @param duration Length of time to wait in milliseconds
-     * @param callback The function to call back when the timer has expired
-     * @return A handle that can be used to cancel the timer if it is no longer
-     * needed.
-     */
-    timer_ptr set_timer(long, timer_handler) {
-        return timer_ptr();
-    }
-
-    /// Sets the write handler
-    /**
-     * The write handler is called when the iostream transport receives data
-     * that needs to be written to the appropriate output location. This handler
-     * can be used in place of registering an ostream for output.
-     *
-     * The signature of the handler is
-     * `lib::error_code (connection_hdl, char const *, size_t)` The
-     * code returned will be reported and logged by the core library.
-     *
-     * See also, set_vector_write_handler, for an optional write handler that
-     * allows more efficient handling of multiple writes at once.
-     *
-     * @see set_vector_write_handler
-     *
-     * @since 0.5.0
-     *
-     * @param h The handler to call when data is to be written.
-     */
-    void set_write_handler(write_handler h) {
-        m_write_handler = h;
-    }
-
-    /// Sets the vectored write handler
-    /**
-     * The vectored write handler is called when the iostream transport receives
-     * multiple chunks of data that need to be written to the appropriate output
-     * location. This handler can be used in conjunction with the write_handler
-     * in place of registering an ostream for output.
-     *
-     * The sequence of buffers represents bytes that should be written
-     * consecutively and it is suggested to group the buffers into as few next
-     * layer packets as possible. Vector write is used to allow implementations
-     * that support it to coalesce writes into a single TCP packet or TLS
-     * segment for improved efficiency.
-     *
-     * This is an optional handler. If it is not defined then multiple calls
-     * will be made to the standard write handler.
-     *
-     * The signature of the handler is
-     * `lib::error_code (connection_hdl, std::vector<websocketpp::transport::buffer>
-     * const & bufs)`. The code returned will be reported and logged by the core
-     * library. The `websocketpp::transport::buffer` type is a struct with two
-     * data members. buf (char const *) and len (size_t).
-     *
-     * @since 0.6.0
-     *
-     * @param h The handler to call when vectored data is to be written.
-     */
-    void set_vector_write_handler(vector_write_handler h) {
-        m_vector_write_handler = h;
-    }
-
-    /// Sets the shutdown handler
-    /**
-     * The shutdown handler is called when the iostream transport receives a
-     * notification from the core library that it is finished with all read and
-     * write operations and that the underlying transport can be cleaned up.
-     *
-     * If you are using iostream transport with another socket library, this is
-     * a good time to close/shutdown the socket for this connection.
-     *
-     * The signature of the handler is `lib::error_code (connection_hdl)`. The
-     * code returned will be reported and logged by the core library.
-     *
-     * @since 0.5.0
-     *
-     * @param h The handler to call on connection shutdown.
-     */
-    void set_shutdown_handler(shutdown_handler h) {
-        m_shutdown_handler = h;
-    }
-protected:
-    /// Initialize the connection transport
-    /**
-     * Initialize the connection's transport component.
-     *
-     * @param handler The `init_handler` to call when initialization is done
-     */
-    void init(init_handler handler) {
-        m_alog->write(log::alevel::devel,"iostream connection init");
-        handler(lib::error_code());
-    }
-
-    /// Initiate an async_read for at least num_bytes bytes into buf
-    /**
-     * Initiates an async_read request for at least num_bytes bytes. The input
-     * will be read into buf. A maximum of len bytes will be input. When the
-     * operation is complete, handler will be called with the status and number
-     * of bytes read.
-     *
-     * This method may or may not call handler from within the initial call. The
-     * application should be prepared to accept either.
-     *
-     * The application should never call this method a second time before it has
-     * been called back for the first read. If this is done, the second read
-     * will be called back immediately with a double_read error.
-     *
-     * If num_bytes or len are zero handler will be called back immediately
-     * indicating success.
-     *
-     * @param num_bytes Don't call handler until at least this many bytes have
-     * been read.
-     * @param buf The buffer to read bytes into
-     * @param len The size of buf. At maximum, this many bytes will be read.
-     * @param handler The callback to invoke when the operation is complete or
-     * ends in an error
-     */
-    void async_read_at_least(size_t num_bytes, char *buf, size_t len,
-        read_handler handler)
-    {
-        std::stringstream s;
-        s << "iostream_con async_read_at_least: " << num_bytes;
-        m_alog->write(log::alevel::devel,s.str());
-
-        if (num_bytes > len) {
-            handler(make_error_code(error::invalid_num_bytes),size_t(0));
-            return;
-        }
-
-        if (m_reading == true) {
-            handler(make_error_code(error::double_read),size_t(0));
-            return;
-        }
-
-        if (num_bytes == 0 || len == 0) {
-            handler(lib::error_code(),size_t(0));
-            return;
-        }
-
-        m_buf = buf;
-        m_len = len;
-        m_bytes_needed = num_bytes;
-        m_read_handler = handler;
-        m_cursor = 0;
-        m_reading = true;
-    }
-
-    /// Asyncronous Transport Write
-    /**
-     * Write len bytes in buf to the output method. Call handler to report
-     * success or failure. handler may or may not be called during async_write,
-     * but it must be safe for this to happen.
-     *
-     * Will return 0 on success. Other possible errors (not exhaustive)
-     * output_stream_required: No output stream was registered to write to
-     * bad_stream: a ostream pass through error
-     *
-     * This method will attempt to write to the registered ostream first. If an
-     * ostream is not registered it will use the write handler. If neither are
-     * registered then an error is passed up to the connection.
-     *
-     * @param buf buffer to read bytes from
-     * @param len number of bytes to write
-     * @param handler Callback to invoke with operation status.
-     */
-    void async_write(char const * buf, size_t len, transport::write_handler
-        handler)
-    {
-        m_alog->write(log::alevel::devel,"iostream_con async_write");
-        // TODO: lock transport state?
-
-        lib::error_code ec;
-
-        if (m_output_stream) {
-            m_output_stream->write(buf,len);
-
-            if (m_output_stream->bad()) {
-                ec = make_error_code(error::bad_stream);
-            }
-        } else if (m_write_handler) {
-            ec = m_write_handler(m_connection_hdl, buf, len);
-        } else {
-            ec = make_error_code(error::output_stream_required);
-        }
-
-        handler(ec);
-    }
-
-    /// Asyncronous Transport Write (scatter-gather)
-    /**
-     * Write a sequence of buffers to the output method. Call handler to report
-     * success or failure. handler may or may not be called during async_write,
-     * but it must be safe for this to happen.
-     *
-     * Will return 0 on success. Other possible errors (not exhaustive)
-     * output_stream_required: No output stream was registered to write to
-     * bad_stream: a ostream pass through error
-     *
-     * This method will attempt to write to the registered ostream first. If an
-     * ostream is not registered it will use the write handler. If neither are
-     * registered then an error is passed up to the connection.
-     *
-     * @param bufs vector of buffers to write
-     * @param handler Callback to invoke with operation status.
-     */
-    void async_write(std::vector<buffer> const & bufs, transport::write_handler
-        handler)
-    {
-        m_alog->write(log::alevel::devel,"iostream_con async_write buffer list");
-        // TODO: lock transport state?
-
-        lib::error_code ec;
-
-        if (m_output_stream) {
-            std::vector<buffer>::const_iterator it;
-            for (it = bufs.begin(); it != bufs.end(); it++) {
-                m_output_stream->write((*it).buf,(*it).len);
-
-                if (m_output_stream->bad()) {
-                    ec = make_error_code(error::bad_stream);
-                    break;
-                }
-            }
-        } else if (m_vector_write_handler) {
-            ec = m_vector_write_handler(m_connection_hdl, bufs);
-        } else if (m_write_handler) {
-            std::vector<buffer>::const_iterator it;
-            for (it = bufs.begin(); it != bufs.end(); it++) {
-                ec = m_write_handler(m_connection_hdl, (*it).buf, (*it).len);
-                if (ec) {break;}
-            }
-
-        } else {
-            ec = make_error_code(error::output_stream_required);
-        }
-
-        handler(ec);
-    }
-
-    /// Set Connection Handle
-    /**
-     * @param hdl The new handle
-     */
-    void set_handle(connection_hdl hdl) {
-        m_connection_hdl = hdl;
-    }
-
-    /// Call given handler back within the transport's event system (if present)
-    /**
-     * Invoke a callback within the transport's event system if it has one. If
-     * it doesn't, the handler will be invoked immediately before this function
-     * returns.
-     *
-     * @param handler The callback to invoke
-     *
-     * @return Whether or not the transport was able to register the handler for
-     * callback.
-     */
-    lib::error_code dispatch(dispatch_handler handler) {
-        handler();
-        return lib::error_code();
-    }
-
-    /// Perform cleanup on socket shutdown_handler
-    /**
-     * If a shutdown handler is set, call it and pass through its return error
-     * code. Otherwise assume there is nothing to do and pass through a success
-     * code.
-     *
-     * @param handler The `shutdown_handler` to call back when complete
-     */
-    void async_shutdown(transport::shutdown_handler handler) {
-        lib::error_code ec;
-
-        if (m_shutdown_handler) {
-            ec = m_shutdown_handler(m_connection_hdl);
-        }
-
-        handler(ec);
-    }
-private:
-    void read(std::istream &in) {
-        m_alog->write(log::alevel::devel,"iostream_con read");
-
-        while (in.good()) {
-            if (!m_reading) {
-                m_elog->write(log::elevel::devel,"write while not reading");
-                break;
-            }
-
-            in.read(m_buf+m_cursor,static_cast<std::streamsize>(m_len-m_cursor));
-
-            if (in.gcount() == 0) {
-                m_elog->write(log::elevel::devel,"read zero bytes");
-                break;
-            }
-
-            m_cursor += static_cast<size_t>(in.gcount());
-
-            // TODO: error handling
-            if (in.bad()) {
-                m_reading = false;
-                complete_read(make_error_code(error::bad_stream));
-            }
-
-            if (m_cursor >= m_bytes_needed) {
-                m_reading = false;
-                complete_read(lib::error_code());
-            }
-        }
-    }
-
-    size_t read_some_impl(char const * buf, size_t len) {
-        m_alog->write(log::alevel::devel,"iostream_con read_some");
-
-        if (!m_reading) {
-            m_elog->write(log::elevel::devel,"write while not reading");
-            return 0;
-        }
-
-        size_t bytes_to_copy = (std::min)(len,m_len-m_cursor);
-
-        std::copy(buf,buf+bytes_to_copy,m_buf+m_cursor);
-
-        m_cursor += bytes_to_copy;
-
-        if (m_cursor >= m_bytes_needed) {
-            complete_read(lib::error_code());
-        }
-
-        return bytes_to_copy;
-    }
-
-    /// Signal that a requested read is complete
-    /**
-     * Sets the reading flag to false and returns the handler that should be
-     * called back with the result of the read. The cursor position that is sent
-     * is whatever the value of m_cursor is.
-     *
-     * It MUST NOT be called when m_reading is false.
-     * it MUST be called while holding the read lock
-     *
-     * It is important to use this method rather than directly setting/calling
-     * m_read_handler back because this function makes sure to delete the
-     * locally stored handler which contains shared pointers that will otherwise
-     * cause circular reference based memory leaks.
-     *
-     * @param ec The error code to forward to the read handler
-     */
-    void complete_read(lib::error_code const & ec) {
-        m_reading = false;
-
-        read_handler handler = m_read_handler;
-        m_read_handler = read_handler();
-
-        handler(ec,m_cursor);
-    }
-
-    // Read space (Protected by m_read_mutex)
-    char *          m_buf;
-    size_t          m_len;
-    size_t          m_bytes_needed;
-    read_handler    m_read_handler;
-    size_t          m_cursor;
-
-    // transport resources
-    std::ostream *  m_output_stream;
-    connection_hdl  m_connection_hdl;
-    write_handler   m_write_handler;
-    vector_write_handler m_vector_write_handler;
-    shutdown_handler    m_shutdown_handler;
-
-    bool            m_reading;
-    bool const      m_is_server;
-    bool            m_is_secure;
-    lib::shared_ptr<alog_type>     m_alog;
-    lib::shared_ptr<elog_type>     m_elog;
-    std::string     m_remote_endpoint;
-
-    // This lock ensures that only one thread can edit read data for this
-    // connection. This is a very coarse lock that is basically locked all the
-    // time. The nature of the connection is such that it cannot be
-    // parallelized, the locking is here to prevent intra-connection concurrency
-    // in order to allow inter-connection concurrency.
-    mutex_type      m_read_mutex;
-};
-
-
-} // namespace iostream
-} // namespace transport
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_TRANSPORT_IOSTREAM_CON_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/iostream/endpoint.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/iostream/endpoint.hpp
deleted file mode 100644
index 14cba725..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/iostream/endpoint.hpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_IOSTREAM_HPP
-#define WEBSOCKETPP_TRANSPORT_IOSTREAM_HPP
-
-#include <websocketpp/transport/base/endpoint.hpp>
-#include <websocketpp/transport/iostream/connection.hpp>
-
-#include <websocketpp/uri.hpp>
-#include <websocketpp/logger/levels.hpp>
-
-#include <websocketpp/common/memory.hpp>
-
-#include <ostream>
-
-namespace websocketpp {
-namespace transport {
-namespace iostream {
-
-template <typename config>
-class endpoint {
-public:
-    /// Type of this endpoint transport component
-    typedef endpoint type;
-    /// Type of a pointer to this endpoint transport component
-    typedef lib::shared_ptr<type> ptr;
-
-    /// Type of this endpoint's concurrency policy
-    typedef typename config::concurrency_type concurrency_type;
-    /// Type of this endpoint's error logging policy
-    typedef typename config::elog_type elog_type;
-    /// Type of this endpoint's access logging policy
-    typedef typename config::alog_type alog_type;
-
-    /// Type of this endpoint transport component's associated connection
-    /// transport component.
-    typedef iostream::connection<config> transport_con_type;
-    /// Type of a shared pointer to this endpoint transport component's
-    /// associated connection transport component
-    typedef typename transport_con_type::ptr transport_con_ptr;
-
-    // generate and manage our own io_service
-    explicit endpoint() : m_output_stream(NULL), m_is_secure(false)
-    {
-        //std::cout << "transport::iostream::endpoint constructor" << std::endl;
-    }
-
-    /// Register a default output stream
-    /**
-     * The specified output stream will be assigned to future connections as the
-     * default output stream.
-     *
-     * @param o The ostream to use as the default output stream.
-     */
-    void register_ostream(std::ostream * o) {
-        m_alog->write(log::alevel::devel,"register_ostream");
-        m_output_stream = o;
-    }
-
-    /// Set whether or not endpoint can create secure connections
-    /**
-     * The iostream transport does not provide any security features. As such
-     * it defaults to returning false when `is_secure` is called. However, the
-     * iostream transport may be used to wrap an external socket API that may
-     * provide secure transport. This method allows that external API to flag
-     * whether or not it can create secure connections so that users of the
-     * WebSocket++ API will get more accurate information.
-     *
-     * Setting this value only indicates whether or not the endpoint is capable
-     * of producing and managing secure connections. Connections produced by
-     * this endpoint must also be individually flagged as secure if they are.
-     *
-     * @since 0.3.0-alpha4
-     *
-     * @param value Whether or not the endpoint can create secure connections.
-     */
-    void set_secure(bool value) {
-        m_is_secure = value;
-    }
-
-    /// Tests whether or not the underlying transport is secure
-    /**
-     * iostream transport will return false by default because it has no
-     * information about the ultimate remote endpoint. This may or may not be
-     * accurate depending on the real source of bytes being input. `set_secure`
-     * may be used by a wrapper API to correct the return value in the case that
-     * secure connections are in fact possible.
-     *
-     * @return Whether or not the underlying transport is secure
-     */
-    bool is_secure() const {
-        return m_is_secure;
-    }
-    
-    /// Sets the write handler
-    /**
-     * The write handler is called when the iostream transport receives data
-     * that needs to be written to the appropriate output location. This handler
-     * can be used in place of registering an ostream for output.
-     *
-     * The signature of the handler is 
-     * `lib::error_code (connection_hdl, char const *, size_t)` The
-     * code returned will be reported and logged by the core library.
-     *
-     * @since 0.5.0
-     *
-     * @param h The handler to call on connection shutdown.
-     */
-    void set_write_handler(write_handler h) {
-        m_write_handler = h;
-    }
-    
-    /// Sets the shutdown handler
-    /**
-     * The shutdown handler is called when the iostream transport receives a
-     * notification from the core library that it is finished with all read and
-     * write operations and that the underlying transport can be cleaned up.
-     *
-     * If you are using iostream transport with another socket library, this is
-     * a good time to close/shutdown the socket for this connection.
-     *
-     * The signature of the handler is lib::error_code (connection_hdl). The
-     * code returned will be reported and logged by the core library.
-     *
-     * @since 0.5.0
-     *
-     * @param h The handler to call on connection shutdown.
-     */
-    void set_shutdown_handler(shutdown_handler h) {
-        m_shutdown_handler = h;
-    }
-protected:
-    /// Initialize logging
-    /**
-     * The loggers are located in the main endpoint class. As such, the
-     * transport doesn't have direct access to them. This method is called
-     * by the endpoint constructor to allow shared logging from the transport
-     * component. These are raw pointers to member variables of the endpoint.
-     * In particular, they cannot be used in the transport constructor as they
-     * haven't been constructed yet, and cannot be used in the transport
-     * destructor as they will have been destroyed by then.
-     *
-     * @param a A pointer to the access logger to use.
-     * @param e A pointer to the error logger to use.
-     */
-    void init_logging(lib::shared_ptr<alog_type> a, lib::shared_ptr<elog_type> e) {
-        m_elog = e;
-        m_alog = a;
-    }
-
-    /// Initiate a new connection
-    /**
-     * @param tcon A pointer to the transport connection component of the
-     * connection to connect.
-     * @param u A URI pointer to the URI to connect to.
-     * @param cb The function to call back with the results when complete.
-     */
-    void async_connect(transport_con_ptr, uri_ptr, connect_handler cb) {
-        cb(lib::error_code());
-    }
-
-    /// Initialize a connection
-    /**
-     * Init is called by an endpoint once for each newly created connection.
-     * It's purpose is to give the transport policy the chance to perform any
-     * transport specific initialization that couldn't be done via the default
-     * constructor.
-     *
-     * @param tcon A pointer to the transport portion of the connection.
-     * @return A status code indicating the success or failure of the operation
-     */
-    lib::error_code init(transport_con_ptr tcon) {
-        tcon->register_ostream(m_output_stream);
-        if (m_shutdown_handler) {
-            tcon->set_shutdown_handler(m_shutdown_handler);
-        }
-        if (m_write_handler) {
-            tcon->set_write_handler(m_write_handler);
-        }
-        return lib::error_code();
-    }
-private:
-    std::ostream *  m_output_stream;
-    shutdown_handler m_shutdown_handler;
-    write_handler   m_write_handler;
-    
-    lib::shared_ptr<elog_type>     m_elog;
-    lib::shared_ptr<alog_type>     m_alog;
-    bool            m_is_secure;
-};
-
-
-} // namespace iostream
-} // namespace transport
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_TRANSPORT_IOSTREAM_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/stub/base.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/stub/base.hpp
deleted file mode 100644
index 754981e2..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/stub/base.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_STUB_BASE_HPP
-#define WEBSOCKETPP_TRANSPORT_STUB_BASE_HPP
-
-#include <websocketpp/common/system_error.hpp>
-#include <websocketpp/common/cpp11.hpp>
-
-#include <string>
-
-namespace websocketpp {
-namespace transport {
-/// Stub transport policy that has no input or output.
-namespace stub {
-
-/// stub transport errors
-namespace error {
-enum value {
-    /// Catch-all error for transport policy errors that don't fit in other
-    /// categories
-    general = 1,
-
-    /// not implemented
-    not_implemented
-};
-
-/// stub transport error category
-class category : public lib::error_category {
-    public:
-    category() {}
-
-    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
-        return "websocketpp.transport.stub";
-    }
-
-    std::string message(int value) const {
-        switch(value) {
-            case general:
-                return "Generic stub transport policy error";
-            case not_implemented:
-                return "feature not implemented";
-            default:
-                return "Unknown";
-        }
-    }
-};
-
-/// Get a reference to a static copy of the stub transport error category
-inline lib::error_category const & get_category() {
-    static category instance;
-    return instance;
-}
-
-/// Get an error code with the given value and the stub transport category
-inline lib::error_code make_error_code(error::value e) {
-    return lib::error_code(static_cast<int>(e), get_category());
-}
-
-} // namespace error
-} // namespace stub
-} // namespace transport
-} // namespace websocketpp
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
-template<> struct is_error_code_enum<websocketpp::transport::stub::error::value>
-{
-    static bool const value = true;
-};
-_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
-
-#endif // WEBSOCKETPP_TRANSPORT_STUB_BASE_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/stub/connection.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/stub/connection.hpp
deleted file mode 100644
index 5bbbf0d7..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/stub/connection.hpp
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_STUB_CON_HPP
-#define WEBSOCKETPP_TRANSPORT_STUB_CON_HPP
-
-#include <websocketpp/transport/stub/base.hpp>
-
-#include <websocketpp/transport/base/connection.hpp>
-
-#include <websocketpp/logger/levels.hpp>
-
-#include <websocketpp/common/connection_hdl.hpp>
-#include <websocketpp/common/memory.hpp>
-#include <websocketpp/common/platforms.hpp>
-
-#include <string>
-#include <vector>
-
-namespace websocketpp {
-namespace transport {
-namespace stub {
-
-/// Empty timer class to stub out for timer functionality that stub
-/// transport doesn't support
-struct timer {
-    void cancel() {}
-};
-
-template <typename config>
-class connection : public lib::enable_shared_from_this< connection<config> > {
-public:
-    /// Type of this connection transport component
-    typedef connection<config> type;
-    /// Type of a shared pointer to this connection transport component
-    typedef lib::shared_ptr<type> ptr;
-
-    /// transport concurrency policy
-    typedef typename config::concurrency_type concurrency_type;
-    /// Type of this transport's access logging policy
-    typedef typename config::alog_type alog_type;
-    /// Type of this transport's error logging policy
-    typedef typename config::elog_type elog_type;
-
-    // Concurrency policy types
-    typedef typename concurrency_type::scoped_lock_type scoped_lock_type;
-    typedef typename concurrency_type::mutex_type mutex_type;
-
-    typedef lib::shared_ptr<timer> timer_ptr;
-
-    explicit connection(bool is_server, const lib::shared_ptr<alog_type> & alog, const lib::shared_ptr<elog_type> & elog)
-      : m_alog(alog), m_elog(elog)
-    {
-        m_alog->write(log::alevel::devel,"stub con transport constructor");
-    }
-
-    /// Get a shared pointer to this component
-    ptr get_shared() {
-        return type::shared_from_this();
-    }
-
-    /// Set whether or not this connection is secure
-    /**
-     * Todo: docs
-     *
-     * @since 0.3.0-alpha4
-     *
-     * @param value Whether or not this connection is secure.
-     */
-    void set_secure(bool value) {}
-
-    /// Tests whether or not the underlying transport is secure
-    /**
-     * TODO: docs
-     *
-     * @return Whether or not the underlying transport is secure
-     */
-    bool is_secure() const {
-        return false;
-    }
-
-    /// Set uri hook
-    /**
-     * Called by the endpoint as a connection is being established to provide
-     * the uri being connected to to the transport layer.
-     *
-     * Implementation is optional and can be ignored if the transport has no
-     * need for this information.
-     *
-     * @since 0.6.0
-     *
-     * @param u The uri to set
-     */
-    void set_uri(uri_ptr) {}
-
-    /// Set human readable remote endpoint address
-    /**
-     * Sets the remote endpoint address returned by `get_remote_endpoint`. This
-     * value should be a human readable string that describes the remote
-     * endpoint. Typically an IP address or hostname, perhaps with a port. But
-     * may be something else depending on the nature of the underlying
-     * transport.
-     *
-     * If none is set a default is returned.
-     *
-     * @since 0.3.0-alpha4
-     *
-     * @param value The remote endpoint address to set.
-     */
-    void set_remote_endpoint(std::string value) {}
-
-    /// Get human readable remote endpoint address
-    /**
-     * TODO: docs
-     *
-     * This value is used in access and error logs and is available to the end
-     * application for including in user facing interfaces and messages.
-     *
-     * @return A string identifying the address of the remote endpoint
-     */
-    std::string get_remote_endpoint() const {
-        return "unknown (stub transport)";
-    }
-
-    /// Get the connection handle
-    /**
-     * @return The handle for this connection.
-     */
-    connection_hdl get_handle() const {
-        return connection_hdl();
-    }
-
-    /// Call back a function after a period of time.
-    /**
-     * Timers are not implemented in this transport. The timer pointer will
-     * always be empty. The handler will never be called.
-     *
-     * @param duration Length of time to wait in milliseconds
-     * @param callback The function to call back when the timer has expired
-     * @return A handle that can be used to cancel the timer if it is no longer
-     * needed.
-     */
-    timer_ptr set_timer(long duration, timer_handler handler) {
-        return timer_ptr();
-    }
-protected:
-    /// Initialize the connection transport
-    /**
-     * Initialize the connection's transport component.
-     *
-     * @param handler The `init_handler` to call when initialization is done
-     */
-    void init(init_handler handler) {
-        m_alog->write(log::alevel::devel,"stub connection init");
-        handler(make_error_code(error::not_implemented));
-    }
-
-    /// Initiate an async_read for at least num_bytes bytes into buf
-    /**
-     * Initiates an async_read request for at least num_bytes bytes. The input
-     * will be read into buf. A maximum of len bytes will be input. When the
-     * operation is complete, handler will be called with the status and number
-     * of bytes read.
-     *
-     * This method may or may not call handler from within the initial call. The
-     * application should be prepared to accept either.
-     *
-     * The application should never call this method a second time before it has
-     * been called back for the first read. If this is done, the second read
-     * will be called back immediately with a double_read error.
-     *
-     * If num_bytes or len are zero handler will be called back immediately
-     * indicating success.
-     *
-     * @param num_bytes Don't call handler until at least this many bytes have
-     * been read.
-     * @param buf The buffer to read bytes into
-     * @param len The size of buf. At maximum, this many bytes will be read.
-     * @param handler The callback to invoke when the operation is complete or
-     * ends in an error
-     */
-    void async_read_at_least(size_t num_bytes, char * buf, size_t len,
-        read_handler handler)
-    {
-        m_alog->write(log::alevel::devel, "stub_con async_read_at_least");
-        handler(make_error_code(error::not_implemented), 0);
-    }
-
-    /// Asyncronous Transport Write
-    /**
-     * Write len bytes in buf to the output stream. Call handler to report
-     * success or failure. handler may or may not be called during async_write,
-     * but it must be safe for this to happen.
-     *
-     * Will return 0 on success.
-     *
-     * @param buf buffer to read bytes from
-     * @param len number of bytes to write
-     * @param handler Callback to invoke with operation status.
-     */
-    void async_write(char const * buf, size_t len, write_handler handler) {
-        m_alog->write(log::alevel::devel,"stub_con async_write");
-        handler(make_error_code(error::not_implemented));
-    }
-
-    /// Asyncronous Transport Write (scatter-gather)
-    /**
-     * Write a sequence of buffers to the output stream. Call handler to report
-     * success or failure. handler may or may not be called during async_write,
-     * but it must be safe for this to happen.
-     *
-     * Will return 0 on success.
-     *
-     * @param bufs vector of buffers to write
-     * @param handler Callback to invoke with operation status.
-     */
-    void async_write(std::vector<buffer> const & bufs, write_handler handler) {
-        m_alog->write(log::alevel::devel,"stub_con async_write buffer list");
-        handler(make_error_code(error::not_implemented));
-    }
-
-    /// Set Connection Handle
-    /**
-     * @param hdl The new handle
-     */
-    void set_handle(connection_hdl hdl) {}
-
-    /// Call given handler back within the transport's event system (if present)
-    /**
-     * Invoke a callback within the transport's event system if it has one. If
-     * it doesn't, the handler will be invoked immediately before this function
-     * returns.
-     *
-     * @param handler The callback to invoke
-     *
-     * @return Whether or not the transport was able to register the handler for
-     * callback.
-     */
-    lib::error_code dispatch(dispatch_handler handler) {
-        handler();
-        return lib::error_code();
-    }
-
-    /// Perform cleanup on socket shutdown_handler
-    /**
-     * @param h The `shutdown_handler` to call back when complete
-     */
-    void async_shutdown(shutdown_handler handler) {
-        handler(lib::error_code());
-    }
-private:
-    // member variables!
-    lib::shared_ptr<alog_type> m_alog;
-    lib::shared_ptr<elog_type> m_elog;
-};
-
-
-} // namespace stub
-} // namespace transport
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_TRANSPORT_STUB_CON_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/transport/stub/endpoint.hpp b/src/sioclient/lib/websocketpp/websocketpp/transport/stub/endpoint.hpp
deleted file mode 100644
index 3bbb78f3..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/transport/stub/endpoint.hpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_TRANSPORT_STUB_HPP
-#define WEBSOCKETPP_TRANSPORT_STUB_HPP
-
-#include <websocketpp/common/memory.hpp>
-#include <websocketpp/logger/levels.hpp>
-
-#include <websocketpp/transport/base/endpoint.hpp>
-#include <websocketpp/transport/stub/connection.hpp>
-
-namespace websocketpp {
-namespace transport {
-namespace stub {
-
-template <typename config>
-class endpoint {
-public:
-    /// Type of this endpoint transport component
-    typedef endpoint type;
-    /// Type of a pointer to this endpoint transport component
-    typedef lib::shared_ptr<type> ptr;
-
-    /// Type of this endpoint's concurrency policy
-    typedef typename config::concurrency_type concurrency_type;
-    /// Type of this endpoint's error logging policy
-    typedef typename config::elog_type elog_type;
-    /// Type of this endpoint's access logging policy
-    typedef typename config::alog_type alog_type;
-
-    /// Type of this endpoint transport component's associated connection
-    /// transport component.
-    typedef stub::connection<config> transport_con_type;
-    /// Type of a shared pointer to this endpoint transport component's
-    /// associated connection transport component
-    typedef typename transport_con_type::ptr transport_con_ptr;
-
-    // generate and manage our own io_service
-    explicit endpoint()
-    {
-        //std::cout << "transport::iostream::endpoint constructor" << std::endl;
-    }
-
-    /// Set whether or not endpoint can create secure connections
-    /**
-     * TODO: docs
-     *
-     * Setting this value only indicates whether or not the endpoint is capable
-     * of producing and managing secure connections. Connections produced by
-     * this endpoint must also be individually flagged as secure if they are.
-     *
-     * @since 0.3.0-alpha4
-     *
-     * @param value Whether or not the endpoint can create secure connections.
-     */
-    void set_secure(bool value) {}
-
-    /// Tests whether or not the underlying transport is secure
-    /**
-     * TODO: docs
-     *
-     * @return Whether or not the underlying transport is secure
-     */
-    bool is_secure() const {
-        return false;
-    }
-protected:
-    /// Initialize logging
-    /**
-     * The loggers are located in the main endpoint class. As such, the
-     * transport doesn't have direct access to them. This method is called
-     * by the endpoint constructor to allow shared logging from the transport
-     * component. These are raw pointers to member variables of the endpoint.
-     * In particular, they cannot be used in the transport constructor as they
-     * haven't been constructed yet, and cannot be used in the transport
-     * destructor as they will have been destroyed by then.
-     *
-     * @param a A pointer to the access logger to use.
-     * @param e A pointer to the error logger to use.
-     */
-    void init_logging(alog_type * a, elog_type * e) {}
-
-    /// Initiate a new connection
-    /**
-     * @param tcon A pointer to the transport connection component of the
-     * connection to connect.
-     * @param u A URI pointer to the URI to connect to.
-     * @param cb The function to call back with the results when complete.
-     */
-    void async_connect(transport_con_ptr tcon, uri_ptr u, connect_handler cb) {
-        cb(make_error_code(error::not_implemented));
-    }
-
-    /// Initialize a connection
-    /**
-     * Init is called by an endpoint once for each newly created connection.
-     * It's purpose is to give the transport policy the chance to perform any
-     * transport specific initialization that couldn't be done via the default
-     * constructor.
-     *
-     * @param tcon A pointer to the transport portion of the connection.
-     * @return A status code indicating the success or failure of the operation
-     */
-    lib::error_code init(transport_con_ptr tcon) {
-        return make_error_code(error::not_implemented);
-    }
-private:
-
-};
-
-} // namespace stub
-} // namespace transport
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_TRANSPORT_STUB_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/uri.hpp b/src/sioclient/lib/websocketpp/websocketpp/uri.hpp
deleted file mode 100644
index c0b8b0cb..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/uri.hpp
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_URI_HPP
-#define WEBSOCKETPP_URI_HPP
-
-#include <websocketpp/error.hpp>
-
-#include <websocketpp/common/memory.hpp>
-#include <websocketpp/common/stdint.hpp>
-
-#include <algorithm>
-#include <sstream>
-#include <string>
-
-namespace websocketpp {
-
-// TODO: figure out why this fixes horrible linking errors.
-
-/// Default port for ws://
-static uint16_t const uri_default_port = 80;
-/// Default port for wss://
-static uint16_t const uri_default_secure_port = 443;
-
-class uri {
-public:
-    explicit uri(std::string const & uri_string) : m_valid(false) {
-        std::string::const_iterator it;
-        std::string::const_iterator temp;
-
-        int state = 0;
-
-        it = uri_string.begin();
-        size_t uri_len = uri_string.length();
-
-        if (uri_len >= 7 && std::equal(it,it+6,"wss://")) {
-            m_secure = true;
-            m_scheme = "wss";
-            it += 6;
-        } else if (uri_len >= 6 && std::equal(it,it+5,"ws://")) {
-            m_secure = false;
-            m_scheme = "ws";
-            it += 5;
-        } else if (uri_len >= 8 && std::equal(it,it+7,"http://")) {
-            m_secure = false;
-            m_scheme = "http";
-            it += 7;
-        } else if (uri_len >= 9 && std::equal(it,it+8,"https://")) {
-            m_secure = true;
-            m_scheme = "https";
-            it += 8;
-        } else {
-            return;
-        }
-
-        // extract host.
-        // either a host string
-        // an IPv4 address
-        // or an IPv6 address
-        if (*it == '[') {
-            ++it;
-            // IPv6 literal
-            // extract IPv6 digits until ]
-
-            // TODO: this doesn't work on g++... not sure why
-            //temp = std::find(it,it2,']');
-
-            temp = it;
-            while (temp != uri_string.end()) {
-                if (*temp == ']') {
-                    break;
-                }
-                ++temp;
-            }
-
-            if (temp == uri_string.end()) {
-                return;
-            } else {
-                // validate IPv6 literal parts
-                // can contain numbers, a-f and A-F
-                m_host.append(it,temp);
-            }
-            it = temp+1;
-            if (it == uri_string.end()) {
-                state = 2;
-            } else if (*it == '/') {
-                state = 2;
-                ++it;
-            } else if (*it == ':') {
-                state = 1;
-                ++it;
-            } else {
-                // problem
-                return;
-            }
-        } else {
-            // IPv4 or hostname
-            // extract until : or /
-            while (state == 0) {
-                if (it == uri_string.end()) {
-                    state = 2;
-                    break;
-                } else if (*it == '/') {
-                    state = 2;
-                } else if (*it == ':') {
-                    // end hostname start port
-                    state = 1;
-                } else {
-                    m_host += *it;
-                }
-                ++it;
-            }
-        }
-
-        // parse port
-        std::string port;
-        while (state == 1) {
-            if (it == uri_string.end()) {
-                // state is not used after this point presently.
-                // this should be re-enabled if it ever is needed in a future
-                // refactoring
-                //state = 3;
-                break;
-            } else if (*it == '/') {
-                state = 3;
-            } else {
-                port += *it;
-            }
-            ++it;
-        }
-
-        lib::error_code ec;
-        m_port = get_port_from_string(port, ec);
-
-        if (ec) {
-            return;
-        }
-
-        m_resource = "/";
-        m_resource.append(it,uri_string.end());
-
-
-        m_valid = true;
-    }
-
-    uri(bool secure, std::string const & host, uint16_t port,
-        std::string const & resource)
-      : m_scheme(secure ? "wss" : "ws")
-      , m_host(host)
-      , m_resource(resource.empty() ? "/" : resource)
-      , m_port(port)
-      , m_secure(secure)
-      , m_valid(true) {}
-
-    uri(bool secure, std::string const & host, std::string const & resource)
-      : m_scheme(secure ? "wss" : "ws")
-      , m_host(host)
-      , m_resource(resource.empty() ? "/" : resource)
-      , m_port(secure ? uri_default_secure_port : uri_default_port)
-      , m_secure(secure)
-      , m_valid(true) {}
-
-    uri(bool secure, std::string const & host, std::string const & port,
-        std::string const & resource)
-      : m_scheme(secure ? "wss" : "ws")
-      , m_host(host)
-      , m_resource(resource.empty() ? "/" : resource)
-      , m_secure(secure)
-    {
-        lib::error_code ec;
-        m_port = get_port_from_string(port,ec);
-        m_valid = !ec;
-    }
-
-    uri(std::string const & scheme, std::string const & host, uint16_t port,
-        std::string const & resource)
-      : m_scheme(scheme)
-      , m_host(host)
-      , m_resource(resource.empty() ? "/" : resource)
-      , m_port(port)
-      , m_secure(scheme == "wss" || scheme == "https")
-      , m_valid(true) {}
-
-    uri(std::string scheme, std::string const & host, std::string const & resource)
-      : m_scheme(scheme)
-      , m_host(host)
-      , m_resource(resource.empty() ? "/" : resource)
-      , m_port((scheme == "wss" || scheme == "https") ? uri_default_secure_port : uri_default_port)
-      , m_secure(scheme == "wss" || scheme == "https")
-      , m_valid(true) {}
-
-    uri(std::string const & scheme, std::string const & host,
-        std::string const & port, std::string const & resource)
-      : m_scheme(scheme)
-      , m_host(host)
-      , m_resource(resource.empty() ? "/" : resource)
-      , m_secure(scheme == "wss" || scheme == "https")
-    {
-        lib::error_code ec;
-        m_port = get_port_from_string(port,ec);
-        m_valid = !ec;
-    }
-
-    bool get_valid() const {
-        return m_valid;
-    }
-
-    bool get_secure() const {
-        return m_secure;
-    }
-
-    std::string const & get_scheme() const {
-        return m_scheme;
-    }
-
-    std::string const & get_host() const {
-        return m_host;
-    }
-
-    std::string get_host_port() const {
-        if (m_port == (m_secure ? uri_default_secure_port : uri_default_port)) {
-            return m_host;
-        } else {
-            std::stringstream p;
-            p << m_host << ":" << m_port;
-            return p.str();
-        }
-    }
-
-    std::string get_authority() const {
-        std::stringstream p;
-        p << m_host << ":" << m_port;
-        return p.str();
-    }
-
-    uint16_t get_port() const {
-        return m_port;
-    }
-
-    std::string get_port_str() const {
-        std::stringstream p;
-        p << m_port;
-        return p.str();
-    }
-
-    std::string const & get_resource() const {
-        return m_resource;
-    }
-
-    std::string str() const {
-        std::stringstream s;
-
-        s << m_scheme << "://" << m_host;
-
-        if (m_port != (m_secure ? uri_default_secure_port : uri_default_port)) {
-            s << ":" << m_port;
-        }
-
-        s << m_resource;
-        return s.str();
-    }
-
-    /// Return the query portion
-    /**
-     * Returns the query portion (after the ?) of the URI or an empty string if
-     * there is none.
-     *
-     * @return query portion of the URI.
-     */
-    std::string get_query() const {
-        std::size_t found = m_resource.find('?');
-        if (found != std::string::npos) {
-            return m_resource.substr(found + 1);
-        } else {
-            return "";
-        }
-    }
-
-    // get fragment
-
-    // hi <3
-
-    // get the string representation of this URI
-
-    //std::string base() const; // is this still needed?
-
-    // setter methods set some or all (in the case of parse) based on the input.
-    // These functions throw a uri_exception on failure.
-    /*void set_uri(const std::string& uri);
-
-    void set_secure(bool secure);
-    void set_host(const std::string& host);
-    void set_port(uint16_t port);
-    void set_port(const std::string& port);
-    void set_resource(const std::string& resource);*/
-private:
-    uint16_t get_port_from_string(std::string const & port, lib::error_code &
-        ec) const
-    {
-        ec = lib::error_code();
-
-        if (port.empty()) {
-            return (m_secure ? uri_default_secure_port : uri_default_port);
-        }
-
-        unsigned int t_port = static_cast<unsigned int>(atoi(port.c_str()));
-
-        if (t_port > 65535) {
-            ec = error::make_error_code(error::invalid_port);
-        }
-
-        if (t_port == 0) {
-            ec = error::make_error_code(error::invalid_port);
-        }
-
-        return static_cast<uint16_t>(t_port);
-    }
-
-    std::string m_scheme;
-    std::string m_host;
-    std::string m_resource;
-    uint16_t    m_port;
-    bool        m_secure;
-    bool        m_valid;
-};
-
-/// Pointer to a URI
-typedef lib::shared_ptr<uri> uri_ptr;
-
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_URI_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/utf8_validator.hpp b/src/sioclient/lib/websocketpp/websocketpp/utf8_validator.hpp
deleted file mode 100644
index c057da62..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/utf8_validator.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * The following code is adapted from code originally written by Bjoern
- * Hoehrmann <bjoern@hoehrmann.de>. See
- * http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details.
- *
- * The original license:
- *
- * Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
-*/
-
-#ifndef UTF8_VALIDATOR_HPP
-#define UTF8_VALIDATOR_HPP
-
-#include <websocketpp/common/stdint.hpp>
-
-#include <string>
-
-namespace websocketpp {
-namespace utf8_validator {
-
-/// State that represents a valid utf8 input sequence
-static unsigned int const utf8_accept = 0;
-/// State that represents an invalid utf8 input sequence
-static unsigned int const utf8_reject = 1;
-
-/// Lookup table for the UTF8 decode state machine
-static uint8_t const utf8d[] = {
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 00..1f
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 20..3f
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 40..5f
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 60..7f
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, // 80..9f
-  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, // a0..bf
-  8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // c0..df
-  0xa,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x4,0x3,0x3, // e0..ef
-  0xb,0x6,0x6,0x6,0x5,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8, // f0..ff
-  0x0,0x1,0x2,0x3,0x5,0x8,0x7,0x1,0x1,0x1,0x4,0x6,0x1,0x1,0x1,0x1, // s0..s0
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,0,1,0,1,1,1,1,1,1, // s1..s2
-  1,2,1,1,1,1,1,2,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1, // s3..s4
-  1,2,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,3,1,1,1,1,1,1, // s5..s6
-  1,3,1,1,1,1,1,3,1,3,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // s7..s8
-};
-
-/// Decode the next byte of a UTF8 sequence
-/**
- * @param [out] state The decoder state to advance
- * @param [out] codep The codepoint to fill in
- * @param [in] byte The byte to input
- * @return The ending state of the decode operation
- */
-inline uint32_t decode(uint32_t * state, uint32_t * codep, uint8_t byte) {
-  uint32_t type = utf8d[byte];
-
-  *codep = (*state != utf8_accept) ?
-    (byte & 0x3fu) | (*codep << 6) :
-    (0xff >> type) & (byte);
-
-  *state = utf8d[256 + *state*16 + type];
-  return *state;
-}
-
-/// Provides streaming UTF8 validation functionality
-class validator {
-public:
-    /// Construct and initialize the validator
-    validator() : m_state(utf8_accept),m_codepoint(0) {}
-
-    /// Advance the state of the validator with the next input byte
-    /**
-     * @param byte The byte to advance the validation state with
-     * @return Whether or not the byte resulted in a validation error.
-     */
-    bool consume (uint8_t byte) {
-        if (utf8_validator::decode(&m_state,&m_codepoint,byte) == utf8_reject) {
-            return false;
-        }
-        return true;
-    }
-
-    /// Advance validator state with input from an iterator pair
-    /**
-     * @param begin Input iterator to the start of the input range
-     * @param end Input iterator to the end of the input range
-     * @return Whether or not decoding the bytes resulted in a validation error.
-     */
-    template <typename iterator_type>
-    bool decode (iterator_type begin, iterator_type end) {
-        for (iterator_type it = begin; it != end; ++it) {
-            unsigned int result = utf8_validator::decode(
-                &m_state,
-                &m_codepoint,
-                static_cast<uint8_t>(*it)
-            );
-
-            if (result == utf8_reject) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /// Return whether the input sequence ended on a valid utf8 codepoint
-    /**
-     * @return Whether or not the input sequence ended on a valid codepoint.
-     */
-    bool complete() {
-        return m_state == utf8_accept;
-    }
-
-    /// Reset the validator to decode another message
-    void reset() {
-        m_state = utf8_accept;
-        m_codepoint = 0;
-    }
-private:
-    uint32_t    m_state;
-    uint32_t    m_codepoint;
-};
-
-/// Validate a UTF8 string
-/**
- * convenience function that creates a validator, validates a complete string
- * and returns the result.
- */
-inline bool validate(std::string const & s) {
-    validator v;
-    if (!v.decode(s.begin(),s.end())) {
-        return false;
-    }
-    return v.complete();
-}
-
-} // namespace utf8_validator
-} // namespace websocketpp
-
-#endif // UTF8_VALIDATOR_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/utilities.hpp b/src/sioclient/lib/websocketpp/websocketpp/utilities.hpp
deleted file mode 100644
index b983c9f3..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/utilities.hpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_UTILITIES_HPP
-#define WEBSOCKETPP_UTILITIES_HPP
-
-#include <websocketpp/common/stdint.hpp>
-
-#include <algorithm>
-#include <string>
-#include <locale>
-
-namespace websocketpp {
-/// Generic non-websocket specific utility functions and data structures
-namespace utility {
-
-/// Helper functor for case insensitive find
-/**
- * Based on code from
- * http://stackoverflow.com/questions/3152241/case-insensitive-stdstring-find
- *
- * templated version of my_equal so it could work with both char and wchar_t
- */
-template<typename charT>
-struct my_equal {
-    /// Construct the functor with the given locale
-    /**
-     * @param [in] loc The locale to use for determining the case of values
-     */
-    my_equal(std::locale const & loc ) : m_loc(loc) {}
-
-    /// Perform a case insensitive comparison
-    /**
-     * @param ch1 The first value to compare
-     * @param ch2 The second value to compare
-     * @return Whether or not the two values are equal when both are converted
-     *         to uppercase using the given locale.
-     */
-    bool operator()(charT ch1, charT ch2) {
-        return std::toupper(ch1, m_loc) == std::toupper(ch2, m_loc);
-    }
-private:
-    std::locale const & m_loc;
-};
-
-/// Helper less than functor for case insensitive find
-/**
- * Based on code from
- * http://stackoverflow.com/questions/3152241/case-insensitive-stdstring-find
- */
-struct ci_less {
-    // case-independent (ci) compare_less binary function
-    struct nocase_compare {
-        bool operator() (unsigned char const & c1, unsigned char const & c2) const {
-            return tolower (c1) < tolower (c2);
-        }
-    };
-    bool operator() (std::string const & s1, std::string const & s2) const {
-        return std::lexicographical_compare
-            (s1.begin (), s1.end (),   // source range
-            s2.begin (), s2.end (),   // dest range
-            nocase_compare ());  // comparison
-    }
-};
-
-/// Find substring (case insensitive)
-/**
- * @param [in] haystack The string to search in
- * @param [in] needle The string to search for
- * @param [in] loc The locale to use for determining the case of values.
- *             Defaults to the current locale.
- * @return An iterator to the first element of the first occurrance of needle in
- *         haystack. If the sequence is not found, the function returns
- *         haystack.end()
- */
-template<typename T>
-typename T::const_iterator ci_find_substr(T const & haystack, T const & needle,
-    std::locale const & loc = std::locale())
-{
-    return std::search( haystack.begin(), haystack.end(),
-        needle.begin(), needle.end(), my_equal<typename T::value_type>(loc) );
-}
-
-/// Find substring (case insensitive)
-/**
- * @todo Is this still used? This method may not make sense.. should use
- * iterators or be less generic. As is it is too tightly coupled to std::string
- *
- * @param [in] haystack The string to search in
- * @param [in] needle The string to search for as a char array of values
- * @param [in] size Length of needle
- * @param [in] loc The locale to use for determining the case of values.
- *             Defaults to the current locale.
- * @return An iterator to the first element of the first occurrance of needle in
- *         haystack. If the sequence is not found, the function returns
- *         haystack.end()
- */
-template<typename T>
-typename T::const_iterator ci_find_substr(T const & haystack,
-    typename T::value_type const * needle, typename T::size_type size,
-    std::locale const & loc = std::locale())
-{
-    return std::search( haystack.begin(), haystack.end(),
-        needle, needle+size, my_equal<typename T::value_type>(loc) );
-}
-
-/// Convert a string to lowercase
-/**
- * @param [in] in The string to convert
- * @return The converted string
- */
-std::string to_lower(std::string const & in);
-
-/// Replace all occurrances of a substring with another
-/**
- * @param [in] subject The string to search in
- * @param [in] search The string to search for
- * @param [in] replace The string to replace with
- * @return A copy of `subject` with all occurances of `search` replaced with
- *         `replace`
- */
-std::string string_replace_all(std::string subject, std::string const & search,
-                               std::string const & replace);
-
-/// Convert std::string to ascii printed string of hex digits
-/**
- * @param [in] input The string to print
- * @return A copy of `input` converted to the printable representation of the
- *         hex values of its data.
- */
-std::string to_hex(std::string const & input);
-
-/// Convert byte array (uint8_t) to ascii printed string of hex digits
-/**
- * @param [in] input The byte array to print
- * @param [in] length The length of input
- * @return A copy of `input` converted to the printable representation of the
- *         hex values of its data.
- */
-std::string to_hex(uint8_t const * input, size_t length);
-
-/// Convert char array to ascii printed string of hex digits
-/**
- * @param [in] input The char array to print
- * @param [in] length The length of input
- * @return A copy of `input` converted to the printable representation of the
- *         hex values of its data.
- */
-std::string to_hex(char const * input, size_t length);
-
-} // namespace utility
-} // namespace websocketpp
-
-#include <websocketpp/impl/utilities_impl.hpp>
-
-#endif // WEBSOCKETPP_UTILITIES_HPP
diff --git a/src/sioclient/lib/websocketpp/websocketpp/version.hpp b/src/sioclient/lib/websocketpp/websocketpp/version.hpp
deleted file mode 100644
index f701ab10..00000000
--- a/src/sioclient/lib/websocketpp/websocketpp/version.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WEBSOCKETPP_VERSION_HPP
-#define WEBSOCKETPP_VERSION_HPP
-
-/// Namespace for the WebSocket++ project
-namespace websocketpp {
-
-/*
- other places where version information is kept
- - readme.md
- - changelog.md
- - Doxyfile
- - CMakeLists.txt
-*/
-
-/// Library major version number
-static int const major_version = 0;
-/// Library minor version number
-static int const minor_version = 8;
-/// Library patch version number
-static int const patch_version = 1;
-/// Library pre-release flag
-/**
- * This is a textual flag indicating the type and number for pre-release
- * versions (dev, alpha, beta, rc). This will be blank for release versions.
- */
-
-static char const prerelease_flag[] = "";
-
-/// Default user agent string
-static char const user_agent[] = "WebSocket++/0.8.1";
-
-} // namespace websocketpp
-
-#endif // WEBSOCKETPP_VERSION_HPP
diff --git a/src/sioclient/src/internal/.DS_Store b/src/sioclient/src/internal/.DS_Store
deleted file mode 100644
index 67805212..00000000
Binary files a/src/sioclient/src/internal/.DS_Store and /dev/null differ
diff --git a/src/sioclient/src/internal/sio_client_impl.cpp b/src/sioclient/src/internal/sio_client_impl.cpp
deleted file mode 100644
index edc2e296..00000000
--- a/src/sioclient/src/internal/sio_client_impl.cpp
+++ /dev/null
@@ -1,601 +0,0 @@
-//
-//  sio_client_impl.cpp
-//  SioChatDemo
-//
-//  Created by Melo Yao on 4/3/15.
-//  Copyright (c) 2015 Melo Yao. All rights reserved.
-//
-
-#include "sio_client_impl.h"
-#include <sstream>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <mutex>
-#include <cmath>
-// Comment this out to disable handshake logging to stdout
-#if DEBUG || _DEBUG
-#define LOG(x) std::cout << x
-#else
-#define LOG(x)
-#endif
-
-using boost::posix_time::milliseconds;
-using namespace std;
-
-namespace sio
-{
-    /*************************public:*************************/
-    client_impl::client_impl() :
-        m_ping_interval(0),
-        m_ping_timeout(0),
-        m_network_thread(),
-        m_con_state(con_closed),
-        m_reconn_delay(5000),
-        m_reconn_delay_max(25000),
-        m_reconn_attempts(0xFFFFFFFF),
-        m_reconn_made(0)
-    {
-        using websocketpp::log::alevel;
-#ifndef DEBUG
-        m_client.clear_access_channels(alevel::all);
-        m_client.set_access_channels(alevel::connect|alevel::disconnect|alevel::app);
-#endif
-        // Initialize the Asio transport policy
-        m_client.init_asio();
-
-        // Bind the clients we are using
-        using websocketpp::lib::placeholders::_1;
-        using websocketpp::lib::placeholders::_2;
-        m_client.set_open_handler(lib::bind(&client_impl::on_open,this,_1));
-        m_client.set_close_handler(lib::bind(&client_impl::on_close,this,_1));
-        m_client.set_fail_handler(lib::bind(&client_impl::on_fail,this,_1));
-        m_client.set_message_handler(lib::bind(&client_impl::on_message,this,_1,_2));
-#if SIO_TLS
-        m_client.set_tls_init_handler(lib::bind(&client_impl::on_tls_init,this,_1));
-#endif
-        m_packet_mgr.set_decode_callback(lib::bind(&client_impl::on_decode,this,_1));
-
-        m_packet_mgr.set_encode_callback(lib::bind(&client_impl::on_encode,this,_1,_2));
-    }
-    
-    client_impl::~client_impl()
-    {
-        this->sockets_invoke_void(&sio::socket::on_close);
-        sync_close();
-    }
-    
-    void client_impl::connect(const string& uri, const map<string,string>& query, const map<string, string>& headers)
-    {
-        if(m_reconn_timer)
-        {
-            m_reconn_timer->cancel();
-            m_reconn_timer.reset();
-        }
-        if(m_network_thread)
-        {
-            if(m_con_state == con_closing||m_con_state == con_closed)
-            {
-                //if client is closing, join to wait.
-                //if client is closed, still need to join,
-                //but in closed case,join will return immediately.
-                m_network_thread->join();
-                m_network_thread.reset();//defensive
-            }
-            else
-            {
-                //if we are connected, do nothing.
-                return;
-            }
-        }
-        m_con_state = con_opening;
-        m_base_url = uri;
-        m_reconn_made = 0;
-
-        string query_str;
-        for(map<string,string>::const_iterator it=query.begin();it!=query.end();++it){
-            query_str.append("&");
-            query_str.append(it->first);
-            query_str.append("=");
-            string query_str_value=encode_query_string(it->second);
-            query_str.append(query_str_value);
-        }
-        m_query_string=move(query_str);
-
-        m_http_headers = headers;
-
-        this->reset_states();
-        m_client.get_io_service().dispatch(lib::bind(&client_impl::connect_impl,this,uri,m_query_string));
-        m_network_thread.reset(new thread(lib::bind(&client_impl::run_loop,this)));//uri lifecycle?
-
-    }
-
-    socket::ptr const& client_impl::socket(string const& nsp)
-    {
-        lock_guard<mutex> guard(m_socket_mutex);
-        string aux;
-        if(nsp == "")
-        {
-            aux = "/";
-        }
-        else if( nsp[0] != '/')
-        {
-            aux.append("/",1);
-            aux.append(nsp);
-        }
-        else
-        {
-            aux = nsp;
-        }
-
-        auto it = m_sockets.find(aux);
-        if(it!= m_sockets.end())
-        {
-            return it->second;
-        }
-        else
-        {
-            pair<const string, socket::ptr> p(aux,shared_ptr<sio::socket>(new sio::socket(this,aux)));
-            return (m_sockets.insert(p).first)->second;
-        }
-    }
-
-    void client_impl::close()
-    {
-        m_con_state = con_closing;
-        this->sockets_invoke_void(&sio::socket::close);
-        m_client.get_io_service().dispatch(lib::bind(&client_impl::close_impl, this,close::status::normal,"End by user"));
-    }
-
-    void client_impl::sync_close()
-    {
-        m_con_state = con_closing;
-        this->sockets_invoke_void(&sio::socket::close);
-        m_client.get_io_service().dispatch(lib::bind(&client_impl::close_impl, this,close::status::normal,"End by user"));
-        if(m_network_thread)
-        {
-            m_network_thread->join();
-            m_network_thread.reset();
-        }
-    }
-
-    /*************************protected:*************************/
-    void client_impl::send(packet& p)
-    {
-        m_packet_mgr.encode(p);
-    }
-
-    void client_impl::remove_socket(string const& nsp)
-    {
-        lock_guard<mutex> guard(m_socket_mutex);
-        auto it = m_sockets.find(nsp);
-        if(it!= m_sockets.end())
-        {
-            m_sockets.erase(it);
-        }
-    }
-
-    boost::asio::io_service& client_impl::get_io_service()
-    {
-        return m_client.get_io_service();
-    }
-
-    void client_impl::on_socket_closed(string const& nsp)
-    {
-        if(m_socket_close_listener)m_socket_close_listener(nsp);
-    }
-
-    void client_impl::on_socket_opened(string const& nsp)
-    {
-        if(m_socket_open_listener)m_socket_open_listener(nsp);
-    }
-
-    /*************************private:*************************/
-    void client_impl::run_loop()
-    {
-
-        m_client.run();
-        m_client.reset();
-        m_client.get_alog().write(websocketpp::log::alevel::devel,
-                                  "run loop end");
-    }
-
-    void client_impl::connect_impl(const string& uri, const string& queryString)
-    {
-        do{
-            websocketpp::uri uo(uri);
-            ostringstream ss;
-#if SIO_TLS
-            ss<<"wss://";
-#else
-            ss<<"ws://";
-#endif
-            const std::string host(uo.get_host());
-            // As per RFC2732, literal IPv6 address should be enclosed in "[" and "]".
-            if(host.find(':')!=std::string::npos){
-                ss<<"["<<uo.get_host()<<"]";
-            } else {
-                ss<<uo.get_host();
-            }
-            ss<<":"<<uo.get_port()<<"/socket.io/?EIO=4&transport=websocket";
-            if(m_sid.size()>0){
-                ss<<"&sid="<<m_sid;
-            }
-            ss<<"&t="<<time(NULL)<<queryString;
-            lib::error_code ec;
-            client_type::connection_ptr con = m_client.get_connection(ss.str(), ec);
-            if (ec) {
-                m_client.get_alog().write(websocketpp::log::alevel::app,
-                                          "Get Connection Error: "+ec.message());
-                break;
-            }
-
-            for( auto&& header: m_http_headers ) {
-                con->replace_header(header.first, header.second);
-            }
-
-            m_client.connect(con);
-            return;
-        }
-        while(0);
-        if(m_fail_listener)
-        {
-            m_fail_listener();
-        }
-    }
-
-    void client_impl::close_impl(close::status::value const& code,string const& reason)
-    {
-        LOG("Close by reason:"<<reason << endl);
-        if(m_reconn_timer)
-        {
-            m_reconn_timer->cancel();
-            m_reconn_timer.reset();
-        }
-        if (m_con.expired())
-        {
-            cerr << "Error: No active session" << endl;
-        }
-        else
-        {
-            lib::error_code ec;
-            m_client.close(m_con, code, reason, ec);
-        }
-    }
-
-    void client_impl::send_impl(shared_ptr<const string> const& payload_ptr,frame::opcode::value opcode)
-    {
-        if(m_con_state == con_opened)
-        {
-            lib::error_code ec;
-            m_client.send(m_con,*payload_ptr,opcode,ec);
-            if(ec)
-            {
-                cerr<<"Send failed,reason:"<< ec.message()<<endl;
-            }
-        }
-    }
-
-    void client_impl::ping(const boost::system::error_code& ec)
-    {
-        if(ec || m_con.expired())
-        {
-            if (ec != boost::asio::error::operation_aborted)
-                LOG("ping exit,con is expired?"<<m_con.expired()<<",ec:"<<ec.message()<<endl);
-            return;
-        }
-        packet p(packet::frame_ping);
-        m_packet_mgr.encode(p, [&](bool /*isBin*/,shared_ptr<const string> payload)
-        {
-            lib::error_code ec;
-            this->m_client.send(this->m_con, *payload, frame::opcode::text, ec);
-        });
-        if(m_ping_timer)
-        {
-            boost::system::error_code e_code;
-            m_ping_timer->expires_from_now(milliseconds(m_ping_interval), e_code);
-            m_ping_timer->async_wait(lib::bind(&client_impl::ping,this,lib::placeholders::_1));
-        }
-        if(!m_ping_timeout_timer)
-        {
-            m_ping_timeout_timer.reset(new boost::asio::deadline_timer(m_client.get_io_service()));
-            boost::system::error_code timeout_ec;
-            m_ping_timeout_timer->expires_from_now(milliseconds(m_ping_timeout), timeout_ec);
-            m_ping_timeout_timer->async_wait(lib::bind(&client_impl::timeout_pong, this,lib::placeholders::_1));
-        }
-    }
-
-    void client_impl::timeout_pong(const boost::system::error_code &ec)
-    {
-        if(ec)
-        {
-            return;
-        }
-        LOG("Pong timeout"<<endl);
-        m_client.get_io_service().dispatch(lib::bind(&client_impl::close_impl, this,close::status::policy_violation,"Pong timeout"));
-    }
-
-    void client_impl::timeout_reconnect(boost::system::error_code const& ec)
-    {
-        if(ec)
-        {
-            return;
-        }
-        if(m_con_state == con_closed)
-        {
-            m_con_state = con_opening;
-            m_reconn_made++;
-            this->reset_states();
-            LOG("Reconnecting..."<<endl);
-            if(m_reconnecting_listener) m_reconnecting_listener();
-            m_client.get_io_service().dispatch(lib::bind(&client_impl::connect_impl,this,m_base_url,m_query_string));
-        }
-    }
-
-    unsigned client_impl::next_delay() const
-    {
-        //no jitter, fixed power root.
-        unsigned reconn_made = min<unsigned>(m_reconn_made,32);//protect the pow result to be too big.
-        return static_cast<unsigned>(min<double>(m_reconn_delay * pow(1.5,reconn_made),m_reconn_delay_max));
-    }
-
-    socket::ptr client_impl::get_socket_locked(string const& nsp)
-    {
-        lock_guard<mutex> guard(m_socket_mutex);
-        auto it = m_sockets.find(nsp);
-        if(it != m_sockets.end())
-        {
-            return it->second;
-        }
-        else
-        {
-            return socket::ptr();
-        }
-    }
-
-    void client_impl::sockets_invoke_void(void (sio::socket::*fn)(void))
-    {
-        map<const string,socket::ptr> socks;
-        {
-            lock_guard<mutex> guard(m_socket_mutex);
-            socks.insert(m_sockets.begin(),m_sockets.end());
-        }
-        for (auto it = socks.begin(); it!=socks.end(); ++it) {
-            ((*(it->second)).*fn)();
-        }
-    }
-
-    void client_impl::on_fail(connection_hdl)
-    {
-        m_con.reset();
-        m_con_state = con_closed;
-        this->sockets_invoke_void(&sio::socket::on_disconnect);
-        LOG("Connection failed." << endl);
-        if(m_reconn_made<m_reconn_attempts)
-        {
-            LOG("Reconnect for attempt:"<<m_reconn_made<<endl);
-            unsigned delay = this->next_delay();
-            if(m_reconnect_listener) m_reconnect_listener(m_reconn_made,delay);
-            m_reconn_timer.reset(new boost::asio::deadline_timer(m_client.get_io_service()));
-            boost::system::error_code ec;
-            m_reconn_timer->expires_from_now(milliseconds(delay), ec);
-            m_reconn_timer->async_wait(lib::bind(&client_impl::timeout_reconnect,this,lib::placeholders::_1));
-        }
-        else
-        {
-            if(m_fail_listener)m_fail_listener();
-        }
-    }
-    
-    void client_impl::on_open(connection_hdl con)
-    {
-        LOG("Connected." << endl);
-        m_con_state = con_opened;
-        m_con = con;
-        m_reconn_made = 0;
-        this->sockets_invoke_void(&sio::socket::on_open);
-        this->socket("");
-        if(m_open_listener)m_open_listener();
-    }
-    
-    void client_impl::on_close(connection_hdl con)
-    {
-        LOG("Client Disconnected." << endl);
-        con_state m_con_state_was = m_con_state;
-        m_con_state = con_closed;
-        lib::error_code ec;
-        close::status::value code = close::status::normal;
-        client_type::connection_ptr conn_ptr  = m_client.get_con_from_hdl(con, ec);
-        if (ec) {
-            LOG("OnClose get conn failed"<<ec<<endl);
-        }
-        else
-        {
-            code = conn_ptr->get_local_close_code();
-        }
-        
-        m_con.reset();
-        this->clear_timers();
-        client::close_reason reason;
-
-        // If we initiated the close, no matter what the close status was,
-        // we'll consider it a normal close. (When using TLS, we can
-        // sometimes get a TLS Short Read error when closing.)
-        if(code == close::status::normal || m_con_state_was == con_closing)
-        {
-            this->sockets_invoke_void(&sio::socket::on_disconnect);
-            reason = client::close_reason_normal;
-        }
-        else
-        {
-            this->sockets_invoke_void(&sio::socket::on_disconnect);
-            if(m_reconn_made<m_reconn_attempts)
-            {
-                LOG("Reconnect for attempt:"<<m_reconn_made<<endl);
-                unsigned delay = this->next_delay();
-                if(m_reconnect_listener) m_reconnect_listener(m_reconn_made,delay);
-                m_reconn_timer.reset(new boost::asio::deadline_timer(m_client.get_io_service()));
-                boost::system::error_code ec;
-                m_reconn_timer->expires_from_now(milliseconds(delay), ec);
-                m_reconn_timer->async_wait(lib::bind(&client_impl::timeout_reconnect,this,lib::placeholders::_1));
-                return;
-            }
-            reason = client::close_reason_drop;
-        }
-        
-        if(m_close_listener)
-        {
-            m_close_listener(reason);
-        }
-    }
-    
-    void client_impl::on_message(connection_hdl, client_type::message_ptr msg)
-    {
-        if (m_ping_timeout_timer) {
-            boost::system::error_code ec;
-            m_ping_timeout_timer->expires_from_now(milliseconds(m_ping_timeout),ec);
-            m_ping_timeout_timer->async_wait(lib::bind(&client_impl::timeout_pong, this,lib::placeholders::_1));
-        }
-        // Parse the incoming message according to socket.IO rules
-        m_packet_mgr.put_payload(msg->get_payload());
-    }
-    
-    void client_impl::on_handshake(message::ptr const& message)
-    {
-        if(message && message->get_flag() == message::flag_object)
-        {
-            const object_message* obj_ptr =static_cast<object_message*>(message.get());
-            const map<string,message::ptr>* values = &(obj_ptr->get_map());
-            auto it = values->find("sid");
-            if (it!= values->end()) {
-                m_sid = static_pointer_cast<string_message>(it->second)->get_string();
-            }
-            else
-            {
-                goto failed;
-            }
-            it = values->find("pingInterval");
-            if (it!= values->end()&&it->second->get_flag() == message::flag_integer) {
-                m_ping_interval = (unsigned)static_pointer_cast<int_message>(it->second)->get_int();
-            }
-            else
-            {
-                m_ping_interval = 25000;
-            }
-            it = values->find("pingTimeout");
-
-            if (it!=values->end()&&it->second->get_flag() == message::flag_integer) {
-                m_ping_timeout = (unsigned) static_pointer_cast<int_message>(it->second)->get_int();
-            }
-            else
-            {
-                m_ping_timeout = 60000;
-            }
-
-            m_ping_timer.reset(new boost::asio::deadline_timer(m_client.get_io_service()));
-            boost::system::error_code ec;
-            m_ping_timer->expires_from_now(milliseconds(m_ping_interval), ec);
-            if(ec)LOG("ec:"<<ec.message()<<endl);
-            m_ping_timer->async_wait(lib::bind(&client_impl::ping,this,lib::placeholders::_1));
-            LOG("On handshake,sid:"<<m_sid<<",ping interval:"<<m_ping_interval<<",ping timeout"<<m_ping_timeout<<endl);
-            return;
-        }
-failed:
-        //just close it.
-        m_client.get_io_service().dispatch(lib::bind(&client_impl::close_impl, this,close::status::policy_violation,"Handshake error"));
-    }
-
-    void client_impl::on_pong()
-    {
-        if(m_ping_timeout_timer)
-        {
-            m_ping_timeout_timer->cancel();
-            m_ping_timeout_timer.reset();
-        }
-    }
-
-    void client_impl::on_decode(packet const& p)
-    {
-        switch(p.get_frame())
-        {
-        case packet::frame_message:
-        {
-            socket::ptr so_ptr = get_socket_locked(p.get_nsp());
-            if(so_ptr)so_ptr->on_message_packet(p);
-            break;
-        }
-        case packet::frame_open:
-            this->on_handshake(p.get_message());
-            break;
-        case packet::frame_close:
-            //FIXME how to deal?
-            this->close_impl(close::status::abnormal_close, "End by server");
-            break;
-        case packet::frame_pong:
-            this->on_pong();
-            break;
-
-        default:
-            break;
-        }
-    }
-    
-    void client_impl::on_encode(bool isBinary,shared_ptr<const string> const& payload)
-    {
-        LOG("encoded payload length:"<<payload->length()<<endl);
-        m_client.get_io_service().dispatch(lib::bind(&client_impl::send_impl,this,payload,isBinary?frame::opcode::binary:frame::opcode::text));
-    }
-    
-    void client_impl::clear_timers()
-    {
-        LOG("clear timers"<<endl);
-        boost::system::error_code ec;
-        if(m_ping_timeout_timer)
-        {
-            m_ping_timeout_timer->cancel(ec);
-            m_ping_timeout_timer.reset();
-        }
-        if(m_ping_timer)
-        {
-            m_ping_timer->cancel(ec);
-            m_ping_timer.reset();
-        }
-    }
-    
-    void client_impl::reset_states()
-    {
-        m_client.reset();
-        m_sid.clear();
-        m_packet_mgr.reset();
-    }
-    
-#if SIO_TLS
-    client_impl::context_ptr client_impl::on_tls_init(connection_hdl conn)
-    {
-        context_ptr ctx = context_ptr(new  boost::asio::ssl::context(boost::asio::ssl::context::tlsv1));
-        boost::system::error_code ec;
-        ctx->set_options(boost::asio::ssl::context::default_workarounds |
-                             boost::asio::ssl::context::no_sslv2 |
-                             boost::asio::ssl::context::single_dh_use,ec);
-        if(ec)
-        {
-            cerr<<"Init tls failed,reason:"<< ec.message()<<endl;
-        }
-        
-        return ctx;
-    }
-#endif
-
-    std::string client_impl::encode_query_string(const std::string &query){
-        ostringstream ss;
-        ss << std::hex;
-        // Percent-encode (RFC3986) non-alphanumeric characters.
-        for(const char c : query){
-            if((c >= 'a' && c <= 'z') || (c>= 'A' && c<= 'Z') || (c >= '0' && c<= '9')){
-                ss << c;
-            } else {
-                ss << '%' << std::uppercase << std::setw(2) << int((unsigned char) c) << std::nouppercase;
-            }
-        }
-        ss << std::dec;
-        return ss.str();
-    }
-}
diff --git a/src/sioclient/src/internal/sio_client_impl.h b/src/sioclient/src/internal/sio_client_impl.h
deleted file mode 100644
index 4d02745d..00000000
--- a/src/sioclient/src/internal/sio_client_impl.h
+++ /dev/null
@@ -1,232 +0,0 @@
-#ifndef SIO_CLIENT_IMPL_H
-#define SIO_CLIENT_IMPL_H
-
-#include <cstdint>
-#ifdef _WIN32
-#define _WEBSOCKETPP_CPP11_THREAD_
-#define BOOST_ALL_NO_LIB
-//#define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
-#define _WEBSOCKETPP_NO_CPP11_FUNCTIONAL_
-#define INTIALIZER(__TYPE__)
-#else
-#define _WEBSOCKETPP_CPP11_STL_ 1
-#define INTIALIZER(__TYPE__) (__TYPE__)
-#endif
-#include <websocketpp/client.hpp>
-#if _DEBUG || DEBUG
-#if SIO_TLS
-#include <websocketpp/config/debug_asio.hpp>
-typedef websocketpp::config::debug_asio_tls client_config;
-#else
-#include <websocketpp/config/debug_asio_no_tls.hpp>
-typedef websocketpp::config::debug_asio client_config;
-#endif //SIO_TLS
-#else
-#if SIO_TLS
-#include <websocketpp/config/asio_client.hpp>
-typedef websocketpp::config::asio_tls_client client_config;
-#else
-#include <websocketpp/config/asio_no_tls_client.hpp>
-typedef websocketpp::config::asio_client client_config;
-#endif //SIO_TLS
-#endif //DEBUG
-#include <boost/asio/deadline_timer.hpp>
-
-#include <memory>
-#include <map>
-#include <thread>
-#include <sio_client.h>
-#include "sio_packet.h"
-
-namespace sio
-{
-    using namespace websocketpp;
-    
-    typedef websocketpp::client<client_config> client_type;
-    
-    class client_impl {
-        
-    protected:
-        enum con_state
-        {
-            con_opening,
-            con_opened,
-            con_closing,
-            con_closed
-        };
-        
-        client_impl();
-        
-        ~client_impl();
-        
-        //set listeners and event bindings.
-#define SYNTHESIS_SETTER(__TYPE__,__FIELD__) \
-    void set_##__FIELD__(__TYPE__ const& l) \
-        { m_##__FIELD__ = l;}
-        
-        SYNTHESIS_SETTER(client::con_listener,open_listener)
-        
-        SYNTHESIS_SETTER(client::con_listener,fail_listener)
-
-        SYNTHESIS_SETTER(client::reconnect_listener,reconnect_listener)
-
-        SYNTHESIS_SETTER(client::con_listener,reconnecting_listener)
-        
-        SYNTHESIS_SETTER(client::close_listener,close_listener)
-        
-        SYNTHESIS_SETTER(client::socket_listener,socket_open_listener)
-        
-        SYNTHESIS_SETTER(client::socket_listener,socket_close_listener)
-        
-#undef SYNTHESIS_SETTER
-        
-        
-        void clear_con_listeners()
-        {
-            m_open_listener = nullptr;
-            m_close_listener = nullptr;
-            m_fail_listener = nullptr;
-            m_reconnect_listener = nullptr;
-            m_reconnecting_listener = nullptr;
-        }
-        
-        void clear_socket_listeners()
-        {
-            m_socket_open_listener = nullptr;
-            m_socket_close_listener = nullptr;
-        }
-        
-        // Client Functions - such as send, etc.
-        void connect(const std::string& uri, const std::map<std::string, std::string>& queryString,
-                     const std::map<std::string, std::string>& httpExtraHeaders);
-        
-        sio::socket::ptr const& socket(const std::string& nsp);
-        
-        // Closes the connection
-        void close();
-        
-        void sync_close();
-        
-        bool opened() const { return m_con_state == con_opened; }
-        
-        std::string const& get_sessionid() const { return m_sid; }
-
-        void set_reconnect_attempts(unsigned attempts) {m_reconn_attempts = attempts;}
-
-        void set_reconnect_delay(unsigned millis) {m_reconn_delay = millis;if(m_reconn_delay_max<millis) m_reconn_delay_max = millis;}
-
-        void set_reconnect_delay_max(unsigned millis) {m_reconn_delay_max = millis;if(m_reconn_delay>millis) m_reconn_delay = millis;}
-        
-    protected:
-        void send(packet& p);
-        
-        void remove_socket(std::string const& nsp);
-        
-        boost::asio::io_service& get_io_service();
-        
-        void on_socket_closed(std::string const& nsp);
-        
-        void on_socket_opened(std::string const& nsp);
-        
-    private:
-        void run_loop();
-
-        void connect_impl(const std::string& uri, const std::string& query);
-
-        void close_impl(close::status::value const& code,std::string const& reason);
-        
-        void send_impl(std::shared_ptr<const std::string> const&  payload_ptr,frame::opcode::value opcode);
-        
-        void ping(const boost::system::error_code& ec);
-        
-        void timeout_pong(const boost::system::error_code& ec);
-
-        void timeout_reconnect(boost::system::error_code const& ec);
-
-        unsigned next_delay() const;
-
-        socket::ptr get_socket_locked(std::string const& nsp);
-        
-        void sockets_invoke_void(void (sio::socket::*fn)(void));
-        
-        void on_decode(packet const& pack);
-        void on_encode(bool isBinary,shared_ptr<const string> const& payload);
-        
-        //websocket callbacks
-        void on_fail(connection_hdl con);
-
-        void on_open(connection_hdl con);
-
-        void on_close(connection_hdl con);
-
-        void on_message(connection_hdl con, client_type::message_ptr msg);
-
-        //socketio callbacks
-        void on_handshake(message::ptr const& message);
-
-        void on_pong();
-
-        void reset_states();
-
-        void clear_timers();
-        
-        #if SIO_TLS
-        typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
-        
-        context_ptr on_tls_init(connection_hdl con);
-        #endif
-        
-        // Percent encode query string
-        std::string encode_query_string(const std::string &query);
-
-        // Connection pointer for client functions.
-        connection_hdl m_con;
-        client_type m_client;
-        // Socket.IO server settings
-        std::string m_sid;
-        std::string m_base_url;
-        std::string m_query_string;
-        std::map<std::string, std::string> m_http_headers;
-
-        unsigned int m_ping_interval;
-        unsigned int m_ping_timeout;
-        
-        std::unique_ptr<std::thread> m_network_thread;
-        
-        packet_manager m_packet_mgr;
-        
-        std::unique_ptr<boost::asio::deadline_timer> m_ping_timer;
-        
-        std::unique_ptr<boost::asio::deadline_timer> m_ping_timeout_timer;
-
-        std::unique_ptr<boost::asio::deadline_timer> m_reconn_timer;
-        
-        con_state m_con_state;
-        
-        client::con_listener m_open_listener;
-        client::con_listener m_fail_listener;
-        client::con_listener m_reconnecting_listener;
-        client::reconnect_listener m_reconnect_listener;
-        client::close_listener m_close_listener;
-        
-        client::socket_listener m_socket_open_listener;
-        client::socket_listener m_socket_close_listener;
-        
-        std::map<const std::string,socket::ptr> m_sockets;
-        
-        std::mutex m_socket_mutex;
-
-        unsigned m_reconn_delay;
-
-        unsigned m_reconn_delay_max;
-
-        unsigned m_reconn_attempts;
-
-        unsigned m_reconn_made;
-        
-        friend class sio::client;
-        friend class sio::socket;
-    };
-}
-#endif // SIO_CLIENT_IMPL_H
-
diff --git a/src/sioclient/src/internal/sio_packet.cpp b/src/sioclient/src/internal/sio_packet.cpp
deleted file mode 100755
index a2d13b5e..00000000
--- a/src/sioclient/src/internal/sio_packet.cpp
+++ /dev/null
@@ -1,517 +0,0 @@
-//
-//  sio_packet.cpp
-//
-//  Created by Melo Yao on 3/22/15.
-//
-
-#include "sio_packet.h"
-#include <rapidjson/document.h>
-#include <rapidjson/encodedstream.h>
-#include <rapidjson/writer.h>
-#include <cassert>
-#include <boost/lexical_cast.hpp>
-
-#define kBIN_PLACE_HOLDER "_placeholder"
-
-namespace sio
-{
-    using namespace rapidjson;
-    using namespace std;
-    void accept_message(message const& msg,Value& val, Document& doc,vector<shared_ptr<const string> >& buffers);
-
-	void accept_bool_message(bool_message const& msg, Value& val)
-	{
-		val.SetBool(msg.get_bool());
-	}
-
-	void accept_null_message(Value& val)
-	{
-		val.SetNull();
-	}
-
-    void accept_int_message(int_message const& msg, Value& val)
-    {
-        val.SetInt64(msg.get_int());
-    }
-
-    void accept_double_message(double_message const& msg, Value& val)
-    {
-        val.SetDouble(msg.get_double());
-    }
-
-    void accept_string_message(string_message const& msg, Value& val)
-    {
-        val.SetString(msg.get_string().data(),(SizeType) msg.get_string().length());
-    }
-
-
-    void accept_binary_message(binary_message const& msg,Value& val,Document& doc,vector<shared_ptr<const string> >& buffers)
-    {
-        val.SetObject();
-        Value boolVal;
-        boolVal.SetBool(true);
-        val.AddMember(kBIN_PLACE_HOLDER, boolVal, doc.GetAllocator());
-        Value numVal;
-        numVal.SetInt((int)buffers.size());
-        val.AddMember("num", numVal, doc.GetAllocator());
-        //FIXME can not avoid binary copy here.
-        shared_ptr<string> write_buffer = make_shared<string>();
-        write_buffer->reserve(msg.get_binary()->size()+1);
-        char frame_char = packet::frame_message;
-        write_buffer->append(&frame_char,1);
-        write_buffer->append(*(msg.get_binary()));
-        buffers.push_back(write_buffer);
-    }
-
-    void accept_array_message(array_message const& msg,Value& val,Document& doc,vector<shared_ptr<const string> >& buffers)
-    {
-        val.SetArray();
-        for (vector<message::ptr>::const_iterator it = msg.get_vector().begin(); it!=msg.get_vector().end(); ++it) {
-            Value child;
-            accept_message(*(*it), child, doc,buffers);
-            val.PushBack(child, doc.GetAllocator());
-        }
-    }
-
-    void accept_object_message(object_message const& msg,Value& val,Document& doc,vector<shared_ptr<const string> >& buffers)
-    {
-        val.SetObject();
-        for (map<string,message::ptr>::const_iterator it = msg.get_map().begin(); it!= msg.get_map().end(); ++it) {
-            Value nameVal;
-            nameVal.SetString(it->first.data(), (SizeType)it->first.length(), doc.GetAllocator());
-            Value valueVal;
-            accept_message(*(it->second), valueVal, doc,buffers);
-            val.AddMember(nameVal, valueVal, doc.GetAllocator());
-        }
-    }
-
-    void accept_message(message const& msg,Value& val, Document& doc,vector<shared_ptr<const string> >& buffers)
-    {
-        const message* msg_ptr = &msg;
-        switch(msg.get_flag())
-        {
-        case message::flag_integer:
-        {
-            accept_int_message(*(static_cast<const int_message*>(msg_ptr)), val);
-            break;
-        }
-        case message::flag_double:
-        {
-            accept_double_message(*(static_cast<const double_message*>(msg_ptr)), val);
-            break;
-        }
-        case message::flag_string:
-        {
-            accept_string_message(*(static_cast<const string_message*>(msg_ptr)), val);
-            break;
-        }
-		case message::flag_boolean:
-		{
-			accept_bool_message(*(static_cast<const bool_message*>(msg_ptr)), val);
-			break;
-		}
-		case message::flag_null:
-		{
-			accept_null_message(val);
-			break;
-		}
-        case message::flag_binary:
-        {
-            accept_binary_message(*(static_cast<const binary_message*>(msg_ptr)), val,doc,buffers);
-            break;
-        }
-        case message::flag_array:
-        {
-            accept_array_message(*(static_cast<const array_message*>(msg_ptr)), val,doc,buffers);
-            break;
-        }
-        case message::flag_object:
-        {
-            accept_object_message(*(static_cast<const object_message*>(msg_ptr)), val,doc,buffers);
-            break;
-        }
-        default:
-            break;
-        }
-    }
-
-    message::ptr from_json(Value const& value, vector<shared_ptr<const string> > const& buffers)
-    {
-        if(value.IsInt64())
-        {
-            return int_message::create(value.GetInt64());
-        }
-        else if(value.IsDouble())
-        {
-            return double_message::create(value.GetDouble());
-        }
-        else if(value.IsString())
-        {
-            string str(value.GetString(),value.GetStringLength());
-            return string_message::create(str);
-        }
-        else if(value.IsArray())
-        {
-            message::ptr ptr = array_message::create();
-            for (SizeType i = 0; i< value.Size(); ++i) {
-                static_cast<array_message*>(ptr.get())->get_vector().push_back(from_json(value[i],buffers));
-            }
-            return ptr;
-        }
-        else if(value.IsObject())
-        {
-            //binary placeholder
-            auto mem_it = value.FindMember(kBIN_PLACE_HOLDER);
-            if (mem_it!=value.MemberEnd() && mem_it->value.GetBool()) {
-
-                int num = value["num"].GetInt();
-                if(num >= 0 && num < static_cast<int>(buffers.size()))
-                {
-                    return binary_message::create(buffers[num]);
-                }
-                return message::ptr();
-            }
-            //real object message.
-            message::ptr ptr = object_message::create();
-            for (auto it = value.MemberBegin();it!=value.MemberEnd();++it)
-            {
-                if(it->name.IsString())
-                {
-                    string key(it->name.GetString(),it->name.GetStringLength());
-                    static_cast<object_message*>(ptr.get())->get_map()[key] = from_json(it->value,buffers);
-                }
-            }
-            return ptr;
-        }
-		else if(value.IsBool())
-		{
-			return bool_message::create(value.GetBool());
-		}
-		else if(value.IsNull())
-		{
-			return null_message::create();
-		}
-        return message::ptr();
-    }
-
-    packet::packet(string const& nsp,message::ptr const& msg,int pack_id, bool isAck):
-        _frame(frame_message),
-        _type((isAck?type_ack : type_event) | type_undetermined),
-        _nsp(nsp),
-        _pack_id(pack_id),
-        _message(msg),
-        _pending_buffers(0)
-    {
-        assert((!isAck
-                || (isAck&&pack_id>=0)));
-    }
-
-    packet::packet(type type,string const& nsp, message::ptr const& msg):
-        _frame(frame_message),
-        _type(type),
-        _nsp(nsp),
-        _pack_id(-1),
-        _message(msg),
-        _pending_buffers(0)
-    {
-
-    }
-
-    packet::packet(packet::frame_type frame):
-        _frame(frame),
-        _type(type_undetermined),
-        _pack_id(-1),
-        _pending_buffers(0)
-    {
-
-    }
-
-    packet::packet():
-        _type(type_undetermined),
-        _pack_id(-1),
-        _pending_buffers(0)
-    {
-
-    }
-
-
-    bool packet::is_binary_message(string const& payload_ptr)
-    {
-        return payload_ptr.size()>0 && payload_ptr[0] == frame_message;
-    }
-
-    bool packet::is_text_message(string const& payload_ptr)
-    {
-        return payload_ptr.size()>0 && payload_ptr[0] == (frame_message + '0');
-    }
-
-    bool packet::is_message(string const& payload_ptr)
-    {
-        return is_binary_message(payload_ptr) || is_text_message(payload_ptr);
-    }
-
-    bool packet::parse_buffer(const string &buf_payload)
-    {
-        if (_pending_buffers > 0) {
-            assert(is_binary_message(buf_payload));//this is ensured by outside.
-            _buffers.push_back(std::make_shared<string>(buf_payload.data()+1,buf_payload.size()-1));
-            _pending_buffers--;
-            if (_pending_buffers == 0) {
-
-                Document doc;
-                doc.Parse<0>(_buffers.front()->data());
-                _buffers.erase(_buffers.begin());
-                _message = from_json(doc, _buffers);
-                _buffers.clear();
-                return false;
-            }
-            return true;
-        }
-        return false;
-    }
-
-    bool packet::parse(const string& payload_ptr)
-    {
-        assert(!is_binary_message(payload_ptr)); //this is ensured by outside
-        _frame = (packet::frame_type) (payload_ptr[0] - '0');
-        _message.reset();
-        _pack_id = -1;
-        _buffers.clear();
-        _pending_buffers = 0;
-        size_t pos = 1;
-        if (_frame == frame_message) {
-            _type = (packet::type)(payload_ptr[pos] - '0');
-            if(_type < type_min || _type > type_max)
-            {
-                return false;
-            }
-            pos++;
-            if (_type == type_binary_event || _type == type_binary_ack) {
-                size_t score_pos = payload_ptr.find('-');
-                _pending_buffers = boost::lexical_cast<unsigned>(payload_ptr.substr(pos,score_pos - pos));
-                pos = score_pos+1;
-            }
-        }
-
-        size_t nsp_json_pos = payload_ptr.find_first_of("{[\"/",pos,4);
-        if(nsp_json_pos==string::npos)//no namespace and no message,the end.
-        {
-            _nsp = "/";
-            return false;
-        }
-        size_t json_pos = nsp_json_pos;
-        if(payload_ptr[nsp_json_pos] == '/')//nsp_json_pos is start of nsp
-        {
-            size_t comma_pos = payload_ptr.find_first_of(",");//end of nsp
-            if(comma_pos == string::npos)//packet end with nsp
-            {
-                _nsp = payload_ptr.substr(nsp_json_pos);
-                return false;
-            }
-            else//we have a message, maybe the message have an id.
-            {
-                _nsp = payload_ptr.substr(nsp_json_pos,comma_pos - nsp_json_pos);
-                pos = comma_pos+1;//start of the message
-                json_pos = payload_ptr.find_first_of("\"[{", pos, 3);//start of the json part of message
-                if(json_pos == string::npos)
-                {
-                    //no message,the end
-                    //assume if there's no message, there's no message id.
-                    return false;
-                }
-            }
-        }
-        else
-        {
-            _nsp = "/";
-        }
-
-        if(pos<json_pos)//we've got pack id.
-        {
-            _pack_id = boost::lexical_cast<int>(payload_ptr.substr(pos,json_pos - pos));
-        }
-        if (_frame == frame_message && (_type == type_binary_event || _type == type_binary_ack)) {
-            //parse later when all buffers are arrived.
-            _buffers.push_back(make_shared<string>(payload_ptr.data() + json_pos, payload_ptr.length() - json_pos));
-            return true;
-        }
-        else
-        {
-            Document doc;
-            doc.Parse<0>(payload_ptr.data()+json_pos);
-            _message = from_json(doc, vector<shared_ptr<const string> >());
-            return false;
-        }
-
-    }
-
-    bool packet::accept(string& payload_ptr, vector<shared_ptr<const string> >&buffers)
-    {
-        char frame_char = _frame+'0';
-        payload_ptr.append(&frame_char,1);
-        if (_frame!=frame_message) {
-            return false;
-        }
-        bool hasMessage = false;
-        Document doc;
-        if (_message) {
-            accept_message(*_message, doc, doc, buffers);
-            hasMessage = true;
-        }
-        bool hasBinary = buffers.size()>0;
-        _type = _type&(~type_undetermined);
-        if(_type == type_event)
-        {
-            _type = hasBinary?type_binary_event:type_event;
-        }
-        else if(_type == type_ack)
-        {
-            _type = hasBinary? type_binary_ack : type_ack;
-        }
-        ostringstream ss;
-        ss.precision(8);
-        ss<<_type;
-        if (hasBinary) {
-            ss<<buffers.size()<<"-";
-        }
-        if(_nsp.size()>0 && _nsp!="/")
-        {
-            ss<<_nsp;
-            if (hasMessage || _pack_id>=0) {
-                ss<<",";
-            }
-        }
-
-        if(_pack_id>=0)
-        {
-            ss<<_pack_id;
-        }
-
-        payload_ptr.append(ss.str());
-        if (hasMessage)
-        {
-            StringBuffer buffer;
-            Writer<StringBuffer> writer(buffer);
-            doc.Accept(writer);
-            payload_ptr.append(buffer.GetString(),buffer.GetSize());
-        }
-        return hasBinary;
-    }
-
-    packet::frame_type packet::get_frame() const
-    {
-        return _frame;
-    }
-
-    packet::type packet::get_type() const
-    {
-        assert((_type & type_undetermined) == 0);
-        return (type)_type;
-    }
-
-    string const& packet::get_nsp() const
-    {
-        return _nsp;
-    }
-
-    message::ptr const& packet::get_message() const
-    {
-        return _message;
-    }
-
-    unsigned packet::get_pack_id() const
-    {
-        return _pack_id;
-    }
-
-
-    void packet_manager::set_decode_callback(function<void (packet const&)> const& decode_callback)
-    {
-        m_decode_callback = decode_callback;
-    }
-
-    void packet_manager::set_encode_callback(function<void (bool,shared_ptr<const string> const&)> const& encode_callback)
-    {
-        m_encode_callback = encode_callback;
-    }
-
-    void packet_manager::reset()
-    {
-        m_partial_packet.reset();
-    }
-
-    void packet_manager::encode(packet& pack,encode_callback_function const& override_encode_callback) const
-    {
-        shared_ptr<string> ptr = make_shared<string>();
-        vector<shared_ptr<const string> > buffers;
-        const encode_callback_function *cb_ptr = &m_encode_callback;
-        if(override_encode_callback)
-        {
-            cb_ptr = &override_encode_callback;
-        }
-        if(pack.accept(*ptr,buffers))
-        {
-            if((*cb_ptr))
-            {
-                (*cb_ptr)(false,ptr);
-            }
-            for(auto it = buffers.begin();it!=buffers.end();++it)
-            {
-                if((*cb_ptr))
-                {
-                    (*cb_ptr)(true,*it);
-                }
-            }
-        }
-        else
-        {
-            if((*cb_ptr))
-            {
-                (*cb_ptr)(false,ptr);
-            }
-        }
-    }
-
-    void packet_manager::put_payload(string const& payload)
-    {
-        unique_ptr<packet> p;
-        do
-        {
-            if(packet::is_text_message(payload))
-            {
-                p.reset(new packet());
-                if(p->parse(payload))
-                {
-                    m_partial_packet = std::move(p);
-                }
-                else
-                {
-                    break;
-                }
-            }
-            else if(packet::is_binary_message(payload))
-            {
-                if(m_partial_packet)
-                {
-                    if(!m_partial_packet->parse_buffer(payload))
-                    {
-                        p = std::move(m_partial_packet);
-                        break;
-                    }
-                }
-            }
-            else
-            {
-                p.reset(new packet());
-                p->parse(payload);
-                break;
-            }
-            return;
-        }while(0);
-
-        if(m_decode_callback)
-        {
-            m_decode_callback(*p);
-        }
-    }
-}
diff --git a/src/sioclient/src/internal/sio_packet.h b/src/sioclient/src/internal/sio_packet.h
deleted file mode 100755
index d6605b46..00000000
--- a/src/sioclient/src/internal/sio_packet.h
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-//  sio_packet.h
-//
-//  Created by Melo Yao on 3/19/15.
-//
-
-#ifndef SIO_PACKET_H
-#define SIO_PACKET_H
-#include <sstream>
-#include <sio_message.h>
-#include <functional>
-
-namespace sio
-{
-    using namespace std;
-    
-    class packet
-    {
-    public:
-        enum frame_type
-        {
-            frame_open = 0,
-            frame_close = 1,
-            frame_ping = 2,
-            frame_pong = 3,
-            frame_message = 4,
-            frame_upgrade = 5,
-            frame_noop = 6
-        };
-        
-        enum type
-        {
-            type_min = 0,
-            type_connect = 0,
-            type_disconnect = 1,
-            type_event = 2,
-            type_ack = 3,
-            type_error = 4,
-            type_binary_event = 5,
-            type_binary_ack = 6,
-            type_max = 6,
-            type_undetermined = 0x10 //undetermined mask bit
-        };
-    private:
-        frame_type _frame;
-        int _type;
-        string _nsp;
-        int _pack_id;
-        message::ptr _message;
-        unsigned _pending_buffers;
-        vector<shared_ptr<const string> > _buffers;
-    public:
-        packet(string const& nsp,message::ptr const& msg,int pack_id = -1,bool isAck = false);//message type constructor.
-        
-        packet(frame_type frame);
-        
-        packet(type type,string const& nsp= string(),message::ptr const& msg = message::ptr());//other message types constructor.
-        //empty constructor for parse.
-        packet();
-        
-        frame_type get_frame() const;
-        
-        type get_type() const;
-        
-        bool parse(string const& payload_ptr);//return true if need to parse buffer.
-        
-        bool parse_buffer(string const& buf_payload);
-        
-        bool accept(string& payload_ptr, vector<shared_ptr<const string> >&buffers); //return true if has binary buffers.
-        
-        string const& get_nsp() const;
-        
-        message::ptr const& get_message() const;
-        
-        unsigned get_pack_id() const;
-        
-        static bool is_message(string const& payload_ptr);
-        static bool is_text_message(string const& payload_ptr);
-        static bool is_binary_message(string const& payload_ptr);
-    };
-    
-    class packet_manager
-    {
-    public:
-        typedef function<void (bool,shared_ptr<const string> const&)> encode_callback_function;
-        typedef  function<void (packet const&)> decode_callback_function;
-        
-        void set_decode_callback(decode_callback_function const& decode_callback);
-
-        void set_encode_callback(encode_callback_function const& encode_callback);
-        
-        void encode(packet& pack,encode_callback_function const& override_encode_callback = encode_callback_function()) const;
-        
-        void put_payload(string const& payload);
-        
-        void reset();
-        
-    private:
-        decode_callback_function m_decode_callback;
-        
-        encode_callback_function m_encode_callback;
-        
-        std::unique_ptr<packet> m_partial_packet;
-    };
-}
-#endif
diff --git a/src/sioclient/src/sio_client.cpp b/src/sioclient/src/sio_client.cpp
deleted file mode 100644
index 48d0ce20..00000000
--- a/src/sioclient/src/sio_client.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-//  sio_client.h
-//
-//  Created by Melo Yao on 3/25/15.
-//
-
-#include "sio_client.h"
-#include "internal/sio_client_impl.h"
-
-using namespace websocketpp;
-using boost::posix_time::milliseconds;
-using std::stringstream;
-
-namespace sio
-{
-    client::client():
-        m_impl(new client_impl())
-    {
-    }
-    
-    client::~client()
-    {
-        delete m_impl;
-    }
-    
-    void client::set_open_listener(con_listener const& l)
-    {
-        m_impl->set_open_listener(l);
-    }
-    
-    void client::set_fail_listener(con_listener const& l)
-    {
-        m_impl->set_fail_listener(l);
-    }
-    
-    void client::set_close_listener(close_listener const& l)
-    {
-        m_impl->set_close_listener(l);
-    }
-    
-    void client::set_socket_open_listener(socket_listener const& l)
-    {
-        m_impl->set_socket_open_listener(l);
-    }
-    
-    void client::set_reconnect_listener(reconnect_listener const& l)
-    {
-        m_impl->set_reconnect_listener(l);
-    }
-
-    void client::set_reconnecting_listener(con_listener const& l)
-    {
-        m_impl->set_reconnecting_listener(l);
-    }
-
-    void client::set_socket_close_listener(socket_listener const& l)
-    {
-        m_impl->set_socket_close_listener(l);
-    }
-    
-    void client::clear_con_listeners()
-    {
-        m_impl->clear_con_listeners();
-    }
-    
-    void client::clear_socket_listeners()
-    {
-        m_impl->clear_socket_listeners();
-    }
-
-    void client::connect(const std::string& uri)
-    {
-        m_impl->connect(uri, {}, {});
-    }
-
-    void client::connect(const std::string& uri, const std::map<string,string>& query)
-    {
-        m_impl->connect(uri, query, {});
-    }
-
-    void client::connect(const std::string& uri, const std::map<std::string,std::string>& query,
-                         const std::map<std::string,std::string>& http_extra_headers)
-    {
-        m_impl->connect(uri, query, http_extra_headers);
-    }
-    
-    socket::ptr const& client::socket(const std::string& nsp)
-    {
-        return m_impl->socket(nsp);
-    }
-    
-    // Closes the connection
-    void client::close()
-    {
-        m_impl->close();
-    }
-    
-    void client::sync_close()
-    {
-        m_impl->sync_close();
-    }
-    
-    bool client::opened() const
-    {
-        return m_impl->opened();
-    }
-    
-    std::string const& client::get_sessionid() const
-    {
-        return m_impl->get_sessionid();
-    }
-
-    void client::set_reconnect_attempts(int attempts)
-    {
-        m_impl->set_reconnect_attempts(attempts);
-    }
-
-    void client::set_reconnect_delay(unsigned millis)
-    {
-        m_impl->set_reconnect_delay(millis);
-    }
-
-    void client::set_reconnect_delay_max(unsigned millis)
-    {
-        m_impl->set_reconnect_delay_max(millis);
-    }
-    
-}
diff --git a/src/sioclient/src/sio_socket.cpp b/src/sioclient/src/sio_socket.cpp
deleted file mode 100644
index 299e0ad0..00000000
--- a/src/sioclient/src/sio_socket.cpp
+++ /dev/null
@@ -1,611 +0,0 @@
-#include "sio_socket.h"
-#include "internal/sio_packet.h"
-#include "internal/sio_client_impl.h"
-#include <boost/asio/deadline_timer.hpp>
-#include <boost/system/error_code.hpp>
-#include <queue>
-#include <cstdarg>
-
-#if DEBUG || _DEBUG
-#define LOG(x) std::cout << x
-#else
-#define LOG(x)
-#endif
-
-#define NULL_GUARD(_x_)  \
-    if(_x_ == NULL) return
-
-namespace sio
-{
-    class event_adapter
-    {
-    public:
-        static void adapt_func(socket::event_listener_aux  const& func, event& event)
-        {
-            func(event.get_name(),event.get_message(),event.need_ack(),event.get_ack_message_impl());
-        }
-        
-        static inline socket::event_listener do_adapt(socket::event_listener_aux const& func)
-        {
-            return std::bind(&event_adapter::adapt_func, func,std::placeholders::_1);
-        }
-        
-        static inline event create_event(std::string const& nsp,std::string const& name,message::list&& message,bool need_ack)
-        {
-            return event(nsp,name,message,need_ack);
-        }
-    };
-    
-    const std::string& event::get_nsp() const
-    {
-        return m_nsp;
-    }
-    
-    const std::string& event::get_name() const
-    {
-        return m_name;
-    }
-    
-    const message::ptr& event::get_message() const
-    {
-        if(m_messages.size()>0)
-            return m_messages[0];
-        else
-        {
-            static message::ptr null_ptr;
-            return null_ptr;
-        }
-    }
-
-    const message::list& event::get_messages() const
-    {
-        return m_messages;
-    }
-    
-    bool event::need_ack() const
-    {
-        return m_need_ack;
-    }
-    
-    void event::put_ack_message(message::list const& ack_message)
-    {
-        if(m_need_ack)
-            m_ack_message = std::move(ack_message);
-    }
-    
-    inline
-    event::event(std::string const& nsp,std::string const& name,message::list&& messages,bool need_ack):
-        m_nsp(nsp),
-        m_name(name),
-        m_messages(std::move(messages)),
-        m_need_ack(need_ack)
-    {
-    }
-
-    inline
-    event::event(std::string const& nsp,std::string const& name,message::list const& messages,bool need_ack):
-        m_nsp(nsp),
-        m_name(name),
-        m_messages(messages),
-        m_need_ack(need_ack)
-    {
-    }
-    
-    message::list const& event::get_ack_message() const
-    {
-        return m_ack_message;
-    }
-    
-    inline
-    message::list& event::get_ack_message_impl()
-    {
-        return m_ack_message;
-    }
-    
-    class socket::impl
-    {
-    public:
-        
-        impl(client_impl *,std::string const&);
-        ~impl();
-        
-        void on(std::string const& event_name,event_listener_aux const& func);
-        
-        void on(std::string const& event_name,event_listener const& func);
-        
-        void off(std::string const& event_name);
-        
-        void off_all();
-        
-#define SYNTHESIS_SETTER(__TYPE__,__FIELD__) \
-    void set_##__FIELD__(__TYPE__ const& l) \
-        { m_##__FIELD__ = l;}
-        
-        SYNTHESIS_SETTER(error_listener, error_listener) //socket io errors
-        
-#undef SYNTHESIS_SETTER
-        
-        void on_error(error_listener const& l);
-        
-        void off_error();
-        
-        void close();
-        
-        void emit(std::string const& name, message::list const& msglist, std::function<void (message::list const&)> const& ack);
-        
-        std::string const& get_namespace() const {return m_nsp;}
-        
-    protected:
-        void on_connected();
-        
-        void on_close();
-        
-        void on_open();
-        
-        void on_message_packet(packet const& packet);
-        
-        void on_disconnect();
-        
-    private:
-        
-        // Message Parsing callbacks.
-        void on_socketio_event(const std::string& nsp, int msgId,const std::string& name, message::list&& message);
-        void on_socketio_ack(int msgId, message::list const& message);
-        void on_socketio_error(message::ptr const& err_message);
-        
-        event_listener get_bind_listener_locked(string const& event);
-        
-        void ack(int msgId,string const& name,message::list const& ack_message);
-        
-        void timeout_connection(const boost::system::error_code &ec);
-        
-        void send_connect();
-        
-        void send_packet(packet& p);
-        
-        static event_listener s_null_event_listener;
-        
-        static unsigned int s_global_event_id;
-        
-        sio::client_impl *m_client;
-        
-        bool m_connected;
-        std::string m_nsp;
-        
-        std::map<unsigned int, std::function<void (message::list const&)> > m_acks;
-        
-        std::map<std::string, event_listener> m_event_binding;
-        
-        error_listener m_error_listener;
-        
-        std::unique_ptr<boost::asio::deadline_timer> m_connection_timer;
-        
-        std::queue<packet> m_packet_queue;
-        
-        std::mutex m_event_mutex;
-
-		std::mutex m_packet_mutex;
-        
-        friend class socket;
-    };
-    
-    void socket::impl::on(std::string const& event_name,event_listener_aux const& func)
-    {
-        this->on(event_name,event_adapter::do_adapt(func));
-    }
-    
-    void socket::impl::on(std::string const& event_name,event_listener const& func)
-    {
-        std::lock_guard<std::mutex> guard(m_event_mutex);
-        m_event_binding[event_name] = func;
-    }
-    
-    void socket::impl::off(std::string const& event_name)
-    {
-        std::lock_guard<std::mutex> guard(m_event_mutex);
-        auto it = m_event_binding.find(event_name);
-        if(it!=m_event_binding.end())
-        {
-            m_event_binding.erase(it);
-        }
-    }
-    
-    void socket::impl::off_all()
-    {
-        std::lock_guard<std::mutex> guard(m_event_mutex);
-        m_event_binding.clear();
-    }
-    
-    void socket::impl::on_error(error_listener const& l)
-    {
-        m_error_listener = l;
-    }
-    
-    void socket::impl::off_error()
-    {
-        m_error_listener = nullptr;
-    }
-    
-    socket::impl::impl(client_impl *client,std::string const& nsp):
-        m_client(client),
-        m_connected(false),
-        m_nsp(nsp)
-    {
-        NULL_GUARD(client);
-        if(m_client->opened())
-        {
-            send_connect();
-        }
-    }
-    
-    socket::impl::~impl()
-    {
-        
-    }
-    
-    unsigned int socket::impl::s_global_event_id = 1;
-    
-    void socket::impl::emit(std::string const& name, message::list const& msglist, std::function<void (message::list const&)> const& ack)
-    {
-        NULL_GUARD(m_client);
-        message::ptr msg_ptr = msglist.to_array_message(name);
-        int pack_id;
-        if(ack)
-        {
-            pack_id = s_global_event_id++;
-            std::lock_guard<std::mutex> guard(m_event_mutex);
-            m_acks[pack_id] = ack;
-        }
-        else
-        {
-            pack_id = -1;
-        }
-        packet p(m_nsp, msg_ptr,pack_id);
-        send_packet(p);
-    }
-    
-    void socket::impl::send_connect()
-    {
-        NULL_GUARD(m_client);
-        if(m_nsp == "/")
-        {
-            return;
-        }
-        packet p(packet::type_connect,m_nsp);
-        m_client->send(p);
-        m_connection_timer.reset(new boost::asio::deadline_timer(m_client->get_io_service()));
-        boost::system::error_code ec;
-        m_connection_timer->expires_from_now(boost::posix_time::milliseconds(20000), ec);
-        m_connection_timer->async_wait(std::bind(&socket::impl::timeout_connection,this, std::placeholders::_1));
-    }
-    
-    void socket::impl::close()
-    {
-        NULL_GUARD(m_client);
-        if(m_connected)
-        {
-            packet p(packet::type_disconnect,m_nsp);
-            send_packet(p);
-            
-            if(!m_connection_timer)
-            {
-                m_connection_timer.reset(new boost::asio::deadline_timer(m_client->get_io_service()));
-            }
-            boost::system::error_code ec;
-            m_connection_timer->expires_from_now(boost::posix_time::milliseconds(3000), ec);
-            m_connection_timer->async_wait(lib::bind(&socket::impl::on_close, this));
-        }
-    }
-    
-    void socket::impl::on_connected()
-    {
-        if(m_connection_timer)
-        {
-            m_connection_timer->cancel();
-            m_connection_timer.reset();
-        }
-        if(!m_connected)
-        {
-            m_connected = true;
-            m_client->on_socket_opened(m_nsp);
-
-            while (true) {
-				m_packet_mutex.lock();
-				if(m_packet_queue.empty())
-				{
-					m_packet_mutex.unlock();
-					return;
-				}
-				sio::packet front_pack = std::move(m_packet_queue.front());
-                m_packet_queue.pop();
-				m_packet_mutex.unlock();
-				m_client->send(front_pack);
-            }
-        }
-    }
-    
-    void socket::impl::on_close()
-    {
-        NULL_GUARD(m_client);
-        sio::client_impl *client = m_client;
-        m_client = NULL;
-
-        if(m_connection_timer)
-        {
-            m_connection_timer->cancel();
-            m_connection_timer.reset();
-        }
-        m_connected = false;
-		{
-			std::lock_guard<std::mutex> guard(m_packet_mutex);
-			while (!m_packet_queue.empty()) {
-				m_packet_queue.pop();
-			}
-		}
-        client->on_socket_closed(m_nsp);
-        client->remove_socket(m_nsp);
-    }
-    
-    void socket::impl::on_open()
-    {
-        send_connect();
-    }
-    
-    void socket::impl::on_disconnect()
-    {
-        NULL_GUARD(m_client);
-        if(m_connected)
-        {
-            m_connected = false;
-			std::lock_guard<std::mutex> guard(m_packet_mutex);
-            while (!m_packet_queue.empty()) {
-                m_packet_queue.pop();
-            }
-        }
-    }
-    
-    void socket::impl::on_message_packet(packet const& p)
-    {
-        NULL_GUARD(m_client);
-        if(p.get_nsp() == m_nsp)
-        {
-            switch (p.get_type())
-            {
-            // Connect open
-            case packet::type_connect:
-            {
-                LOG("Received Message type (Connect)"<<std::endl);
-
-                this->on_connected();
-                break;
-            }
-            case packet::type_disconnect:
-            {
-                LOG("Received Message type (Disconnect)"<<std::endl);
-                this->on_close();
-                break;
-            }
-            case packet::type_event:
-            case packet::type_binary_event:
-            {
-                LOG("Received Message type (Event)"<<std::endl);
-                const message::ptr ptr = p.get_message();
-                if(ptr->get_flag() == message::flag_array)
-                {
-                    const array_message* array_ptr = static_cast<const array_message*>(ptr.get());
-                    if(array_ptr->get_vector().size() >= 1&&array_ptr->get_vector()[0]->get_flag() == message::flag_string)
-                    {
-                        const string_message* name_ptr = static_cast<const string_message*>(array_ptr->get_vector()[0].get());
-                        message::list mlist;
-                        for(size_t i = 1;i<array_ptr->get_vector().size();++i)
-                        {
-                            mlist.push(array_ptr->get_vector()[i]);
-                        }
-                        this->on_socketio_event(p.get_nsp(), p.get_pack_id(),name_ptr->get_string(), std::move(mlist));
-                    }
-                }
-
-                break;
-            }
-                // Ack
-            case packet::type_ack:
-            case packet::type_binary_ack:
-            {
-                LOG("Received Message type (ACK)"<<std::endl);
-                const message::ptr ptr = p.get_message();
-                if(ptr->get_flag() == message::flag_array)
-                {
-					message::list msglist(ptr->get_vector());
-					this->on_socketio_ack(p.get_pack_id(),msglist);
-                }
-				else
-				{
-					this->on_socketio_ack(p.get_pack_id(),message::list(ptr));
-				}
-                break;
-            }
-                // Error
-            case packet::type_error:
-            {
-                LOG("Received Message type (ERROR)"<<std::endl);
-                this->on_socketio_error(p.get_message());
-                break;
-            }
-            default:
-                break;
-            }
-        }
-    }
-    
-    void socket::impl::on_socketio_event(const std::string& nsp,int msgId,const std::string& name, message::list && message)
-    {
-        bool needAck = msgId >= 0;
-        event ev = event_adapter::create_event(nsp,name, std::move(message),needAck);
-        event_listener func = this->get_bind_listener_locked(name);
-        if(func)func(ev);
-        if(needAck)
-        {
-            this->ack(msgId, name, ev.get_ack_message());
-        }
-    }
-    
-    void socket::impl::ack(int msgId, const string &, const message::list &ack_message)
-    {
-        packet p(m_nsp, ack_message.to_array_message(),msgId,true);
-        send_packet(p);
-    }
-    
-    void socket::impl::on_socketio_ack(int msgId, message::list const& message)
-    {
-        std::function<void (message::list const&)> l;
-        {
-            std::lock_guard<std::mutex> guard(m_event_mutex);
-            auto it = m_acks.find(msgId);
-            if(it!=m_acks.end())
-            {
-                l = it->second;
-                m_acks.erase(it);
-            }
-        }
-        if(l)l(message);
-    }
-    
-    void socket::impl::on_socketio_error(message::ptr const& err_message)
-    {
-        if(m_error_listener)m_error_listener(err_message);
-    }
-    
-    void socket::impl::timeout_connection(const boost::system::error_code &ec)
-    {
-        NULL_GUARD(m_client);
-        if(ec)
-        {
-            return;
-        }
-        m_connection_timer.reset();
-        LOG("Connection timeout,close socket."<<std::endl);
-        //Should close socket if no connected message arrive.Otherwise we'll never ask for open again.
-        this->on_close();
-    }
-    
-    void socket::impl::send_packet(sio::packet &p)
-    {
-        NULL_GUARD(m_client);
-        if(m_connected)
-        {
-            while (true) {
-				m_packet_mutex.lock();
-				if(m_packet_queue.empty())
-				{
-					m_packet_mutex.unlock();
-					break;
-				}
-				sio::packet front_pack = std::move(m_packet_queue.front());
-                m_packet_queue.pop();
-				m_packet_mutex.unlock();
-				m_client->send(front_pack);
-            }
-            m_client->send(p);
-        }
-        else
-        {
-			std::lock_guard<std::mutex> guard(m_packet_mutex);
-            m_packet_queue.push(p);
-        }
-    }
-    
-    socket::event_listener socket::impl::get_bind_listener_locked(const string &event)
-    {
-        std::lock_guard<std::mutex> guard(m_event_mutex);
-        auto it = m_event_binding.find(event);
-        if(it!=m_event_binding.end())
-        {
-            return it->second;
-        }
-        return socket::event_listener();
-    }
-    
-    socket::socket(client_impl* client,std::string const& nsp):
-        m_impl(new impl(client,nsp))
-    {
-    }
-    
-    socket::~socket()
-    {
-        delete m_impl;
-    }
-    
-    void socket::on(std::string const& event_name,event_listener const& func)
-    {
-        m_impl->on(event_name, func);
-    }
-    
-    void socket::on(std::string const& event_name,event_listener_aux const& func)
-    {
-        m_impl->on(event_name, func);
-    }
-    
-    void socket::off(std::string const& event_name)
-    {
-        m_impl->off(event_name);
-    }
-    
-    void socket::off_all()
-    {
-        m_impl->off_all();
-    }
-    
-    void socket::close()
-    {
-        m_impl->close();
-    }
-    
-    void socket::on_error(error_listener const& l)
-    {
-        m_impl->on_error(l);
-    }
-    
-    void socket::off_error()
-    {
-        m_impl->off_error();
-    }
-
-    void socket::emit(std::string const& name, message::list const& msglist, std::function<void (message::list const&)> const& ack)
-    {
-        m_impl->emit(name, msglist,ack);
-    }
-    
-    std::string const& socket::get_namespace() const
-    {
-        return m_impl->get_namespace();
-    }
-    
-    void socket::on_connected()
-    {
-        m_impl->on_connected();
-    }
-    
-    void socket::on_close()
-    {
-        m_impl->on_close();
-    }
-    
-    void socket::on_open()
-    {
-        m_impl->on_open();
-    }
-    
-    void socket::on_message_packet(packet const& p)
-    {
-        m_impl->on_message_packet(p);
-    }
-    
-    void socket::on_disconnect()
-    {
-        m_impl->on_disconnect();
-    }
-}
-
-
-
-
diff --git a/src/sioclient/test/CMakeLists.txt b/src/sioclient/test/CMakeLists.txt
deleted file mode 100644
index c9c78d81..00000000
--- a/src/sioclient/test/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
-include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)
-find_package(Boost ${BOOST_VER} REQUIRED COMPONENTS unit_test_framework) 
-add_executable(sio_test sio_test.cpp)
-set_property(TARGET sio_test PROPERTY CXX_STANDARD 11)
-set_property(TARGET sio_test PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(sioclient PRIVATE ${Boost_LIBRARIES})
-target_link_libraries(sio_test sioclient)
-target_include_directories(sio_test PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../src"  ${Boost_INCLUDE_DIRS} )
diff --git a/src/sioclient/test/README.md b/src/sioclient/test/README.md
deleted file mode 100644
index ee7b663f..00000000
--- a/src/sioclient/test/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-You need have your boost unpacked on your disk, at least staged following modules:
-
-* system
-* date_time
-* random
-* unit_test_framework
-
-Then use following instruction to gen makefile or VS project.
-```bash
-cmake -DBOOST_LIBRARYDIR=`<your boost static libs path>` -DBOOST_INCLUDEDIR=`<your boost include path>` -DBOOST_VER:STRING=`<your boost version>` -DCMAKE_BUILD_TYPE=Debug ./
-```
-Then run `make` or open by VS.
-
-For example I've installed boost 1.57.0 at `D:\boost_1_57_0` and staged the static lib at `D\boost_1_57_0\build\lib` then the command should be:
-```bash
-cmake -DBOOST_LIBRARYDIR=D:\boost_1_57_0\build\lib -DBOOST_INCLUDEDIR=D:\boost_1_57_0 -DBOOST_VER:STRING=1.57.0 -DCMAKE_BUILD_TYPE=Debug ./
-```
-In this case(Windows) CMake will create a VS project under `./test` folder. Open in VS and run it.
\ No newline at end of file
diff --git a/src/sioclient/test/echo_server/.gitignore b/src/sioclient/test/echo_server/.gitignore
deleted file mode 100644
index 3c3629e6..00000000
--- a/src/sioclient/test/echo_server/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/src/sioclient/test/echo_server/index.js b/src/sioclient/test/echo_server/index.js
deleted file mode 100644
index 2c59ab1c..00000000
--- a/src/sioclient/test/echo_server/index.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var port = 3000;
-
-var io = require('socket.io').listen(port);
-console.log("Listening on port " + port);
-
-/* Socket.IO events */
-io.on("connection", function(socket){
-    console.log("new connection");
-    socket.on('test_text',function()
-    {
-        console.log("test text event received.");
-    });
-
-    socket.on('test_binary',function()
-    {
-       var args =Array.prototype.slice.call(arguments);
-      if(args[0] instanceof Buffer)
-      {
-        console.log("test binary event received,binary length:"+ args[0].length);
-      }
-    });
-
-    socket.on('test ack',function()
-    {
-       var args =Array.prototype.slice.call(arguments);
-      if('object' == typeof args[0])
-      {
-        console.log("test combo received,object:");
-        console.log(JSON.stringify(args[0]));
-      }
-      if(args.length>1 && 'function' == typeof args[args.length - 1])
-      {
-        console.log('need ack for test combo');
-        var fn = args[args.length - 1];
-        fn('Got bin length:' + args[0].bin.length);//invoke ack callback function.
-      }
-    });
-
-  });
\ No newline at end of file
diff --git a/src/sioclient/test/echo_server/package.json b/src/sioclient/test/echo_server/package.json
deleted file mode 100644
index e4a4727e..00000000
--- a/src/sioclient/test/echo_server/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "name": "echo_server",
-    "author":"Melo Yao",
-    "version":"0.0.0",
-    "dependencies": {
-        "socket.io": "1.*"
-  }
-}
diff --git a/src/sioclient/test/json.hpp b/src/sioclient/test/json.hpp
deleted file mode 100644
index 89fd9a41..00000000
--- a/src/sioclient/test/json.hpp
+++ /dev/null
@@ -1,4955 +0,0 @@
-/*!
-@file
-@copyright The code is licensed under the MIT License
-           <http://opensource.org/licenses/MIT>,
-           Copyright (c) 2013-2015 Niels Lohmann.
-@author Niels Lohmann <http://nlohmann.me>
-@see https://github.com/nlohmann/json
-*/
-
-#ifndef _NLOHMANN_JSON
-#define _NLOHMANN_JSON
-
-#include <algorithm>
-#include <cmath>
-#include <cstdio>
-#include <functional>
-#include <initializer_list>
-#include <iomanip>
-#include <iostream>
-#include <iterator>
-#include <limits>
-#include <map>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-*/
-namespace nlohmann
-{
-
-
-// Helper to determine whether there's a key_type for T.
-// http://stackoverflow.com/a/7728728/266378
-template<typename T>
-struct has_mapped_type
-{
-  private:
-    template<typename C> static char test(typename C::mapped_type*);
-    template<typename C> static int  test(...);
-  public:
-    enum { value = sizeof(test<T>(0)) == sizeof(char) };
-};
-
-/*!
-@brief JSON
-
-@tparam ObjectType         type for JSON objects
-                           (@c std::map by default)
-@tparam ArrayType          type for JSON arrays
-                           (@c std::vector by default)
-@tparam StringType         type for JSON strings and object keys
-                           (@c std::string by default)
-@tparam BooleanType        type for JSON booleans
-                           (@c bool by default)
-@tparam NumberIntegerType  type for JSON integer numbers
-                           (@c int64_t by default)
-@tparam NumberFloatType    type for JSON floating-point numbers
-                           (@c double by default)
-@tparam AllocatorType      type of the allocator to use
-                           (@c std::allocator by default)
-
-@note ObjectType trick from http://stackoverflow.com/a/9860911
-
-@see RFC 7159 <http://rfc7159.net/rfc7159>
-@see ECMA 404 <http://www.ecma-international.org/publications/standards/Ecma-404.htm>
-*/
-template <
-    template<typename U, typename V, typename... Args> class ObjectType = std::map,
-    template<typename U, typename... Args> class ArrayType = std::vector,
-    class StringType = std::string,
-    class BooleanType = bool,
-    class NumberIntegerType = int64_t,
-    class NumberFloatType = double,
-    template<typename U> class AllocatorType = std::allocator
-    >
-class basic_json
-{
-  public:
-    /////////////////////
-    // container types //
-    /////////////////////
-
-    // forward declarations
-    class iterator;
-    class const_iterator;
-    class reverse_iterator;
-    class const_reverse_iterator;
-
-    /*!
-    @brief the type of elements in a basic_json container
-    @ingroup container
-    */
-    using value_type = basic_json;
-
-    /*!
-    @brief the type of an element reference
-    @ingroup container
-    */
-    using reference = value_type&;
-
-    /*!
-    @brief the type of an element const reference
-    @ingroup container
-    */
-    using const_reference = const value_type&;
-
-    /*!
-    @brief a type to represent differences between iterators
-    @ingroup container
-    */
-    using difference_type = std::ptrdiff_t;
-
-    /*!
-    @brief a type to represent container sizes
-    @ingroup container
-    */
-    using size_type = std::size_t;
-
-    /// the allocator type
-    using allocator_type = AllocatorType<basic_json>;
-
-    /// the type of an element pointer
-    using pointer = typename std::allocator_traits<allocator_type>::pointer;
-    /// the type of an element const pointer
-    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
-
-    /*!
-    @brief an iterator for a basic_json container
-    @ingroup container
-    */
-    using iterator = basic_json::iterator;
-
-    /*!
-    @brief a const iterator for a basic_json container
-    @ingroup container
-    */
-    using const_iterator = basic_json::const_iterator;
-
-    /*!
-    @brief a reverse iterator for a basic_json container
-    @ingroup reversiblecontainer
-    */
-    using reverse_iterator = basic_json::reverse_iterator;
-
-    /*!
-    @brief a const reverse iterator for a basic_json container
-    @ingroup reversiblecontainer
-    */
-    using const_reverse_iterator = basic_json::const_reverse_iterator;
-
-
-    /// returns the allocator associated with the container
-    inline static allocator_type get_allocator()
-    {
-        return allocator_type();
-    }
-
-
-    ///////////////////////////
-    // JSON value data types //
-    ///////////////////////////
-
-    /// a type for an object
-    using object_t = ObjectType<StringType, basic_json>;
-    /// a type for an array
-    using array_t = ArrayType<basic_json>;
-    /// a type for a string
-    using string_t = StringType;
-    /// a type for a boolean
-    using boolean_t = BooleanType;
-    /// a type for a number (integer)
-    using number_integer_t = NumberIntegerType;
-    /// a type for a number (floating-point)
-    using number_float_t = NumberFloatType;
-    /// a type for list initialization
-    using list_init_t = std::initializer_list<basic_json>;
-
-
-    ////////////////////////
-    // JSON value storage //
-    ////////////////////////
-
-    /// a JSON value
-    union json_value
-    {
-        /// object (stored with pointer to save storage)
-        object_t* object;
-        /// array (stored with pointer to save storage)
-        array_t* array;
-        /// string (stored with pointer to save storage)
-        string_t* string;
-        /// bolean
-        boolean_t boolean;
-        /// number (integer)
-        number_integer_t number_integer;
-        /// number (floating-point)
-        number_float_t number_float;
-
-        /// default constructor (for null values)
-        json_value() = default;
-        /// constructor for booleans
-        json_value(boolean_t v) : boolean(v) {}
-        /// constructor for numbers (integer)
-        json_value(number_integer_t v) : number_integer(v) {}
-        /// constructor for numbers (floating-point)
-        json_value(number_float_t v) : number_float(v) {}
-    };
-
-
-    /////////////////////////////////
-    // JSON value type enumeration //
-    /////////////////////////////////
-
-    /// JSON value type enumeration
-    enum class value_t : uint8_t
-    {
-        null,           ///< null value
-        object,         ///< object (unordered set of name/value pairs)
-        array,          ///< array (ordered collection of values)
-        string,         ///< string value
-        boolean,        ///< boolean value
-        number_integer, ///< number value (integer)
-        number_float    ///< number value (floating-point)
-    };
-
-    /*!
-    @brief comparison operator for JSON value types
-
-    Returns an ordering that is similar to Python:
-    - order: null < boolean < number < object < array < string
-    - furthermore, each type is not smaller than itself
-    */
-    friend bool operator<(const value_t lhs, const value_t rhs)
-    {
-        // no type is smaller than itself
-        if (lhs == rhs)
-        {
-            return false;
-        }
-
-        switch (lhs)
-        {
-            case (value_t::null):
-            {
-                // nulls are smaller than all other types
-                return true;
-            }
-
-            case (value_t::boolean):
-            {
-                // only nulls are smaller than booleans
-                return (rhs != value_t::null);
-            }
-
-            case (value_t::number_float):
-            case (value_t::number_integer):
-            {
-                switch (rhs)
-                {
-                    // numbers are smaller than objects, arrays, and string
-                    case (value_t::object):
-                    case (value_t::array):
-                    case (value_t::string):
-                    {
-                        return true;
-                    }
-
-                    default:
-                    {
-                        return false;
-                    }
-                }
-            }
-
-            case (value_t::object):
-            {
-                switch (rhs)
-                {
-                    // objects are smaller than arrays and string
-                    case (value_t::array):
-                    case (value_t::string):
-                    {
-                        return true;
-                    }
-
-                    default:
-                    {
-                        return false;
-                    }
-                }
-            }
-
-            case (value_t::array):
-            {
-                // arrays are smaller than strings
-                return (rhs == value_t::string);
-            }
-
-            default:
-            {
-                // a string is not smaller than any other types
-                return false;
-            }
-        }
-    }
-
-
-    //////////////////
-    // constructors //
-    //////////////////
-
-    /*!
-    @brief create an empty value with a given type
-    @param value  the type to create an value of
-
-    @exception std::bad_alloc  if allocation for object, array, or string fails.
-    */
-    inline basic_json(const value_t value)
-        : m_type(value)
-    {
-        switch (m_type)
-        {
-            case (value_t::null):
-            {
-                break;
-            }
-
-            case (value_t::object):
-            {
-                AllocatorType<object_t> alloc;
-                m_value.object = alloc.allocate(1);
-                alloc.construct(m_value.object);
-                break;
-            }
-
-            case (value_t::array):
-            {
-                AllocatorType<array_t> alloc;
-                m_value.array = alloc.allocate(1);
-                alloc.construct(m_value.array);
-                break;
-            }
-
-            case (value_t::string):
-            {
-                AllocatorType<string_t> alloc;
-                m_value.string = alloc.allocate(1);
-                alloc.construct(m_value.string, "");
-                break;
-            }
-
-            case (value_t::boolean):
-            {
-                m_value.boolean = boolean_t(false);
-                break;
-            }
-
-            case (value_t::number_integer):
-            {
-                m_value.number_integer = number_integer_t(0);
-                break;
-            }
-
-            case (value_t::number_float):
-            {
-                m_value.number_float = number_float_t(0.0);
-                break;
-            }
-        }
-    }
-
-    /*!
-    @brief create a null object (implicitly)
-    @ingroup container
-    */
-    inline basic_json() noexcept = default;
-
-    /// create a null object (explicitly)
-    inline basic_json(std::nullptr_t) noexcept
-        : m_type(value_t::null)
-    {}
-
-    /// create an object (explicit)
-    inline basic_json(const object_t& value)
-        : m_type(value_t::object)
-    {
-        AllocatorType<object_t> alloc;
-        m_value.object = alloc.allocate(1);
-        alloc.construct(m_value.object, value);
-    }
-
-    /// create an object (implicit)
-    template <class V, typename
-              std::enable_if<
-                  std::is_constructible<typename object_t::key_type, typename V::key_type>::value and
-                  std::is_constructible<basic_json, typename V::mapped_type>::value, int>::type
-              = 0>
-    inline basic_json(const V& value)
-        : m_type(value_t::object)
-    {
-        AllocatorType<object_t> alloc;
-        m_value.object = alloc.allocate(1);
-        using std::begin;
-        using std::end;
-        alloc.construct(m_value.object, begin(value), end(value));
-    }
-
-    /// create an array (explicit)
-    inline basic_json(const array_t& value)
-        : m_type(value_t::array)
-    {
-        AllocatorType<array_t> alloc;
-        m_value.array = alloc.allocate(1);
-        alloc.construct(m_value.array, value);
-    }
-
-    /// create an array (implicit)
-    template <class V, typename
-              std::enable_if<
-                  not std::is_same<V, basic_json::iterator>::value and
-                  not std::is_same<V, basic_json::const_iterator>::value and
-                  not std::is_same<V, basic_json::reverse_iterator>::value and
-                  not std::is_same<V, basic_json::const_reverse_iterator>::value and
-                  not std::is_same<V, typename array_t::iterator>::value and
-                  not std::is_same<V, typename array_t::const_iterator>::value and
-                  std::is_constructible<basic_json, typename V::value_type>::value, int>::type
-              = 0>
-    inline basic_json(const V& value)
-        : m_type(value_t::array)
-    {
-        AllocatorType<array_t> alloc;
-        m_value.array = alloc.allocate(1);
-        using std::begin;
-        using std::end;
-        alloc.construct(m_value.array, begin(value), end(value));
-    }
-
-    /// create a string (explicit)
-    inline basic_json(const string_t& value)
-        : m_type(value_t::string)
-    {
-        AllocatorType<string_t> alloc;
-        m_value.string = alloc.allocate(1);
-        alloc.construct(m_value.string, value);
-    }
-
-    /// create a string (explicit)
-    inline basic_json(const typename string_t::value_type* value)
-        : m_type(value_t::string)
-    {
-        AllocatorType<string_t> alloc;
-        m_value.string = alloc.allocate(1);
-        alloc.construct(m_value.string, value);
-    }
-
-    /// create a string (implicit)
-    template <class V, typename
-              std::enable_if<
-                  std::is_constructible<string_t, V>::value, int>::type
-              = 0>
-    inline basic_json(const V& value)
-        : basic_json(string_t(value))
-    {}
-
-    /// create a boolean (explicit)
-    inline basic_json(boolean_t value)
-        : m_type(value_t::boolean), m_value(value)
-    {}
-
-    /// create an integer number (explicit)
-    inline basic_json(const number_integer_t& value)
-        : m_type(value_t::number_integer), m_value(value)
-    {}
-
-    /// create an integer number (implicit)
-    template<typename T, typename
-             std::enable_if<
-                 std::is_constructible<number_integer_t, T>::value and
-                 std::numeric_limits<T>::is_integer, T>::type
-             = 0>
-    inline basic_json(const T value) noexcept
-        : m_type(value_t::number_integer), m_value(number_integer_t(value))
-    {}
-
-    /// create a floating-point number (explicit)
-    inline basic_json(const number_float_t& value)
-        : m_type(value_t::number_float), m_value(value)
-    {}
-
-    /// create a floating-point number (implicit)
-    template<typename T, typename = typename
-             std::enable_if<
-                 std::is_constructible<number_float_t, T>::value and
-                 std::is_floating_point<T>::value>::type
-             >
-    inline basic_json(const T value) noexcept
-        : m_type(value_t::number_float), m_value(number_float_t(value))
-    {}
-
-    /// create a container (array or object) from an initializer list
-    inline basic_json(list_init_t l, bool type_deduction = true, value_t manual_type = value_t::array)
-    {
-        // the initializer list could describe an object
-        bool is_object = true;
-
-        // check if each element is an array with two elements whose first element
-        // is a string
-        for (const auto& element : l)
-        {
-            if ((element.m_final and element.m_type == value_t::array)
-                    or (element.m_type != value_t::array or element.size() != 2
-                        or element[0].m_type != value_t::string))
-            {
-                // we found an element that makes it impossible to use the
-                // initializer list as object
-                is_object = false;
-                break;
-            }
-        }
-
-        // adjust type if type deduction is not wanted
-        if (not type_deduction)
-        {
-            // mark this object's type as final
-            m_final = true;
-
-            // if array is wanted, do not create an object though possible
-            if (manual_type == value_t::array)
-            {
-                is_object = false;
-            }
-
-            // if object is wanted but impossible, throw an exception
-            if (manual_type == value_t::object and not is_object)
-            {
-                throw std::logic_error("cannot create JSON object from initializer list");
-            }
-        }
-
-        if (is_object)
-        {
-            // the initializer list is a list of pairs -> create object
-            m_type = value_t::object;
-            AllocatorType<object_t> alloc;
-            m_value.object = alloc.allocate(1);
-            alloc.construct(m_value.object);
-
-            for (auto& element : l)
-            {
-                m_value.object->emplace(std::move(*(element[0].m_value.string)), std::move(element[1]));
-            }
-        }
-        else
-        {
-            // the initializer list describes an array -> create array
-            m_type = value_t::array;
-            AllocatorType<array_t> alloc;
-            m_value.array = alloc.allocate(1);
-            alloc.construct(m_value.array, std::move(l));
-        }
-    }
-
-    /// explicitly create an array from an initializer list
-    inline static basic_json array(list_init_t l = list_init_t())
-    {
-        return basic_json(l, false, value_t::array);
-    }
-
-    /// explicitly create an object from an initializer list
-    inline static basic_json object(list_init_t l = list_init_t())
-    {
-        return basic_json(l, false, value_t::object);
-    }
-
-    /// construct an array with count copies of given value
-    inline basic_json(size_type count, const basic_json& other)
-        : m_type(value_t::array)
-    {
-        AllocatorType<array_t> alloc;
-        m_value.array = alloc.allocate(1);
-        alloc.construct(m_value.array, count, other);
-    }
-
-    /// construct a JSON container given an iterator range
-    template <class T, typename
-              std::enable_if<
-                  std::is_same<T, basic_json::iterator>::value or
-                  std::is_same<T, basic_json::const_iterator>::value
-                  , int>::type
-              = 0>
-    inline basic_json(T first, T last)
-    {
-        // make sure iterator fits the current value
-        if (first.m_object != last.m_object or
-                first.m_object->m_type != last.m_object->m_type)
-        {
-            throw std::runtime_error("iterators are not compatible");
-        }
-
-        // set the type
-        m_type = first.m_object->m_type;
-
-        // check if iterator range is complete for non-compound values
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            case value_t::number_float:
-            case value_t::boolean:
-            case value_t::string:
-            {
-                if (first.m_it.generic_iterator != 0 or last.m_it.generic_iterator != 1)
-                {
-                    throw std::out_of_range("iterators out of range");
-                }
-                break;
-            }
-
-            default:
-            {
-                break;
-            }
-        }
-
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            {
-                m_value.number_integer = first.m_object->m_value.number_integer;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value.number_float = first.m_object->m_value.number_float;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value.boolean = first.m_object->m_value.boolean;
-                break;
-            }
-
-            case value_t::string:
-            {
-                AllocatorType<string_t> alloc;
-                m_value.string = alloc.allocate(1);
-                alloc.construct(m_value.string, *first.m_object->m_value.string);
-                break;
-            }
-
-            case value_t::object:
-            {
-                AllocatorType<object_t> alloc;
-                m_value.object = alloc.allocate(1);
-                alloc.construct(m_value.object, first.m_it.object_iterator, last.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                AllocatorType<array_t> alloc;
-                m_value.array = alloc.allocate(1);
-                alloc.construct(m_value.array, first.m_it.array_iterator, last.m_it.array_iterator);
-                break;
-            }
-
-            default:
-            {
-                throw std::runtime_error("cannot use construct with iterators from " + first.m_object->type_name());
-            }
-        }
-    }
-
-    ///////////////////////////////////////
-    // other constructors and destructor //
-    ///////////////////////////////////////
-
-    /*!
-    @brief copy constructor
-
-    @exception std::bad_alloc  if allocation for object, array, or string fails.
-
-    @ingroup container
-    */
-    inline basic_json(const basic_json& other)
-        : m_type(other.m_type)
-    {
-        switch (m_type)
-        {
-            case (value_t::null):
-            {
-                break;
-            }
-
-            case (value_t::object):
-            {
-                AllocatorType<object_t> alloc;
-                m_value.object = alloc.allocate(1);
-                alloc.construct(m_value.object, *other.m_value.object);
-                break;
-            }
-
-            case (value_t::array):
-            {
-                AllocatorType<array_t> alloc;
-                m_value.array = alloc.allocate(1);
-                alloc.construct(m_value.array, *other.m_value.array);
-                break;
-            }
-
-            case (value_t::string):
-            {
-                AllocatorType<string_t> alloc;
-                m_value.string = alloc.allocate(1);
-                alloc.construct(m_value.string, *other.m_value.string);
-                break;
-            }
-
-            case (value_t::boolean):
-            {
-                m_value.boolean = other.m_value.boolean;
-                break;
-            }
-
-            case (value_t::number_integer):
-            {
-                m_value.number_integer = other.m_value.number_integer;
-                break;
-            }
-
-            case (value_t::number_float):
-            {
-                m_value.number_float = other.m_value.number_float;
-                break;
-            }
-        }
-    }
-
-    /// move constructor
-    inline basic_json(basic_json&& other) noexcept
-        : m_type(std::move(other.m_type)),
-          m_value(std::move(other.m_value))
-    {
-        // invalidate payload
-        other.m_type = value_t::null;
-        other.m_value = {};
-    }
-
-    /*!
-    @brief copy assignment
-    @ingroup container
-    */
-    inline reference& operator=(basic_json other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value and
-        std::is_nothrow_move_assignable<value_t>::value and
-        std::is_nothrow_move_constructible<json_value>::value and
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        std::swap(m_type, other.m_type);
-        std::swap(m_value, other.m_value);
-        return *this;
-    }
-
-    /*!
-    @brief destructor
-    @ingroup container
-    */
-    inline ~basic_json() noexcept
-    {
-        switch (m_type)
-        {
-            case (value_t::object):
-            {
-                AllocatorType<object_t> alloc;
-                alloc.destroy(m_value.object);
-                alloc.deallocate(m_value.object, 1);
-                m_value.object = nullptr;
-                break;
-            }
-
-            case (value_t::array):
-            {
-                AllocatorType<array_t> alloc;
-                alloc.destroy(m_value.array);
-                alloc.deallocate(m_value.array, 1);
-                m_value.array = nullptr;
-                break;
-            }
-
-            case (value_t::string):
-            {
-                AllocatorType<string_t> alloc;
-                alloc.destroy(m_value.string);
-                alloc.deallocate(m_value.string, 1);
-                m_value.string = nullptr;
-                break;
-            }
-
-            default:
-            {
-                // all other types need no specific destructor
-                break;
-            }
-        }
-    }
-
-
-  public:
-    ///////////////////////
-    // object inspection //
-    ///////////////////////
-
-    /*!
-    @brief serialization
-
-    Serialization function for JSON objects. The function tries to mimick
-    Python's @p json.dumps() function, and currently supports its @p indent
-    parameter.
-
-    @param indent  sif indent is nonnegative, then array elements and object
-    members will be pretty-printed with that indent level. An indent level of 0
-    will only insert newlines. -1 (the default) selects the most compact
-    representation
-
-    @see https://docs.python.org/2/library/json.html#json.dump
-    */
-    inline string_t dump(const int indent = -1) const noexcept
-    {
-        if (indent >= 0)
-        {
-            return dump(true, static_cast<unsigned int>(indent));
-        }
-        else
-        {
-            return dump(false, 0);
-        }
-    }
-
-    /// return the type of the object (explicit)
-    inline value_t type() const noexcept
-    {
-        return m_type;
-    }
-
-    // return whether value is null
-    inline bool is_null() const noexcept
-    {
-        return m_type == value_t::null;
-    }
-
-    // return whether value is boolean
-    inline bool is_boolean() const noexcept
-    {
-        return m_type == value_t::boolean;
-    }
-
-    // return whether value is number
-    inline bool is_number() const noexcept
-    {
-        return (m_type == value_t::number_integer) or (m_type == value_t::number_float);
-    }
-
-    // return whether value is object
-    inline bool is_object() const noexcept
-    {
-        return m_type == value_t::object;
-    }
-
-    // return whether value is array
-    inline bool is_array() const noexcept
-    {
-        return m_type == value_t::array;
-    }
-
-    // return whether value is string
-    inline bool is_string() const noexcept
-    {
-        return m_type == value_t::string;
-    }
-
-    /// return the type of the object (implicit)
-    inline operator value_t() const noexcept
-    {
-        return m_type;
-    }
-
-  private:
-    //////////////////////
-    // value conversion //
-    //////////////////////
-
-    /// get an object (explicit)
-    template <class T, typename
-              std::enable_if<
-                  std::is_convertible<typename object_t::key_type, typename T::key_type>::value and
-                  std::is_convertible<basic_json, typename T::mapped_type>::value
-                  , int>::type = 0>
-    inline T get_impl(T*) const
-    {
-        switch (m_type)
-        {
-            case (value_t::object):
-            {
-                return T(m_value.object->begin(), m_value.object->end());
-            }
-            default:
-            {
-                throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name());
-            }
-        }
-    }
-
-    /// get an object (explicit)
-    inline object_t get_impl(object_t*) const
-    {
-        switch (m_type)
-        {
-            case (value_t::object):
-            {
-                return *(m_value.object);
-            }
-            default:
-            {
-                throw std::logic_error("cannot cast " + type_name() + " to object");
-            }
-        }
-    }
-
-    /// get an array (explicit)
-    template <class T, typename
-              std::enable_if<
-                  std::is_convertible<basic_json, typename T::value_type>::value and
-                  not std::is_same<basic_json, typename T::value_type>::value and
-                  not std::is_arithmetic<T>::value and
-                  not std::is_convertible<std::string, T>::value and
-                  not has_mapped_type<T>::value
-                  , int>::type = 0>
-    inline T get_impl(T*) const
-    {
-        switch (m_type)
-        {
-            case (value_t::array):
-            {
-                T to_vector;
-                std::transform(m_value.array->begin(), m_value.array->end(),
-                               std::inserter(to_vector, to_vector.end()), [](basic_json i)
-                {
-                    return i.get<typename T::value_type>();
-                });
-                return to_vector;
-            }
-            default:
-            {
-                throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name());
-            }
-        }
-    }
-
-    /// get an array (explicit)
-    template <class T, typename
-              std::enable_if<
-                  std::is_convertible<basic_json, T>::value and
-                  not std::is_same<basic_json, T>::value
-                  , int>::type = 0>
-    inline std::vector<T> get_impl(std::vector<T>*) const
-    {
-        switch (m_type)
-        {
-            case (value_t::array):
-            {
-                std::vector<T> to_vector;
-                to_vector.reserve(m_value.array->size());
-                std::transform(m_value.array->begin(), m_value.array->end(),
-                               std::inserter(to_vector, to_vector.end()), [](basic_json i)
-                {
-                    return i.get<T>();
-                });
-                return to_vector;
-            }
-            default:
-            {
-                throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name());
-            }
-        }
-    }
-
-    /// get an array (explicit)
-    template <class T, typename
-              std::enable_if<
-                  std::is_same<basic_json, typename T::value_type>::value and
-                  not has_mapped_type<T>::value
-                  , int>::type = 0>
-    inline T get_impl(T*) const
-    {
-        switch (m_type)
-        {
-            case (value_t::array):
-            {
-                return T(m_value.array->begin(), m_value.array->end());
-            }
-            default:
-            {
-                throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name());
-            }
-        }
-    }
-
-    inline array_t get_impl(array_t*) const
-    {
-        switch (m_type)
-        {
-            case (value_t::array):
-            {
-                return *(m_value.array);
-            }
-            default:
-            {
-                throw std::logic_error("cannot cast " + type_name() + " to array");
-            }
-        }
-    }
-
-    /// get a string (explicit)
-    template <typename T, typename
-              std::enable_if<
-                  std::is_convertible<string_t, T>::value
-                  , int>::type = 0>
-    inline T get_impl(T*) const
-    {
-        switch (m_type)
-        {
-            case (value_t::string):
-            {
-                return *m_value.string;
-            }
-            default:
-            {
-                throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name());
-            }
-        }
-    }
-
-    /// get a number (explicit)
-    template<typename T, typename
-             std::enable_if<
-                 std::is_arithmetic<T>::value
-                 , int>::type = 0>
-    inline T get_impl(T*) const
-    {
-        switch (m_type)
-        {
-            case (value_t::number_integer):
-            {
-                return static_cast<T>(m_value.number_integer);
-            }
-            case (value_t::number_float):
-            {
-                return static_cast<T>(m_value.number_float);
-            }
-            default:
-            {
-                throw std::logic_error("cannot cast " + type_name() + " to " + typeid(T).name());
-            }
-        }
-    }
-
-    /// get a boolean (explicit)
-    inline boolean_t get_impl(boolean_t*) const
-    {
-        switch (m_type)
-        {
-            case (value_t::boolean):
-            {
-                return m_value.boolean;
-            }
-            default:
-            {
-                throw std::logic_error("cannot cast " + type_name() + " to " + typeid(boolean_t).name());
-            }
-        }
-    }
-
-  public:
-    /// get a value (explicit)
-    // <http://stackoverflow.com/a/8315197/266378>
-    template<typename T>
-    inline T get() const
-    {
-        return get_impl(static_cast<T*>(nullptr));
-    }
-
-    /// get a value (implicit)
-    template<typename T>
-    inline operator T() const
-    {
-        return get<T>();
-    }
-
-
-    ////////////////////
-    // element access //
-    ////////////////////
-
-    /// access specified element with bounds checking
-    inline reference at(size_type idx)
-    {
-        // at only works for arrays
-        if (m_type != value_t::array)
-        {
-            throw std::runtime_error("cannot use at with " + type_name());
-        }
-
-        return m_value.array->at(idx);
-    }
-
-    /// access specified element with bounds checking
-    inline const_reference at(size_type idx) const
-    {
-        // at only works for arrays
-        if (m_type != value_t::array)
-        {
-            throw std::runtime_error("cannot use at with " + type_name());
-        }
-
-        return m_value.array->at(idx);
-    }
-
-    /// access specified element with bounds checking
-    inline reference at(const typename object_t::key_type& key)
-    {
-        // at only works for objects
-        if (m_type != value_t::object)
-        {
-            throw std::runtime_error("cannot use at with " + type_name());
-        }
-
-        return m_value.object->at(key);
-    }
-
-    /// access specified element with bounds checking
-    inline const_reference at(const typename object_t::key_type& key) const
-    {
-        // at only works for objects
-        if (m_type != value_t::object)
-        {
-            throw std::runtime_error("cannot use at with " + type_name());
-        }
-
-        return m_value.object->at(key);
-    }
-
-    /// access specified element
-    inline reference operator[](size_type idx)
-    {
-        // implicitly convert null to object
-        if (m_type == value_t::null)
-        {
-            m_type = value_t::array;
-            AllocatorType<array_t> alloc;
-            m_value.array = alloc.allocate(1);
-            alloc.construct(m_value.array);
-        }
-
-        // [] only works for arrays
-        if (m_type != value_t::array)
-        {
-            throw std::runtime_error("cannot use [] with " + type_name());
-        }
-
-        for (size_t i = m_value.array->size(); i <= idx; ++i)
-        {
-            m_value.array->push_back(basic_json());
-        }
-
-        return m_value.array->operator[](idx);
-    }
-
-    /// access specified element
-    inline const_reference operator[](size_type idx) const
-    {
-        // at only works for arrays
-        if (m_type != value_t::array)
-        {
-            throw std::runtime_error("cannot use [] with " + type_name());
-        }
-
-        return m_value.array->operator[](idx);
-    }
-
-    /// access specified element
-    inline reference operator[](const typename object_t::key_type& key)
-    {
-        // implicitly convert null to object
-        if (m_type == value_t::null)
-        {
-            m_type = value_t::object;
-            AllocatorType<object_t> alloc;
-            m_value.object = alloc.allocate(1);
-            alloc.construct(m_value.object);
-        }
-
-        // [] only works for objects
-        if (m_type != value_t::object)
-        {
-            throw std::runtime_error("cannot use [] with " + type_name());
-        }
-
-        return m_value.object->operator[](key);
-    }
-
-    /// access specified element
-    inline const_reference operator[](const typename object_t::key_type& key) const
-    {
-        // at only works for objects
-        if (m_type != value_t::object)
-        {
-            throw std::runtime_error("cannot use [] with " + type_name());
-        }
-
-        return m_value.object->operator[](key);
-    }
-
-    /// access specified element (needed for clang)
-    template<typename T, std::size_t n>
-    inline reference operator[](const T (&key)[n])
-    {
-        // implicitly convert null to object
-        if (m_type == value_t::null)
-        {
-            m_type = value_t::object;
-            AllocatorType<object_t> alloc;
-            m_value.object = alloc.allocate(1);
-            alloc.construct(m_value.object);
-        }
-
-        // at only works for objects
-        if (m_type != value_t::object)
-        {
-            throw std::runtime_error("cannot use [] with " + type_name());
-        }
-
-        return m_value.object->operator[](key);
-    }
-
-    /// access specified element (needed for clang)
-    template<typename T, std::size_t n>
-    inline const_reference operator[](const T (&key)[n]) const
-    {
-        // at only works for objects
-        if (m_type != value_t::object)
-        {
-            throw std::runtime_error("cannot use [] with " + type_name());
-        }
-
-        return m_value.object->operator[](key);
-    }
-
-    /// access the first element
-    inline reference front()
-    {
-        return *begin();
-    }
-
-    /// access the first element
-    inline const_reference front() const
-    {
-        return *cbegin();
-    }
-
-    /// access the last element
-    inline reference back()
-    {
-        auto tmp = end();
-        --tmp;
-        return *tmp;
-    }
-
-    /// access the last element
-    inline const_reference back() const
-    {
-        auto tmp = cend();
-        --tmp;
-        return *tmp;
-    }
-
-    /// remove element given an iterator
-    template <class T, typename
-              std::enable_if<
-                  std::is_same<T, basic_json::iterator>::value or
-                  std::is_same<T, basic_json::const_iterator>::value
-                  , int>::type
-              = 0>
-    inline T erase(T pos)
-    {
-        // make sure iterator fits the current value
-        if (this != pos.m_object or m_type != pos.m_object->m_type)
-        {
-            throw std::runtime_error("iterator does not fit current value");
-        }
-
-        T result = end();
-
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            case value_t::number_float:
-            case value_t::boolean:
-            case value_t::string:
-            {
-                if (pos.m_it.generic_iterator != 0)
-                {
-                    throw std::out_of_range("iterator out of range");
-                }
-
-                if (m_type == value_t::string)
-                {
-                    delete m_value.string;
-                    m_value.string = nullptr;
-                }
-
-                m_type = value_t::null;
-                break;
-            }
-
-            case value_t::object:
-            {
-                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
-                break;
-            }
-
-            default:
-            {
-                throw std::runtime_error("cannot use erase with " + type_name());
-            }
-        }
-
-        return result;
-    }
-
-    /// remove elements given an iterator range
-    template <class T, typename
-              std::enable_if<
-                  std::is_same<T, basic_json::iterator>::value or
-                  std::is_same<T, basic_json::const_iterator>::value
-                  , int>::type
-              = 0>
-    inline T erase(T first, T last)
-    {
-        // make sure iterator fits the current value
-        if (this != first.m_object or this != last.m_object or
-                m_type != first.m_object->m_type or m_type != last.m_object->m_type)
-        {
-            throw std::runtime_error("iterators do not fit current value");
-        }
-
-        T result = end();
-
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            case value_t::number_float:
-            case value_t::boolean:
-            case value_t::string:
-            {
-                if (first.m_it.generic_iterator != 0 or last.m_it.generic_iterator != 1)
-                {
-                    throw std::out_of_range("iterators out of range");
-                }
-
-                if (m_type == value_t::string)
-                {
-                    delete m_value.string;
-                    m_value.string = nullptr;
-                }
-
-                m_type = value_t::null;
-                break;
-            }
-
-            case value_t::object:
-            {
-                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
-                                              last.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
-                                             last.m_it.array_iterator);
-                break;
-            }
-
-            default:
-            {
-                throw std::runtime_error("cannot use erase with " + type_name());
-            }
-        }
-
-        return result;
-    }
-
-    /// remove element from an object given a key
-    inline size_type erase(const typename object_t::key_type& key)
-    {
-        // this erase only works for objects
-        if (m_type != value_t::object)
-        {
-            throw std::runtime_error("cannot use erase with " + type_name());
-        }
-
-        return m_value.object->erase(key);
-    }
-
-    /// remove element from an array given an index
-    inline void erase(const size_type idx)
-    {
-        // this erase only works for arrays
-        if (m_type != value_t::array)
-        {
-            throw std::runtime_error("cannot use erase with " + type_name());
-        }
-
-        if (idx >= size())
-        {
-            throw std::out_of_range("index out of range");
-        }
-
-        m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
-    }
-
-    /// find an element in an object
-    inline iterator find(typename object_t::key_type key)
-    {
-        auto result = end();
-
-        if (m_type == value_t::object)
-        {
-            result.m_it.object_iterator = m_value.object->find(key);
-        }
-
-        return result;
-    }
-
-    /// find an element in an object
-    inline const_iterator find(typename object_t::key_type key) const
-    {
-        auto result = cend();
-
-        if (m_type == value_t::object)
-        {
-            result.m_it.object_iterator = m_value.object->find(key);
-        }
-
-        return result;
-    }
-
-    /// returns the number of occurrences of a key in an object
-    inline size_type count(typename object_t::key_type key) const
-    {
-        // return 0 for all nonobject types
-        return (m_type == value_t::object) ? m_value.object->count(key) : 0;
-    }
-
-
-    ///////////////
-    // iterators //
-    ///////////////
-
-    /*!
-    @brief returns an iterator to the first element
-    @ingroup container
-    */
-    inline iterator begin() noexcept
-    {
-        iterator result(this);
-        result.set_begin();
-        return result;
-    }
-
-    /*!
-    @brief returns a const iterator to the first element
-    @ingroup container
-    */
-    inline const_iterator begin() const noexcept
-    {
-        return cbegin();
-    }
-
-    /*!
-    @brief returns a const iterator to the first element
-    @ingroup container
-    */
-    inline const_iterator cbegin() const noexcept
-    {
-        const_iterator result(this);
-        result.set_begin();
-        return result;
-    }
-
-    /*!
-    @brief returns an iterator to one past the last element
-    @ingroup container
-    */
-    inline iterator end() noexcept
-    {
-        iterator result(this);
-        result.set_end();
-        return result;
-    }
-
-    /*!
-    @brief returns a const iterator to one past the last element
-    @ingroup container
-    */
-    inline const_iterator end() const noexcept
-    {
-        return cend();
-    }
-
-    /*!
-    @brief returns a const iterator to one past the last element
-    @ingroup container
-    */
-    inline const_iterator cend() const noexcept
-    {
-        const_iterator result(this);
-        result.set_end();
-        return result;
-    }
-
-    /*!
-    @brief returns a reverse iterator to the first element
-    @ingroup reversiblecontainer
-    */
-    inline reverse_iterator rbegin() noexcept
-    {
-        return reverse_iterator(end());
-    }
-
-    /*!
-    @brief returns a const reverse iterator to the first element
-    @ingroup reversiblecontainer
-    */
-    inline const_reverse_iterator rbegin() const noexcept
-    {
-        return crbegin();
-    }
-
-    /*!
-    @brief returns a reverse iterator to one past the last element
-    @ingroup reversiblecontainer
-    */
-    inline reverse_iterator rend() noexcept
-    {
-        return reverse_iterator(begin());
-    }
-
-    /*!
-    @brief returns a const reverse iterator to one past the last element
-    @ingroup reversiblecontainer
-    */
-    inline const_reverse_iterator rend() const noexcept
-    {
-        return crend();
-    }
-
-    /*!
-    @brief returns a const reverse iterator to the first element
-    @ingroup reversiblecontainer
-    */
-    inline const_reverse_iterator crbegin() const noexcept
-    {
-        return const_reverse_iterator(cend());
-    }
-
-    /*!
-    @brief returns a const reverse iterator to one past the last element
-    @ingroup reversiblecontainer
-    */
-    inline const_reverse_iterator crend() const noexcept
-    {
-        return const_reverse_iterator(cbegin());
-    }
-
-
-    //////////////
-    // capacity //
-    //////////////
-
-    /*!
-    @brief checks whether the container is empty
-    @ingroup container
-    */
-    inline bool empty() const noexcept
-    {
-        switch (m_type)
-        {
-            case (value_t::null):
-            {
-                return true;
-            }
-
-            case (value_t::array):
-            {
-                return m_value.array->empty();
-            }
-
-            case (value_t::object):
-            {
-                return m_value.object->empty();
-            }
-
-            default:
-            {
-                // all other types are nonempty
-                return false;
-            }
-        }
-    }
-
-    /*!
-    @brief returns the number of elements
-    @ingroup container
-    */
-    inline size_type size() const noexcept
-    {
-        switch (m_type)
-        {
-            case (value_t::null):
-            {
-                return 0;
-            }
-
-            case (value_t::array):
-            {
-                return m_value.array->size();
-            }
-
-            case (value_t::object):
-            {
-                return m_value.object->size();
-            }
-
-            default:
-            {
-                // all other types have size 1
-                return 1;
-            }
-        }
-    }
-
-    /*!
-    @brief returns the maximum possible number of elements
-    @ingroup container
-    */
-    inline size_type max_size() const noexcept
-    {
-        switch (m_type)
-        {
-            case (value_t::null):
-            {
-                return 0;
-            }
-
-            case (value_t::array):
-            {
-                return m_value.array->max_size();
-            }
-
-            case (value_t::object):
-            {
-                return m_value.object->max_size();
-            }
-
-            default:
-            {
-                // all other types have max_size 1
-                return 1;
-            }
-        }
-    }
-
-
-    ///////////////
-    // modifiers //
-    ///////////////
-
-    /// clears the contents
-    inline void clear() noexcept
-    {
-        switch (m_type)
-        {
-            case (value_t::null):
-            {
-                break;
-            }
-
-            case (value_t::number_integer):
-            {
-                m_value.number_integer = 0;
-                break;
-            }
-
-            case (value_t::number_float):
-            {
-                m_value.number_float = 0.0;
-                break;
-            }
-
-            case (value_t::boolean):
-            {
-                m_value.boolean = false;
-                break;
-            }
-
-            case (value_t::string):
-            {
-                m_value.string->clear();
-                break;
-            }
-
-            case (value_t::array):
-            {
-                m_value.array->clear();
-                break;
-            }
-
-            case (value_t::object):
-            {
-                m_value.object->clear();
-                break;
-            }
-        }
-    }
-
-    /// add an object to an array
-    inline void push_back(basic_json&& value)
-    {
-        // push_back only works for null objects or arrays
-        if (not(m_type == value_t::null or m_type == value_t::array))
-        {
-            throw std::runtime_error("cannot add element to " + type_name());
-        }
-
-        // transform null object into an array
-        if (m_type == value_t::null)
-        {
-            m_type = value_t::array;
-            AllocatorType<array_t> alloc;
-            m_value.array = alloc.allocate(1);
-            alloc.construct(m_value.array);
-        }
-
-        // add element to array (move semantics)
-        m_value.array->push_back(std::move(value));
-        // invalidate object
-        value.m_type = value_t::null;
-    }
-
-    /// add an object to an array
-    inline reference operator+=(basic_json&& value)
-    {
-        push_back(std::move(value));
-        return *this;
-    }
-
-    /// add an object to an array
-    inline void push_back(const basic_json& value)
-    {
-        // push_back only works for null objects or arrays
-        if (not(m_type == value_t::null or m_type == value_t::array))
-        {
-            throw std::runtime_error("cannot add element to " + type_name());
-        }
-
-        // transform null object into an array
-        if (m_type == value_t::null)
-        {
-            m_type = value_t::array;
-            AllocatorType<array_t> alloc;
-            m_value.array = alloc.allocate(1);
-            alloc.construct(m_value.array);
-        }
-
-        // add element to array
-        m_value.array->push_back(value);
-    }
-
-    /// add an object to an array
-    inline reference operator+=(const basic_json& value)
-    {
-        push_back(value);
-        return *this;
-    }
-
-    /// add an object to an object
-    inline void push_back(const typename object_t::value_type& value)
-    {
-        // push_back only works for null objects or objects
-        if (not(m_type == value_t::null or m_type == value_t::object))
-        {
-            throw std::runtime_error("cannot add element to " + type_name());
-        }
-
-        // transform null object into an object
-        if (m_type == value_t::null)
-        {
-            m_type = value_t::object;
-            AllocatorType<object_t> alloc;
-            m_value.object = alloc.allocate(1);
-            alloc.construct(m_value.object);
-        }
-
-        // add element to array
-        m_value.object->insert(value);
-    }
-
-    /// add an object to an object
-    inline reference operator+=(const typename object_t::value_type& value)
-    {
-        push_back(value);
-        return operator[](value.first);
-    }
-
-    /*!
-    @brief exchanges the values
-    @ingroup container
-    */
-    inline void swap(reference other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value and
-        std::is_nothrow_move_assignable<value_t>::value and
-        std::is_nothrow_move_constructible<json_value>::value and
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        std::swap(m_type, other.m_type);
-        std::swap(m_value, other.m_value);
-    }
-
-    /// swaps the contents
-    inline void swap(array_t& other)
-    {
-        // swap only works for arrays
-        if (m_type != value_t::array)
-        {
-            throw std::runtime_error("cannot use swap with " + type_name());
-        }
-
-        // swap arrays
-        std::swap(*(m_value.array), other);
-    }
-
-    /// swaps the contents
-    inline void swap(object_t& other)
-    {
-        // swap only works for objects
-        if (m_type != value_t::object)
-        {
-            throw std::runtime_error("cannot use swap with " + type_name());
-        }
-
-        // swap arrays
-        std::swap(*(m_value.object), other);
-    }
-
-    /// swaps the contents
-    inline void swap(string_t& other)
-    {
-        // swap only works for strings
-        if (m_type != value_t::string)
-        {
-            throw std::runtime_error("cannot use swap with " + type_name());
-        }
-
-        // swap arrays
-        std::swap(*(m_value.string), other);
-    }
-
-
-    //////////////////////////////////////////
-    // lexicographical comparison operators //
-    //////////////////////////////////////////
-
-    /*!
-    @brief comparison: equal
-    @ingroup container
-    */
-    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
-    {
-        switch (lhs.type())
-        {
-            case (value_t::array):
-            {
-                if (rhs.type() == value_t::array)
-                {
-                    return *lhs.m_value.array == *rhs.m_value.array;
-                }
-                break;
-            }
-            case (value_t::object):
-            {
-                if (rhs.type() == value_t::object)
-                {
-                    return *lhs.m_value.object == *rhs.m_value.object;
-                }
-                break;
-            }
-            case (value_t::null):
-            {
-                if (rhs.type() == value_t::null)
-                {
-                    return true;
-                }
-                break;
-            }
-            case (value_t::string):
-            {
-                if (rhs.type() == value_t::string)
-                {
-                    return *lhs.m_value.string == *rhs.m_value.string;
-                }
-                break;
-            }
-            case (value_t::boolean):
-            {
-                if (rhs.type() == value_t::boolean)
-                {
-                    return lhs.m_value.boolean == rhs.m_value.boolean;
-                }
-                break;
-            }
-            case (value_t::number_integer):
-            {
-                if (rhs.type() == value_t::number_integer)
-                {
-                    return lhs.m_value.number_integer == rhs.m_value.number_integer;
-                }
-                if (rhs.type() == value_t::number_float)
-                {
-                    return lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_float);
-                }
-                break;
-            }
-            case (value_t::number_float):
-            {
-                if (rhs.type() == value_t::number_integer)
-                {
-                    return approx(lhs.m_value.number_float, static_cast<number_float_t>(rhs.m_value.number_integer));
-                }
-                if (rhs.type() == value_t::number_float)
-                {
-                    return approx(lhs.m_value.number_float, rhs.m_value.number_float);
-                }
-                break;
-            }
-        }
-
-        return false;
-    }
-
-    /*!
-    @brief comparison: not equal
-    @ingroup container
-    */
-    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return not (lhs == rhs);
-    }
-
-    /// comparison: less than
-    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
-    {
-        switch (lhs.type())
-        {
-            case (value_t::array):
-            {
-                if (rhs.type() == value_t::array)
-                {
-                    return *lhs.m_value.array < *rhs.m_value.array;
-                }
-                break;
-            }
-            case (value_t::object):
-            {
-                if (rhs.type() == value_t::object)
-                {
-                    return *lhs.m_value.object < *rhs.m_value.object;
-                }
-                break;
-            }
-            case (value_t::null):
-            {
-                if (rhs.type() == value_t::null)
-                {
-                    return false;
-                }
-                break;
-            }
-            case (value_t::string):
-            {
-                if (rhs.type() == value_t::string)
-                {
-                    return *lhs.m_value.string < *rhs.m_value.string;
-                }
-                break;
-            }
-            case (value_t::boolean):
-            {
-                if (rhs.type() == value_t::boolean)
-                {
-                    return lhs.m_value.boolean < rhs.m_value.boolean;
-                }
-                break;
-            }
-            case (value_t::number_integer):
-            {
-                if (rhs.type() == value_t::number_integer)
-                {
-                    return lhs.m_value.number_integer < rhs.m_value.number_integer;
-                }
-                if (rhs.type() == value_t::number_float)
-                {
-                    return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_float);
-                }
-                break;
-            }
-            case (value_t::number_float):
-            {
-                if (rhs.type() == value_t::number_integer)
-                {
-                    return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
-                }
-                if (rhs.type() == value_t::number_float)
-                {
-                    return lhs.m_value.number_float < rhs.m_value.number_float;
-                }
-                break;
-            }
-        }
-
-        // We only reach this line if we cannot compare values. In that case,
-        // we compare types.
-        return lhs.type() < rhs.type();
-    }
-
-    /// comparison: less than or equal
-    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return not (rhs < lhs);
-    }
-
-    /// comparison: greater than
-    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
-    {
-        return not (lhs <= rhs);
-    }
-
-    /// comparison: greater than or equal
-    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return not (lhs < rhs);
-    }
-
-
-    ///////////////////
-    // serialization //
-    ///////////////////
-
-    /// serialize to stream
-    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
-    {
-        // read width member and use it as indentation parameter if nonzero
-        const int indentation = (o.width() == 0) ? -1 : o.width();
-
-        o << j.dump(indentation);
-        return o;
-    }
-
-    /// serialize to stream
-    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
-    {
-        // read width member and use it as indentation parameter if nonzero
-        const int indentation = (o.width() == 0) ? -1 : o.width();
-
-        o << j.dump(indentation);
-        return o;
-    }
-
-
-    /////////////////////
-    // deserialization //
-    /////////////////////
-
-    /// deserialize from string
-    static basic_json parse(const string_t& s)
-    {
-        return parser(s).parse();
-    }
-
-    /// deserialize from stream
-    static basic_json parse(std::istream& i)
-    {
-        return parser(i).parse();
-    }
-
-    /// deserialize from stream
-    friend std::istream& operator>>(std::istream& i, basic_json& j)
-    {
-        j = parser(i).parse();
-        return i;
-    }
-
-    /// deserialize from stream
-    friend std::istream& operator<<(basic_json& j, std::istream& i)
-    {
-        j = parser(i).parse();
-        return i;
-    }
-
-
-  private:
-    ///////////////////////////
-    // convenience functions //
-    ///////////////////////////
-
-    /// return the type as string
-    inline string_t type_name() const noexcept
-    {
-        switch (m_type)
-        {
-            case (value_t::null):
-            {
-                return "null";
-            }
-
-            case (value_t::object):
-            {
-                return "object";
-            }
-
-            case (value_t::array):
-            {
-                return "array";
-            }
-
-            case (value_t::string):
-            {
-                return "string";
-            }
-
-            case (value_t::boolean):
-            {
-                return "boolean";
-            }
-
-            default:
-            {
-                return "number";
-            }
-        }
-    }
-
-    /*!
-    @brief escape a string
-
-    Escape a string by replacing certain special characters by a sequence of an
-    escape character (backslash) and another character and other control
-    characters by a sequence of "\u" followed by a four-digit hex
-    representation.
-
-    @param s  the string to escape
-    @return escaped string
-    */
-    static string_t escape_string(const string_t& s) noexcept
-    {
-        // create a result string of at least the size than s
-        string_t result;
-        result.reserve(s.size());
-
-        for (const auto c : s)
-        {
-            switch (c)
-            {
-                // quotation mark (0x22)
-                case '"':
-                {
-                    result += "\\\"";
-                    break;
-                }
-
-                // reverse solidus (0x5c)
-                case '\\':
-                {
-                    result += "\\\\";
-                    break;
-                }
-
-                // backspace (0x08)
-                case '\b':
-                {
-                    result += "\\b";
-                    break;
-                }
-
-                // formfeed (0x0c)
-                case '\f':
-                {
-                    result += "\\f";
-                    break;
-                }
-
-                // newline (0x0a)
-                case '\n':
-                {
-                    result += "\\n";
-                    break;
-                }
-
-                // carriage return (0x0d)
-                case '\r':
-                {
-                    result += "\\r";
-                    break;
-                }
-
-                // horizontal tab (0x09)
-                case '\t':
-                {
-                    result += "\\t";
-                    break;
-                }
-
-                default:
-                {
-                    if (c >= 0 and c <= 0x1f)
-                    {
-                        // control characters (everything between 0x00 and 0x1f)
-                        // -> create four-digit hex representation
-                        std::stringstream ss;
-                        ss << "\\u" << std::hex << std::setw(4) << std::setfill('0') << int(c);
-                        result += ss.str();
-                    }
-                    else
-                    {
-                        // all other characters are added as-is
-                        result.append(1, c);
-                    }
-                    break;
-                }
-            }
-        }
-
-        return result;
-    }
-
-
-    /*!
-    @brief internal implementation of the serialization function
-
-    This function is called by the public member function dump and organizes
-    the serializaion internally. The indentation level is propagated as
-    additional parameter. In case of arrays and objects, the function is called
-    recursively. Note that
-
-    - strings and object keys are escaped using escape_string()
-    - integer numbers are converted to a string before output using
-      std::to_string()
-    - floating-point numbers are converted to a string using "%g" format
-
-    @param prettyPrint    whether the output shall be pretty-printed
-    @param indentStep     the indent level
-    @param currentIndent  the current indent level (only used internally)
-    */
-    inline string_t dump(const bool prettyPrint, const unsigned int indentStep,
-                         const unsigned int currentIndent = 0) const noexcept
-    {
-        // variable to hold indentation for recursive calls
-        auto new_indent = currentIndent;
-
-        // helper function to return whitespace as indentation
-        const auto indent = [prettyPrint, &new_indent]()
-        {
-            return prettyPrint ? string_t(new_indent, ' ') : string_t();
-        };
-
-        switch (m_type)
-        {
-            case (value_t::object):
-            {
-                if (m_value.object->empty())
-                {
-                    return "{}";
-                }
-
-                string_t result = "{";
-
-                // increase indentation
-                if (prettyPrint)
-                {
-                    new_indent += indentStep;
-                    result += "\n";
-                }
-
-                for (auto i = m_value.object->cbegin(); i != m_value.object->cend(); ++i)
-                {
-                    if (i != m_value.object->cbegin())
-                    {
-                        result += prettyPrint ? ",\n" : ",";
-                    }
-                    result += indent() + "\"" + escape_string(i->first) + "\":" + (prettyPrint ? " " : "")
-                              + i->second.dump(prettyPrint, indentStep, new_indent);
-                }
-
-                // decrease indentation
-                if (prettyPrint)
-                {
-                    new_indent -= indentStep;
-                    result += "\n";
-                }
-
-                return result + indent() + "}";
-            }
-
-            case (value_t::array):
-            {
-                if (m_value.array->empty())
-                {
-                    return "[]";
-                }
-
-                string_t result = "[";
-
-                // increase indentation
-                if (prettyPrint)
-                {
-                    new_indent += indentStep;
-                    result += "\n";
-                }
-
-                for (auto i = m_value.array->cbegin(); i != m_value.array->cend(); ++i)
-                {
-                    if (i != m_value.array->cbegin())
-                    {
-                        result += prettyPrint ? ",\n" : ",";
-                    }
-                    result += indent() + i->dump(prettyPrint, indentStep, new_indent);
-                }
-
-                // decrease indentation
-                if (prettyPrint)
-                {
-                    new_indent -= indentStep;
-                    result += "\n";
-                }
-
-                return result + indent() + "]";
-            }
-
-            case (value_t::string):
-            {
-                return string_t("\"") + escape_string(*m_value.string) + "\"";
-            }
-
-            case (value_t::boolean):
-            {
-                return m_value.boolean ? "true" : "false";
-            }
-
-            case (value_t::number_integer):
-            {
-                return std::to_string(m_value.number_integer);
-            }
-
-            case (value_t::number_float):
-            {
-                // 15 digits of precision allows round-trip IEEE 754
-                // string->double->string
-                const auto sz = static_cast<unsigned int>(std::snprintf(nullptr, 0, "%.15g", m_value.number_float));
-                std::vector<char> buf(sz + 1);
-                std::snprintf(&buf[0], buf.size(), "%.15g", m_value.number_float);
-                return string_t(buf.data());
-            }
-
-            default:
-            {
-                return "null";
-            }
-        }
-    }
-
-    /// "equality" comparison for floating point numbers
-    template<typename T>
-    inline static bool approx(const T a, const T b)
-    {
-        return not (a > b or a < b);
-    }
-
-
-  private:
-    //////////////////////
-    // member variables //
-    //////////////////////
-
-    /// the type of the current element
-    value_t m_type = value_t::null;
-
-    /// whether the type of JSON object may change later
-    bool m_final = false;
-
-    /// the value of the current element
-    json_value m_value = {};
-
-
-  private:
-    ///////////////
-    // iterators //
-    ///////////////
-
-    /// an iterator value
-    template<typename array_iterator_t, typename object_iterator_t>
-    union internal_iterator
-    {
-        /// iterator for JSON objects
-        object_iterator_t object_iterator;
-        /// iterator for JSON arrays
-        array_iterator_t array_iterator;
-        /// generic iteraotr for all other value types
-        difference_type generic_iterator;
-
-        /// default constructor
-        internal_iterator() : generic_iterator(-1) {}
-    };
-
-  public:
-    /// a random access iterator for the basic_json class
-    class iterator : public std::iterator<std::random_access_iterator_tag, basic_json>
-    {
-        // allow basic_json class to access m_it
-        friend class basic_json;
-
-      public:
-        /// the type of the values when the iterator is dereferenced
-        using value_type = basic_json::value_type;
-        /// a type to represent differences between iterators
-        using difference_type = basic_json::difference_type;
-        /// defines a pointer to the type iterated over (value_type)
-        using pointer = basic_json::pointer;
-        /// defines a reference to the type iterated over (value_type)
-        using reference = basic_json::reference;
-        /// the category of the iterator
-        using iterator_category = std::bidirectional_iterator_tag;
-
-        /// default constructor
-        inline iterator() = default;
-
-        /// constructor for a given JSON instance
-        inline iterator(pointer object) noexcept : m_object(object)
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    m_it.object_iterator = typename object_t::iterator();
-                    break;
-                }
-                case (basic_json::value_t::array):
-                {
-                    m_it.array_iterator = typename array_t::iterator();
-                    break;
-                }
-                default:
-                {
-                    m_it.generic_iterator = -1;
-                    break;
-                }
-            }
-        }
-
-        /// copy constructor
-        inline iterator(const iterator& other) noexcept
-            : m_object(other.m_object), m_it(other.m_it)
-        {}
-
-        /// copy assignment
-        inline iterator& operator=(iterator other) noexcept (
-            std::is_nothrow_move_constructible<pointer>::value and
-            std::is_nothrow_move_assignable<pointer>::value and
-            std::is_nothrow_move_constructible<internal_iterator<typename array_t::iterator, typename object_t::iterator>>::value
-            and
-            std::is_nothrow_move_assignable<internal_iterator<typename array_t::iterator, typename object_t::iterator>>::value
-        )
-        {
-            std::swap(m_object, other.m_object);
-            std::swap(m_it, other.m_it);
-            return *this;
-        }
-
-      private:
-        /// set the iterator to the first value
-        inline void set_begin() noexcept
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    m_it.object_iterator = m_object->m_value.object->begin();
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    m_it.array_iterator = m_object->m_value.array->begin();
-                    break;
-                }
-
-                case (basic_json::value_t::null):
-                {
-                    // set to end so begin()==end() is true: null is empty
-                    m_it.generic_iterator = 1;
-                    break;
-                }
-
-                default:
-                {
-                    m_it.generic_iterator = 0;
-                    break;
-                }
-            }
-        }
-
-        /// set the iterator past the last value
-        inline void set_end() noexcept
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    m_it.object_iterator = m_object->m_value.object->end();
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    m_it.array_iterator = m_object->m_value.array->end();
-                    break;
-                }
-
-                default:
-                {
-                    m_it.generic_iterator = 1;
-                    break;
-                }
-            }
-        }
-
-      public:
-        /// return a reference to the value pointed to by the iterator
-        inline reference operator*()
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    return m_it.object_iterator->second;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    return *m_it.array_iterator;
-                }
-
-                case (basic_json::value_t::null):
-                {
-                    throw std::out_of_range("cannot get value");
-                }
-
-                default:
-                {
-                    if (m_it.generic_iterator == 0)
-                    {
-                        return *m_object;
-                    }
-                    else
-                    {
-                        throw std::out_of_range("cannot get value");
-                    }
-                }
-            }
-        }
-
-        /// dereference the iterator
-        inline pointer operator->()
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    return &(m_it.object_iterator->second);
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    return &*m_it.array_iterator;
-                }
-
-                case (basic_json::value_t::null):
-                {
-                    throw std::out_of_range("cannot get value");
-                }
-
-                default:
-                {
-                    if (m_it.generic_iterator == 0)
-                    {
-                        return m_object;
-                    }
-                    else
-                    {
-                        throw std::out_of_range("cannot get value");
-                    }
-                }
-            }
-        }
-
-        /// post-increment (it++)
-        inline iterator operator++(int)
-        {
-            auto result = *this;
-
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    m_it.object_iterator++;
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    m_it.array_iterator++;
-                    break;
-                }
-
-                default:
-                {
-                    m_it.generic_iterator++;
-                    break;
-                }
-            }
-
-            return result;
-        }
-
-        /// pre-increment (++it)
-        inline iterator& operator++()
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    ++m_it.object_iterator;
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    ++m_it.array_iterator;
-                    break;
-                }
-
-                default:
-                {
-                    ++m_it.generic_iterator;
-                    break;
-                }
-            }
-
-            return *this;
-        }
-
-        /// post-decrement (it--)
-        inline iterator operator--(int)
-        {
-            auto result = *this;
-
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    m_it.object_iterator--;
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    m_it.array_iterator--;
-                    break;
-                }
-
-                default:
-                {
-                    m_it.generic_iterator--;
-                    break;
-                }
-            }
-
-            return result;
-        }
-
-        /// pre-decrement (--it)
-        inline iterator& operator--()
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    --m_it.object_iterator;
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    --m_it.array_iterator;
-                    break;
-                }
-
-                default:
-                {
-                    --m_it.generic_iterator;
-                    break;
-                }
-            }
-
-            return *this;
-        }
-
-        /// comparison: equal
-        inline bool operator==(const iterator& other) const
-        {
-            // if objects are not the same, the comparison is undefined
-            if (m_object != other.m_object)
-            {
-                throw std::domain_error("cannot compare iterators of different containers");
-            }
-
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    return (m_it.object_iterator == other.m_it.object_iterator);
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    return (m_it.array_iterator == other.m_it.array_iterator);
-                }
-
-                default:
-                {
-                    return (m_it.generic_iterator == other.m_it.generic_iterator);
-                }
-            }
-        }
-
-        /// comparison: not equal
-        inline bool operator!=(const iterator& other) const
-        {
-            return not operator==(other);
-        }
-
-        /// comparison: smaller
-        inline bool operator<(const iterator& other) const
-        {
-            // if objects are not the same, the comparison is undefined
-            if (m_object != other.m_object)
-            {
-                throw std::domain_error("cannot compare iterators of different containers");
-            }
-
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    throw std::domain_error("cannot use operator< for object iterators");
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    return (m_it.array_iterator < other.m_it.array_iterator);
-                }
-
-                default:
-                {
-                    return (m_it.generic_iterator < other.m_it.generic_iterator);
-                }
-            }
-        }
-
-        /// comparison: less than or equal
-        inline bool operator<=(const iterator& other) const
-        {
-            return not other.operator < (*this);
-        }
-
-        /// comparison: greater than
-        inline bool operator>(const iterator& other) const
-        {
-            return not operator<=(other);
-        }
-
-        /// comparison: greater than or equal
-        inline bool operator>=(const iterator& other) const
-        {
-            return not operator<(other);
-        }
-
-        /// add to iterator
-        inline iterator& operator+=(difference_type i)
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    throw std::domain_error("cannot use operator+= for object iterators");
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    m_it.array_iterator += i;
-                    break;
-                }
-
-                default:
-                {
-                    m_it.generic_iterator += i;
-                    break;
-                }
-            }
-
-            return *this;
-        }
-
-        /// subtract from iterator
-        inline iterator& operator-=(difference_type i)
-        {
-            return operator+=(-i);
-        }
-
-        /// add to iterator
-        inline iterator operator+(difference_type i)
-        {
-            auto result = *this;
-            result += i;
-            return result;
-        }
-
-        /// subtract from iterator
-        inline iterator operator-(difference_type i)
-        {
-            auto result = *this;
-            result -= i;
-            return result;
-        }
-
-        /// return difference
-        inline difference_type operator-(const iterator& other) const
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    throw std::domain_error("cannot use operator- for object iterators");
-                    return 0;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    return m_it.array_iterator - other.m_it.array_iterator;
-                }
-
-                default:
-                {
-                    return m_it.generic_iterator - other.m_it.generic_iterator;
-                }
-            }
-        }
-
-        /// access to successor
-        inline reference operator[](difference_type n)
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    throw std::domain_error("cannot use operator[] for object iterators");
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    return *(m_it.array_iterator + n);
-                }
-
-                case (basic_json::value_t::null):
-                {
-                    throw std::out_of_range("cannot get value");
-                }
-
-                default:
-                {
-                    if (m_it.generic_iterator == -n)
-                    {
-                        return *m_object;
-                    }
-                    else
-                    {
-                        throw std::out_of_range("cannot get value");
-                    }
-                }
-            }
-        }
-
-        /// return the key of an object iterator
-        inline typename object_t::key_type key() const
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    return m_it.object_iterator->first;
-                }
-
-                default:
-                {
-                    throw std::domain_error("cannot use key() for non-object iterators");
-                }
-            }
-        }
-
-        /// return the key of an iterator
-        inline reference value()
-        {
-            return operator*();
-        }
-
-      private:
-        /// associated JSON instance
-        pointer m_object = nullptr;
-        /// the actual iterator of the associated instance
-        internal_iterator<typename array_t::iterator, typename object_t::iterator> m_it;
-    };
-
-    /// a const random access iterator for the basic_json class
-    class const_iterator : public std::iterator<std::random_access_iterator_tag, const basic_json>
-    {
-        // allow basic_json class to access m_it
-        friend class basic_json;
-
-      public:
-        /// the type of the values when the iterator is dereferenced
-        using value_type = basic_json::value_type;
-        /// a type to represent differences between iterators
-        using difference_type = basic_json::difference_type;
-        /// defines a pointer to the type iterated over (value_type)
-        using pointer = basic_json::const_pointer;
-        /// defines a reference to the type iterated over (value_type)
-        using reference = basic_json::const_reference;
-        /// the category of the iterator
-        using iterator_category = std::bidirectional_iterator_tag;
-
-        /// default constructor
-        inline const_iterator() = default;
-
-        /// constructor for a given JSON instance
-        inline const_iterator(pointer object) noexcept : m_object(object)
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    m_it.object_iterator = typename object_t::const_iterator();
-                    break;
-                }
-                case (basic_json::value_t::array):
-                {
-                    m_it.array_iterator = typename array_t::const_iterator();
-                    break;
-                }
-                default:
-                {
-                    m_it.generic_iterator = -1;
-                    break;
-                }
-            }
-        }
-
-        /// copy constructor given a nonconst iterator
-        inline const_iterator(const iterator& other) noexcept : m_object(other.m_object)
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    m_it.object_iterator = other.m_it.object_iterator;
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    m_it.array_iterator = other.m_it.array_iterator;
-                    break;
-                }
-
-                default:
-                {
-                    m_it.generic_iterator = other.m_it.generic_iterator;
-                    break;
-                }
-            }
-        }
-
-        /// copy constructor
-        inline const_iterator(const const_iterator& other) noexcept
-            : m_object(other.m_object), m_it(other.m_it)
-        {}
-
-        /// copy assignment
-        inline const_iterator& operator=(const_iterator other) noexcept(
-            std::is_nothrow_move_constructible<pointer>::value and
-            std::is_nothrow_move_assignable<pointer>::value and
-            std::is_nothrow_move_constructible<internal_iterator<typename array_t::const_iterator, typename object_t::const_iterator>>::value
-            and
-            std::is_nothrow_move_assignable<internal_iterator<typename array_t::const_iterator, typename object_t::const_iterator>>::value
-        )
-        {
-            std::swap(m_object, other.m_object);
-            std::swap(m_it, other.m_it);
-            return *this;
-        }
-
-      private:
-        /// set the iterator to the first value
-        inline void set_begin() noexcept
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    m_it.object_iterator = m_object->m_value.object->cbegin();
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    m_it.array_iterator = m_object->m_value.array->cbegin();
-                    break;
-                }
-
-                case (basic_json::value_t::null):
-                {
-                    // set to end so begin()==end() is true: null is empty
-                    m_it.generic_iterator = 1;
-                    break;
-                }
-
-                default:
-                {
-                    m_it.generic_iterator = 0;
-                    break;
-                }
-            }
-        }
-
-        /// set the iterator past the last value
-        inline void set_end() noexcept
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    m_it.object_iterator = m_object->m_value.object->cend();
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    m_it.array_iterator = m_object->m_value.array->cend();
-                    break;
-                }
-
-                default:
-                {
-                    m_it.generic_iterator = 1;
-                    break;
-                }
-            }
-        }
-
-      public:
-        /// return a reference to the value pointed to by the iterator
-        inline reference operator*() const
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    return m_it.object_iterator->second;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    return *m_it.array_iterator;
-                }
-
-                case (basic_json::value_t::null):
-                {
-                    throw std::out_of_range("cannot get value");
-                }
-
-                default:
-                {
-                    if (m_it.generic_iterator == 0)
-                    {
-                        return *m_object;
-                    }
-                    else
-                    {
-                        throw std::out_of_range("cannot get value");
-                    }
-                }
-            }
-        }
-
-        /// dereference the iterator
-        inline pointer operator->() const
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    return &(m_it.object_iterator->second);
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    return &*m_it.array_iterator;
-                }
-
-                default:
-                {
-                    if (m_it.generic_iterator == 0)
-                    {
-                        return m_object;
-                    }
-                    else
-                    {
-                        throw std::out_of_range("cannot get value");
-                    }
-                }
-            }
-        }
-
-        /// post-increment (it++)
-        inline const_iterator operator++(int)
-        {
-            auto result = *this;
-
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    m_it.object_iterator++;
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    m_it.array_iterator++;
-                    break;
-                }
-
-                default:
-                {
-                    m_it.generic_iterator++;
-                    break;
-                }
-            }
-
-            return result;
-        }
-
-        /// pre-increment (++it)
-        inline const_iterator& operator++()
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    ++m_it.object_iterator;
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    ++m_it.array_iterator;
-                    break;
-                }
-
-                default:
-                {
-                    ++m_it.generic_iterator;
-                    break;
-                }
-            }
-
-            return *this;
-        }
-
-        /// post-decrement (it--)
-        inline const_iterator operator--(int)
-        {
-            auto result = *this;
-
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    m_it.object_iterator--;
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    m_it.array_iterator--;
-                    break;
-                }
-
-                default:
-                {
-                    m_it.generic_iterator--;
-                    break;
-                }
-            }
-
-            return result;
-        }
-
-        /// pre-decrement (--it)
-        inline const_iterator& operator--()
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    --m_it.object_iterator;
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    --m_it.array_iterator;
-                    break;
-                }
-
-                default:
-                {
-                    --m_it.generic_iterator;
-                    break;
-                }
-            }
-
-            return *this;
-        }
-
-        /// comparison: equal
-        inline bool operator==(const const_iterator& other) const
-        {
-            // if objects are not the same, the comparison is undefined
-            if (m_object != other.m_object)
-            {
-                throw std::domain_error("cannot compare iterators of different containers");
-            }
-
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    return (m_it.object_iterator == other.m_it.object_iterator);
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    return (m_it.array_iterator == other.m_it.array_iterator);
-                }
-
-                default:
-                {
-                    return (m_it.generic_iterator == other.m_it.generic_iterator);
-                }
-            }
-        }
-
-        /// comparison: not equal
-        inline bool operator!=(const const_iterator& other) const
-        {
-            return not operator==(other);
-        }
-
-        /// comparison: smaller
-        inline bool operator<(const const_iterator& other) const
-        {
-            // if objects are not the same, the comparison is undefined
-            if (m_object != other.m_object)
-            {
-                throw std::domain_error("cannot compare iterators of different containers");
-            }
-
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    throw std::domain_error("cannot use operator< for object iterators");
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    return (m_it.array_iterator < other.m_it.array_iterator);
-                }
-
-                default:
-                {
-                    return (m_it.generic_iterator < other.m_it.generic_iterator);
-                }
-            }
-        }
-
-        /// comparison: less than or equal
-        inline bool operator<=(const const_iterator& other) const
-        {
-            return not other.operator < (*this);
-        }
-
-        /// comparison: greater than
-        inline bool operator>(const const_iterator& other) const
-        {
-            return not operator<=(other);
-        }
-
-        /// comparison: greater than or equal
-        inline bool operator>=(const const_iterator& other) const
-        {
-            return not operator<(other);
-        }
-
-        /// add to iterator
-        inline const_iterator& operator+=(difference_type i)
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    throw std::domain_error("cannot use operator+= for object iterators");
-                    break;
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    m_it.array_iterator += i;
-                    break;
-                }
-
-                default:
-                {
-                    m_it.generic_iterator += i;
-                    break;
-                }
-            }
-
-            return *this;
-        }
-
-        /// subtract from iterator
-        inline const_iterator& operator-=(difference_type i)
-        {
-            return operator+=(-i);
-        }
-
-        /// add to iterator
-        inline const_iterator operator+(difference_type i)
-        {
-            auto result = *this;
-            result += i;
-            return result;
-        }
-
-        /// subtract from iterator
-        inline const_iterator operator-(difference_type i)
-        {
-            auto result = *this;
-            result -= i;
-            return result;
-        }
-
-        /// return difference
-        inline difference_type operator-(const const_iterator& other) const
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    throw std::domain_error("cannot use operator- for object iterators");
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    return m_it.array_iterator - other.m_it.array_iterator;
-                }
-
-                default:
-                {
-                    return m_it.generic_iterator - other.m_it.generic_iterator;
-                }
-            }
-        }
-
-        /// access to successor
-        inline reference operator[](difference_type n) const
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    throw std::domain_error("cannot use operator[] for object iterators");
-                }
-
-                case (basic_json::value_t::array):
-                {
-                    return *(m_it.array_iterator + n);
-                }
-
-                case (basic_json::value_t::null):
-                {
-                    throw std::out_of_range("cannot get value");
-                }
-
-                default:
-                {
-                    if (m_it.generic_iterator == -n)
-                    {
-                        return *m_object;
-                    }
-                    else
-                    {
-                        throw std::out_of_range("cannot get value");
-                    }
-                }
-            }
-        }
-
-        /// return the key of an object iterator
-        inline typename object_t::key_type key() const
-        {
-            switch (m_object->m_type)
-            {
-                case (basic_json::value_t::object):
-                {
-                    return m_it.object_iterator->first;
-                }
-
-                default:
-                {
-                    throw std::domain_error("cannot use key() for non-object iterators");
-                }
-            }
-        }
-
-        /// return the value of an iterator
-        inline reference value() const
-        {
-            return operator*();
-        }
-
-      private:
-        /// associated JSON instance
-        pointer m_object = nullptr;
-        /// the actual iterator of the associated instance
-        internal_iterator<typename array_t::const_iterator, typename object_t::const_iterator> m_it;
-    };
-
-    /// a reverse random access iterator for the basic_json class
-    class reverse_iterator : private std::reverse_iterator<basic_json::iterator>
-    {
-      public:
-        inline reverse_iterator(const typename std::reverse_iterator<basic_json::iterator>::iterator_type&
-                                it)
-            : std::reverse_iterator<basic_json::iterator>(it) {}
-
-        /// return the key of an object iterator
-        inline typename object_t::key_type key() const
-        {
-            return this->base().key();
-        }
-
-        /// return the value of an iterator
-        inline reference value() const
-        {
-            return this->base().operator * ();
-        }
-    };
-
-    /// a const reverse random access iterator for the basic_json class
-    class const_reverse_iterator : private std::reverse_iterator<basic_json::const_iterator>
-    {
-      public:
-        inline const_reverse_iterator(const typename
-                                      std::reverse_iterator<basic_json::const_iterator>::iterator_type& it)
-            : std::reverse_iterator<basic_json::const_iterator>(it) {}
-
-        /// return the key of an object iterator
-        inline typename object_t::key_type key() const
-        {
-            return this->base().key();
-        }
-
-        /// return the value of an iterator
-        inline const_reference value() const
-        {
-            return this->base().operator * ();
-        }
-    };
-
-
-  private:
-    //////////////////////
-    // lexer and parser //
-    //////////////////////
-
-    /*!
-    @brief lexical analysis
-
-    This class organizes the lexical analysis during JSON deserialization. The
-    core of it is a scanner generated by re2c <http://re2c.org> that processes
-    a buffer and recognizes tokens according to RFC 7159 and ECMA-404.
-    */
-    class lexer
-    {
-      public:
-        /// token types for the parser
-        enum class token_type
-        {
-            uninitialized,    ///< indicating the scanner is uninitialized
-            literal_true,     ///< the "true" literal
-            literal_false,    ///< the "false" literal
-            literal_null,     ///< the "null" literal
-            value_string,     ///< a string - use get_string() for actual value
-            value_number,     ///< a number - use get_number() for actual value
-            begin_array,      ///< the character for array begin "["
-            begin_object,     ///< the character for object begin "{"
-            end_array,        ///< the character for array end "]"
-            end_object,       ///< the character for object end "}"
-            name_separator,   ///< the name separator ":"
-            value_separator,  ///< the value separator ","
-            parse_error,      ///< indicating a parse error
-            end_of_input      ///< indicating the end of the input buffer
-        };
-
-        /// the char type to use in the lexer
-        using lexer_char_t = unsigned char;
-
-        /// constructor with a given buffer
-        inline lexer(const string_t& s) noexcept
-            : m_stream(nullptr), m_buffer(s)
-        {
-            m_content = reinterpret_cast<const lexer_char_t*>(s.c_str());
-            m_start = m_cursor = m_content;
-            m_limit = m_content + s.size();
-        }
-        inline lexer(std::istream* s) noexcept
-            : m_stream(s)
-        {
-            getline(*m_stream, m_buffer);
-            m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str());
-            m_start = m_cursor = m_content;
-            m_limit = m_content + m_buffer.size();
-        }
-
-        /// default constructor
-        inline lexer() = default;
-
-        /*!
-        @brief create a string from a Unicode code point
-
-        @param codepoint1  the code point (can be high surrogate)
-        @param codepoint2  the code point (can be low surrogate or 0)
-        @return string representation of the code point
-        @exception std::out_of_range if code point is >0x10ffff
-        @exception std::invalid_argument if the low surrogate is invalid
-
-        @see <http://en.wikipedia.org/wiki/UTF-8#Sample_code>
-        */
-        inline static string_t to_unicode(const std::size_t codepoint1,
-                                          const std::size_t codepoint2 = 0)
-        {
-            string_t result;
-
-            // calculate the codepoint from the given code points
-            std::size_t codepoint = codepoint1;
-            if (codepoint1 >= 0xD800 and codepoint1 <= 0xDBFF)
-            {
-                if (codepoint2 >= 0xDC00 and codepoint2 <= 0xDFFF)
-                {
-                    codepoint =
-                        // high surrogate occupies the most significant 22 bits
-                        (codepoint1 << 10)
-                        // low surrogate occupies the least significant 15 bits
-                        + codepoint2
-                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
-                        // in the result so we have to substract with:
-                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
-                        - 0x35FDC00;
-                }
-                else
-                {
-                    throw std::invalid_argument("missing or wrong low surrogate");
-                }
-            }
-
-            if (codepoint <= 0x7f)
-            {
-                // 1-byte characters: 0xxxxxxx (ASCII)
-                result.append(1, static_cast<typename string_t::value_type>(codepoint));
-            }
-            else if (codepoint <= 0x7ff)
-            {
-                // 2-byte characters: 110xxxxx 10xxxxxx
-                result.append(1, static_cast<typename string_t::value_type>(0xC0 | ((codepoint >> 6) & 0x1F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | (codepoint & 0x3F)));
-            }
-            else if (codepoint <= 0xffff)
-            {
-                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
-                result.append(1, static_cast<typename string_t::value_type>(0xE0 | ((codepoint >> 12) & 0x0F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | ((codepoint >> 6) & 0x3F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | (codepoint & 0x3F)));
-            }
-            else if (codepoint <= 0x10ffff)
-            {
-                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-                result.append(1, static_cast<typename string_t::value_type>(0xF0 | ((codepoint >> 18) & 0x07)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | ((codepoint >> 12) & 0x3F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | ((codepoint >> 6) & 0x3F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | (codepoint & 0x3F)));
-            }
-            else
-            {
-                throw std::out_of_range("code points above 0x10FFFF are invalid");
-            }
-
-            return result;
-        }
-
-        /// return name of values of type token_type
-        inline static std::string token_type_name(token_type t) noexcept
-        {
-            switch (t)
-            {
-                case (token_type::uninitialized):
-                    return "<uninitialized>";
-                case (token_type::literal_true):
-                    return "true literal";
-                case (token_type::literal_false):
-                    return "false literal";
-                case (token_type::literal_null):
-                    return "null literal";
-                case (token_type::value_string):
-                    return "string literal";
-                case (token_type::value_number):
-                    return "number literal";
-                case (token_type::begin_array):
-                    return "[";
-                case (token_type::begin_object):
-                    return "{";
-                case (token_type::end_array):
-                    return "]";
-                case (token_type::end_object):
-                    return "}";
-                case (token_type::name_separator):
-                    return ":";
-                case (token_type::value_separator):
-                    return ",";
-                case (token_type::end_of_input):
-                    return "<end of input>";
-                default:
-                    return "<parse error>";
-            }
-        }
-
-        /*!
-        This function implements a scanner for JSON. It is specified using
-        regular expressions that try to follow RFC 7159 and ECMA-404 as close
-        as possible. These regular expressions are then translated into a
-        deterministic finite automaton (DFA) by the tool re2c
-        <http://re2c.org>. As a result, the translated code for this function
-        consists of a large block of code with goto jumps.
-
-        @return the class of the next token read from the buffer
-        */
-        inline token_type scan() noexcept
-        {
-            // pointer for backtracking information
-            m_marker = nullptr;
-
-            // remember the begin of the token
-            m_start = m_cursor;
-
-
-            {
-                lexer_char_t yych;
-                unsigned int yyaccept = 0;
-                static const unsigned char yybm[] =
-                {
-                    0,  64,  64,  64,  64,  64,  64,  64,
-                    64,  96,  96,  64,  64,  96,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    96,  64,   0,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    192, 192, 192, 192, 192, 192, 192, 192,
-                    192, 192,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,   0,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                    64,  64,  64,  64,  64,  64,  64,  64,
-                };
-
-                if ((m_limit - m_cursor) < 5)
-                {
-                    yyfill();
-                };
-                yych = *m_cursor;
-                if (yych <= '9')
-                {
-                    if (yych <= ' ')
-                    {
-                        if (yych <= '\n')
-                        {
-                            if (yych <= 0x00)
-                            {
-                                goto basic_json_parser_27;
-                            }
-                            if (yych <= 0x08)
-                            {
-                                goto basic_json_parser_29;
-                            }
-                            if (yych >= '\n')
-                            {
-                                goto basic_json_parser_4;
-                            }
-                        }
-                        else
-                        {
-                            if (yych == '\r')
-                            {
-                                goto basic_json_parser_2;
-                            }
-                            if (yych <= 0x1F)
-                            {
-                                goto basic_json_parser_29;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= ',')
-                        {
-                            if (yych == '"')
-                            {
-                                goto basic_json_parser_26;
-                            }
-                            if (yych <= '+')
-                            {
-                                goto basic_json_parser_29;
-                            }
-                            goto basic_json_parser_14;
-                        }
-                        else
-                        {
-                            if (yych <= '-')
-                            {
-                                goto basic_json_parser_22;
-                            }
-                            if (yych <= '/')
-                            {
-                                goto basic_json_parser_29;
-                            }
-                            if (yych <= '0')
-                            {
-                                goto basic_json_parser_23;
-                            }
-                            goto basic_json_parser_25;
-                        }
-                    }
-                }
-                else
-                {
-                    if (yych <= 'm')
-                    {
-                        if (yych <= '\\')
-                        {
-                            if (yych <= ':')
-                            {
-                                goto basic_json_parser_16;
-                            }
-                            if (yych == '[')
-                            {
-                                goto basic_json_parser_6;
-                            }
-                            goto basic_json_parser_29;
-                        }
-                        else
-                        {
-                            if (yych <= ']')
-                            {
-                                goto basic_json_parser_8;
-                            }
-                            if (yych == 'f')
-                            {
-                                goto basic_json_parser_21;
-                            }
-                            goto basic_json_parser_29;
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= 'z')
-                        {
-                            if (yych <= 'n')
-                            {
-                                goto basic_json_parser_18;
-                            }
-                            if (yych == 't')
-                            {
-                                goto basic_json_parser_20;
-                            }
-                            goto basic_json_parser_29;
-                        }
-                        else
-                        {
-                            if (yych <= '{')
-                            {
-                                goto basic_json_parser_10;
-                            }
-                            if (yych == '}')
-                            {
-                                goto basic_json_parser_12;
-                            }
-                            goto basic_json_parser_29;
-                        }
-                    }
-                }
-basic_json_parser_2:
-                ++m_cursor;
-                yych = *m_cursor;
-                goto basic_json_parser_5;
-basic_json_parser_3:
-                {
-                    return scan();
-                }
-basic_json_parser_4:
-                ++m_cursor;
-                if (m_limit <= m_cursor)
-                {
-                    yyfill();
-                };
-                yych = *m_cursor;
-basic_json_parser_5:
-                if (yybm[0 + yych] & 32)
-                {
-                    goto basic_json_parser_4;
-                }
-                goto basic_json_parser_3;
-basic_json_parser_6:
-                ++m_cursor;
-                {
-                    return token_type::begin_array;
-                }
-basic_json_parser_8:
-                ++m_cursor;
-                {
-                    return token_type::end_array;
-                }
-basic_json_parser_10:
-                ++m_cursor;
-                {
-                    return token_type::begin_object;
-                }
-basic_json_parser_12:
-                ++m_cursor;
-                {
-                    return token_type::end_object;
-                }
-basic_json_parser_14:
-                ++m_cursor;
-                {
-                    return token_type::value_separator;
-                }
-basic_json_parser_16:
-                ++m_cursor;
-                {
-                    return token_type::name_separator;
-                }
-basic_json_parser_18:
-                yyaccept = 0;
-                yych = *(m_marker = ++m_cursor);
-                if (yych == 'u')
-                {
-                    goto basic_json_parser_59;
-                }
-basic_json_parser_19:
-                {
-                    return token_type::parse_error;
-                }
-basic_json_parser_20:
-                yyaccept = 0;
-                yych = *(m_marker = ++m_cursor);
-                if (yych == 'r')
-                {
-                    goto basic_json_parser_55;
-                }
-                goto basic_json_parser_19;
-basic_json_parser_21:
-                yyaccept = 0;
-                yych = *(m_marker = ++m_cursor);
-                if (yych == 'a')
-                {
-                    goto basic_json_parser_50;
-                }
-                goto basic_json_parser_19;
-basic_json_parser_22:
-                yych = *++m_cursor;
-                if (yych <= '/')
-                {
-                    goto basic_json_parser_19;
-                }
-                if (yych <= '0')
-                {
-                    goto basic_json_parser_49;
-                }
-                if (yych <= '9')
-                {
-                    goto basic_json_parser_40;
-                }
-                goto basic_json_parser_19;
-basic_json_parser_23:
-                yyaccept = 1;
-                yych = *(m_marker = ++m_cursor);
-                if (yych <= 'D')
-                {
-                    if (yych == '.')
-                    {
-                        goto basic_json_parser_42;
-                    }
-                }
-                else
-                {
-                    if (yych <= 'E')
-                    {
-                        goto basic_json_parser_43;
-                    }
-                    if (yych == 'e')
-                    {
-                        goto basic_json_parser_43;
-                    }
-                }
-basic_json_parser_24:
-                {
-                    return token_type::value_number;
-                }
-basic_json_parser_25:
-                yyaccept = 1;
-                yych = *(m_marker = ++m_cursor);
-                goto basic_json_parser_41;
-basic_json_parser_26:
-                yyaccept = 0;
-                yych = *(m_marker = ++m_cursor);
-                if (yych <= 0x00)
-                {
-                    goto basic_json_parser_19;
-                }
-                goto basic_json_parser_31;
-basic_json_parser_27:
-                ++m_cursor;
-                {
-                    return token_type::end_of_input;
-                }
-basic_json_parser_29:
-                yych = *++m_cursor;
-                goto basic_json_parser_19;
-basic_json_parser_30:
-                ++m_cursor;
-                if (m_limit <= m_cursor)
-                {
-                    yyfill();
-                };
-                yych = *m_cursor;
-basic_json_parser_31:
-                if (yybm[0 + yych] & 64)
-                {
-                    goto basic_json_parser_30;
-                }
-                if (yych <= 0x00)
-                {
-                    goto basic_json_parser_32;
-                }
-                if (yych <= '"')
-                {
-                    goto basic_json_parser_34;
-                }
-                goto basic_json_parser_33;
-basic_json_parser_32:
-                m_cursor = m_marker;
-                if (yyaccept == 0)
-                {
-                    goto basic_json_parser_19;
-                }
-                else
-                {
-                    goto basic_json_parser_24;
-                }
-basic_json_parser_33:
-                ++m_cursor;
-                if (m_limit <= m_cursor)
-                {
-                    yyfill();
-                };
-                yych = *m_cursor;
-                if (yych <= 'e')
-                {
-                    if (yych <= '/')
-                    {
-                        if (yych == '"')
-                        {
-                            goto basic_json_parser_30;
-                        }
-                        if (yych <= '.')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        goto basic_json_parser_30;
-                    }
-                    else
-                    {
-                        if (yych <= '\\')
-                        {
-                            if (yych <= '[')
-                            {
-                                goto basic_json_parser_32;
-                            }
-                            goto basic_json_parser_30;
-                        }
-                        else
-                        {
-                            if (yych == 'b')
-                            {
-                                goto basic_json_parser_30;
-                            }
-                            goto basic_json_parser_32;
-                        }
-                    }
-                }
-                else
-                {
-                    if (yych <= 'q')
-                    {
-                        if (yych <= 'f')
-                        {
-                            goto basic_json_parser_30;
-                        }
-                        if (yych == 'n')
-                        {
-                            goto basic_json_parser_30;
-                        }
-                        goto basic_json_parser_32;
-                    }
-                    else
-                    {
-                        if (yych <= 's')
-                        {
-                            if (yych <= 'r')
-                            {
-                                goto basic_json_parser_30;
-                            }
-                            goto basic_json_parser_32;
-                        }
-                        else
-                        {
-                            if (yych <= 't')
-                            {
-                                goto basic_json_parser_30;
-                            }
-                            if (yych <= 'u')
-                            {
-                                goto basic_json_parser_36;
-                            }
-                            goto basic_json_parser_32;
-                        }
-                    }
-                }
-basic_json_parser_34:
-                ++m_cursor;
-                {
-                    return token_type::value_string;
-                }
-basic_json_parser_36:
-                ++m_cursor;
-                if (m_limit <= m_cursor)
-                {
-                    yyfill();
-                };
-                yych = *m_cursor;
-                if (yych <= '@')
-                {
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych >= ':')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                }
-                else
-                {
-                    if (yych <= 'F')
-                    {
-                        goto basic_json_parser_37;
-                    }
-                    if (yych <= '`')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych >= 'g')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                }
-basic_json_parser_37:
-                ++m_cursor;
-                if (m_limit <= m_cursor)
-                {
-                    yyfill();
-                };
-                yych = *m_cursor;
-                if (yych <= '@')
-                {
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych >= ':')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                }
-                else
-                {
-                    if (yych <= 'F')
-                    {
-                        goto basic_json_parser_38;
-                    }
-                    if (yych <= '`')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych >= 'g')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                }
-basic_json_parser_38:
-                ++m_cursor;
-                if (m_limit <= m_cursor)
-                {
-                    yyfill();
-                };
-                yych = *m_cursor;
-                if (yych <= '@')
-                {
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych >= ':')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                }
-                else
-                {
-                    if (yych <= 'F')
-                    {
-                        goto basic_json_parser_39;
-                    }
-                    if (yych <= '`')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych >= 'g')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                }
-basic_json_parser_39:
-                ++m_cursor;
-                if (m_limit <= m_cursor)
-                {
-                    yyfill();
-                };
-                yych = *m_cursor;
-                if (yych <= '@')
-                {
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= '9')
-                    {
-                        goto basic_json_parser_30;
-                    }
-                    goto basic_json_parser_32;
-                }
-                else
-                {
-                    if (yych <= 'F')
-                    {
-                        goto basic_json_parser_30;
-                    }
-                    if (yych <= '`')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 'f')
-                    {
-                        goto basic_json_parser_30;
-                    }
-                    goto basic_json_parser_32;
-                }
-basic_json_parser_40:
-                yyaccept = 1;
-                m_marker = ++m_cursor;
-                if ((m_limit - m_cursor) < 3)
-                {
-                    yyfill();
-                };
-                yych = *m_cursor;
-basic_json_parser_41:
-                if (yybm[0 + yych] & 128)
-                {
-                    goto basic_json_parser_40;
-                }
-                if (yych <= 'D')
-                {
-                    if (yych != '.')
-                    {
-                        goto basic_json_parser_24;
-                    }
-                }
-                else
-                {
-                    if (yych <= 'E')
-                    {
-                        goto basic_json_parser_43;
-                    }
-                    if (yych == 'e')
-                    {
-                        goto basic_json_parser_43;
-                    }
-                    goto basic_json_parser_24;
-                }
-basic_json_parser_42:
-                yych = *++m_cursor;
-                if (yych <= '/')
-                {
-                    goto basic_json_parser_32;
-                }
-                if (yych <= '9')
-                {
-                    goto basic_json_parser_47;
-                }
-                goto basic_json_parser_32;
-basic_json_parser_43:
-                yych = *++m_cursor;
-                if (yych <= ',')
-                {
-                    if (yych != '+')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                }
-                else
-                {
-                    if (yych <= '-')
-                    {
-                        goto basic_json_parser_44;
-                    }
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= '9')
-                    {
-                        goto basic_json_parser_45;
-                    }
-                    goto basic_json_parser_32;
-                }
-basic_json_parser_44:
-                yych = *++m_cursor;
-                if (yych <= '/')
-                {
-                    goto basic_json_parser_32;
-                }
-                if (yych >= ':')
-                {
-                    goto basic_json_parser_32;
-                }
-basic_json_parser_45:
-                ++m_cursor;
-                if (m_limit <= m_cursor)
-                {
-                    yyfill();
-                };
-                yych = *m_cursor;
-                if (yych <= '/')
-                {
-                    goto basic_json_parser_24;
-                }
-                if (yych <= '9')
-                {
-                    goto basic_json_parser_45;
-                }
-                goto basic_json_parser_24;
-basic_json_parser_47:
-                yyaccept = 1;
-                m_marker = ++m_cursor;
-                if ((m_limit - m_cursor) < 3)
-                {
-                    yyfill();
-                };
-                yych = *m_cursor;
-                if (yych <= 'D')
-                {
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_24;
-                    }
-                    if (yych <= '9')
-                    {
-                        goto basic_json_parser_47;
-                    }
-                    goto basic_json_parser_24;
-                }
-                else
-                {
-                    if (yych <= 'E')
-                    {
-                        goto basic_json_parser_43;
-                    }
-                    if (yych == 'e')
-                    {
-                        goto basic_json_parser_43;
-                    }
-                    goto basic_json_parser_24;
-                }
-basic_json_parser_49:
-                yyaccept = 1;
-                yych = *(m_marker = ++m_cursor);
-                if (yych <= 'D')
-                {
-                    if (yych == '.')
-                    {
-                        goto basic_json_parser_42;
-                    }
-                    goto basic_json_parser_24;
-                }
-                else
-                {
-                    if (yych <= 'E')
-                    {
-                        goto basic_json_parser_43;
-                    }
-                    if (yych == 'e')
-                    {
-                        goto basic_json_parser_43;
-                    }
-                    goto basic_json_parser_24;
-                }
-basic_json_parser_50:
-                yych = *++m_cursor;
-                if (yych != 'l')
-                {
-                    goto basic_json_parser_32;
-                }
-                yych = *++m_cursor;
-                if (yych != 's')
-                {
-                    goto basic_json_parser_32;
-                }
-                yych = *++m_cursor;
-                if (yych != 'e')
-                {
-                    goto basic_json_parser_32;
-                }
-                ++m_cursor;
-                {
-                    return token_type::literal_false;
-                }
-basic_json_parser_55:
-                yych = *++m_cursor;
-                if (yych != 'u')
-                {
-                    goto basic_json_parser_32;
-                }
-                yych = *++m_cursor;
-                if (yych != 'e')
-                {
-                    goto basic_json_parser_32;
-                }
-                ++m_cursor;
-                {
-                    return token_type::literal_true;
-                }
-basic_json_parser_59:
-                yych = *++m_cursor;
-                if (yych != 'l')
-                {
-                    goto basic_json_parser_32;
-                }
-                yych = *++m_cursor;
-                if (yych != 'l')
-                {
-                    goto basic_json_parser_32;
-                }
-                ++m_cursor;
-                {
-                    return token_type::literal_null;
-                }
-            }
-
-
-        }
-
-        /// append data from the stream to the internal buffer
-        inline void yyfill() noexcept
-        {
-            if (not m_stream or not * m_stream)
-            {
-                return;
-            }
-
-            const ssize_t offset_start = m_start - m_content;
-            const ssize_t offset_marker = m_marker - m_start;
-            const ssize_t offset_cursor = m_cursor - m_start;
-
-            m_buffer.erase(0, static_cast<size_t>(offset_start));
-            std::string line;
-            std::getline(*m_stream, line);
-            m_buffer += line;
-
-            m_content = reinterpret_cast<const lexer_char_t*>(m_buffer.c_str());
-            m_start  = m_content;
-            m_marker = m_start + offset_marker;
-            m_cursor = m_start + offset_cursor;
-            m_limit  = m_start + m_buffer.size() - 1;
-        }
-
-        /// return string representation of last read token
-        inline string_t get_token() const noexcept
-        {
-            return string_t(reinterpret_cast<typename string_t::const_pointer>(m_start),
-                            static_cast<size_t>(m_cursor - m_start));
-        }
-
-        /*!
-        @brief return string value for string tokens
-
-        The function iterates the characters between the opening and closing
-        quotes of the string value. The complete string is the range
-        [m_start,m_cursor). Consequently, we iterate from m_start+1 to
-        m_cursor-1.
-
-        We differentiate two cases:
-
-        1. Escaped characters. In this case, a new character is constructed
-           according to the nature of the escape. Some escapes create new
-           characters (e.g., @c "\\n" is replaced by @c "\n"), some are copied
-           as is (e.g., @c "\\\\"). Furthermore, Unicode escapes of the shape
-           @c "\\uxxxx" need special care. In this case, to_unicode takes care
-           of the construction of the values.
-        2. Unescaped characters are copied as is.
-
-        @return string value of current token without opening and closing quotes
-        @exception std::out_of_range if to_unicode fails
-        */
-        inline string_t get_string() const
-        {
-            string_t result;
-            result.reserve(static_cast<size_t>(m_cursor - m_start - 2));
-
-            // iterate the result between the quotes
-            for (const lexer_char_t* i = m_start + 1; i < m_cursor - 1; ++i)
-            {
-                // process escaped characters
-                if (*i == '\\')
-                {
-                    // read next character
-                    ++i;
-
-                    switch (*i)
-                    {
-                        // the default escapes
-                        case 't':
-                        {
-                            result += "\t";
-                            break;
-                        }
-                        case 'b':
-                        {
-                            result += "\b";
-                            break;
-                        }
-                        case 'f':
-                        {
-                            result += "\f";
-                            break;
-                        }
-                        case 'n':
-                        {
-                            result += "\n";
-                            break;
-                        }
-                        case 'r':
-                        {
-                            result += "\r";
-                            break;
-                        }
-
-                        // characters that are not "un"escsaped
-                        case '\\':
-                        {
-                            result += "\\\\";
-                            break;
-                        }
-                        case '/':
-                        {
-                            result += "\\/";
-                            break;
-                        }
-                        case '"':
-                        {
-                            result += "\\\"";
-                            break;
-                        }
-
-                        // unicode
-                        case 'u':
-                        {
-                            // get code xxxx from uxxxx
-                            auto codepoint = std::strtoul(std::string(reinterpret_cast<typename string_t::const_pointer>(i + 1),
-                                                          4).c_str(), nullptr, 16);
-
-                            if (codepoint >= 0xD800 and codepoint <= 0xDBFF)
-                            {
-                                // make sure there is a subsequent unicode
-                                if ((i + 6 >= m_limit) or * (i + 5) != '\\' or * (i + 6) != 'u')
-                                {
-                                    throw std::invalid_argument("missing low surrogate");
-                                }
-
-                                // get code yyyy from uxxxx\uyyyy
-                                auto codepoint2 = std::strtoul(std::string(reinterpret_cast<typename string_t::const_pointer>
-                                                               (i + 7), 4).c_str(), nullptr, 16);
-                                result += to_unicode(codepoint, codepoint2);
-                                // skip the next 11 characters (xxxx\uyyyy)
-                                i += 11;
-                            }
-                            else
-                            {
-                                // add unicode character(s)
-                                result += to_unicode(codepoint);
-                                // skip the next four characters (xxxx)
-                                i += 4;
-                            }
-                            break;
-                        }
-                    }
-                }
-                else
-                {
-                    // all other characters are just copied to the end of the
-                    // string
-                    result.append(1, static_cast<typename string_t::value_type>(*i));
-                }
-            }
-
-            return result;
-        }
-
-        /*!
-        @brief return number value for number tokens
-
-        This function translates the last token into a floating point number.
-        The pointer m_begin points to the beginning of the parsed number. We
-        pass this pointer to std::strtod which sets endptr to the first
-        character past the converted number. If this pointer is not the same as
-        m_cursor, then either more or less characters have been used during the
-        comparison. This can happen for inputs like "01" which will be treated
-        like number 0 followed by number 1.
-
-        @return the result of the number conversion or NAN if the conversion
-        read past the current token. The latter case needs to be treated by the
-        caller function.
-
-        @exception std::range_error if passed value is out of range
-        */
-        inline number_float_t get_number() const
-        {
-            // conversion
-            typename string_t::value_type* endptr;
-            const auto float_val = std::strtod(reinterpret_cast<typename string_t::const_pointer>(m_start),
-                                               &endptr);
-
-            // return float_val if the whole number was translated and NAN
-            // otherwise
-            return (reinterpret_cast<lexer_char_t*>(endptr) == m_cursor) ? float_val : NAN;
-        }
-
-      private:
-        /// optional input stream
-        std::istream* m_stream;
-        /// the buffer
-        string_t m_buffer;
-        /// the buffer pointer
-        const lexer_char_t* m_content = nullptr;
-        /// pointer to the beginning of the current symbol
-        const lexer_char_t* m_start = nullptr;
-        /// pointer for backtracking information
-        const lexer_char_t* m_marker = nullptr;
-        /// pointer to the current symbol
-        const lexer_char_t* m_cursor = nullptr;
-        /// pointer to the end of the buffer
-        const lexer_char_t* m_limit = nullptr;
-    };
-
-    /*!
-    @brief syntax analysis
-    */
-    class parser
-    {
-      public:
-        /// constructor for strings
-        inline parser(const string_t& s) : m_lexer(s)
-        {
-            // read first token
-            get_token();
-        }
-
-        /// a parser reading from an input stream
-        inline parser(std::istream& _is) : m_lexer(&_is)
-        {
-            // read first token
-            get_token();
-        }
-
-        /// public parser interface
-        inline basic_json parse()
-        {
-            basic_json result = parse_internal();
-
-            expect(lexer::token_type::end_of_input);
-
-            return result;
-        }
-
-      private:
-        /// the actual parser
-        inline basic_json parse_internal()
-        {
-            switch (last_token)
-            {
-                case (lexer::token_type::begin_object):
-                {
-                    // explicitly set result to object to cope with {}
-                    basic_json result(value_t::object);
-
-                    // read next token
-                    get_token();
-
-                    // closing } -> we are done
-                    if (last_token == lexer::token_type::end_object)
-                    {
-                        get_token();
-                        return result;
-                    }
-
-                    // otherwise: parse key-value pairs
-                    do
-                    {
-                        // ugly, but could be fixed with loop reorganization
-                        if (last_token == lexer::token_type::value_separator)
-                        {
-                            get_token();
-                        }
-
-                        // store key
-                        expect(lexer::token_type::value_string);
-                        const auto key = m_lexer.get_string();
-
-                        // parse separator (:)
-                        get_token();
-                        expect(lexer::token_type::name_separator);
-
-                        // parse value
-                        get_token();
-                        result[key] = parse_internal();
-                    }
-                    while (last_token == lexer::token_type::value_separator);
-
-                    // closing }
-                    expect(lexer::token_type::end_object);
-                    get_token();
-
-                    return result;
-                }
-
-                case (lexer::token_type::begin_array):
-                {
-                    // explicitly set result to object to cope with []
-                    basic_json result(value_t::array);
-
-                    // read next token
-                    get_token();
-
-                    // closing ] -> we are done
-                    if (last_token == lexer::token_type::end_array)
-                    {
-                        get_token();
-                        return result;
-                    }
-
-                    // otherwise: parse values
-                    do
-                    {
-                        // ugly, but could be fixed with loop reorganization
-                        if (last_token == lexer::token_type::value_separator)
-                        {
-                            get_token();
-                        }
-
-                        // parse value
-                        result.push_back(parse_internal());
-                    }
-                    while (last_token == lexer::token_type::value_separator);
-
-                    // closing ]
-                    expect(lexer::token_type::end_array);
-                    get_token();
-
-                    return result;
-                }
-
-                case (lexer::token_type::literal_null):
-                {
-                    get_token();
-                    return basic_json(nullptr);
-                }
-
-                case (lexer::token_type::value_string):
-                {
-                    const auto s = m_lexer.get_string();
-                    get_token();
-                    return basic_json(s);
-                }
-
-                case (lexer::token_type::literal_true):
-                {
-                    get_token();
-                    return basic_json(true);
-                }
-
-                case (lexer::token_type::literal_false):
-                {
-                    get_token();
-                    return basic_json(false);
-                }
-
-                case (lexer::token_type::value_number):
-                {
-                    auto float_val = m_lexer.get_number();
-
-                    // NAN is returned if token could not be translated
-                    // completely
-                    if (std::isnan(float_val))
-                    {
-                        throw std::invalid_argument(std::string("parse error - ") +
-                                                    m_lexer.get_token() + " is not a number");
-                    }
-
-                    get_token();
-
-                    // check if conversion loses precision
-                    const auto int_val = static_cast<number_integer_t>(float_val);
-                    if (approx(float_val, static_cast<number_float_t>(int_val)))
-                    {
-                        // we basic_json not lose precision -> return int
-                        return basic_json(int_val);
-                    }
-                    else
-                    {
-                        // we would lose precision -> returnfloat
-                        return basic_json(float_val);
-                    }
-                }
-
-                default:
-                {
-                    std::string error_msg = "parse error - unexpected \'";
-                    error_msg += m_lexer.get_token();
-                    error_msg += "\' (";
-                    error_msg += lexer::token_type_name(last_token) + ")";
-                    throw std::invalid_argument(error_msg);
-                }
-            }
-        }
-
-        /// get next token from lexer
-        inline typename lexer::token_type get_token()
-        {
-            last_token = m_lexer.scan();
-            return last_token;
-        }
-
-        inline void expect(typename lexer::token_type t) const
-        {
-            if (t != last_token)
-            {
-                std::string error_msg = "parse error - unexpected \'";
-                error_msg += m_lexer.get_token();
-                error_msg += "\' (" + lexer::token_type_name(last_token);
-                error_msg += "); expected " + lexer::token_type_name(t);
-                throw std::invalid_argument(error_msg);
-            }
-        }
-
-      private:
-        /// the type of the last read token
-        typename lexer::token_type last_token = lexer::token_type::uninitialized;
-        /// the lexer
-        lexer m_lexer;
-    };
-};
-
-
-/////////////
-// presets //
-/////////////
-
-/// default JSON class
-using json = basic_json<>;
-}
-
-
-/////////////////////////
-// nonmember functions //
-/////////////////////////
-
-// specialization of std::swap, and std::hash
-namespace std
-{
-/*!
-@brief exchanges the values of two JSON objects
-@ingroup container
-*/
-template <>
-inline void swap(nlohmann::json& j1,
-                 nlohmann::json& j2) noexcept(
-                     is_nothrow_move_constructible<nlohmann::json>::value and
-                     is_nothrow_move_assignable<nlohmann::json>::value
-                 )
-{
-    j1.swap(j2);
-}
-
-/// hash value for JSON objects
-template <>
-struct hash<nlohmann::json>
-{
-    /// return a hash value for a JSON object
-    inline std::size_t operator()(const nlohmann::json& j) const
-    {
-        // a naive hashing via the string representation
-        const auto& h = hash<nlohmann::json::string_t>();
-        return h(j.dump());
-    }
-};
-}
-
-/*!
-This operator implements a user-defined string literal for JSON objects. It can
-be used by adding \p "_json" to a string literal and returns a JSON object if
-no parse error occurred.
-
-@param s  a string representation of a JSON object
-@return a JSON object
-*/
-inline nlohmann::json operator "" _json(const char* s, std::size_t)
-{
-    return nlohmann::json::parse(reinterpret_cast<nlohmann::json::string_t::value_type*>
-                                 (const_cast<char*>(s)));
-}
-
-#endif
diff --git a/src/sioclient/test/sio_test.cpp b/src/sioclient/test/sio_test.cpp
deleted file mode 100644
index fb6f3e50..00000000
--- a/src/sioclient/test/sio_test.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-//
-//  sio_test_sample.cpp
-//
-//  Created by Melo Yao on 3/24/15.
-//
-
-#include <sio_client.h>
-#include <internal/sio_packet.h>
-#include <functional>
-#include <iostream>
-#include <thread>
-
-#define BOOST_TEST_MODULE sio_test
-
-#include <boost/test/unit_test.hpp>
-#ifndef _WIN32
-#include "json.hpp" //nlohmann::json cannot build in MSVC
-#endif
-
-using namespace sio;
-BOOST_AUTO_TEST_SUITE(test_packet)
-
-BOOST_AUTO_TEST_CASE( test_packet_construct_1 )
-{
-    packet p("/nsp",nullptr,1001,true);
-    BOOST_CHECK(p.get_frame() == packet::frame_message);
-    BOOST_CHECK(p.get_message() == nullptr);
-    BOOST_CHECK(p.get_nsp() == std::string("/nsp"));
-    BOOST_CHECK(p.get_pack_id() == 1001);
-}
-
-BOOST_AUTO_TEST_CASE( test_packet_construct_2 )
-{
-    packet p(packet::frame_ping);
-    BOOST_CHECK(p.get_frame() == packet::frame_ping);
-    BOOST_CHECK(p.get_message() == nullptr);
-    BOOST_CHECK(p.get_nsp() == std::string(""));
-    BOOST_CHECK(p.get_pack_id() == 0xFFFFFFFF);
-}
-
-BOOST_AUTO_TEST_CASE( test_packet_construct_3 )
-{
-    packet p(packet::type_connect,"/nsp",nullptr);
-    BOOST_CHECK(p.get_frame() == packet::frame_message);
-    BOOST_CHECK(p.get_type() == packet::type_connect);
-    BOOST_CHECK(p.get_message() == nullptr);
-    BOOST_CHECK(p.get_nsp() == std::string("/nsp"));
-    BOOST_CHECK(p.get_pack_id() == 0xFFFFFFFF);
-}
-
-BOOST_AUTO_TEST_CASE( test_packet_accept_1 )
-{
-    packet p(packet::type_connect,"/nsp",nullptr);
-    std::string payload;
-    std::vector<std::shared_ptr<const std::string> > buffers;
-    p.accept(payload,buffers);
-    BOOST_CHECK(buffers.size() == 0);
-    BOOST_CHECK_MESSAGE(payload == "40/nsp",std::string("outputing payload:")+payload);
-}
-
-BOOST_AUTO_TEST_CASE( test_packet_accept_2 )
-{
-    packet p(packet::frame_ping);
-    std::string payload;
-    std::vector<std::shared_ptr<const std::string> > buffers;
-    p.accept(payload,buffers);
-    BOOST_CHECK(buffers.size() == 0);
-    BOOST_CHECK_MESSAGE(payload == "2",std::string("outputing payload:")+payload);
-}
-
-BOOST_AUTO_TEST_CASE( test_packet_accept_3 )
-{
-    message::ptr array = array_message::create();
-    array->get_vector().push_back(string_message::create("event"));
-    array->get_vector().push_back(string_message::create("text"));
-    packet p("/nsp",array,1001,true);
-    std::string payload;
-    std::vector<std::shared_ptr<const std::string> > buffers;
-    p.accept(payload,buffers);
-    BOOST_CHECK(p.get_type() == packet::type_ack);
-    BOOST_CHECK(buffers.size() == 0);
-    BOOST_CHECK_MESSAGE(payload == "43/nsp,1001[\"event\",\"text\"]",std::string("outputing payload:")+payload);
-}
-
-#ifndef _WIN32
-BOOST_AUTO_TEST_CASE( test_packet_accept_4 )
-{
-    message::ptr binObj = object_message::create();
-    binObj->get_map()["desc"] = string_message::create("Bin of 100 bytes");
-    char bin[100];
-    memset(bin,0,100*sizeof(char));
-    binObj->get_map()["bin1"] = binary_message::create(std::shared_ptr<const std::string>(new std::string(bin,100)));
-    char bin2[50];
-    memset(bin2,1,50*sizeof(char));
-    binObj->get_map()["bin2"] = binary_message::create(std::make_shared<const std::string>(bin2,50));
-
-    packet p("/nsp",binObj,1001,false);
-    std::string payload;
-    std::vector<std::shared_ptr<const std::string> > buffers;
-    p.accept(payload,buffers);
-    BOOST_CHECK(p.get_type() == packet::type_binary_event);
-    BOOST_REQUIRE(buffers.size() == 2);
-    size_t json_start = payload.find("{");
-    BOOST_REQUIRE(json_start!=std::string::npos);
-    std::string header = payload.substr(0,json_start);
-    BOOST_CHECK_MESSAGE(header=="452-/nsp,1001",std::string("outputing payload header:")+header);
-    std::string json = payload.substr(json_start);
-    nlohmann::json j = nlohmann::json::parse(json);
-    BOOST_CHECK_MESSAGE(j["desc"].get<std::string>() == "Bin of 100 bytes", std::string("outputing payload desc:") + j["desc"].get<std::string>());
-    BOOST_CHECK_MESSAGE((bool)j["bin1"]["_placeholder"] , std::string("outputing payload bin1:") + j["bin1"].dump());
-    BOOST_CHECK_MESSAGE((bool)j["bin2"]["_placeholder"] , std::string("outputing payload bin2:") + j["bin2"].dump());
-    int bin1Num = j["bin1"]["num"].get<int>();
-    char numchar[] = {0,0};
-    numchar[0] = bin1Num+'0';
-    BOOST_CHECK_MESSAGE(buffers[bin1Num]->length()==101 , std::string("outputing payload bin1 num:")+numchar);
-    BOOST_CHECK(buffers[bin1Num]->at(50)==0 && buffers[bin1Num]->at(0) == packet::frame_message);
-    int bin2Num = j["bin2"]["num"].get<int>();
-    numchar[0] = bin2Num+'0';
-    BOOST_CHECK_MESSAGE(buffers[bin2Num]->length()==51 , std::string("outputing payload bin2 num:") + numchar);
-    BOOST_CHECK(buffers[bin2Num]->at(25)==1 && buffers[bin2Num]->at(0) == packet::frame_message);
-}
-#endif
-
-BOOST_AUTO_TEST_CASE( test_packet_parse_1 )
-{
-    packet p;
-    bool hasbin = p.parse("42/nsp,1001[\"event\",\"text\"]");
-    BOOST_CHECK(!hasbin);
-    BOOST_CHECK(p.get_frame() == packet::frame_message);
-    BOOST_CHECK(p.get_type() == packet::type_event);
-    BOOST_CHECK(p.get_nsp() == "/nsp");
-    BOOST_CHECK(p.get_pack_id() == 1001);
-    BOOST_CHECK(p.get_message()->get_flag() == message::flag_array);
-    BOOST_REQUIRE(p.get_message()->get_vector()[0]->get_flag() == message::flag_string);
-    BOOST_CHECK(p.get_message()->get_vector()[0]->get_string() == "event");
-    BOOST_REQUIRE(p.get_message()->get_vector()[1]->get_flag() == message::flag_string);
-    BOOST_CHECK(p.get_message()->get_vector()[1]->get_string() == "text");
-
-    hasbin = p.parse("431111[\"ack\",{\"count\":5}]");
-    BOOST_CHECK(!hasbin);
-    BOOST_CHECK(p.get_frame() == packet::frame_message);
-    BOOST_CHECK(p.get_type() == packet::type_ack);
-    BOOST_CHECK(p.get_pack_id() == 1111);
-    BOOST_CHECK(p.get_nsp() == "/");
-    BOOST_CHECK(p.get_message()->get_flag() == message::flag_array);
-    BOOST_REQUIRE(p.get_message()->get_vector()[0]->get_flag() == message::flag_string);
-    BOOST_CHECK(p.get_message()->get_vector()[0]->get_string() == "ack");
-    BOOST_REQUIRE(p.get_message()->get_vector()[1]->get_flag() == message::flag_object);
-    BOOST_CHECK(p.get_message()->get_vector()[1]->get_map()["count"]->get_int() == 5);
-}
-
-BOOST_AUTO_TEST_CASE( test_packet_parse_2 )
-{
-    packet p;
-    bool hasbin = p.parse("3");
-    BOOST_CHECK(!hasbin);
-    BOOST_CHECK(p.get_frame() == packet::frame_pong);
-    BOOST_CHECK(!p.get_message());
-    BOOST_CHECK(p.get_nsp() == "/");
-    BOOST_CHECK(p.get_pack_id() == -1);
-    hasbin = p.parse("2");
-
-    BOOST_CHECK(!hasbin);
-    BOOST_CHECK(p.get_frame() == packet::frame_ping);
-    BOOST_CHECK(!p.get_message());
-    BOOST_CHECK(p.get_nsp() == "/");
-    BOOST_CHECK(p.get_pack_id() == -1);
-}
-
-BOOST_AUTO_TEST_CASE( test_packet_parse_3 )
-{
-    packet p;
-    bool hasbin = p.parse("40/nsp");
-    BOOST_CHECK(!hasbin);
-    BOOST_CHECK(p.get_type() == packet::type_connect);
-    BOOST_CHECK(p.get_frame() == packet::frame_message);
-    BOOST_CHECK(p.get_nsp() == "/nsp");
-    BOOST_CHECK(p.get_pack_id() == -1);
-    BOOST_CHECK(!p.get_message());
-    p.parse("40");
-    BOOST_CHECK(p.get_type() == packet::type_connect);
-    BOOST_CHECK(p.get_nsp() == "/");
-    BOOST_CHECK(p.get_pack_id() == -1);
-    BOOST_CHECK(!p.get_message());
-    p.parse("44\"error\"");
-    BOOST_CHECK(p.get_type() == packet::type_error);
-    BOOST_CHECK(p.get_nsp() == "/");
-    BOOST_CHECK(p.get_pack_id() == -1);
-    BOOST_CHECK(p.get_message()->get_flag() == message::flag_string);
-    p.parse("44/nsp,\"error\"");
-    BOOST_CHECK(p.get_type() == packet::type_error);
-    BOOST_CHECK(p.get_nsp() == "/nsp");
-    BOOST_CHECK(p.get_pack_id() == -1);
-    BOOST_CHECK(p.get_message()->get_flag() == message::flag_string);
-}
-
-BOOST_AUTO_TEST_CASE( test_packet_parse_4 )
-{
-    packet p;
-    bool hasbin = p.parse("452-/nsp,101[\"bin_event\",[{\"_placeholder\":true,\"num\":1},{\"_placeholder\":true,\"num\":0},\"text\"]]");
-    BOOST_CHECK(hasbin);
-    char buf[101];
-    buf[0] = packet::frame_message;
-    memset(buf+1,0,100);
-
-    std::string bufstr(buf,101);
-    std::string bufstr2(buf,51);
-    BOOST_CHECK(p.parse_buffer(bufstr));
-    BOOST_CHECK(!p.parse_buffer(bufstr2));
-
-    BOOST_CHECK(p.get_frame() == packet::frame_message);
-    BOOST_CHECK(p.get_nsp() == "/nsp");
-    BOOST_CHECK(p.get_pack_id() == 101);
-    message::ptr msg = p.get_message();
-    BOOST_REQUIRE(msg&&msg->get_flag() == message::flag_array);
-    BOOST_CHECK(msg->get_vector()[0]->get_string() == "bin_event");
-    message::ptr array = msg->get_vector()[1];
-    BOOST_REQUIRE(array->get_flag() == message::flag_array);
-    BOOST_REQUIRE(array->get_vector()[0]->get_flag() == message::flag_binary);
-    BOOST_REQUIRE(array->get_vector()[1]->get_flag() == message::flag_binary);
-    BOOST_REQUIRE(array->get_vector()[2]->get_flag() == message::flag_string);
-    BOOST_CHECK(array->get_vector()[0]->get_binary()->size() == 50);
-    BOOST_CHECK(array->get_vector()[1]->get_binary()->size() == 100);
-    BOOST_CHECK(array->get_vector()[2]->get_string() == "text");
-
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-