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
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
|
Author: Mikoláš Janota <mikolas.janota@gmail.com>
Description: compliance to the C++11 standard
Debian-bug: #811793
diff -ru --unidirectional-new-file /home/rt/debian/packages/collab-maint/packup/basic_clset.hh ./basic_clset.hh
--- /home/rt/debian/packages/collab-maint/packup/basic_clset.hh 2016-12-05 09:13:30.186505896 +0100
+++ ./basic_clset.hh 2016-12-19 20:03:22.000000000 +0100
@@ -34,11 +34,7 @@
#include <cmath>
#include <vector>
-#include <ext/hash_map> // Location of STL hash extensions
-#include <ext/hash_set> // Location of STL hash extensions
-
using namespace std;
-using namespace __gnu_cxx; // Required for STL hash extensions
#include "globals.hh"
#include "basic_clause.hh"
diff -ru --unidirectional-new-file /home/rt/debian/packages/collab-maint/packup/cl_globals.hh ./cl_globals.hh
--- /home/rt/debian/packages/collab-maint/packup/cl_globals.hh 2016-12-05 09:13:30.186505896 +0100
+++ ./cl_globals.hh 2016-12-19 20:03:32.000000000 +0100
@@ -34,11 +34,7 @@
#include <cmath>
#include <vector>
-#include <ext/hash_map> // Location of STL hash extensions
-#include <ext/hash_set> // Location of STL hash extensions
-
using namespace std;
-using namespace __gnu_cxx; // Required for STL hash extensions
#include "globals.hh"
#include "basic_clause.hh"
diff -ru --unidirectional-new-file /home/rt/debian/packages/collab-maint/packup/cl_registry.hh ./cl_registry.hh
--- /home/rt/debian/packages/collab-maint/packup/cl_registry.hh 2016-12-05 09:13:30.186505896 +0100
+++ ./cl_registry.hh 2016-12-19 20:03:52.000000000 +0100
@@ -34,8 +34,6 @@
#include <cmath>
#include <vector>
-#include <ext/hash_map> // Location of STL hash extensions
-#include <ext/hash_set> // Location of STL hash extensions
#include <ext/algorithm> // Location of STL hash extensions
using namespace std;
diff -ru --unidirectional-new-file /home/rt/debian/packages/collab-maint/packup/cl_types.hh ./cl_types.hh
--- /home/rt/debian/packages/collab-maint/packup/cl_types.hh 2016-12-05 09:13:30.186505896 +0100
+++ ./cl_types.hh 2016-12-19 20:23:10.000000000 +0100
@@ -66,7 +66,7 @@
typedef vector<BasicClause*> BasicClauseVector;
typedef BasicClauseVector::iterator ClVectIterator;
-typedef slist<BasicClause*> BasicClauseSList;
+//typedef slist<BasicClause*> BasicClauseSList;
typedef list<BasicClause*> BasicClauseList;
diff -ru --unidirectional-new-file /home/rt/debian/packages/collab-maint/packup/collections.hh ./collections.hh
--- /home/rt/debian/packages/collab-maint/packup/collections.hh 2016-12-05 09:13:30.186505896 +0100
+++ ./collections.hh 2016-12-19 20:20:39.000000000 +0100
@@ -34,7 +34,7 @@
typedef vector<PackageVersions> PackageVersionsList;
typedef vector<PackageVersionsList*> PackageVersionsCNF;
typedef vector<PackageVersion> PackageVersionList;
-typedef unordered_map< const char*,string,__gnu_cxx::hash<const char*>, streq > Str2Str;
+typedef unordered_map< const char*,string,std::hash<const char*>, streq > Str2Str;
typedef unordered_map<PackageVersion, Variable, hash_package_version, eq_package_version> PackageVersionMap;
typedef unordered_map<Variable,PackageVersion> VariableToPackageVersion;
typedef vector<Version> VersionVector;
diff -ru --unidirectional-new-file /home/rt/debian/packages/collab-maint/packup/common_types.hh ./common_types.hh
--- /home/rt/debian/packages/collab-maint/packup/common_types.hh 2016-12-05 09:13:30.186505896 +0100
+++ ./common_types.hh 2016-12-19 20:21:04.000000000 +0100
@@ -25,13 +25,9 @@
#ifndef COMMON_TYPES_H
#define COMMON_TYPES_H
-#include <ext/hash_set>
-#include <ext/hash_map>
+#include "hash_structs.hh"
#include <string.h>
#include "types.hh"
-using __gnu_cxx::hash;
-using __gnu_cxx::hash_map;
-using __gnu_cxx::hash_set;
using std::string;
using std::vector;
using std::ostream;
@@ -40,8 +36,6 @@
#define CONSTANT const
#define CONTAINS(s,e) ( ((s).find(e))!=(s).end() )
#define SAME_PACKAGE_NAME(n1,n2) (n1.data()==n2.data())
-#define unordered_set hash_set
-#define unordered_map hash_map
typedef unsigned int UINT;
typedef UINT Version;
@@ -115,6 +109,7 @@
{return strcmp(s1, s2) == 0;}
};
+/*
namespace __gnu_cxx
{
template<>
@@ -126,7 +121,9 @@
return h(s.data());
}
};
-} /*end of namespace __gnu_cxx */
+}*/ /*end of namespace __gnu_cxx */
+
+
const char* to_string (KeepValue value);
const char* to_string (Criterion value);
diff -ru --unidirectional-new-file /home/rt/debian/packages/collab-maint/packup/cudf_msu.cc ./cudf_msu.cc
--- /home/rt/debian/packages/collab-maint/packup/cudf_msu.cc 2016-12-05 09:13:30.186505896 +0100
+++ ./cudf_msu.cc 2016-12-19 20:45:19.000000000 +0100
@@ -27,8 +27,9 @@
#include "Options.hh"
using std::ifstream;
-static const char* dist_date = ""DISTDATE"";
-static const char* changeset = ""CHANGESET"";
+#define stringify(s) #s
+static const char* dist_date = stringify(DISTDATE);
+static const char* changeset = stringify(CHANGESET);
static const char* release = "0.6";
IDManager id_manager;
Only in /home/rt/debian/packages/collab-maint/packup/: .git
diff -ru --unidirectional-new-file /home/rt/debian/packages/collab-maint/packup/hash_structs.hh ./hash_structs.hh
--- /home/rt/debian/packages/collab-maint/packup/hash_structs.hh 1970-01-01 01:00:00.000000000 +0100
+++ ./hash_structs.hh 2016-12-19 20:19:45.000000000 +0100
@@ -0,0 +1,12 @@
+#ifndef HASH_STRUCTS_123
+#define HASH_STRUCTS_123
+
+#include <unordered_set>
+#include <unordered_map>
+#define hash_multimap unordered_multimap
+#define hash_set unordered_set
+#define hash_map unordered_map
+using std::hash;
+using std::unordered_map;
+using std::unordered_set;
+#endif
diff -ru --unidirectional-new-file /home/rt/debian/packages/collab-maint/packup/Makefile ./Makefile
--- /home/rt/debian/packages/collab-maint/packup/Makefile 2016-12-05 09:13:30.182505875 +0100
+++ ./Makefile 2016-12-19 20:36:07.000000000 +0100
@@ -16,6 +16,7 @@
CFLAGS+=-DEXTERNAL_SOLVER
CFLAGS+=-DNDEBUG -DNCHECK
CFLAGS+=-O3
+CFLAGS+=-std=c++11
CFLAGS += -Wall -DBUILDDATE='"$(BUILDDATE)"' -DDISTDATE='"$(DISTDATE)"'
CFLAGS += -DCHANGESET='"$(CHANGESET)"' -DRELDATE='"$(RELDATE)"'
CFLAGS+=-D __STDC_LIMIT_MACROS -D __STDC_FORMAT_MACROS -Wno-parentheses -Wno-deprecated
diff -ru --unidirectional-new-file /home/rt/debian/packages/collab-maint/packup/types.hh ./types.hh
--- /home/rt/debian/packages/collab-maint/packup/types.hh 2016-12-05 09:13:30.190505918 +0100
+++ ./types.hh 2016-12-19 20:17:12.000000000 +0100
@@ -38,6 +38,12 @@
using namespace std;
+#include <unordered_set>
+#include <unordered_map>
+#define hash_multimap unordered_multimap
+#define hash_set unordered_set
+#define hash_map unordered_map
+
/*----------------------------------------------------------------------------*\
* Values besides 0 and 1
@@ -158,11 +164,8 @@
#include <map>
#include <set>
#include <ext/slist> // Location of STL list extensions
-#include <ext/hash_map> // Location of STL hash extensions
-#include <ext/hash_set> // Location of STL hash extensions
using namespace std;
-using namespace __gnu_cxx; // Required for STL hash extensions
#ifdef USE_RBTREE_SETS
|
