summaryrefslogtreecommitdiff
path: root/modules/database
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2013-05-05 21:05:43 -0400
committerAdam <Adam@anope.org>2013-05-05 21:05:43 -0400
commit5b3f81ea78f7a8ab69ff94cbf2bbf07f5966682e (patch)
tree3536557fea79ffd77bb5a885465e579eeeafb8ff /modules/database
parent3e8752fe665c3cdf683f2b5fa271231fb3a624df (diff)
That doesn't work either, just don't use references.
find ./ -name '*.cpp' -exec sed -i 's/Get<const Anope::string\&>/Get<const Anope::string>/g' {} \;
Diffstat (limited to 'modules/database')
-rw-r--r--modules/database/db_flatfile.cpp10
-rw-r--r--modules/database/db_old.cpp2
-rw-r--r--modules/database/db_plain.cpp2
-rw-r--r--modules/database/db_sql.cpp4
-rw-r--r--modules/database/db_sql_live.cpp4
5 files changed, 11 insertions, 11 deletions
diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp
index 8cede5394..f7cc3df59 100644
--- a/modules/database/db_flatfile.cpp
+++ b/modules/database/db_flatfile.cpp
@@ -119,7 +119,7 @@ class DBFlatFile : public Module, public Pipe
const std::vector<Anope::string> &type_order = Serialize::Type::GetTypeOrder();
std::set<Anope::string> dbs;
- dbs.insert(Config->GetModule(this)->Get<const Anope::string &>("database"));
+ dbs.insert(Config->GetModule(this)->Get<const Anope::string>("database"));
for (unsigned i = 0; i < type_order.size(); ++i)
{
@@ -195,7 +195,7 @@ class DBFlatFile : public Module, public Pipe
const std::vector<Anope::string> &type_order = Serialize::Type::GetTypeOrder();
std::set<Anope::string> tried_dbs;
- const Anope::string &db_name = Anope::DataDir + "/" + Config->GetModule(this)->Get<const Anope::string &>("database");
+ const Anope::string &db_name = Anope::DataDir + "/" + Config->GetModule(this)->Get<const Anope::string>("database");
std::fstream fd(db_name.c_str(), std::ios_base::in);
if (!fd.is_open())
@@ -272,7 +272,7 @@ class DBFlatFile : public Module, public Pipe
if (s_type->GetOwner())
db_name = Anope::DataDir + "/module_" + s_type->GetOwner()->name + ".db";
else
- db_name = Anope::DataDir + "/" + Config->GetModule(this)->Get<const Anope::string &>("database");
+ db_name = Anope::DataDir + "/" + Config->GetModule(this)->Get<const Anope::string>("database");
if (Anope::IsFile(db_name))
rename(db_name.c_str(), (db_name + ".tmp").c_str());
@@ -304,7 +304,7 @@ class DBFlatFile : public Module, public Pipe
for (std::map<Module *, std::fstream *>::iterator it = databases.begin(), it_end = databases.end(); it != it_end; ++it)
{
std::fstream *f = it->second;
- const Anope::string &db_name = Anope::DataDir + "/" + (it->first ? (it->first->name + ".db") : Config->GetModule(this)->Get<const Anope::string &>("database"));
+ const Anope::string &db_name = Anope::DataDir + "/" + (it->first ? (it->first->name + ".db") : Config->GetModule(this)->Get<const Anope::string>("database"));
if (!f->is_open() || !f->good())
{
@@ -349,7 +349,7 @@ class DBFlatFile : public Module, public Pipe
if (stype->GetOwner())
db_name = Anope::DataDir + "/module_" + stype->GetOwner()->name + ".db";
else
- db_name = Anope::DataDir + "/" + Config->GetModule(this)->Get<const Anope::string &>("database");
+ db_name = Anope::DataDir + "/" + Config->GetModule(this)->Get<const Anope::string>("database");
std::fstream fd(db_name.c_str(), std::ios_base::in);
if (!fd.is_open())
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index fd499d0cb..64faafe10 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -1098,7 +1098,7 @@ class DBOld : public Module
Implementation i[] = { I_OnLoadDatabase, I_OnUplinkSync };
ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
- hashm = Config->GetModule(this)->Get<const Anope::string &>("hash");
+ hashm = Config->GetModule(this)->Get<const Anope::string>("hash");
if (hashm != "md5" && hashm != "oldmd5" && hashm != "sha1" && hashm != "plain" && hashm != "sha256")
throw ModuleException("Invalid hash method");
diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp
index 3c6324b6f..809fcc2e5 100644
--- a/modules/database/db_plain.cpp
+++ b/modules/database/db_plain.cpp
@@ -637,7 +637,7 @@ class DBPlain : public Module
void OnReload(Configuration::Conf *conf) anope_override
{
- DatabaseFile = Anope::DataDir + "/" + conf->GetModule(this)->Get<const Anope::string &>("database");
+ DatabaseFile = Anope::DataDir + "/" + conf->GetModule(this)->Get<const Anope::string>("database");
if (DatabaseFile.empty())
DatabaseFile = "anope.db";
BackupFile = Anope::DataDir + "/backups/" + DatabaseFile;
diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp
index 145857614..bb4d5277b 100644
--- a/modules/database/db_sql.cpp
+++ b/modules/database/db_sql.cpp
@@ -149,8 +149,8 @@ class DBSQL : public Module, public Pipe
void OnReload(Configuration::Conf *conf) anope_override
{
Configuration::Block *block = conf->GetModule(this);
- this->sql = ServiceReference<Provider>("SQL::Provider", block->Get<const Anope::string &>("engine"));
- this->prefix = block->Get<const Anope::string &>("prefix", "anope_db_");
+ this->sql = ServiceReference<Provider>("SQL::Provider", block->Get<const Anope::string>("engine"));
+ this->prefix = block->Get<const Anope::string>("prefix", "anope_db_");
this->import = block->Get<bool>("import");
}
diff --git a/modules/database/db_sql_live.cpp b/modules/database/db_sql_live.cpp
index 091febda7..1a53f98d0 100644
--- a/modules/database/db_sql_live.cpp
+++ b/modules/database/db_sql_live.cpp
@@ -131,8 +131,8 @@ class DBMySQL : public Module, public Pipe
void OnReload(Configuration::Conf *conf) anope_override
{
Configuration::Block *block = conf->GetModule(this);
- this->SQL = ServiceReference<Provider>("SQL::Provider", block->Get<const Anope::string &>("engine"));
- this->prefix = block->Get<const Anope::string &>("prefix", "anope_db_");
+ this->SQL = ServiceReference<Provider>("SQL::Provider", block->Get<const Anope::string>("engine"));
+ this->prefix = block->Get<const Anope::string>("prefix", "anope_db_");
}
void OnSerializableConstruct(Serializable *obj) anope_override