diff options
| author | Sadie Powell <sadie@witchery.services> | 2022-01-04 00:39:07 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2022-01-04 00:39:34 +0000 |
| commit | c9f93eeaedcf3e2d211fea7799ea529d76ebaad5 (patch) | |
| tree | df31d369f0d28f05b6665a09f1542e09b11f9b56 /include | |
| parent | db6b2225b186e6254443e00bc04b43664bf96d39 (diff) | |
| parent | a93a7c87b61acc3e696c7bb1f56e9ba313dd6bfd (diff) | |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'include')
| -rw-r--r-- | include/anope.h | 1 | ||||
| -rw-r--r-- | include/modules/sql.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/anope.h b/include/anope.h index 0ee78c540..129028fda 100644 --- a/include/anope.h +++ b/include/anope.h @@ -54,6 +54,7 @@ namespace Anope string(const ci::string &_str) : _string(_str.c_str()) { } string(const string &_str, size_type pos, size_type n = npos) : _string(_str._string, pos, n) { } template <class InputIterator> string(InputIterator first, InputIterator last) : _string(first, last) { } + string(const string &) = default; /** * Assignment operators, so any type of string can be assigned to this class. diff --git a/include/modules/sql.h b/include/modules/sql.h index dbb21afcd..f7734a717 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -149,7 +149,7 @@ namespace SQL inline operator bool() const { return this->error.empty(); } - inline const unsigned int GetID() const { return this->id; } + inline unsigned int GetID() const { return this->id; } inline const Query &GetQuery() const { return this->query; } inline const Anope::string &GetError() const { return this->error; } |