From 16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 13 Jul 2017 23:50:42 +0300
Subject: Add vector.h for use different vectors.

Also replace <vector> include into "utils/vector.h"
---
 src/utils/langs.h        |  3 ++-
 src/utils/perfomance.h   |  3 ++-
 src/utils/stringvector.h |  3 ++-
 src/utils/vector.h       | 32 ++++++++++++++++++++++++++++++++
 src/utils/xmlutils.h     |  3 ++-
 5 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 src/utils/vector.h

(limited to 'src/utils')

diff --git a/src/utils/langs.h b/src/utils/langs.h
index 902dcf264..133883089 100644
--- a/src/utils/langs.h
+++ b/src/utils/langs.h
@@ -21,8 +21,9 @@
 #ifndef UTILS_LANGS_H
 #define UTILS_LANGS_H
 
+#include "utils/vector.h"
+
 #include <string>
-#include <vector>
 
 #include "localconsts.h"
 
diff --git a/src/utils/perfomance.h b/src/utils/perfomance.h
index 4d8fc6188..1e8688551 100644
--- a/src/utils/perfomance.h
+++ b/src/utils/perfomance.h
@@ -22,11 +22,12 @@
 #define UTILS_PERFOMANCE_H
 
 #ifdef USE_PROFILER
+#include "utils/vector.h"
+
 #include <string>
 #include <sstream>
 #include <list>
 #include <set>
-#include <vector>
 
 #include "localconsts.h"
 
diff --git a/src/utils/stringvector.h b/src/utils/stringvector.h
index 4c060b9b9..7649f3b35 100644
--- a/src/utils/stringvector.h
+++ b/src/utils/stringvector.h
@@ -21,8 +21,9 @@
 #ifndef UTILS_STRINGVECTOR_H
 #define UTILS_STRINGVECTOR_H
 
+#include "utils/vector.h"
+
 #include <string>
-#include <vector>
 
 typedef std::vector<std::string> StringVect;
 typedef StringVect::iterator StringVectIter;
diff --git a/src/utils/vector.h b/src/utils/vector.h
new file mode 100644
index 000000000..6ec054edf
--- /dev/null
+++ b/src/utils/vector.h
@@ -0,0 +1,32 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2017  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program 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; either version 2 of the License, or
+ *  any later version.
+ *
+ *  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 UTILS_VECTOR_H
+#define UTILS_VECTOR_H
+
+#ifdef ENABLE_STLDEBUG
+#include "debug/mse/msemstdvector.h"
+#define STD_VECTOR mse::mstd::vector
+#else  // ENABLE_STLDEBUG
+#include <vector>
+#define STD_VECTOR std::vector
+#endif  // ENABLE_STLDEBUG
+
+#endif  // UTILS_VECTOR_H
diff --git a/src/utils/xmlutils.h b/src/utils/xmlutils.h
index df736b4da..6b24dc471 100644
--- a/src/utils/xmlutils.h
+++ b/src/utils/xmlutils.h
@@ -23,9 +23,10 @@
 
 #include "enums/simpletypes/skiperror.h"
 
+#include "utils/vector.h"
+
 #include <string>
 #include <map>
-#include <vector>
 
 void readXmlIntVector(const std::string &fileName,
                       const std::string &rootName,
-- 
cgit v1.2.3-60-g2f50