Merge branch 'develop' into main
continuous-integration/drone/push Build was killed Details

This commit is contained in:
tastytea 2020-03-21 12:25:54 +01:00
commit aea4b0f492
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
2 changed files with 28 additions and 10 deletions

View File

@ -57,20 +57,14 @@ public:
*
* @since 0.1.0
*/
explicit Instance(const string_view hostname,
const string_view access_token)
: _hostname{hostname}
, _baseuri{"https://" + _hostname}
, _access_token{access_token}
, _max_chars{0}
{}
explicit Instance(string_view hostname, string_view access_token);
/*!
* @brief Copy constructor. A new CURLWrapper is constructed.
*
* @since 0.5.2
*/
Instance(const Instance &other) = default;
Instance(const Instance &other);
//! Move constructor
Instance(Instance &&other) noexcept = delete;
@ -143,9 +137,10 @@ public:
*
* @since 0.1.0
*/
inline void set_access_token(string access_token)
inline void set_access_token(const string_view access_token)
{
_access_token = move(access_token);
_access_token = access_token;
CURLWrapper::set_access_token(access_token);
}
/*!

View File

@ -31,6 +31,29 @@ using std::regex;
using std::regex_search;
using std::smatch;
Instance::Instance(const string_view hostname, const string_view access_token)
: _hostname{hostname}
, _baseuri{"https://" + _hostname}
, _max_chars{0}
{
set_access_token(access_token);
}
Instance::Instance(const Instance &other)
: CURLWrapper{other}
, _hostname{other._hostname}
, _baseuri{other._baseuri}
, _access_token{other._access_token}
, _max_chars{other._max_chars}
, _proxy{other._proxy}
, _post_formats{other._post_formats}
, _cainfo{other._cainfo}
, _useragent{other._useragent}
{
CURLWrapper::setup_connection_properties(_proxy, _access_token,
_cainfo, _useragent);
}
uint64_t Instance::get_max_chars() noexcept
{
constexpr uint64_t default_max_chars{500};