Merge pull request #237 from SaberUK/insp20-fix-windows-build

[user/henk/code/inspircd.git] / include / hash_map.h

diff --git a/include/hash_map.h b/include/hash_map.h
index 6e47d292b8199930734d9a0ed66d5b072da6b0c8..313b216a78520eba03581fe002290c185519fa01 100644 (file)
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -1,18 +1,29 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-       #ifndef INSPIRCD_HASHMAP_H
-       #define INSPIRCD_HASHMAP_H
+
+#ifndef INSPIRCD_HASHMAP_H
+#define INSPIRCD_HASHMAP_H
+
+#include "inspircd_config.h"
 
        /** Where hash_map is varies from compiler to compiler
         * as it is not standard unless we have tr1.
@@ -36,8 +47,9 @@
                        #define HAS_TR1_UNORDERED
                        #define HASHMAP_DEPRECATED
                #else
-                       #define nspace stdext
                        /** Oddball windows namespace for hash_map */
+                       #include <hash_map>
+                       #define nspace stdext
                        using stdext::hash_map;
                        #define BEGIN_HASHMAP_NAMESPACE namespace nspace {
                        #define END_HASHMAP_NAMESPACE }