Merge branch 'development' of https://git01.codeplex.com/casablanca into development

Author: stgates

CONTRIBUTORS.txt

@@ -20,6 +20,7 @@ jracle
 gandziej 
 adish
 LeonidCSIT
+LocutusOfBorg
 
 AutoDesk Inc.
 Cyrille Fauvel (cyrillef)

Release/CMakeLists.txt

@@ -165,7 +165,20 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
 
 # These settings can be used by the test targets
 set(Casablanca_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
-set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include ${Boost_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
+
+find_path(WEBSOCKETPP_CONFIG websocketpp-config.cmake
+                       HINTS /usr/lib/cmake/websocketpp)
+find_path(WEBSOCKETPP_CONFIG_VERSION websocketpp-configVersion.cmake
+                       HINTS /usr/lib/cmake/websocketpp)
+if(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
+  include(${WEBSOCKETPP_CONFIG}/websocketpp-config.cmake)
+  include(${WEBSOCKETPP_CONFIG}/websocketpp-configVersion.cmake)
+  message("-- Found websocketpp version " ${PACKAGE_VERSION} " on system")
+  set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${WEBSOCKETPP_INCLUDE_DIR})
+else(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
+  set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
+  message("-- websocketpp not found, using the embedded version")
+endif(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
 
 set(Casablanca_LIBRARY ${LIB}cpprest)
 set(Casablanca_LIBRARIES ${Casablanca_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK})

Release/include/cpprest/details/basic_types.h

@@ -30,7 +30,6 @@
 #include <iostream>
 #include <sstream>
 #include "cpprest/details/cpprest_compat.h"
-#include "cpprest/details/basic_types.h"
 
 #ifndef _WIN32
 # define __STDC_LIMIT_MACROS

Release/include/cpprest/details/cpprest_compat.h

@@ -55,17 +55,11 @@
 // No SAL on non Windows platforms
 #include "cpprest/details/nosal.h"
 
-#if defined(__APPLE__) // Settings specific to Apple
-#define __cdecl
+#if not defined __cdecl
+#if defined cdecl
+#define __cdecl __attribute__ ((cdecl))
 #else
-
-// Settings specific to Linux and Android
-
-// Ignore cdecl on ANDROID ARM and 64bit
-#if defined(__ANDROID__) && defined(__arm__) || defined(__LP64__)
 #define __cdecl
-#else
-#define __cdecl __attribute__ ((cdecl))
 #endif
 
 #if defined(__ANDROID__)

Release/include/pplx/pplxcancellation_token.h

@@ -35,7 +35,7 @@
 #endif
 
 #include <string>
-#include <pplx/pplxinterface.h>
+#include "pplx/pplxinterface.h"
 
 #pragma pack(push,_CRT_PACKING)
 // All header files are required to be protected from the macro new

Release/include/pplx/pplxinterface.h

@@ -46,12 +46,7 @@
 #include <atomic>
 #endif
 
-#if (defined(ANDROID) || defined(__ANDROID__))
-// This prevents users from requiring -Wno-attributes when using gcc-4.8 with the android NDK.
-#define _pplx_cdecl
-#else
 #define _pplx_cdecl __cdecl
-#endif
 
 namespace pplx
 {

Release/src/CMakeLists.txt

@@ -1,4 +1,4 @@
-include_directories(../include pch ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
+include_directories(pch ${OPENSSL_INCLUDE_DIR})
 
 set(SOURCES_COMMON
   http/client/http_client_msg.cpp

Release/src/utilities/base64.cpp

@@ -102,12 +102,7 @@ std::vector<unsigned char> _from_base64(const utility::string_t& input)
 
         for (auto iter = input.begin(); iter != input.end(); ++iter,--size)
         {
-            const auto ch = *iter;
-            if ( ch < 0 )
-            {
-                throw std::runtime_error("invalid character found in base64 string");
-            }
-            const size_t ch_sz = static_cast<size_t>(ch);
+            const size_t ch_sz = static_cast<size_t>(*iter);
             if ( ch_sz >= _base64_dectbl.size() || _base64_dectbl[ch_sz] == 255 )
             {
                 throw std::runtime_error("invalid character found in base64 string");
@@ -122,12 +117,7 @@ std::vector<unsigned char> _from_base64(const utility::string_t& input)
                 }
                 if ( size == 2 )
                 {
-                    const auto ch2 = *(iter+1);
-                    if ( ch2 < 0 )
-                    {
-                        throw std::runtime_error("invalid padding character found in base64 string");
-                    }
-                    const size_t ch2_sz = static_cast<size_t>(ch2);
+                    const size_t ch2_sz = static_cast<size_t>(*(iter+1));
                     if ( ch2_sz >= _base64_dectbl.size() || _base64_dectbl[ch2_sz] != 254 )
                     {
                         throw std::runtime_error("invalid padding character found in base64 string");

Release/tests/common/TestRunner/CMakeLists.txt

@@ -1,7 +1,4 @@
-include_directories(${Casablanca_INCLUDE_DIR}
-  ../UnitTestpp
-  ${Boost_INCLUDE_DIR}
-  )
+include_directories(${Casablanca_INCLUDE_DIRS})
 
 set(TR_SOURCES
   test_runner.cpp