From 1e60a227ca7eb081b7eb02b0aef9bbb8705733dc Mon Sep 17 00:00:00 2001
From: nyamatongwe <nyamatongwe@gmail.com>
Date: Tue, 23 Jul 2013 11:13:57 +1000
Subject: Only use map for character representations instead of unordered_map
 where possible. unordered_map caused too many porting problems.

---
 cocoa/ScintillaCocoa.h             | 3 ---
 gtk/ScintillaGTK.cxx               | 3 ---
 qt/ScintillaEditBase/ScintillaQt.h | 3 ---
 src/Editor.cxx                     | 3 ---
 src/PositionCache.cxx              | 3 ---
 src/PositionCache.h                | 6 +-----
 src/ScintillaBase.cxx              | 3 ---
 win32/ScintillaWin.cxx             | 3 ---
 8 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index cddce4b5b..9b2c9fa1e 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -21,9 +21,6 @@
 
 #include <vector>
 #include <map>
-#ifndef SCINTILLA_NO_UNORDERED_MAP
-#include <unordered_map>
-#endif
 
 #include "ILexer.h"
 
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index dc8d91565..b02c7202d 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -14,9 +14,6 @@
 #include <string>
 #include <vector>
 #include <map>
-#ifndef SCINTILLA_NO_UNORDERED_MAP
-#include <unordered_map>
-#endif
 #include <algorithm>
 
 #include <gtk/gtk.h>
diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h
index d9f2458c5..d3c5be594 100644
--- a/qt/ScintillaEditBase/ScintillaQt.h
+++ b/qt/ScintillaEditBase/ScintillaQt.h
@@ -19,9 +19,6 @@
 #include <string>
 #include <vector>
 #include <map>
-#ifndef SCINTILLA_NO_UNORDERED_MAP
-#include <unordered_map>
-#endif
 #include <algorithm>
 
 #include "Scintilla.h"
diff --git a/src/Editor.cxx b/src/Editor.cxx
index acd5b3611..859ae180c 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -15,9 +15,6 @@
 #include <string>
 #include <vector>
 #include <map>
-#ifndef SCINTILLA_NO_UNORDERED_MAP
-#include <unordered_map>
-#endif
 #include <algorithm>
 #include <memory>
 
diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx
index d92d49338..009ed7cfa 100644
--- a/src/PositionCache.cxx
+++ b/src/PositionCache.cxx
@@ -13,9 +13,6 @@
 #include <string>
 #include <vector>
 #include <map>
-#ifndef SCINTILLA_NO_UNORDERED_MAP
-#include <unordered_map>
-#endif
 
 #include "Platform.h"
 
diff --git a/src/PositionCache.h b/src/PositionCache.h
index bab43390a..10afbd972 100644
--- a/src/PositionCache.h
+++ b/src/PositionCache.h
@@ -120,15 +120,11 @@ public:
 	}
 };
 
-#ifdef SCINTILLA_NO_UNORDERED_MAP
 typedef std::map<int, Representation> MapRepresentation;
-#else
-typedef std::unordered_map<int, Representation> MapRepresentation;
-#endif
 
 class SpecialRepresentations {
 	MapRepresentation mapReprs;
-	int startByteHasReprs[0x100];
+	short startByteHasReprs[0x100];
 public:
 	SpecialRepresentations();
 	void SetRepresentation(const char *charBytes, const char *value);
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index 462d90ea4..05768799d 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -14,9 +14,6 @@
 #include <string>
 #include <vector>
 #include <map>
-#ifndef SCINTILLA_NO_UNORDERED_MAP
-#include <unordered_map>
-#endif
 #include <algorithm>
 
 #include "Platform.h"
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 0509539fc..2386f1c48 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -16,9 +16,6 @@
 #include <string>
 #include <vector>
 #include <map>
-#ifndef SCINTILLA_NO_UNORDERED_MAP
-#include <unordered_map>
-#endif
 #include <algorithm>
 
 #undef _WIN32_WINNT
-- 
cgit v1.2.3