Skip to content

Commit b96fdeb

Browse files
stgatesstgates
committed
Merge branch 'development' of https://git01.codeplex.com/casablanca into development
2 parents cc6978a + ffeff70 commit b96fdeb

Some content is hidden

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

66 files changed

+1484
-934
lines changed

‎Build_iOS/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ execute_process(WORKING_DIRECTORY ${ARM_BINARY_DIR}
3535
add_custom_target(sim
3636
COMMAND ${CMAKE_COMMAND}
3737
--build ${SIM_BINARY_DIR}
38-
--target cpprest
3938
--config ${CMAKE_BUILD_TYPE}
4039
COMMENT "Building for i386 (simulator)"
4140
VERBATIM
@@ -45,7 +44,6 @@ add_custom_target(sim
4544
add_custom_target(arm
4645
COMMAND ${CMAKE_COMMAND}
4746
--build ${ARM_BINARY_DIR}
48-
--target cpprest
4947
--config ${CMAKE_BUILD_TYPE}
5048
COMMENT "Building for armv7, armv7s, arm64"
5149
VERBATIM

‎Release/include/cpprest/asyncrt_utils.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,11 @@ namespace details
250250
class windows_category_impl : public std::error_category
251251
{
252252
public:
253-
virtual const char *name() const _noexcept { return "windows"; }
253+
virtual const char *name() const CPPREST_NOEXCEPT { return "windows"; }
254254

255-
_ASYNCRTIMP virtual std::string message(int errorCode) const _noexcept;
255+
_ASYNCRTIMP virtual std::string message(int errorCode) const CPPREST_NOEXCEPT;
256256

257-
_ASYNCRTIMP virtual std::error_condition default_error_condition(int errorCode) const _noexcept;
257+
_ASYNCRTIMP virtual std::error_condition default_error_condition(int errorCode) const CPPREST_NOEXCEPT;
258258
};
259259

260260
/// <summary>

‎Release/include/cpprest/base_uri.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ namespace web {
7070
return *this;
7171
}
7272

73-
uri_components(uri_components &&other) _noexcept :
73+
uri_components(uri_components &&other) CPPREST_NOEXCEPT :
7474
m_scheme(std::move(other.m_scheme)),
7575
m_host(std::move(other.m_host)),
7676
m_user_info(std::move(other.m_user_info)),
@@ -80,7 +80,7 @@ namespace web {
8080
m_port(other.m_port)
8181
{}
8282

83-
uri_components & operator=(uri_components &&other) _noexcept
83+
uri_components & operator=(uri_components &&other) CPPREST_NOEXCEPT
8484
{
8585
if (this != &other)
8686
{
@@ -116,9 +116,9 @@ namespace web {
116116

117117
uri_exception(std::string msg) : m_msg(std::move(msg)) {}
118118

119-
~uri_exception() _noexcept {}
119+
~uri_exception() CPPREST_NOEXCEPT {}
120120

121-
const char* what() const _noexcept
121+
const char* what() const CPPREST_NOEXCEPT
122122
{
123123
return m_msg.c_str();
124124
}
@@ -264,15 +264,15 @@ namespace web {
264264
/// <summary>
265265
/// Move constructor.
266266
/// </summary>
267-
uri(uri &&other) _noexcept :
267+
uri(uri &&other) CPPREST_NOEXCEPT :
268268
m_uri(std::move(other.m_uri)),
269269
m_components(std::move(other.m_components))
270270
{}
271271

272272
/// <summary>
273273
/// Move assignment operator
274274
/// </summary>
275-
uri & operator=(uri &&other) _noexcept
275+
uri & operator=(uri &&other) CPPREST_NOEXCEPT
276276
{
277277
if (this != &other)
278278
{

‎Release/include/cpprest/details/apple_compat.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030

3131
#include "nosal.h"
3232

33-
// MSVC doesn't support this yet
34-
#define _noexcept noexcept
33+
#define CPPREST_NOEXCEPT noexcept
3534

3635
#define novtable /* no novtable equivalent */
3736
#define __declspec(x) __attribute__ ((x))

‎Release/include/cpprest/details/linux_compat.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828

2929
#include "cpprest/details/nosal.h"
3030

31-
// MSVC doesn't support this yet
32-
#define _noexcept noexcept
31+
#define CPPREST_NOEXCEPT noexcept
3332

3433
#define novtable /* no novtable equivalent */
3534
#define __declspec(x) __attribute__ ((x))

‎Release/include/cpprest/details/windows_compat.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,18 @@
2626
****/
2727
#pragma once
2828

29-
#if _MSC_VER >= 1700
29+
#if defined(_MSC_VER) && _MSC_VER >= 1700
3030
// Support VS2012 SAL syntax only
3131
#include <sal.h>
3232
#else
3333
#include "cpprest/details/nosal.h"
3434
#endif
3535

36-
#define _noexcept
36+
#if defined(_MSC_VER) && _MSC_VER >= 1900
37+
#define CPPREST_NOEXCEPT noexcept
38+
#else
39+
#define CPPREST_NOEXCEPT
40+
#endif
3741

3842
#define CASABLANCA_UNREFERENCED_PARAMETER(x) (x)
3943

‎Release/include/cpprest/http_client.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ class http_client
369369
/// Note the destructor doesn't necessarily close the connection and release resources.
370370
/// The connection is reference counted with the http_responses.
371371
/// </summary>
372-
~http_client() _noexcept {}
372+
~http_client() CPPREST_NOEXCEPT {}
373373

374374
/// <summary>
375375
/// Gets the base uri

‎Release/include/cpprest/http_msg.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@ class http_exception : public std::exception
200200
m_msg = m_errorCode.message();
201201
}
202202

203-
~http_exception() _noexcept {}
203+
~http_exception() CPPREST_NOEXCEPT {}
204204

205-
const char* what() const _noexcept
205+
const char* what() const CPPREST_NOEXCEPT
206206
{
207207
return m_msg.c_str();
208208
}

‎Release/include/cpprest/json.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ namespace json
209209
/// <summary>
210210
/// Move constructor
211211
/// </summary>
212-
_ASYNCRTIMP value(value &&) _noexcept ;
212+
_ASYNCRTIMP value(value &&) CPPREST_NOEXCEPT ;
213213

214214
/// <summary>
215215
/// Assignment operator.
@@ -221,7 +221,7 @@ namespace json
221221
/// Move assignment operator.
222222
/// </summary>
223223
/// <returns>The JSON value object that contains the result of the assignment.</returns>
224-
_ASYNCRTIMP value &operator=(value &&) _noexcept ;
224+
_ASYNCRTIMP value &operator=(value &&) CPPREST_NOEXCEPT ;
225225

226226
// Static factories
227227

@@ -627,11 +627,11 @@ namespace json
627627
json_exception(const utility::char_t * const &message) : _message(utility::conversions::to_utf8string(message)) { }
628628

629629
// Must be narrow string because it derives from std::exception
630-
const char* what() const _noexcept
630+
const char* what() const CPPREST_NOEXCEPT
631631
{
632632
return _message.c_str();
633633
}
634-
~json_exception() _noexcept {}
634+
~json_exception() CPPREST_NOEXCEPT {}
635635
};
636636

637637
/// <summary>

‎Release/include/cpprest/oauth1.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ namespace web
3535
{
3636
namespace http
3737
{
38+
namespace client
39+
{
40+
// Forward declaration to avoid circular include dependency.
41+
class http_client_config;
42+
}
43+
3844
/// oAuth 1.0 library.
3945
namespace oauth1
4046
{
@@ -117,8 +123,8 @@ class oauth1_exception : public std::exception
117123
{
118124
public:
119125
oauth1_exception(utility::string_t msg) : m_msg(utility::conversions::to_utf8string(std::move(msg))) {}
120-
~oauth1_exception() _noexcept {}
121-
const char* what() const _noexcept { return m_msg.c_str(); }
126+
~oauth1_exception() CPPREST_NOEXCEPT {}
127+
const char* what() const CPPREST_NOEXCEPT { return m_msg.c_str(); }
122128

123129
private:
124130
std::string m_msg;

0 commit comments

Comments
 (0)