OpenPunk/citra
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4304 from B3n30/std_optional

Browse Source 
Replace boost::optional with std::optional where possible
This commit is contained in:
Weiyi Wang
2018-10-11 12:40:00 -04:00
committed by GitHub
parent efc0d502ed 2306af3600
commit 9adc407112
30 changed files with 115 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/hle/service/http_c.h
View File

@@ -5,10 +5,10 @@
#pragma once
#include <memory>
#include <optional>
#include <string>
#include <unordered_map>
#include <vector>
#include <boost/optional.hpp>
#include "core/hle/kernel/shared_memory.h"
#include "core/hle/service/service.h"
@@ -116,8 +116,8 @@ public:
std::string url;
RequestMethod method;
RequestState state = RequestState::NotStarted;
boost::optional<Proxy> proxy;
boost::optional<BasicAuth> basic_auth;
std::optional<Proxy> proxy;
std::optional<BasicAuth> basic_auth;
SSLConfig ssl_config{};
u32 socket_buffer_size;
std::vector<RequestHeader> headers;
@@ -127,7 +127,7 @@ public:
struct SessionData : public Kernel::SessionRequestHandler::SessionDataBase {
/// The HTTP context that is currently bound to this session, this can be empty if no context
/// has been bound. Certain commands can only be called on a session with a bound context.
boost::optional<Context::Handle> current_http_context;
std::optional<Context::Handle> current_http_context;
u32 session_id;