Merge pull request #254 from McdonaldSeanp/PA3244

(PA-3244) Updates to support boost 1.73

Author: donoghuc

README.md

@@ -16,7 +16,7 @@ Dependencies
 
  - a C++11 compiler (clang/gcc 4.7)
  - CMake (3.2 or newer)
- - Boost (1.54 or newer)
+ - Boost (1.55 or newer)
  - OpenSSL
  - [leatherman][leatherman], installed as a standalone library (0.5.1 or newer)
 

lib/inc/cpp-pcp-client/protocol/v1/serialization.hpp

@@ -5,7 +5,7 @@
 
 #include <leatherman/locale/locale.hpp>
 
-#include <boost/detail/endian.hpp>
+#include <boost/predef/other/endian.h>
 
 #include <string>
 #include <vector>
@@ -27,7 +27,7 @@ typedef std::vector<uint8_t> SerializedMessage;
 // Utility functions
 //
 
-#ifdef BOOST_LITTLE_ENDIAN
+#ifdef BOOST_ENDIAN_LITTLE_BYTE
 
 LIBCPP_PCP_CLIENT_EXPORT uint32_t getNetworkNumber(const uint32_t& number);
 LIBCPP_PCP_CLIENT_EXPORT uint32_t getHostNumber(const uint32_t& number);
@@ -42,7 +42,7 @@ inline uint32_t getHostNumber(const uint32_t& number) {
     return number;
 }
 
-#endif  // BOOST_LITTLE_ENDIAN
+#endif  // BOOST_ENDIAN_LITTLE_BYTE
 
 //
 // Serialize

lib/src/protocol/v1/serialization.cc

@@ -9,7 +9,7 @@
 namespace PCPClient {
 namespace v1 {
 
-#ifdef BOOST_LITTLE_ENDIAN
+#if BOOST_ENDIAN_LITTLE_BYTE
 
 uint32_t getNetworkNumber(const uint32_t& number)
 {
@@ -21,7 +21,7 @@ uint32_t getHostNumber(const uint32_t& number)
     return ntohl(number);
 }
 
-#endif  // BOOST_LITTLE_ENDIAN
+#endif  // BOOST_ENDIAN_LITTLE_BYTE
 
 }  // namespace v1
 }  // namespace PCPClient

vendor/websocketpp-0.8.1.zip renamed to vendor/websocketpp-0.8.2.zip

@@ -4,8 +4,8 @@ INCLUDE(ExternalProject)
 EXTERNALPROJECT_ADD(
     websocketpp
     PREFIX "${PROJECT_BINARY_DIR}"
-    URL "file://${VENDOR_DIRECTORY}/websocketpp-0.8.1.zip"
-    URL_MD5 "af0385e19ae5d37b087b1c73b176f10d"
+    URL "file://${VENDOR_DIRECTORY}/websocketpp-0.8.2.zip"
+    URL_MD5 "87d06d8ce62767602cb339d46b6664a1"
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
     BUILD_IN_SOURCE 1