Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tiziano Mueller (dev-zero)" <dev-zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-cpp/xsd/files: 3.3.0-boost-filesystem-v2-deprecation.patch
Date: Thu, 23 Aug 2012 13:41:07
Message-Id: 20120823134053.0BF932046E@flycatcher.gentoo.org
1 dev-zero 12/08/23 13:40:52
2
3 Added: 3.3.0-boost-filesystem-v2-deprecation.patch
4 Log:
5 Fix compatibility with boost >=1.49.0 (filesystem v2 gone), bug #425426.
6
7 (Portage version: 2.1.11.9/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-cpp/xsd/files/3.3.0-boost-filesystem-v2-deprecation.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/xsd/files/3.3.0-boost-filesystem-v2-deprecation.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/xsd/files/3.3.0-boost-filesystem-v2-deprecation.patch?rev=1.1&content-type=text/plain
14
15 Index: 3.3.0-boost-filesystem-v2-deprecation.patch
16 ===================================================================
17 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/parser/expat/elements.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/expat/elements.txx
18 --- xsd-3.3.0/libxsd/xsd/cxx/parser/expat/elements.txx 2010-04-28 08:58:09.000000000 +0200
19 +++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/expat/elements.txx 2012-06-03 11:02:09.000000000 +0200
20 @@ -594,7 +594,7 @@
21 {
22 try
23 {
24 - start_element (ns, name, 0);
25 + this->start_element (ns, name, 0);
26 }
27 catch (const schema_exception<C>& e)
28 {
29 @@ -621,7 +621,7 @@
30 {
31 try
32 {
33 - start_element (ns, name, 0);
34 + this->start_element (ns, name, 0);
35 }
36 catch (const schema_exception<C>& e)
37 {
38 @@ -693,7 +693,7 @@
39 }
40
41 ro_string<C> ro_id (id);
42 - start_element (ns, name, &ro_id);
43 + this->start_element (ns, name, &ro_id);
44 }
45 catch (const schema_exception<C>& e)
46 {
47 @@ -713,7 +713,7 @@
48
49 try
50 {
51 - attribute (ns, name, value);
52 + this->attribute (ns, name, value);
53 }
54 catch (const schema_exception<C>& e)
55 {
56 @@ -748,7 +748,7 @@
57
58 try
59 {
60 - end_element (ns, name);
61 + this->end_element (ns, name);
62 }
63 catch (const schema_exception<C>& e)
64 {
65 @@ -777,7 +777,7 @@
66
67 try
68 {
69 - characters (str);
70 + this->characters (str);
71 }
72 catch (const schema_exception<C>& e)
73 {
74 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/parser/non-validating/parser.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/non-validating/parser.txx
75 --- xsd-3.3.0/libxsd/xsd/cxx/parser/non-validating/parser.txx 2010-04-28 08:58:09.000000000 +0200
76 +++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/non-validating/parser.txx 2012-06-03 11:02:09.000000000 +0200
77 @@ -164,15 +164,15 @@
78 if (ns == xml::bits::xmlns_namespace<C> ())
79 return;
80
81 - if (!_attribute_impl (ns, name, value))
82 - _any_attribute (ns, name, value);
83 + if (!this->_attribute_impl (ns, name, value))
84 + this->_any_attribute (ns, name, value);
85 }
86
87 template <typename C>
88 void simple_content<C>::
89 _characters (const ro_string<C>& str)
90 {
91 - _characters_impl (str);
92 + this->_characters_impl (str);
93 }
94
95
96 @@ -190,15 +190,15 @@
97 if (s.depth_++ > 0)
98 {
99 if (s.any_)
100 - _start_any_element (ns, name, type);
101 + this->_start_any_element (ns, name, type);
102 else if (s.parser_)
103 s.parser_->_start_element (ns, name, type);
104 }
105 else
106 {
107 - if (!_start_element_impl (ns, name, type))
108 + if (!this->_start_element_impl (ns, name, type))
109 {
110 - _start_any_element (ns, name, type);
111 + this->_start_any_element (ns, name, type);
112 s.any_ = true;
113 }
114 else if (s.parser_ != 0)
115 @@ -235,7 +235,7 @@
116
117 this->_post_impl ();
118
119 - if (!_end_element_impl (ns, name))
120 + if (!this->_end_element_impl (ns, name))
121 assert (false);
122 }
123 }
124 @@ -246,7 +246,7 @@
125 if (--s.depth_ > 0)
126 {
127 if (s.any_)
128 - _end_any_element (ns, name);
129 + this->_end_any_element (ns, name);
130 else if (s.parser_)
131 s.parser_->_end_element (ns, name);
132 }
133 @@ -255,10 +255,10 @@
134 if (s.parser_ != 0 && !s.any_)
135 s.parser_->_post_impl ();
136
137 - if (!_end_element_impl (ns, name))
138 + if (!this->_end_element_impl (ns, name))
139 {
140 s.any_ = false;
141 - _end_any_element (ns, name);
142 + this->_end_any_element (ns, name);
143 }
144 }
145 }
146 @@ -292,14 +292,14 @@
147 if (s.depth_ > 0)
148 {
149 if (s.any_)
150 - _any_attribute (ns, name, value);
151 + this->_any_attribute (ns, name, value);
152 else if (s.parser_)
153 s.parser_->_attribute (ns, name, value);
154 }
155 else
156 {
157 - if (!_attribute_impl (ns, name, value))
158 - _any_attribute (ns, name, value);
159 + if (!this->_attribute_impl (ns, name, value))
160 + this->_any_attribute (ns, name, value);
161 }
162 }
163
164 @@ -312,14 +312,14 @@
165 if (s.depth_ > 0)
166 {
167 if (s.any_)
168 - _any_characters (str);
169 + this->_any_characters (str);
170 else if (s.parser_)
171 s.parser_->_characters (str);
172 }
173 else
174 {
175 - if (!_characters_impl (str))
176 - _any_characters (str);
177 + if (!this->_characters_impl (str))
178 + this->_any_characters (str);
179 }
180 }
181
182 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx
183 --- xsd-3.3.0/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx 2010-04-28 08:58:09.000000000 +0200
184 +++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx 2012-06-03 11:02:09.000000000 +0200
185 @@ -20,7 +20,7 @@
186 const ro_string<C>& name,
187 const ro_string<C>* type)
188 {
189 - _start_any_element (ns, name, type);
190 + this->_start_any_element (ns, name, type);
191 this->complex_content<C>::context_.top ().any_ = true;
192 return true;
193 }
194 @@ -30,7 +30,7 @@
195 _end_element_impl (const ro_string<C>& ns, const ro_string<C>& name)
196 {
197 this->complex_content<C>::context_.top ().any_ = false;
198 - _end_any_element (ns, name);
199 + this->_end_any_element (ns, name);
200 return true;
201 }
202
203 @@ -41,7 +41,7 @@
204 const ro_string<C>& name,
205 const ro_string<C>& value)
206 {
207 - _any_attribute (ns, name, value);
208 + this->_any_attribute (ns, name, value);
209 return true;
210 }
211
212 @@ -49,7 +49,7 @@
213 bool any_type_pskel<C>::
214 _characters_impl (const ro_string<C>& s)
215 {
216 - _any_characters (s);
217 + this->_any_characters (s);
218 return true;
219 }
220
221 @@ -60,7 +60,7 @@
222 bool any_simple_type_pskel<C>::
223 _characters_impl (const ro_string<C>& s)
224 {
225 - _any_characters (s);
226 + this->_any_characters (s);
227 return true;
228 }
229 }
230 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/parser/validating/parser.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/validating/parser.txx
231 --- xsd-3.3.0/libxsd/xsd/cxx/parser/validating/parser.txx 2010-04-28 08:58:09.000000000 +0200
232 +++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/validating/parser.txx 2012-06-03 11:02:09.000000000 +0200
233 @@ -93,8 +93,8 @@
234 const ro_string<C>& name,
235 const ro_string<C>* type)
236 {
237 - if (!_start_element_impl (ns, name, type))
238 - _unexpected_element (ns, name);
239 + if (!this->_start_element_impl (ns, name, type))
240 + this->_unexpected_element (ns, name);
241 }
242
243 template <typename C>
244 @@ -102,8 +102,8 @@
245 _end_element (const ro_string<C>& ns,
246 const ro_string<C>& name)
247 {
248 - if (!_end_element_impl (ns, name))
249 - _unexpected_element (ns, name);
250 + if (!this->_end_element_impl (ns, name))
251 + this->_unexpected_element (ns, name);
252 }
253
254 template <typename C>
255 @@ -129,16 +129,16 @@
256 if (ns == xml::bits::xmlns_namespace<C> ())
257 return;
258
259 - if (!_attribute_impl (ns, name, value))
260 - _unexpected_attribute (ns, name, value);
261 + if (!this->_attribute_impl (ns, name, value))
262 + this->_unexpected_attribute (ns, name, value);
263 }
264
265 template <typename C>
266 void empty_content<C>::
267 _characters (const ro_string<C>& s)
268 {
269 - if (!_characters_impl (s))
270 - _unexpected_characters (s);
271 + if (!this->_characters_impl (s))
272 + this->_unexpected_characters (s);
273 }
274
275 //
276 @@ -218,15 +218,15 @@
277 if (ns == xml::bits::xmlns_namespace<C> ())
278 return;
279
280 - if (!_attribute_impl (ns, name, value))
281 - _unexpected_attribute (ns, name, value);
282 + if (!this->_attribute_impl (ns, name, value))
283 + this->_unexpected_attribute (ns, name, value);
284 }
285
286 template <typename C>
287 void simple_content<C>::
288 _characters (const ro_string<C>& str)
289 {
290 - if (!_characters_impl (str))
291 + if (!this->_characters_impl (str))
292 {
293 // Mixed content is implemented in the generated code
294 // by overriding _characters_impl and forwarding to
295 @@ -245,7 +245,7 @@
296 c != C (0x0D) && // carriage return
297 c != C (0x09) && // tab
298 c != C (0x0A))
299 - _unexpected_characters (str);
300 + this->_unexpected_characters (str);
301 }
302 }
303 }
304 @@ -322,14 +322,14 @@
305 if (s.depth_++ > 0)
306 {
307 if (s.any_)
308 - _start_any_element (ns, name, type);
309 + this->_start_any_element (ns, name, type);
310 else if (s.parser_)
311 s.parser_->_start_element (ns, name, type);
312 }
313 else
314 {
315 - if (!_start_element_impl (ns, name, type))
316 - _unexpected_element (ns, name);
317 + if (!this->_start_element_impl (ns, name, type))
318 + this->_unexpected_element (ns, name);
319 else if (s.parser_ != 0)
320 s.parser_->_pre_impl ();
321 }
322 @@ -364,7 +364,7 @@
323
324 this->_post_impl ();
325
326 - if (!_end_element_impl (ns, name))
327 + if (!this->_end_element_impl (ns, name))
328 assert (false);
329 }
330 }
331 @@ -375,7 +375,7 @@
332 if (--s.depth_ > 0)
333 {
334 if (s.any_)
335 - _end_any_element (ns, name);
336 + this->_end_any_element (ns, name);
337 else if (s.parser_)
338 s.parser_->_end_element (ns, name);
339 }
340 @@ -384,8 +384,8 @@
341 if (s.parser_ != 0 && !s.any_)
342 s.parser_->_post_impl ();
343
344 - if (!_end_element_impl (ns, name))
345 - _unexpected_element (ns, name);
346 + if (!this->_end_element_impl (ns, name))
347 + this->_unexpected_element (ns, name);
348 }
349 }
350 }
351 @@ -418,14 +418,14 @@
352 if (s.depth_ > 0)
353 {
354 if (s.any_)
355 - _any_attribute (ns, name, value);
356 + this->_any_attribute (ns, name, value);
357 else if (s.parser_)
358 s.parser_->_attribute (ns, name, value);
359 }
360 else
361 {
362 - if (!_attribute_impl (ns, name, value))
363 - _unexpected_attribute (ns, name, value);
364 + if (!this->_attribute_impl (ns, name, value))
365 + this->_unexpected_attribute (ns, name, value);
366 }
367 }
368
369 @@ -438,13 +438,13 @@
370 if (s.depth_ > 0)
371 {
372 if (s.any_)
373 - _any_characters (str);
374 + this->_any_characters (str);
375 else if (s.parser_)
376 s.parser_->_characters (str);
377 }
378 else
379 {
380 - if (!_characters_impl (str))
381 + if (!this->_characters_impl (str))
382 {
383 // Mixed content is implemented in the generated code
384 // by overriding _characters_impl and forwarding to
385 @@ -463,7 +463,7 @@
386 c != C (0x0D) && // carriage return
387 c != C (0x09) && // tab
388 c != C (0x0A))
389 - _unexpected_characters (str);
390 + this->_unexpected_characters (str);
391 }
392 }
393 }
394 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx
395 --- xsd-3.3.0/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx 2010-04-28 08:58:09.000000000 +0200
396 +++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx 2012-06-03 11:02:09.000000000 +0200
397 @@ -20,7 +20,7 @@
398 const ro_string<C>& name,
399 const ro_string<C>* type)
400 {
401 - _start_any_element (ns, name, type);
402 + this->_start_any_element (ns, name, type);
403 this->complex_content<C>::context_.top ().any_ = true;
404 return true;
405 }
406 @@ -30,7 +30,7 @@
407 _end_element_impl (const ro_string<C>& ns, const ro_string<C>& name)
408 {
409 this->complex_content<C>::context_.top ().any_ = false;
410 - _end_any_element (ns, name);
411 + this->_end_any_element (ns, name);
412 return true;
413 }
414
415 @@ -41,7 +41,7 @@
416 const ro_string<C>& name,
417 const ro_string<C>& value)
418 {
419 - _any_attribute (ns, name, value);
420 + this->_any_attribute (ns, name, value);
421 return true;
422 }
423
424 @@ -49,7 +49,7 @@
425 bool any_type_pskel<C>::
426 _characters_impl (const ro_string<C>& s)
427 {
428 - _any_characters (s);
429 + this->_any_characters (s);
430 return true;
431 }
432
433 @@ -60,7 +60,7 @@
434 bool any_simple_type_pskel<C>::
435 _characters_impl (const ro_string<C>& s)
436 {
437 - _any_characters (s);
438 + this->_any_characters (s);
439 return true;
440 }
441 }
442 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/tree/parsing.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/tree/parsing.txx
443 --- xsd-3.3.0/libxsd/xsd/cxx/tree/parsing.txx 2010-04-28 08:58:09.000000000 +0200
444 +++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/tree/parsing.txx 2012-06-03 11:02:09.000000000 +0200
445 @@ -299,7 +299,7 @@
446
447 if (j != basic_string<C>::npos)
448 {
449 - push_back (
450 + this->push_back (
451 traits<T, C, ST>::create (
452 basic_string<C> (data + i, j - i), parent, 0, 0));
453
454 @@ -309,7 +309,7 @@
455 {
456 // Last element.
457 //
458 - push_back (
459 + this->push_back (
460 traits<T, C, ST>::create (
461 basic_string<C> (data + i, size - i), parent, 0, 0));
462
463 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/tree/stream-extraction.hxx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/tree/stream-extraction.hxx
464 --- xsd-3.3.0/libxsd/xsd/cxx/tree/stream-extraction.hxx 2010-04-28 08:58:09.000000000 +0200
465 +++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/tree/stream-extraction.hxx 2012-06-03 11:03:11.000000000 +0200
466 @@ -68,7 +68,7 @@
467 while (size--)
468 {
469 std::auto_ptr<T> p (new T (s, f, c));
470 - push_back (p);
471 + this->push_back (p);
472 }
473 }
474 }
475 @@ -91,7 +91,7 @@
476 {
477 T x;
478 s >> x;
479 - push_back (x);
480 + this->push_back (x);
481 }
482 }
483 }
484 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/zc-istream.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/zc-istream.txx
485 --- xsd-3.3.0/libxsd/xsd/cxx/zc-istream.txx 2010-04-28 08:58:09.000000000 +0200
486 +++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/zc-istream.txx 2012-06-03 11:02:09.000000000 +0200
487 @@ -32,7 +32,7 @@
488 C* b (const_cast<C*> (str_.data ()));
489 C* e (b + str_.size ());
490
491 - setg (b, b, e);
492 + this->setg (b, b, e);
493 }
494
495 template <typename C>
496 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/cxx/elements.cxx xsd-3.3.0-2+dep/xsd/xsd/cxx/elements.cxx
497 --- xsd-3.3.0/xsd/cxx/elements.cxx 2010-04-28 08:58:09.000000000 +0200
498 +++ xsd-3.3.0-2+dep/xsd/xsd/cxx/elements.cxx 2012-06-03 11:02:29.000000000 +0200
499 @@ -326,7 +326,11 @@
500 }
501 catch (SemanticGraph::InvalidPath const&)
502 {
503 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
504 pair = path.native_file_string ();
505 +#else
506 + pair = path.string ();
507 +#endif
508 }
509 }
510
511 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/cxx/parser/elements.cxx xsd-3.3.0-2+dep/xsd/xsd/cxx/parser/elements.cxx
512 --- xsd-3.3.0/xsd/cxx/parser/elements.cxx 2010-04-28 08:58:09.000000000 +0200
513 +++ xsd-3.3.0-2+dep/xsd/xsd/cxx/parser/elements.cxx 2012-06-03 11:02:29.000000000 +0200
514 @@ -244,7 +244,11 @@
515 }
516 catch (SemanticGraph::InvalidPath const&)
517 {
518 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
519 path_str = path.native_file_string ();
520 +#else
521 + path_str = path.string ();
522 +#endif
523 }
524
525 String inc_path;
526 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/cxx/parser/generator.cxx xsd-3.3.0-2+dep/xsd/xsd/cxx/parser/generator.cxx
527 --- xsd-3.3.0/xsd/cxx/parser/generator.cxx 2010-04-28 08:58:09.000000000 +0200
528 +++ xsd-3.3.0-2+dep/xsd/xsd/cxx/parser/generator.cxx 2012-06-03 11:02:29.000000000 +0200
529 @@ -552,7 +552,11 @@
530 {
531 try
532 {
533 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
534 Path fs_path (path, boost::filesystem::native);
535 +#else
536 + Path fs_path (path.c_str());
537 +#endif
538 ifs.open (fs_path, std::ios_base::in | std::ios_base::binary);
539
540 if (!ifs.is_open ())
541 @@ -638,7 +642,11 @@
542 {
543 if (NarrowString name = ops.value<CLI::extern_xml_schema> ())
544 {
545 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
546 if (file_path.native_file_string () != name)
547 +#else
548 + if (file_path.string () != name)
549 +#endif
550 generate_xml_schema = false;
551 }
552 }
553 @@ -815,7 +823,11 @@
554
555 // Generate code.
556 //
557 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
558 NarrowString name (file_path.leaf ());
559 +#else
560 + NarrowString name (file_path.filename().string());
561 +#endif
562 NarrowString skel_suffix (ops.value <CLI::skel_file_suffix> ());
563 NarrowString impl_suffix (ops.value <CLI::impl_file_suffix> ());
564
565 @@ -921,9 +933,15 @@
566 cxx_driver_name = cxx_driver_expr.merge (name);
567 }
568
569 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
570 Path hxx_path (hxx_name, boost::filesystem::native);
571 Path ixx_path (ixx_name, boost::filesystem::native);
572 Path cxx_path (cxx_name, boost::filesystem::native);
573 +#else
574 + Path hxx_path (hxx_name.c_str());
575 + Path ixx_path (ixx_name.c_str());
576 + Path cxx_path (cxx_name.c_str());
577 +#endif
578
579 Path hxx_impl_path;
580 Path cxx_impl_path;
581 @@ -931,9 +949,15 @@
582
583 if (impl || driver)
584 {
585 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
586 hxx_impl_path = Path (hxx_impl_name, boost::filesystem::native);
587 cxx_impl_path = Path (cxx_impl_name, boost::filesystem::native);
588 cxx_driver_path = Path (cxx_driver_name, boost::filesystem::native);
589 +#else
590 + hxx_impl_path = Path (hxx_impl_name.c_str());
591 + cxx_impl_path = Path (cxx_impl_name.c_str());
592 + cxx_driver_path = Path (cxx_driver_name.c_str());
593 +#endif
594 }
595
596 Path out_dir;
597 @@ -942,7 +966,11 @@
598 {
599 try
600 {
601 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
602 out_dir = Path (dir, boost::filesystem::native);
603 +#else
604 + out_dir = Path (dir.c_str());
605 +#endif
606 }
607 catch (InvalidPath const&)
608 {
609 @@ -1010,7 +1038,11 @@
610 }
611
612 unlinks.add (hxx_impl_path);
613 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
614 file_list.push_back (hxx_impl_path.native_file_string ());
615 +#else
616 + file_list.push_back (hxx_impl_path.string ());
617 +#endif
618
619 if (!ops.value<CLI::force_overwrite> ())
620 {
621 @@ -1036,7 +1068,11 @@
622 }
623
624 unlinks.add (cxx_impl_path);
625 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
626 file_list.push_back (cxx_impl_path.native_file_string ());
627 +#else
628 + file_list.push_back (cxx_impl_path.string ());
629 +#endif
630 }
631
632 if (driver)
633 @@ -1065,7 +1101,11 @@
634 }
635
636 unlinks.add (cxx_driver_path);
637 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
638 file_list.push_back (cxx_driver_path.native_file_string ());
639 +#else
640 + file_list.push_back (cxx_driver_path.string ());
641 +#endif
642 }
643
644 // Open the skel files.
645 @@ -1081,7 +1121,11 @@
646 }
647
648 unlinks.add (hxx_path);
649 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
650 file_list.push_back (hxx_path.native_file_string ());
651 +#else
652 + file_list.push_back (hxx_path.string ());
653 +#endif
654
655 if (inline_)
656 {
657 @@ -1094,7 +1138,11 @@
658 }
659
660 unlinks.add (ixx_path);
661 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
662 file_list.push_back (ixx_path.native_file_string ());
663 +#else
664 + file_list.push_back (ixx_path.string ());
665 +#endif
666 }
667
668
669 @@ -1109,7 +1157,11 @@
670 }
671
672 unlinks.add (cxx_path);
673 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
674 file_list.push_back (cxx_path.native_file_string ());
675 +#else
676 + file_list.push_back (cxx_path.string ());
677 +#endif
678 }
679
680 // Print copyright and license.
681 @@ -1168,7 +1220,11 @@
682 NarrowString guard_prefix (ops.value<CLI::guard_prefix> ());
683
684 if (!guard_prefix)
685 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
686 guard_prefix = file_path.branch_path ().native_directory_string ();
687 +#else
688 + guard_prefix = file_path.branch_path ().string ();
689 +#endif
690
691 if (guard_prefix)
692 guard_prefix += '_';
693 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/cxx/tree/elements.cxx xsd-3.3.0-2+dep/xsd/xsd/cxx/tree/elements.cxx
694 --- xsd-3.3.0/xsd/cxx/tree/elements.cxx 2010-04-28 08:58:09.000000000 +0200
695 +++ xsd-3.3.0-2+dep/xsd/xsd/cxx/tree/elements.cxx 2012-06-03 11:02:29.000000000 +0200
696 @@ -1312,7 +1312,11 @@
697 }
698 catch (SemanticGraph::InvalidPath const&)
699 {
700 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
701 path_str = path.native_file_string ();
702 +#else
703 + path_str = path.string ();
704 +#endif
705 }
706
707 String inc_path;
708 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/cxx/tree/generator.cxx xsd-3.3.0-2+dep/xsd/xsd/cxx/tree/generator.cxx
709 --- xsd-3.3.0/xsd/cxx/tree/generator.cxx 2010-04-28 08:58:09.000000000 +0200
710 +++ xsd-3.3.0-2+dep/xsd/xsd/cxx/tree/generator.cxx 2012-06-03 11:02:29.000000000 +0200
711 @@ -773,7 +773,11 @@
712 {
713 try
714 {
715 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
716 Path fs_path (path, boost::filesystem::native);
717 +#else
718 + Path fs_path (path.c_str());
719 +#endif
720 ifs.open (fs_path, std::ios_base::in | std::ios_base::binary);
721
722 if (!ifs.is_open ())
723 @@ -939,7 +943,11 @@
724 {
725 if (NarrowString name = ops.value<CLI::extern_xml_schema> ())
726 {
727 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
728 if (file_path.native_file_string () != name)
729 +#else
730 + if (file_path.string () != name)
731 +#endif
732 generate_xml_schema = false;
733 }
734 }
735 @@ -954,7 +962,11 @@
736
737 // Generate code.
738 //
739 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
740 NarrowString name (file_path.leaf ());
741 +#else
742 + NarrowString name (file_path.filename ().string());
743 +#endif
744
745 NarrowString hxx_suffix (ops.value <CLI::hxx_suffix> ());
746 NarrowString ixx_suffix (ops.value <CLI::ixx_suffix> ());
747 @@ -1013,9 +1025,15 @@
748 NarrowString ixx_name (inline_ ? ixx_expr.merge (name) : NarrowString ());
749 NarrowString fwd_name (forward ? fwd_expr.merge (name) : NarrowString ());
750
751 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
752 Path hxx_path (hxx_name, boost::filesystem::native);
753 Path ixx_path (ixx_name, boost::filesystem::native);
754 Path fwd_path (fwd_name, boost::filesystem::native);
755 +#else
756 + Path hxx_path (hxx_name.c_str());
757 + Path ixx_path (ixx_name.c_str());
758 + Path fwd_path (fwd_name.c_str());
759 +#endif
760 Paths cxx_paths;
761
762 if (source)
763 @@ -1041,12 +1059,20 @@
764 }
765
766 cxx_paths.push_back (
767 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
768 Path (cxx_expr.merge (part_name), boost::filesystem::native));
769 +#else
770 + Path (cxx_expr.merge (part_name).c_str()));
771 +#endif
772 }
773 }
774 else
775 cxx_paths.push_back (
776 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
777 Path (cxx_expr.merge (name), boost::filesystem::native));
778 +#else
779 + Path (cxx_expr.merge (name).c_str()));
780 +#endif
781 }
782
783 Path out_dir;
784 @@ -1055,7 +1081,11 @@
785 {
786 try
787 {
788 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
789 out_dir = Path (dir, boost::filesystem::native);
790 +#else
791 + out_dir = Path (dir.c_str());
792 +#endif
793 }
794 catch (InvalidPath const&)
795 {
796 @@ -1108,7 +1138,11 @@
797 }
798
799 unlinks.add (fwd_path);
800 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
801 file_list.push_back (fwd_path.native_file_string ());
802 +#else
803 + file_list.push_back (fwd_path.string ());
804 +#endif
805 }
806
807
808 @@ -1121,7 +1155,11 @@
809 }
810
811 unlinks.add (hxx_path);
812 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
813 file_list.push_back (hxx_path.native_file_string ());
814 +#else
815 + file_list.push_back (hxx_path.string ());
816 +#endif
817
818
819 // IXX
820 @@ -1137,7 +1175,11 @@
821 }
822
823 unlinks.add (ixx_path);
824 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
825 file_list.push_back (ixx_path.native_file_string ());
826 +#else
827 + file_list.push_back (ixx_path.string ());
828 +#endif
829 }
830
831
832 @@ -1158,7 +1200,11 @@
833 }
834
835 unlinks.add (*i);
836 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
837 file_list.push_back (i->native_file_string ());
838 +#else
839 + file_list.push_back (i->string ());
840 +#endif
841 cxx.push_back (s);
842 }
843 }
844 @@ -1230,7 +1276,11 @@
845 NarrowString guard_prefix (ops.value<CLI::guard_prefix> ());
846
847 if (!guard_prefix)
848 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
849 guard_prefix = file_path.branch_path ().native_directory_string ();
850 +#else
851 + guard_prefix = file_path.branch_path ().string ();
852 +#endif
853
854 if (guard_prefix)
855 guard_prefix += '_';
856 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/xsd.cxx xsd-3.3.0-2+dep/xsd/xsd/xsd.cxx
857 --- xsd-3.3.0/xsd/xsd.cxx 2010-04-28 08:58:09.000000000 +0200
858 +++ xsd-3.3.0-2+dep/xsd/xsd/xsd.cxx 2012-06-03 11:02:29.000000000 +0200
859 @@ -636,7 +636,11 @@
860
861 try
862 {
863 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
864 tu = SemanticGraph::Path (args[i], boost::filesystem::native);
865 +#else
866 + tu = SemanticGraph::Path (args[i]);
867 +#endif
868 }
869 catch (SemanticGraph::InvalidPath const&)
870 {
871 @@ -675,7 +679,11 @@
872 if (NarrowString name =
873 tree_ops->value<CXX::Tree::CLI::extern_xml_schema> ())
874 {
875 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
876 if (tu.native_file_string () != name)
877 +#else
878 + if (tu.string () != name)
879 +#endif
880 gen_xml_schema = false;
881 }
882 }
883 @@ -690,7 +698,11 @@
884 if (NarrowString name =
885 parser_ops->value<CXX::Parser::CLI::extern_xml_schema> ())
886 {
887 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
888 if (tu.native_file_string () != name)
889 +#else
890 + if (tu.string () != name)
891 +#endif
892 gen_xml_schema = false;
893 }
894 }
895 @@ -827,8 +839,13 @@
896 {
897 try
898 {
899 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
900 paths.push_back (
901 SemanticGraph::Path (args[i], boost::filesystem::native));
902 +#else
903 + paths.push_back (
904 + SemanticGraph::Path (args[i]));
905 +#endif
906 }
907 catch (SemanticGraph::InvalidPath const&)
908 {
909 @@ -991,9 +1008,17 @@
910 try
911 {
912 OutputFileStream ofs;
913 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
914 SemanticGraph::Path path (fl);
915 +#else
916 + SemanticGraph::Path path (fl.c_str());
917 +#endif
918
919 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
920 ofs.open (fl, std::ios_base::out);
921 +#else
922 + ofs.open (fl.c_str(), std::ios_base::out);
923 +#endif
924
925 if (!ofs.is_open ())
926 {
927 diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/xsd.hxx xsd-3.3.0-2+dep/xsd/xsd/xsd.hxx
928 --- xsd-3.3.0/xsd/xsd.hxx 2010-04-28 08:58:09.000000000 +0200
929 +++ xsd-3.3.0-2+dep/xsd/xsd/xsd.hxx 2012-06-03 11:02:29.000000000 +0200
930 @@ -38,7 +38,11 @@
931 {
932 if (!canceled_)
933 {
934 +#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
935 std::remove (file_.native_file_string ().c_str ());
936 +#else
937 + std::remove (file_.string ().c_str ());
938 +#endif
939 }
940 }
Report Message
Find on MARC Find on Google Groups