Moved compat headers into a details subfolder

Author: ras0219-msft

Release/CMakeLists.txt

@@ -73,12 +73,12 @@ elseif(UNIX) # This includes OSX
   option(BUILD_SAMPLES "Build samples." ON)
   option(CASA_INSTALL_HEADERS "Install header files." ON)
   if(CASA_INSTALL_HEADERS)
-    file(GLOB_RECURSE CASA_HEADERS_CPPREST include/cpprest/*.hpp include/cpprest/*.h)
+    file(GLOB CASA_HEADERS_CPPREST include/cpprest/*.hpp include/cpprest/*.h)
     install(FILES ${CASA_HEADERS_CPPREST} DESTINATION include/cpprest)
-    file(GLOB_RECURSE CASA_HEADERS_PPLX include/pplx/*.hpp include/pplx/*.h)
+    file(GLOB CASA_HEADERS_PPLX include/pplx/*.hpp include/pplx/*.h)
     install(FILES ${CASA_HEADERS_PPLX} DESTINATION include/pplx)
-    file(GLOB_RECURSE CASA_HEADERS_COMPAT include/compat/*.hpp include/compat/*.h)
-    install(FILES ${CASA_HEADERS_COMPAT} DESTINATION include/compat)
+    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)

Release/include/compat/pplxtasks.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

@@ -53,11 +53,11 @@
 
 // for guids, used in comm.h
 #ifdef MS_TARGET_APPLE
-#include "compat/apple_compat.h"
+#include "cpprest/details/apple_compat.h"
 #else
 #ifdef _MS_WINDOWS
 #include <Guiddef.h>
-#include "compat/windows_compat.h"
+#include "cpprest/details/windows_compat.h"
 #else
 #include "boost/uuid/uuid.hpp"
 #endif
@@ -70,4 +70,4 @@
 #endif
 
 // Define the _NOT_PHONE8_ as non-windows or windows desktop without arm configuration or windows store app or windows phone8.1
-#define _NOT_PHONE8_ !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP && !defined(_M_ARM)) || WINAPI_FAMILY == WINAPI_FAMILY_APP || (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _WIN32_WINNT == _WIN32_WINNT_WINBLUE)
+#define _NOT_PHONE8_ !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP && !defined(_M_ARM)) || WINAPI_FAMILY == WINAPI_FAMILY_APP || (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _WIN32_WINNT == _WIN32_WINNT_WINBLUE)

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

@@ -52,15 +52,15 @@
 
 // Use PPLx
 #ifdef _MS_WINDOWS
-#include "compat/windows_compat.h"
+#include "cpprest/details/windows_compat.h"
 #include "pplx/pplxwin.h"
 #elif defined(__APPLE__)
 #undef _PPLXIMP
 #define _PPLXIMP
-#include "compat/apple_compat.h"
+#include "cpprest/details/apple_compat.h"
 #include "pplx/pplxlinux.h"
 #else
-#include "compat/linux_compat.h"
+#include "cpprest/details/linux_compat.h"
 #include "pplx/pplxlinux.h"
 #endif // _MS_WINDOWS