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

Author: stgates

Build_iOS/fix_boost_version.patch

@@ -26,7 +26,7 @@ index 22b308c..07ef184
 +: ${BOOST_VERSION2:=1_57_0}
 
 -: ${BOOST_LIBS:="atomic chrono date_time exception filesystem program_options random signals system test thread"}
-+: ${BOOST_LIBS:="thread chrono filesystem regex locale system random"}
++: ${BOOST_LIBS:="thread chrono filesystem regex system random"}
 
  # Current iPhone SDK
  : ${IPHONE_SDKVERSION:=`xcodebuild -showsdks | grep iphoneos | egrep "[[:digit:]]+\.[[:digit:]]+" -o | tail -1`}

CONTRIBUTORS.txt

@@ -16,6 +16,7 @@ luisfeliu
 intercommiura
 halex2005
 simonlep
+jracle
 
 AutoDesk Inc.
 Cyrille Fauvel (cyrillef)

Release/CMakeLists.txt

@@ -114,7 +114,7 @@ elseif(WIN32)
   endif()
   add_definitions(${Casablanca_DEFINITIONS} -D_WINSOCK_DEPRECATED_NO_WARNINGS -DWIN32)
 
-  find_package(Boost 1.55 REQUIRED COMPONENTS random system thread locale filesystem chrono atomic)
+  find_package(Boost 1.55 REQUIRED COMPONENTS random system thread filesystem chrono atomic)
   find_package(OpenSSL 1.0 REQUIRED)
 else()
   message(FATAL_ERROR "-- Unsupported Build Platform.")
@@ -146,9 +146,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
   message("-- Setting gcc options")
 
   set(WARNINGS "-Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code")
-  set(LINUX_SUPPRESSIONS "-Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-unused-function -Wno-char-subscripts -Wno-switch -Wno-unused-but-set-parameter -Wno-unused-value -Wno-unused-local-typedefs")
 
-  set(WARNINGS "${WARNINGS} ${LINUX_SUPPRESSIONS}")
   set(LD_FLAGS "${LD_FLAGS} -Wl,-z,defs")
 
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")

Release/include/cpprest/asyncrt_utils.h

@@ -107,11 +107,6 @@ namespace conversions
     /// <returns>A single byte character UTF-8 string.</returns>
     _ASYNCRTIMP utf8string __cdecl latin1_to_utf8(const std::string &s);
 
-    /// <summary>
-    /// Converts a string with the OS's default code page to a UTF-16 string.
-    /// </summary>
-    _ASYNCRTIMP utf16string __cdecl default_code_page_to_utf16(const std::string &s);
-
     /// <summary>
     /// Converts to a platform dependent Unicode string type.
     /// </summary>

Release/include/pplx/pplxtasks.h

@@ -6388,8 +6388,6 @@ namespace details
 
                     _PTask->_Then([_PParam, _Index](task<_ElementType> _ResultTask) {
 
-                        //  Dev10 compiler bug
-                        typedef _ElementType _ElementTypeDev10;
                         auto _PParamCopy = _PParam;
                         auto _IndexCopy = _Index;
                         auto _Func = [_PParamCopy, _IndexCopy, &_ResultTask](){
@@ -6467,8 +6465,7 @@ namespace details
                     }
 
                     _PTask->_Then([_PParam, _Index](task<std::vector<_ElementType>> _ResultTask) {
-                        //  Dev10 compiler bug
-                        typedef _ElementType _ElementTypeDev10;
+
                         auto _PParamCopy = _PParam;
                         auto _IndexCopy = _Index;
                         auto _Func = [_PParamCopy, _IndexCopy, &_ResultTask]() {
@@ -6585,8 +6582,6 @@ namespace details
             _ReturnTask._SetAsync();
         }
         _VectorTask._Then([_PParam](task<std::vector<_ReturnType>> _ResultTask) {
-            //  Dev10 compiler bug
-            typedef _ReturnType _ReturnTypeDev10;
             auto _PParamCopy = _PParam;
             auto _Func = [_PParamCopy, &_ResultTask]() {
                 auto _ResultLocal = _ResultTask._GetImpl()->_GetResult();
@@ -6596,8 +6591,6 @@ namespace details
             _WhenAllContinuationWrapper(_PParam, _Func, _ResultTask);
         }, _CancellationTokenState::_None());
         _ValueTask._Then([_PParam](task<_ReturnType> _ResultTask) {
-            //  Dev10 compiler bug
-            typedef _ReturnType _ReturnTypeDev10;
             auto _PParamCopy = _PParam;
             auto _Func = [_PParamCopy, &_ResultTask]() {
                 auto _ResultLocal = _ResultTask._GetImpl()->_GetResult();
@@ -7178,13 +7171,11 @@ task<std::vector<_ReturnType>> operator||(const task<std::vector<_ReturnType>> &
 
     _Rhs._Then([_PParam](task<_ReturnType> _ResultTask) 
     {
-        //  Dev10 compiler bug
-        typedef _ReturnType _ReturnTypeDev10;
         auto _PParamCopy = _PParam;
         auto _Func = [&_ResultTask, _PParamCopy]() {
             auto _Result = _ResultTask._GetImpl()->_GetResult();
 
-            std::vector<_ReturnTypeDev10> _Vec;
+            std::vector<_ReturnType> _Vec;
             _Vec.push_back(_Result);
             _PParamCopy->_M_Completed.set(std::make_pair(_Vec, _ResultTask._GetImpl()->_M_pTokenState));
         };

Release/src/CMakeLists.txt

@@ -58,10 +58,8 @@ elseif(WIN32)
     http/client/x509_cert_utilities_win32.cpp
     http/listener/http_server_httpsys.cpp
     pplx/pplxwin.cpp
-    streams/ioscheduler.cpp
     streams/fileio_win32.cpp
     pch/stdafx.cpp
-    utilities/dllmain.cpp
   )
   set(EXTRALINKS
     bcrypt.lib

Release/src/pch/stdafx.h

@@ -75,7 +75,6 @@
 #undef BOOST_NO_CXX11_NULLPTR
 #endif
 #include "boost/thread/mutex.hpp"
-#include "boost/locale.hpp"
 #include "boost/thread/condition_variable.hpp"
 #include "boost/date_time/posix_time/posix_time_types.hpp"
 #include "boost/bind/bind.hpp"

Release/src/pplx/pplxwin.cpp

@@ -237,7 +237,7 @@ namespace details
     _PPLXIMP void windows_scheduler::schedule( TaskProc_t proc, _In_ void* param)
     {
         auto schedulerParam = new _Scheduler_Param(proc, param);
-        auto work = QueueUserWorkItem(_Scheduler_Param::DefaultWorkCallback, schedulerParam, WT_EXECUTEDEFAULT);
+        auto work = QueueUserWorkItem(_Scheduler_Param::DefaultWorkCallback, schedulerParam, WT_EXECUTELONGFUNCTION);
 
         if (!work)
         {