Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Explicitely set boost namespace when using make_optional.#880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Explicitely set boost namespace when using make_optional. Avoid confl…
…icting with std::make_optional from c++17
  • Loading branch information
@maingoh
maingoh committedSep 16, 2019
commit99d03eaece6266a84f16f2d98390e2c290a37a68
12 changes: 6 additions & 6 deletionsboost/network/protocol/http/client/options.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,39 +94,39 @@ class client_options {
/// Set the filename of the certificate to load for the SSL connection for
/// verification.
client_options& openssl_certificate(string_type const& v) {
openssl_certificate_ = make_optional(v);
openssl_certificate_ =boost::make_optional(v);
return *this;
}

/// Set the directory for which the certificate authority files are located.
client_options& openssl_verify_path(string_type const& v) {
openssl_verify_path_ = make_optional(v);
openssl_verify_path_ =boost::make_optional(v);
return *this;
}

/// Set the filename of the certificate to use for client-side SSL session
/// establishment.
client_options& openssl_certificate_file(string_type const& v) {
openssl_certificate_file_ = make_optional(v);
openssl_certificate_file_ =boost::make_optional(v);
return *this;
}

/// Set the filename of the private key to use for client-side SSL session
/// establishment.
client_options& openssl_private_key_file(string_type const& v) {
openssl_private_key_file_ = make_optional(v);
openssl_private_key_file_ =boost::make_optional(v);
return *this;
}

/// Set the ciphers to support for SSL negotiation.
client_options& openssl_ciphers(string_type const& v) {
openssl_ciphers_ = make_optional(v);
openssl_ciphers_ =boost::make_optional(v);
return *this;
}

/// Set the hostname for SSL SNI hostname support.
client_options& openssl_sni_hostname(string_type const& v) {
openssl_sni_hostname_ = make_optional(v);
openssl_sni_hostname_ =boost::make_optional(v);
return *this;
}

Expand Down
2 changes: 1 addition & 1 deletionboost/network/protocol/http/message/async_message.hpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ struct async_message {
for (string_type const & key : removed_headers) {
raw_headers.erase(key);
}
retrieved_headers_ = make_optional(raw_headers);
retrieved_headers_ =boost::make_optional(raw_headers);
return *retrieved_headers_;
}

Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp