Skip to content

Commit e8d9262

Browse files
glynosglynos
committed
Reverted changes where I used a macro for a noexcept replacement - we'll prefer to use C++11 unadorned.
1 parent d945654 commit e8d9262

File tree

10 files changed

+31
-31
lines changed

10 files changed

+31
-31
lines changed

‎http/src/http/v2/client/client.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ namespace network {
5050

5151
explicit impl(client_options options);
5252

53-
~impl() NETWORK_NOEXCEPT;
53+
~impl() noexcept;
5454

5555
void connect(client::string_type host,
5656
const boost::system::error_code &ec,
@@ -91,7 +91,7 @@ namespace network {
9191

9292
}
9393

94-
client::impl::~impl() NETWORK_NOEXCEPT {
94+
client::impl::~impl() noexcept {
9595
sentinel_.reset();
9696
lifetime_thread_.join();
9797
}
@@ -170,7 +170,7 @@ namespace network {
170170

171171
}
172172

173-
client::~client() NETWORK_NOEXCEPT {
173+
client::~client() noexcept {
174174
delete pimpl_;
175175
}
176176

‎http/src/http/v2/client/client_errors.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ namespace network {
1616

1717
client_category_impl() = default;
1818

19-
virtual ~client_category_impl() NETWORK_NOEXCEPT;
19+
virtual ~client_category_impl() noexcept;
2020

21-
virtual const char *name() const NETWORK_NOEXCEPT;
21+
virtual const char *name() const noexcept;
2222

2323
virtual std::string message(int ev) const;
2424

2525
};
2626

27-
client_category_impl::~client_category_impl() NETWORK_NOEXCEPT {
27+
client_category_impl::~client_category_impl() noexcept {
2828

2929
}
3030

31-
const char *client_category_impl::name() const NETWORK_NOEXCEPT {
31+
const char *client_category_impl::name() const noexcept {
3232
static const char name[] = "client_error";
3333
return name;
3434
}
@@ -63,7 +63,7 @@ namespace network {
6363

6464
}
6565

66-
invalid_url::~invalid_url() NETWORK_NOEXCEPT {
66+
invalid_url::~invalid_url() noexcept {
6767

6868
}
6969

‎http/src/network/http/v2/client/client.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ namespace network {
6969
/**
7070
* \brief Destructor.
7171
*/
72-
~client_options() NETWORK_NOEXCEPT {
72+
~client_options() noexcept {
7373

7474
}
7575

7676
/**
7777
* \brief Swap.
7878
*/
79-
void swap(client_options &other) NETWORK_NOEXCEPT {
79+
void swap(client_options &other) noexcept {
8080
using std::swap;
8181
std::swap(io_service_, other.io_service_);
8282
swap(follow_redirects_, other.follow_redirects_);
@@ -228,7 +228,7 @@ namespace network {
228228
};
229229

230230
inline
231-
void swap(client_options &lhs, client_options &rhs) NETWORK_NOEXCEPT {
231+
void swap(client_options &lhs, client_options &rhs) noexcept {
232232
lhs.swap(rhs);
233233
}
234234

@@ -259,7 +259,7 @@ namespace network {
259259
/**
260260
* Destructor.
261261
*/
262-
~client() NETWORK_NOEXCEPT;
262+
~client() noexcept;
263263

264264
/**
265265
* \brief Makes an HTTP GET request.

‎http/src/network/http/v2/client/client_errors.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ namespace network {
6868
/**
6969
* \brief Destructor.
7070
*/
71-
virtual ~invalid_url() NETWORK_NOEXCEPT;
71+
virtual ~invalid_url() noexcept;
7272

7373
};
7474

@@ -89,7 +89,7 @@ namespace network {
8989
/**
9090
* \brief Destructor.
9191
*/
92-
virtual ~resolver_error() NETWORK_NOEXCEPT;
92+
virtual ~resolver_error() noexcept;
9393

9494
};
9595

@@ -111,7 +111,7 @@ namespace network {
111111
/**
112112
* \brief Destructor.
113113
*/
114-
virtual ~connection_error() NETWORK_NOEXCEPT;
114+
virtual ~connection_error() noexcept;
115115

116116
};
117117

@@ -132,7 +132,7 @@ namespace network {
132132
/**
133133
* \brief Destructor.
134134
*/
135-
virtual ~response_error() NETWORK_NOEXCEPT;
135+
virtual ~response_error() noexcept;
136136

137137
};
138138
} // namespace v2

‎http/src/network/http/v2/client/connection/async_resolver.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ namespace network {
5656
/**
5757
* \brief Destructor.
5858
*/
59-
~async_resolver() NETWORK_NOEXCEPT {
59+
~async_resolver() noexcept {
6060

6161
}
6262

‎http/src/network/http/v2/client/connection/connection.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ namespace network {
5050
/**
5151
* \brief Destructor.
5252
*/
53-
virtual ~connection() NETWORK_NOEXCEPT { }
53+
virtual ~connection() noexcept { }
5454

5555
/**
5656
* \brief Asynchronously creates a connection to an endpoint.

‎http/src/network/http/v2/client/connection/normal_connection.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace network {
2828

2929
}
3030

31-
virtual ~normal_connection() NETWORK_NOEXCEPT {
31+
virtual ~normal_connection() noexcept {
3232

3333
}
3434

‎http/src/network/http/v2/client/connection/ssl_connection.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace network {
3333

3434
}
3535

36-
virtual ~ssl_connection() NETWORK_NOEXCEPT {
36+
virtual ~ssl_connection() noexcept {
3737

3838
}
3939

‎http/src/network/http/v2/client/request.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ namespace network {
7272
/**
7373
* \brief Destructor.
7474
*/
75-
~request_options() NETWORK_NOEXCEPT {
75+
~request_options() noexcept {
7676

7777
}
7878

79-
void swap(request_options &other) NETWORK_NOEXCEPT {
79+
void swap(request_options &other) noexcept {
8080
using std::swap;
8181
swap(resolve_timeout_, other.resolve_timeout_);
8282
swap(read_timeout_, other.read_timeout_);
@@ -129,7 +129,7 @@ namespace network {
129129
};
130130

131131
inline
132-
void swap(request_options &lhs, request_options &rhs) NETWORK_NOEXCEPT {
132+
void swap(request_options &lhs, request_options &rhs) noexcept {
133133
lhs.swap(rhs);
134134
}
135135

@@ -158,7 +158,7 @@ namespace network {
158158
/**
159159
* \brief Destructor.
160160
*/
161-
virtual ~byte_source() NETWORK_NOEXCEPT {}
161+
virtual ~byte_source() noexcept {}
162162

163163
/**
164164
* \brief Allows the request to read the data into a local
@@ -271,7 +271,7 @@ namespace network {
271271
/**
272272
* \brief Move constructor.
273273
*/
274-
request(request &&other) NETWORK_NOEXCEPT
274+
request(request &&other) noexcept
275275
: method_(std::move(other.method_))
276276
, path_(std::move(other.path_))
277277
, version_(std::move(other.version_))
@@ -289,14 +289,14 @@ namespace network {
289289
/**
290290
* \brief Destructor.
291291
*/
292-
~request() NETWORK_NOEXCEPT {
292+
~request() noexcept {
293293

294294
}
295295

296296
/**
297297
* \brief Swap.
298298
*/
299-
void swap(request &other) NETWORK_NOEXCEPT {
299+
void swap(request &other) noexcept {
300300
using std::swap;
301301
swap(method_, other.method_);
302302
swap(path_, other.path_);
@@ -412,7 +412,7 @@ namespace network {
412412
};
413413

414414
inline
415-
void swap(request &lhs, request &rhs) NETWORK_NOEXCEPT {
415+
void swap(request &lhs, request &rhs) noexcept {
416416
lhs.swap(rhs);
417417
}
418418
} // namespace v2

‎http/src/network/http/v2/client/response.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ namespace network {
7373
* \brief Move constructor.
7474
* \param other The other response object.
7575
*/
76-
response(response &&other) NETWORK_NOEXCEPT
76+
response(response &&other) noexcept
7777
: version_(std::move(other.version_))
7878
, status_(std::move(other.status_))
7979
, status_message_(std::move(other.status_message_))
@@ -94,7 +94,7 @@ namespace network {
9494
* \brief Swap function.
9595
* \param other The other response object.
9696
*/
97-
void swap(response &other) NETWORK_NOEXCEPT {
97+
void swap(response &other) noexcept {
9898
using std::swap;
9999
swap(version_, other.version_);
100100
swap(status_, other.status_);
@@ -153,7 +153,7 @@ namespace network {
153153
};
154154

155155
inline
156-
void swap(response &lhs, response &rhs) NETWORK_NOEXCEPT {
156+
void swap(response &lhs, response &rhs) noexcept {
157157
lhs.swap(rhs);
158158
}
159159
} // namespace v2

0 commit comments

Comments
 (0)