pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-29 12:36:38 +02:00
Code Activity

Merge branch '2.0' into 2.1.

Browse Source
This commit is contained in:
Sadie Powell
2022-01-04 00:39:07 +00:00
parent db6b2225b1 a93a7c87b6
commit c9f93eeaed
6 changed files with 397 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/anope.h
+1
View File
@@ -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.
include/modules/sql.h
+1 -1
View File
@@ -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; }