]> git.pld-linux.org Git - packages/3DLDF.git/blame - upstream-cleanup-permissive_cxx_code.patch
- release 7 (rebuild with gsl 2.6)
[packages/3DLDF.git] / upstream-cleanup-permissive_cxx_code.patch
CommitLineData
359ef529
JR
1Description: permissive code cleanup
2 Clarify C++ permissive code as detected by gcc-5; closes RC bug #777763.
3Origin: debian
4Forwarded: https://savannah.gnu.org/bugs/?44314
5Author: Jerome Benoit <calculus@rezozer.net>
6Last-Update: 2015-06-26
7
8--- a/src/pspglb.web
9+++ b/src/pspglb.web
10@@ -5075,12 +5075,7 @@
11 void*
12 polyhedron_path_intersection_func(Polyhedron* p,
13 Path* q,
14- void* parameter = 0);
15-
16-template <class C>
17-int
18-show_func(C* c, string text = "", void* parameter = 0);
19-
20+ void* parameter = 0);
21
22 void*
23 plane_intersection_func(void* v, void* w, void* parameter = 0);
24--- a/src/io.web
25+++ b/src/io.web
26@@ -4937,22 +4937,22 @@
27 template <class C>
28 friend
29 void*
30- Scan_Parse::get_point_func(real r, C* c, void* parameter = 0);
31+ Scan_Parse::get_point_func(real r, C* c, void* parameter);
32
33 template <class C>
34 friend
35 void*
36- Scan_Parse::get_center_func(C* c, void* parameter = 0);
37+ Scan_Parse::get_center_func(C* c, void* parameter);
38
39 template <class C>
40 friend
41 void*
42- Scan_Parse::get_focus_func(C* c, const unsigned short s = 0, void* parameter = 0);
43+ Scan_Parse::get_focus_func(C* c, const unsigned short s, void* parameter);
44
45 template <class C>
46 friend
47 void*
48- Scan_Parse::get_vertex_func(C* c, const unsigned short s = 0, void* parameter = 0);
49+ Scan_Parse::get_vertex_func(C* c, const unsigned short s, void* parameter);
50
51
52 @q **** (4) Functions for |Focuses|.@>
53@@ -5009,8 +5009,8 @@
54 friend
55 string*
56 Scan_Parse::sub_binary_number_string_func(C c,
57- bool oversize_switch = false,
58- Scanner_Node scanner_node = 0);
59+ bool oversize_switch,
60+ Scanner_Node scanner_node);
61
62
63 @q **** (4) @>
64@@ -5035,7 +5035,7 @@
65 int
66 Scan_Parse::shape_decl_func(Scanner_Node,
67 int,
68- C* dummy = 0);
69+ C*);
70
71 template <class C>
72 friend
73@@ -5164,7 +5164,7 @@
74 template <class C>
75 friend
76 void*
77-Scan_Parse::normal_func(C* c, Scanner_Node scanner_node = 0);
78+Scan_Parse::normal_func(C* c, Scanner_Node scanner_node);
79
80
81 @q **** (4)@>
82@@ -5226,7 +5226,7 @@
83 Scan_Parse::vector_type_decl(Scanner_Node scanner_node,
84 int vector_type_num,
85 int array_type_num,
86- C* dummy = 0);
87+ C* dummy);
88
89
90 template <class C>
91@@ -5237,7 +5237,7 @@
92 int vector_type_num,
93 int array_type_num,
94 C* object,
95- bool copy_object = true);
96+ bool copy_object);
97
98 template <class C, class D>
99 friend
100@@ -5245,7 +5245,7 @@
101 Scan_Parse::vector_type_assign(Scanner_Node scanner_node,
102 Id_Map_Entry_Node entry,
103 const Pointer_Vector<D>* object_vector,
104- C* dummy = 0);
105+ C* dummy);
106 friend
107 int
108 Scan_Parse::conditional(Scanner_Node scanner_node,
109@@ -5367,7 +5367,7 @@
110 template<class C>
111 friend
112 int
113- Scan_Parse::reverse_func(void* v, void* parameter, C* c = 0);
114+ Scan_Parse::reverse_func(void* v, void* parameter, C* c);
115
116
117 friend
118@@ -5447,7 +5447,7 @@
119 template<class C>
120 friend
121 void*
122-standardize_func(C* c, void* v = 0);
123+standardize_func(C* c, void* v);
124
125 friend
126 void*
127@@ -5610,11 +5610,11 @@
128 int increment_value,
129 const unsigned short conic_section_type,
130 C* c,
131- void* parameter = 0,
132- bool test_points = true,
133- bool rectify_points = true,
134- real tolerance = -1,
135- bool ignore_extra_points = true);
136+ void* parameter,
137+ bool test_points,
138+ bool rectify_points,
139+ real tolerance,
140+ bool ignore_extra_points);
141
142 friend
143 void*
144@@ -5677,23 +5677,23 @@
145 template<class C>
146 friend
147 int
148-Scan_Parse::cull_func(void* v,
149- const unsigned short comparison = 0,
150- Scanner_Node scanner_node = 0,
151- real tolerance = -1,
152- C* c = 0);
153+Scan_Parse::cull_func(void* v,
154+ const unsigned short comparison,
155+ Scanner_Node scanner_node,
156+ real tolerance,
157+ C* c);
158
159 template<class C>
160 friend
161 int
162 Scan_Parse::rectify_func(void* v,
163- Scanner_Node scanner_node = 0,
164- bool do_test = true,
165- bool do_cull = true,
166- bool do_transform = true,
167- real tolerance = -1,
168- Transform* t = 0,
169- C* c = 0);
170+ Scanner_Node scanner_node,
171+ bool do_test,
172+ bool do_cull,
173+ bool do_transform,
174+ real tolerance,
175+ Transform* t,
176+ C* c);
177
178 @q ***** (5) |cuboid| expressions.@>
179 @*4 {\bf cuboid} expressions.
180@@ -5709,12 +5709,12 @@
181 template<class C>
182 friend
183 void*
184-Scan_Parse::in_cuboid_func(C* c, void* parameter = 0);
185+Scan_Parse::in_cuboid_func(C* c, void* parameter);
186
187 template<class C>
188 friend
189 void*
190-Scan_Parse::out_cuboid_func(C* c, void* parameter = 0);
191+Scan_Parse::out_cuboid_func(C* c, void* parameter);
192
193 @q ***** (5) Functions for |Polyhedra|.@>
194 @*4 Functions for {\bf Polyhedra}.
195@@ -6033,7 +6033,7 @@
196 template<class C>
197 friend
198 void*
199-Scan_Parse::is_whatever_func(C* c, void* parameter = 0);
200+Scan_Parse::is_whatever_func(C* c, void* parameter);
201
202
203 friend
204@@ -6047,10 +6047,10 @@
205 template <class C, class D, class E>
206 friend
207 void*
208-Scan_Parse::intersection_points_func(C* c,
209- D* d,
210- void* parameter = 0,
211- E* e = 0);
212+Scan_Parse::intersection_points_func(C* c,
213+ D* d,
214+ void* parameter,
215+ E* e);
216 friend
217 Pointer_Vector<Bool_Point>*
218 Scan_Parse::convert(Bool_Point_Quadruple* bpq,
219@@ -6061,22 +6061,22 @@
220 template<class C, class D>
221 friend
222 void*
223-Scan_Parse::ellipse_like_intersection_func(C* c, D* d, void* parameter = 0);
224+Scan_Parse::ellipse_like_intersection_func(C* c, D* d, void* parameter);
225
226 template<class C>
227 friend
228 void*
229-Scan_Parse::ellipse_like_plane_intersection_func(C* c, void* w, void* parameter = 0);
230+Scan_Parse::ellipse_like_plane_intersection_func(C* c, void* w, void* parameter);
231
232 template<class C, class D>
233 friend
234 void*
235-Scan_Parse::conic_section_intersection_func(C* c, D* d, void* parameter = 0);
236+Scan_Parse::conic_section_intersection_func(C* c, D* d, void* parameter);
237
238 template<class C, class D>
239 friend
240 void*
241-Scan_Parse::polygon_like_intersection_func(C* c, D* d, void* parameter = 0);
242+Scan_Parse::polygon_like_intersection_func(C* c, D* d, void* parameter);
243
244
245 template<class C>
246@@ -6084,7 +6084,7 @@
247 void*
248 Scan_Parse::ellipsoid_like_plane_intersection_func(C* c,
249 Plane* p,
250- void* parameter = 0);
251+ void* parameter);
252 friend
253 void*
254 Scan_Parse::sphere_line_intersection_func(Sphere* s,
255@@ -6100,12 +6100,12 @@
256 template<class C>
257 friend
258 void*
259-Scan_Parse::plane_cast_func(C* c, void* parameter = 0);
260+Scan_Parse::plane_cast_func(C* c, void* parameter);
261
262 template <class C>
263 friend
264 void*
265-Scan_Parse::plane_assignment_func(void* entry, C* c, void* parameter = 0);
266+Scan_Parse::plane_assignment_func(void* entry, C* c, void* parameter);
267
268 friend
269 int
270@@ -6114,7 +6114,7 @@
271 template <class C>
272 friend
273 int
274-Scan_Parse::show_func(C* c, string text = "", void* parameter = 0);
275+Scan_Parse::show_func(C* c, string text, void* parameter);
276
277 friend
278 void*
279--- a/src/scanprse.web
280+++ b/src/scanprse.web
281@@ -6245,7 +6245,7 @@
282 Scan_Parse::vector_type_decl(Scanner_Node scanner_node,
283 int vector_type_num,
284 int array_type_num,
285- C* dummy = 0)
286+ C* dummy)
287 {
288
289
290@@ -8147,8 +8147,8 @@
291 Scan_Parse::cull_func(void* v,
292 const unsigned short comparison,
293 Scanner_Node scanner_node,
294- real tolerance = -1,
295- C* c = 0)
296+ real tolerance,
297+ C* c)
298 {
299
300 @q ***** (5) Preliminaries.@>
This page took 0.108202 seconds and 4 git commands to generate.