head 1.2; access; symbols pkgsrc-2020Q4:1.1.0.64 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.62 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.58 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.38 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.60 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.56 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.54 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.52 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.50 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.48 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.46 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.44 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.42 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.40 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.36 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.34 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.32 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.30 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.28 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.26 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.24 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.22 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.20 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.18 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.16 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.14 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.12 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.10 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.8 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.6 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.4 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.2 pkgsrc-2013Q1-base:1.1; locks; strict; comment @// @; 1.2 date 2021.03.08.14.33.44; author nia; state dead; branches; next 1.1; commitid V3BdLvSjXSVhWvKC; 1.1 date 2013.03.28.21.20.15; author joerg; state Exp; branches; next ; desc @@ 1.2 log @xsd: Update to 4.0.0. Builds again. Borrowed patches from FreeBSD to rename the executable to avoid a conflict wiht lang/mono. @ text @$NetBSD: patch-xsd-3.2.0-2_xsd_cxx_tree_generator.cxx,v 1.1 2013/03/28 21:20:15 joerg Exp $ --- xsd-3.2.0-2/xsd/cxx/tree/generator.cxx.orig 2013-03-28 16:28:31.000000000 +0000 +++ xsd-3.2.0-2/xsd/cxx/tree/generator.cxx @@@@ -717,7 +717,7 @@@@ namespace CXX { try { - Path fs_path (path, boost::filesystem::native); + Path fs_path (path); ifs.open (fs_path, std::ios_base::in | std::ios_base::binary); if (!ifs.is_open ()) @@@@ -871,7 +871,7 @@@@ namespace CXX { if (NarrowString name = ops.value ()) { - if (file_path.native_file_string () != name) + if (file_path.string () != name) generate_xml_schema = false; } } @@@@ -886,7 +886,7 @@@@ namespace CXX // Generate code. // - NarrowString name (file_path.leaf ()); + NarrowString name (file_path.leaf ().string()); NarrowString hxx_suffix (ops.value ()); NarrowString ixx_suffix (ops.value ()); @@@@ -945,9 +945,9 @@@@ namespace CXX NarrowString ixx_name (inline_ ? ixx_expr.merge (name) : NarrowString ()); NarrowString fwd_name (forward ? fwd_expr.merge (name) : NarrowString ()); - Path hxx_path (hxx_name, boost::filesystem::native); - Path ixx_path (ixx_name, boost::filesystem::native); - Path fwd_path (fwd_name, boost::filesystem::native); + Path hxx_path (hxx_name); + Path ixx_path (ixx_name); + Path fwd_path (fwd_name); Paths cxx_paths; if (source) @@@@ -973,19 +973,19 @@@@ namespace CXX } cxx_paths.push_back ( - Path (cxx_expr.merge (part_name), boost::filesystem::native)); + Path (cxx_expr.merge (part_name))); } } else cxx_paths.push_back ( - Path (cxx_expr.merge (name), boost::filesystem::native)); + Path (cxx_expr.merge (name))); } if (NarrowString dir = ops.value ()) { try { - Path path (dir, boost::filesystem::native); + Path path (dir); hxx_path = path / hxx_path; ixx_path = path / ixx_path; @@@@ -1023,7 +1023,7 @@@@ namespace CXX } unlinks.add (fwd_path); - file_list.push_back (fwd_path.native_file_string ()); + file_list.push_back (fwd_path.string ()); } @@@@ -1036,7 +1036,7 @@@@ namespace CXX } unlinks.add (hxx_path); - file_list.push_back (hxx_path.native_file_string ()); + file_list.push_back (hxx_path.string ()); // IXX @@@@ -1052,7 +1052,7 @@@@ namespace CXX } unlinks.add (ixx_path); - file_list.push_back (ixx_path.native_file_string ()); + file_list.push_back (ixx_path.string ()); } @@@@ -1073,7 +1073,7 @@@@ namespace CXX } unlinks.add (*i); - file_list.push_back (i->native_file_string ()); + file_list.push_back (i->string ()); cxx.push_back (s); } } @@@@ -1145,7 +1145,7 @@@@ namespace CXX NarrowString guard_prefix (ops.value ()); if (!guard_prefix) - guard_prefix = file_path.branch_path ().native_directory_string (); + guard_prefix = file_path.branch_path ().string (); if (guard_prefix) guard_prefix += '_'; @@@@ -1161,7 +1161,7 @@@@ namespace CXX // Guard // - String guard (guard_expr.merge (guard_prefix + fwd_name)); + WideString guard (guard_expr.merge (guard_prefix + fwd_name)); guard = ctx.escape (guard); // make a c++ id std::transform (guard.begin (), guard.end(), guard.begin (), upcase); @@@@ -1269,7 +1269,7 @@@@ namespace CXX // Guard // - String guard (guard_expr.merge (guard_prefix + hxx_name)); + WideString guard (guard_expr.merge (guard_prefix + hxx_name)); guard = ctx.escape (guard); // make a c++ id std::transform (guard.begin (), guard.end(), guard.begin (), upcase); @@@@ -1415,7 +1415,7 @@@@ namespace CXX // Guard // - String guard (guard_expr.merge (guard_prefix + ixx_name)); + WideString guard (guard_expr.merge (guard_prefix + ixx_name)); guard = ctx.escape (guard); // make a c++ id std::transform (guard.begin (), guard.end(), guard.begin (), upcase); @ 1.1 log @Fix a bit more fallout from the Boost filesystem API changes. Fix confusion around Narrow vs Wide strings. @ text @d1 1 a1 1 $NetBSD$ @