blob: 918d882983a30ff3e209f08189ba07b085b75bd9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
--- a/CommonSource/DataStructures/UnorderedMap.h
+++ b/CommonSource/DataStructures/UnorderedMap.h
@@ -42,13 +42,9 @@
#else // all decent C++ compilers
-#ifdef WIN32
#include <unordered_map>
-#else // Linux
-#include <tr1/unordered_map>
-#endif
-using namespace std::tr1;
+using namespace std;
#endif
--- a/CommonSource/DataStructures/UnorderedSet.h
+++ b/CommonSource/DataStructures/UnorderedSet.h
@@ -42,13 +42,9 @@
#else // all decent C++ compilers
-#ifdef WIN32
#include <unordered_set>
-#else // Linux
-#include <tr1/unordered_set>
-#endif
-using namespace std::tr1;
+using namespace std;
#endif
--- a/CommonSource/Utilities/RegexUtilities.h
+++ b/CommonSource/Utilities/RegexUtilities.h
@@ -12,10 +12,7 @@
#define REGEXUTILITIES_H_
#include <iostream>
-#ifdef WIN32
#include <regex>
-using namespace std::tr1;
-#endif
#include <string>
#include <vector>
#include <cstdlib>
--- a/MosaikBuild/MosaikBuild.h
+++ b/MosaikBuild/MosaikBuild.h
@@ -15,10 +15,7 @@
#include <iostream>
#include <fstream>
#include <map>
-#ifdef WIN32
#include <regex>
-using namespace std::tr1;
-#endif
#include <set>
#include <sstream>
#include "ColorspaceUtilities.h"
|
