Skip to content

Commit db66364

Browse files
stgatesstgates
committed
Merge branch 'development' of https://git01.codeplex.com/casablanca into 2.6.0bump
2 parents 74188d2 + 22c4c69 commit db66364

File tree

106 files changed

+133
-9596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+133
-9596
lines changed

‎Build_iOS/fix_boost_version.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ index 22b308c..07ef184
2626
+: ${BOOST_VERSION2:=1_57_0}
2727

2828
-: ${BOOST_LIBS:="atomic chrono date_time exception filesystem program_options random signals system test thread"}
29-
+: ${BOOST_LIBS:="thread chrono filesystem regex locale system random"}
29+
+: ${BOOST_LIBS:="thread chrono filesystem regex system random"}
3030

3131
# Current iPhone SDK
3232
: ${IPHONE_SDKVERSION:=`xcodebuild -showsdks | grep iphoneos | egrep "[[:digit:]]+\.[[:digit:]]+" -o | tail -1`}

‎CONTRIBUTORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ luisfeliu
1616
intercommiura
1717
halex2005
1818
simonlep
19+
jracle
1920

2021
AutoDesk Inc.
2122
Cyrille Fauvel (cyrillef)

‎Release/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ elseif(WIN32)
114114
endif()
115115
add_definitions(${Casablanca_DEFINITIONS} -D_WINSOCK_DEPRECATED_NO_WARNINGS -DWIN32)
116116

117-
find_package(Boost 1.55 REQUIRED COMPONENTS random system thread locale filesystem chrono atomic)
117+
find_package(Boost 1.55 REQUIRED COMPONENTS random system thread filesystem chrono atomic)
118118
find_package(OpenSSL 1.0 REQUIRED)
119119
else()
120120
message(FATAL_ERROR "-- Unsupported Build Platform.")
@@ -146,9 +146,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
146146
message("-- Setting gcc options")
147147

148148
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")
149-
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")
150149

151-
set(WARNINGS "${WARNINGS} ${LINUX_SUPPRESSIONS}")
152150
set(LD_FLAGS "${LD_FLAGS} -Wl,-z,defs")
153151

154152
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")

‎Release/include/cpprest/asyncrt_utils.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@ namespace conversions
107107
/// <returns>A single byte character UTF-8 string.</returns>
108108
_ASYNCRTIMP utf8string __cdecl latin1_to_utf8(const std::string &s);
109109

110-
/// <summary>
111-
/// Converts a string with the OS's default code page to a UTF-16 string.
112-
/// </summary>
113-
_ASYNCRTIMP utf16string __cdecl default_code_page_to_utf16(const std::string &s);
114-
115110
/// <summary>
116111
/// Converts to a platform dependent Unicode string type.
117112
/// </summary>

‎Release/include/pplx/pplxtasks.h

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6388,8 +6388,6 @@ namespace details
63886388

63896389
_PTask->_Then([_PParam, _Index](task<_ElementType> _ResultTask) {
63906390

6391-
// Dev10 compiler bug
6392-
typedef _ElementType _ElementTypeDev10;
63936391
auto _PParamCopy = _PParam;
63946392
auto _IndexCopy = _Index;
63956393
auto _Func = [_PParamCopy, _IndexCopy, &_ResultTask](){
@@ -6467,8 +6465,7 @@ namespace details
64676465
}
64686466

64696467
_PTask->_Then([_PParam, _Index](task<std::vector<_ElementType>> _ResultTask) {
6470-
// Dev10 compiler bug
6471-
typedef _ElementType _ElementTypeDev10;
6468+
64726469
auto _PParamCopy = _PParam;
64736470
auto _IndexCopy = _Index;
64746471
auto _Func = [_PParamCopy, _IndexCopy, &_ResultTask]() {
@@ -6585,8 +6582,6 @@ namespace details
65856582
_ReturnTask._SetAsync();
65866583
}
65876584
_VectorTask._Then([_PParam](task<std::vector<_ReturnType>> _ResultTask) {
6588-
// Dev10 compiler bug
6589-
typedef _ReturnType _ReturnTypeDev10;
65906585
auto _PParamCopy = _PParam;
65916586
auto _Func = [_PParamCopy, &_ResultTask]() {
65926587
auto _ResultLocal = _ResultTask._GetImpl()->_GetResult();
@@ -6596,8 +6591,6 @@ namespace details
65966591
_WhenAllContinuationWrapper(_PParam, _Func, _ResultTask);
65976592
}, _CancellationTokenState::_None());
65986593
_ValueTask._Then([_PParam](task<_ReturnType> _ResultTask) {
6599-
// Dev10 compiler bug
6600-
typedef _ReturnType _ReturnTypeDev10;
66016594
auto _PParamCopy = _PParam;
66026595
auto _Func = [_PParamCopy, &_ResultTask]() {
66036596
auto _ResultLocal = _ResultTask._GetImpl()->_GetResult();
@@ -7178,13 +7171,11 @@ task<std::vector<_ReturnType>> operator||(const task<std::vector<_ReturnType>> &
71787171

71797172
_Rhs._Then([_PParam](task<_ReturnType> _ResultTask)
71807173
{
7181-
// Dev10 compiler bug
7182-
typedef _ReturnType _ReturnTypeDev10;
71837174
auto _PParamCopy = _PParam;
71847175
auto _Func = [&_ResultTask, _PParamCopy]() {
71857176
auto _Result = _ResultTask._GetImpl()->_GetResult();
71867177

7187-
std::vector<_ReturnTypeDev10> _Vec;
7178+
std::vector<_ReturnType> _Vec;
71887179
_Vec.push_back(_Result);
71897180
_PParamCopy->_M_Completed.set(std::make_pair(_Vec, _ResultTask._GetImpl()->_M_pTokenState));
71907181
};

‎Release/samples/CasaLens/casalens.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ void CasaLens::handle_error(pplx::task<void>& t)
8181

8282
pplx::task<void> CasaLens::open()
8383
{
84-
return m_listener.open().then(std::bind(&handle_error, std::placeholders::_1));
84+
return m_listener.open().then([](pplx::task<void> t) { handle_error(t); });
8585
}
8686

8787
pplx::task<void> CasaLens::close()
8888
{
89-
return m_listener.close().then(std::bind(&handle_error, std::placeholders::_1));
89+
return m_listener.close().then([](pplx::task<void> t) { handle_error(t); });
9090
}
9191

9292
// Handler to process HTTP::GET requests.
@@ -97,15 +97,15 @@ void CasaLens::handle_get(http_request message)
9797
auto content_data = m_htmlcontentmap.find(path);
9898
if (content_data == m_htmlcontentmap.end())
9999
{
100-
message.reply(status_codes::NotFound, U("Path not found")).then(std::bind(&handle_error, std::placeholders::_1));
100+
message.reply(status_codes::NotFound, U("Path not found")).then([](pplx::task<void> t) { handle_error(t); });
101101
return;
102102
}
103103

104104
auto file_name = std::get<0>(content_data->second);
105105
auto content_type = std::get<1>(content_data->second);
106106
concurrency::streams::fstream::open_istream(file_name, std::ios::in).then([=](concurrency::streams::istream is)
107107
{
108-
message.reply(status_codes::OK, is, content_type).then(std::bind(&handle_error, std::placeholders::_1));
108+
message.reply(status_codes::OK, is, content_type).then([](pplx::task<void> t) { handle_error(t); });
109109
}).then([=](pplx::task<void>& t)
110110
{
111111
try
@@ -116,7 +116,7 @@ void CasaLens::handle_get(http_request message)
116116
{
117117
// opening the file (open_istream) failed.
118118
// Reply with an error.
119-
message.reply(status_codes::InternalError).then(std::bind(&handle_error, std::placeholders::_1));
119+
message.reply(status_codes::InternalError).then([](pplx::task<void> t) { handle_error(t); });
120120
}
121121
});
122122
}
@@ -132,11 +132,11 @@ void CasaLens::handle_post(http_request message)
132132
message.extract_string().then([=](const utility::string_t& location)
133133
{
134134
get_data(message, location);
135-
}).then(std::bind(&handle_error, std::placeholders::_1));
135+
}).then([](pplx::task<void> t) { handle_error(t); });
136136
}
137137
else
138138
{
139-
message.reply(status_codes::NotFound, U("Path not found")).then(std::bind(&handle_error, std::placeholders::_1));
139+
message.reply(status_codes::NotFound, U("Path not found")).then([](pplx::task<void> t) { handle_error(t); });
140140
}
141141
}
142142

‎Release/samples/CasaLens/datafetcher.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,11 +395,11 @@ void CasaLens::fetch_data(http_request message, const std::wstring& postal_code,
395395
}
396396

397397
// Reply with the aggregated JSON data
398-
message.reply(status_codes::OK, resp_data).then(std::bind(&handle_error, std::placeholders::_1));
398+
message.reply(status_codes::OK, resp_data).then([](pplx::task<void> t) { handle_error(t); });
399399
}
400400
catch(...)
401401
{
402-
message.reply(status_codes::InternalError).then(std::bind(&handle_error, std::placeholders::_1));
402+
message.reply(status_codes::InternalError).then([](pplx::task<void> t) { handle_error(t); });
403403
}
404404
}
405405

‎Release/src/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ elseif(WIN32)
5858
http/client/x509_cert_utilities_win32.cpp
5959
http/listener/http_server_httpsys.cpp
6060
pplx/pplxwin.cpp
61-
streams/ioscheduler.cpp
6261
streams/fileio_win32.cpp
6362
pch/stdafx.cpp
64-
utilities/dllmain.cpp
6563
)
6664
set(EXTRALINKS
6765
bcrypt.lib

‎Release/src/build/vs11.winrt/casablanca110.winrt.vcxproj

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎Release/src/build/vs11.winrt/packages.config

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)