Require cmake 2.8 and C++11 support

4 files changed, 10 insertions, 10 deletions

diff --git a/include/modules/dns.h b/include/modules/dns.h
index 37af05cc9..59fc83e64 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -165,7 +165,7 @@ namespace DNS
 		/** Used to time out the query, xalls OnError and lets the TimerManager
 		 * delete this request.
 		 */
-		void Tick(time_t) anope_override
+		void Tick(time_t) override
 		{
 			Log(LOG_DEBUG_2) << "Resolver: timeout for query " << this->name;
 			Query rr(*this);
diff --git a/include/modules/os_session.h b/include/modules/os_session.h
index 65f1c6f75..ac6bf9395 100644
--- a/include/modules/os_session.h
+++ b/include/modules/os_session.h
@@ -20,14 +20,14 @@ struct Exception : Serializable
 	time_t expires;			/* Time when it expires. 0 == no expiry */
 
 	Exception() : Serializable("Exception") { }
-	void Serialize(Serialize::Data &data) const anope_override;
+	void Serialize(Serialize::Data &data) const override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
 };
 
 class SessionService : public Service
 {
  public:
- 	typedef TR1NS::unordered_map<cidr, Session *, cidr::hash> SessionMap;
+ 	typedef std::unordered_map<cidr, Session *, cidr::hash> SessionMap;
 	typedef std::vector<Exception *> ExceptionVector;
 
 	SessionService(Module *m) : Service(m, "SessionService", "session") { }
diff --git a/include/modules/sasl.h b/include/modules/sasl.h
index ec6d741ca..dbe6441e9 100644
--- a/include/modules/sasl.h
+++ b/include/modules/sasl.h
@@ -80,7 +80,7 @@ namespace SASL
 	 public:
 		IdentifyRequest(Module *m, const Anope::string &id, const Anope::string &acc, const Anope::string &pass) : ::IdentifyRequest(m, acc, pass), uid(id) { }
 
-		void OnSuccess() anope_override
+		void OnSuccess() override
 		{
 			if (!sasl)
 				return;
@@ -98,7 +98,7 @@ namespace SASL
 			}
 		}
 
-		void OnFail() anope_override
+		void OnFail() override
 		{
 			if (!sasl)
 				return;
diff --git a/include/modules/sql.h b/include/modules/sql.h
index 789bec98b..9cde772dc 100644
--- a/include/modules/sql.h
+++ b/include/modules/sql.h
@@ -20,7 +20,7 @@ namespace SQL
 			Clear();
 		}
 
-		std::iostream& operator[](const Anope::string &key) anope_override
+		std::iostream& operator[](const Anope::string &key) override
 		{
 			std::stringstream *&ss = data[key];
 			if (!ss)
@@ -28,7 +28,7 @@ namespace SQL
 			return *ss;
 		}
 
-		std::set<Anope::string> KeySet() const anope_override
+		std::set<Anope::string> KeySet() const override
 		{
 			std::set<Anope::string> keys;
 			for (Map::const_iterator it = this->data.begin(), it_end = this->data.end(); it != it_end; ++it)
@@ -36,7 +36,7 @@ namespace SQL
 			return keys;
 		}
 
-		size_t Hash() const anope_override
+		size_t Hash() const override
 		{
 			size_t hash = 0;
 			for (Map::const_iterator it = this->data.begin(), it_end = this->data.end(); it != it_end; ++it)
@@ -60,12 +60,12 @@ namespace SQL
 			this->data.clear();
 		}
 
-		void SetType(const Anope::string &key, Type t) anope_override
+		void SetType(const Anope::string &key, Type t) override
 		{
 			this->types[key] = t;
 		}
 
-		Type GetType(const Anope::string &key) const anope_override
+		Type GetType(const Anope::string &key) const override
 		{
 			std::map<Anope::string, Type>::const_iterator it = this->types.find(key);
 			if (it != this->types.end())