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

Author: stgates

Release/CMakeLists.txt

@@ -71,6 +71,15 @@ elseif(UNIX) # This includes OSX
   option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
   option(BUILD_TESTS "Build tests." ON)
   option(BUILD_SAMPLES "Build samples." ON)
+  option(CASA_INSTALL_HEADERS "Install header files." ON)
+  if(CASA_INSTALL_HEADERS)
+    file(GLOB CASA_HEADERS_CPPREST include/cpprest/*.hpp include/cpprest/*.h)
+    install(FILES ${CASA_HEADERS_CPPREST} DESTINATION include/cpprest)
+    file(GLOB CASA_HEADERS_PPLX include/pplx/*.hpp include/pplx/*.h)
+    install(FILES ${CASA_HEADERS_PPLX} DESTINATION include/pplx)
+    file(GLOB CASA_HEADERS_DETAILS include/cpprest/details/*.hpp include/cpprest/details/*.h)
+    install(FILES ${CASA_HEADERS_DETAILS} DESTINATION include/cpprest/details)
+  endif()
 elseif(WIN32)
   option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
   option(BUILD_TESTS "Build tests." ON)
@@ -169,4 +178,3 @@ endif()
 if(BUILD_SAMPLES)
   add_subdirectory(samples)
 endif()
-

Release/include/compat/pplxtasks.h

@@ -60,66 +60,64 @@ namespace concurrency = Concurrency;
 #pragma warning(disable : 4718)
 #endif
 
-#ifndef _MS_WINDOWS
-// TFS 579628 - 1206: figure out how to avoid having this specialization for Linux (beware of 64-bit Linux)
-namespace std {
+namespace Concurrency 
+{ 
+/// Library for asychronous streams.
+namespace streams
+{
+    /// <summary>
+    /// Extending the standard char_traits type with one that adds values and types
+    /// that are unique to "C++ REST SDK" streams.
+    /// </summary>
+    /// <typeparam name="_CharType">
+    /// The data type of the basic element of the stream.
+    /// </typeparam>
+    template<typename _CharType>
+    struct char_traits : std::char_traits<_CharType>
+    {
+        /// <summary>
+        /// Some synchronous functions will return this value if the operation
+        /// requires an asynchronous call in a given situation.
+        /// </summary>
+        /// <returns>An <c>int_type</c> value which implies that an asynchronous call is required.</returns>
+        static typename std::char_traits<_CharType>::int_type requires_async() { return std::char_traits<_CharType>::eof()-1; }
+    };
+#if !defined(_MS_WINDOWS)
     template<>
-    struct char_traits<unsigned char> : private char_traits<char>
+    struct char_traits<unsigned char> : private std::char_traits<char>
     {
     public:
         typedef unsigned char char_type;
 
-        using char_traits<char>::eof;
-        using char_traits<char>::int_type;
-        using char_traits<char>::off_type;
-        using char_traits<char>::pos_type;
+        using std::char_traits<char>::eof;
+        using std::char_traits<char>::int_type;
+        using std::char_traits<char>::off_type;
+        using std::char_traits<char>::pos_type;
 
         static size_t length(const unsigned char* str)
         {
-            return char_traits<char>::length(reinterpret_cast<const char*>(str));
+            return std::char_traits<char>::length(reinterpret_cast<const char*>(str));
         }
 
         static void assign(unsigned char& left, const unsigned char& right) { left = right; }
         static unsigned char* assign(unsigned char* left, size_t n, unsigned char value)
         {
-            return reinterpret_cast<unsigned char*>(char_traits<char>::assign(reinterpret_cast<char*>(left), n, static_cast<char>(value)));
+            return reinterpret_cast<unsigned char*>(std::char_traits<char>::assign(reinterpret_cast<char*>(left), n, static_cast<char>(value)));
         }
 
         static unsigned char* copy(unsigned char* left, const unsigned char* right, size_t n)
         {
-            return reinterpret_cast<unsigned char*>(char_traits<char>::copy(reinterpret_cast<char*>(left), reinterpret_cast<const char*>(right), n));
+            return reinterpret_cast<unsigned char*>(std::char_traits<char>::copy(reinterpret_cast<char*>(left), reinterpret_cast<const char*>(right), n));
         }
 
         static unsigned char* move(unsigned char* left, const unsigned char* right, size_t n)
         {
-            return reinterpret_cast<unsigned char*>(char_traits<char>::move(reinterpret_cast<char*>(left), reinterpret_cast<const char*>(right), n));
+            return reinterpret_cast<unsigned char*>(std::char_traits<char>::move(reinterpret_cast<char*>(left), reinterpret_cast<const char*>(right), n));
         }
-    };
-}
-#endif // _MS_WINDOWS
 
-namespace Concurrency 
-{ 
-/// Library for asychronous streams.
-namespace streams
-{
-    /// <summary>
-    /// Extending the standard char_traits type with one that adds values and types
-    /// that are unique to "C++ REST SDK" streams.
-    /// </summary>
-    /// <typeparam name="_CharType">
-    /// The data type of the basic element of the stream.
-    /// </typeparam>
-    template<typename _CharType>
-    struct char_traits : std::char_traits<_CharType>
-    {
-        /// <summary>
-        /// Some synchronous functions will return this value if the operation
-        /// requires an asynchronous call in a given situation.
-        /// </summary>
-        /// <returns>An <c>int_type</c> value which implies that an asynchronous call is required.</returns>
-        static typename std::char_traits<_CharType>::int_type requires_async() { return std::char_traits<_CharType>::eof()-1; }
+        static int_type requires_async() { return eof()-1; }
     };
+#endif
 
     namespace details {
 

Release/include/cpprest/astreambuf.h

@@ -40,7 +40,7 @@
 #include <cstdint>
 #endif
 
-#include "compat/SafeInt3.hpp"
+#include "cpprest/details/SafeInt3.hpp"
 typedef SafeInt<size_t> SafeSize;
 
 namespace utility
@@ -124,4 +124,4 @@ typedef std::basic_ostringstream<utf16char> utf16ostringstream;
 typedef std::basic_ostream<utf16char> utf16ostream;
 typedef std::basic_istream<utf16char> utf16istream;
 typedef std::basic_istringstream<utf16char> utf16istringstream;
-#endif
+#endif

Release/include/cpprest/basic_types.h

@@ -26,7 +26,7 @@
 #include <iostream>
 #define __cdecl __attribute__ ((cdecl))
 
-#include "compat/nosal.h"
+#include "cpprest/details/nosal.h"
 
 // MSVC doesn't support this yet
 #define _noexcept noexcept

Release/include/compat/SafeInt3.hpp renamed to Release/include/cpprest/details/SafeInt3.hpp

@@ -30,7 +30,7 @@
 // Support VS2012 SAL syntax only
 #include <sal.h>
 #else
-#include "compat/nosal.h"
+#include "cpprest/details/nosal.h"
 #endif
 
 #define _noexcept 
@@ -41,4 +41,4 @@
 #define CASABLANCA_DEPRECATED(x)
 #else
 #define CASABLANCA_DEPRECATED(x) __declspec(deprecated(x))
-#endif
+#endif

Release/include/compat/apple_compat.h renamed to Release/include/cpprest/details/apple_compat.h

@@ -638,7 +638,7 @@ namespace details {
             {
                 return (pos_type)_seekwrpos_fsb(m_info, size_t(pos), sizeof(_CharType)); 
             }
-            return (pos_type)std::char_traits<_CharType>::eof(); 
+            return (pos_type)Concurrency::streams::char_traits<_CharType>::eof(); 
         }
 
         /// <summary>