Windows

4 files changed, 9 insertions, 9 deletions

diff --git a/modules/extra/m_mysql.cpp b/modules/extra/m_mysql.cpp
index 61e6c39c9..189a950d8 100644
--- a/modules/extra/m_mysql.cpp
+++ b/modules/extra/m_mysql.cpp
@@ -123,7 +123,7 @@ class MySQLService : public SQLProvider
 
 	SQLResult RunQuery(const SQLQuery &query);
 
-	SQLQuery CreateTable(const Anope::string &table, const SerializableBase::serialized_data &data);
+	SQLQuery CreateTable(const Anope::string &table, const Serializable::serialized_data &data);
 
 	SQLQuery GetTables();
 
@@ -342,10 +342,10 @@ SQLResult MySQLService::RunQuery(const SQLQuery &query)
 	}
 }
 
-SQLQuery MySQLService::CreateTable(const Anope::string &table, const SerializableBase::serialized_data &data)
+SQLQuery MySQLService::CreateTable(const Anope::string &table, const Serializable::serialized_data &data)
 {
 	Anope::string query_text = "CREATE TABLE `" + table + "` (", key_buf;
-	for (SerializableBase::serialized_data::const_iterator it = data.begin(), it_end = data.end(); it != it_end; ++it)
+	for (Serializable::serialized_data::const_iterator it = data.begin(), it_end = data.end(); it != it_end; ++it)
 	{
 		query_text += "`" + it->first + "` ";
 		if (it->second.getType() == Serialize::DT_INT)
diff --git a/modules/extra/m_proxyscan.cpp b/modules/extra/m_proxyscan.cpp
index 685d984b0..36d9544ec 100644
--- a/modules/extra/m_proxyscan.cpp
+++ b/modules/extra/m_proxyscan.cpp
@@ -9,7 +9,7 @@
 
 struct ProxyCheck
 {
-	std::set<Anope::string, std::less<ci::string> > types;
+	std::set<Anope::string, ci::less> types;
 	std::vector<unsigned short> ports;
 	time_t duration;
 	Anope::string reason;
@@ -361,7 +361,7 @@ class ModuleProxyScan : public Module
 		{
 			ProxyCheck &p = this->proxyscans[i - 1];
 
-			for (std::set<Anope::string, std::less<ci::string> >::iterator it = p.types.begin(), it_end = p.types.end(); it != it_end; ++it)
+			for (std::set<Anope::string, ci::less>::iterator it = p.types.begin(), it_end = p.types.end(); it != it_end; ++it)
 			{
 				for (unsigned k = 0; k < p.ports.size(); ++k)
 				{
diff --git a/modules/extra/m_sqlite.cpp b/modules/extra/m_sqlite.cpp
index 2411f843f..e81bca8ab 100644
--- a/modules/extra/m_sqlite.cpp
+++ b/modules/extra/m_sqlite.cpp
@@ -44,7 +44,7 @@ class SQLiteService : public SQLProvider
 
 	SQLResult RunQuery(const SQLQuery &query);
 
-	SQLQuery CreateTable(const Anope::string &table, const SerializableBase::serialized_data &data);
+	SQLQuery CreateTable(const Anope::string &table, const Serializable::serialized_data &data);
 
 	SQLQuery GetTables();
 
@@ -181,10 +181,10 @@ SQLResult SQLiteService::RunQuery(const SQLQuery &query)
 	return result;
 }
 
-SQLQuery SQLiteService::CreateTable(const Anope::string &table, const SerializableBase::serialized_data &data)
+SQLQuery SQLiteService::CreateTable(const Anope::string &table, const Serializable::serialized_data &data)
 {
 	Anope::string query_text = "CREATE TABLE `" + table + "` (", key_buf;
-	for (SerializableBase::serialized_data::const_iterator it = data.begin(), it_end = data.end(); it != it_end; ++it)
+	for (Serializable::serialized_data::const_iterator it = data.begin(), it_end = data.end(); it != it_end; ++it)
 	{
 		query_text += "`" + it->first + "` ";
 		if (it->second.getType() == Serialize::DT_INT)
diff --git a/modules/extra/sql.h b/modules/extra/sql.h
index 21b311014..14272ed90 100644
--- a/modules/extra/sql.h
+++ b/modules/extra/sql.h
@@ -117,7 +117,7 @@ class SQLProvider : public Service<Base>
 
 	virtual SQLResult RunQuery(const SQLQuery &query) = 0;
 
-	virtual SQLQuery CreateTable(const Anope::string &table, const SerializableBase::serialized_data &data) = 0;
+	virtual SQLQuery CreateTable(const Anope::string &table, const Serializable::serialized_data &data) = 0;
 
 	virtual SQLQuery GetTables() = 0;
 };