summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/command_parse.cpp5
-rw-r--r--src/hashcomp.cpp8
-rw-r--r--src/message.cpp4
-rw-r--r--src/modules/m_spanningtree.cpp4
-rw-r--r--src/modules/m_spy.cpp9
-rw-r--r--src/userprocess.cpp4
6 files changed, 0 insertions, 34 deletions
diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index befcde7ca..644860702 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -51,12 +51,7 @@
#include "command_parse.h"
#include "ctables.h"
-#ifdef GCC3
#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
-
extern InspIRCd* ServerInstance;
diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index d107df309..3271e599c 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -21,17 +21,9 @@ using namespace std;
#include <string>
#include "hashcomp.h"
#include "helperfuncs.h"
-#ifdef GCC3
#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#ifdef GCC3
#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
// from helperfuncs.cpp
extern const char lowermap[255];
diff --git a/src/message.cpp b/src/message.cpp
index 7c0b860dc..e49663e55 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -25,11 +25,7 @@ using namespace std;
#include <sys/utsname.h>
#include <time.h>
#include <string>
-#ifdef GCC3
#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
#include <map>
#include <sstream>
#include <vector>
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 23e7f1b19..5222d8f18 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -41,11 +41,7 @@ using namespace std;
#include "cull_list.h"
#include "aes.h"
-#ifdef GCC3
#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
/*
* The server list in InspIRCd is maintained as two structures
diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index 32c19ccc9..625b5c971 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -28,11 +28,7 @@ using namespace std;
#include <deque>
#include "globals.h"
#include "inspircd_config.h"
-#ifdef GCC3
#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
#include "users.h"
#include "channels.h"
#include "modules.h"
@@ -48,12 +44,7 @@ using namespace std;
#include "cull_list.h"
#include "aes.h"
-#ifdef GCC3
#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
-
static Server *Srv;
diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index e9860b594..391c15d7a 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -28,11 +28,7 @@ using namespace std;
#include <sys/utsname.h>
#include <time.h>
#include <string>
-#ifdef GCC3
#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
#include <map>
#include <sstream>
#include <vector>