]> git.pld-linux.org Git - packages/povray.git/blob - povray-c++11.patch
- updated to 3.7.1-rc1
[packages/povray.git] / povray-c++11.patch
1 --- povray-3.7.1-rc.1/unix/povconfig/syspovconfig.h.orig        2017-06-22 20:42:33.000000000 +0200
2 +++ povray-3.7.1-rc.1/unix/povconfig/syspovconfig.h     2019-05-05 20:50:54.936577187 +0200
3 @@ -50,13 +50,13 @@
4  #include <exception>
5  #include <limits>
6  #include <list>
7 +#include <memory>
8  #include <stdexcept>
9  #include <string>
10  #include <vector>
11  
12  // boost headers
13  #include <boost/intrusive_ptr.hpp>
14 -#include <boost/tr1/memory.hpp>
15  
16  #ifdef HAVE_CONFIG_H
17  // from directory "." (generated by ./configure)
18 @@ -91,12 +91,11 @@
19  // to in a few other places.
20  using std::runtime_error;
21  
22 -// these may actually be the boost implementations, depending on what boost/tr1/memory.hpp has pulled in
23 -using std::tr1::shared_ptr;
24 -using std::tr1::weak_ptr;
25 -using std::tr1::dynamic_pointer_cast;
26 -using std::tr1::static_pointer_cast;
27 -using std::tr1::const_pointer_cast;
28 +using std::shared_ptr;
29 +using std::weak_ptr;
30 +using std::dynamic_pointer_cast;
31 +using std::static_pointer_cast;
32 +using std::const_pointer_cast;
33  
34  using boost::intrusive_ptr;
35  
36 --- povray-3.7.1-rc.1/source/base/precomp.h.orig        2017-06-22 20:42:33.000000000 +0200
37 +++ povray-3.7.1-rc.1/source/base/precomp.h     2019-05-05 21:10:21.240868851 +0200
38 @@ -62,6 +62,7 @@
39  #include <exception>
40  #include <list>
41  #include <map>
42 +#include <memory>
43  #include <new>
44  #include <set>
45  #include <stack>
46 @@ -81,6 +82,5 @@
47  #include <boost/thread.hpp>
48  #include <boost/thread/condition.hpp>
49  #endif
50 -#include <boost/tr1/memory.hpp>
51  #include <boost/unordered_map.hpp>
52  
53 --- povray-3.7.1-rc.1/source/backend/precomp.h.orig     2017-06-22 20:42:33.000000000 +0200
54 +++ povray-3.7.1-rc.1/source/backend/precomp.h  2019-05-05 21:20:44.480101155 +0200
55 @@ -60,6 +60,7 @@
56  #include <exception>
57  #include <list>
58  #include <map>
59 +#include <memory>
60  #include <new>
61  #include <set>
62  #include <stack>
63 @@ -78,6 +79,5 @@
64  #include <boost/thread.hpp>
65  #include <boost/thread/condition.hpp>
66  #endif
67 -#include <boost/tr1/memory.hpp>
68  #include <boost/unordered_map.hpp>
69  
70 --- povray-3.7.1-rc.1/source/core/precomp.h.orig        2017-06-22 20:42:33.000000000 +0200
71 +++ povray-3.7.1-rc.1/source/core/precomp.h     2019-05-05 21:26:40.592038719 +0200
72 @@ -60,6 +60,7 @@
73  #include <exception>
74  #include <list>
75  #include <map>
76 +#include <memory>
77  #include <new>
78  #include <set>
79  #include <stack>
80 @@ -78,6 +79,5 @@
81  #include <boost/thread.hpp>
82  #include <boost/thread/condition.hpp>
83  #endif
84 -#include <boost/tr1/memory.hpp>
85  #include <boost/unordered_map.hpp>
86  
87 --- povray-3.7.1-rc.1/source/core/shape/parametric.cpp.orig     2017-06-22 20:42:33.000000000 +0200
88 +++ povray-3.7.1-rc.1/source/core/shape/parametric.cpp  2019-05-05 21:55:01.000916811 +0200
89 @@ -37,8 +37,7 @@
90  #include "core/shape/parametric.h"
91  
92  #include <algorithm>
93 -
94 -#include <boost/tr1/array.hpp>
95 +#include <array>
96  
97  #include "core/math/matrix.h"
98  #include "core/render/ray.h"
99 @@ -441,7 +440,7 @@
100      Vector3d RU, RV;
101      Vector2d uv_vect;
102  
103 -    std::tr1::array<GenericScalarFunctionInstance,3> aFn = {
104 +    std::array<GenericScalarFunctionInstance,3> aFn = {
105          GenericScalarFunctionInstance(Function[0], Thread),
106          GenericScalarFunctionInstance(Function[1], Thread),
107          GenericScalarFunctionInstance(Function[2], Thread)
108 @@ -919,7 +918,7 @@
109          throw POV_EXCEPTION_STRING("Cannot allocate memory for parametric precomputation data.");
110  
111      PrecompLastDepth = 1 << (depth - 1);
112 -    std::tr1::array<GenericScalarFunctionInstance,3> aFn = {
113 +    std::array<GenericScalarFunctionInstance,3> aFn = {
114          GenericScalarFunctionInstance(Function[0], Thread),
115          GenericScalarFunctionInstance(Function[1], Thread),
116          GenericScalarFunctionInstance(Function[2], Thread)
117 --- povray-3.7.1-rc.1/source/frontend/precomp.h.orig    2017-06-22 20:42:33.000000000 +0200
118 +++ povray-3.7.1-rc.1/source/frontend/precomp.h 2019-05-06 05:16:59.760443675 +0200
119 @@ -60,6 +60,7 @@
120  #include <exception>
121  #include <list>
122  #include <map>
123 +#include <memory>
124  #include <new>
125  #include <set>
126  #include <stack>
127 @@ -78,6 +79,5 @@
128  #include <boost/thread.hpp>
129  #include <boost/thread/condition.hpp>
130  #endif
131 -#include <boost/tr1/memory.hpp>
132  #include <boost/unordered_map.hpp>
133  
134 --- povray-3.7.1-rc.1/source/parser/precomp.h.orig      2017-06-22 20:42:33.000000000 +0200
135 +++ povray-3.7.1-rc.1/source/parser/precomp.h   2019-05-06 05:24:59.805900707 +0200
136 @@ -60,6 +60,7 @@
137  #include <exception>
138  #include <list>
139  #include <map>
140 +#include <memory>
141  #include <new>
142  #include <set>
143  #include <stack>
144 @@ -78,6 +79,5 @@
145  #include <boost/thread.hpp>
146  #include <boost/thread/condition.hpp>
147  #endif
148 -#include <boost/tr1/memory.hpp>
149  #include <boost/unordered_map.hpp>
150  
151 --- povray-3.7.1-rc.1/source/povms/precomp.h.orig       2017-06-22 20:42:33.000000000 +0200
152 +++ povray-3.7.1-rc.1/source/povms/precomp.h    2019-05-06 05:29:58.565082232 +0200
153 @@ -60,6 +60,7 @@
154  #include <exception>
155  #include <list>
156  #include <map>
157 +#include <memory>
158  #include <new>
159  #include <set>
160  #include <stack>
161 @@ -78,6 +79,5 @@
162  #include <boost/thread.hpp>
163  #include <boost/thread/condition.hpp>
164  #endif
165 -#include <boost/tr1/memory.hpp>
166  #include <boost/unordered_map.hpp>
167  
168 --- povray-3.7.1-rc.1/source/vm/precomp.h.orig  2017-06-22 20:42:33.000000000 +0200
169 +++ povray-3.7.1-rc.1/source/vm/precomp.h       2019-05-06 05:30:54.058009990 +0200
170 @@ -60,6 +60,7 @@
171  #include <exception>
172  #include <list>
173  #include <map>
174 +#include <memory>
175  #include <new>
176  #include <set>
177  #include <stack>
178 @@ -78,6 +79,5 @@
179  #include <boost/thread.hpp>
180  #include <boost/thread/condition.hpp>
181  #endif
182 -#include <boost/tr1/memory.hpp>
183  #include <boost/unordered_map.hpp>
184  
This page took 0.073274 seconds and 3 git commands to generate.