From e488cc27eb20e1b96cb0751249b19236a7e373ea Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 14 Nov 2013 12:08:03 +0200 Subject: Drop support for aCC3 --- xsd/cxx/tree/parser-source.cxx | 20 ++++---------------- xsd/cxx/tree/serialization-source.cxx | 35 ++++++----------------------------- xsd/cxx/tree/stream-source.cxx | 2 -- xsd/cxx/tree/tree-source.cxx | 12 ++---------- 4 files changed, 12 insertions(+), 57 deletions(-) (limited to 'xsd/cxx/tree') diff --git a/xsd/cxx/tree/parser-source.cxx b/xsd/cxx/tree/parser-source.cxx index 881a2df..362e9e6 100644 --- a/xsd/cxx/tree/parser-source.cxx +++ b/xsd/cxx/tree/parser-source.cxx @@ -333,15 +333,9 @@ namespace CXX if (poly) { - // aCC cannot handle an inline call to type_factory_map_instance. - // - os << "::xsd::cxx::tree::type_factory_map< " << char_type << - " >& tfm (" << endl + os << "::std::auto_ptr< ::xsd::cxx::tree::type > tmp (" << endl << "::xsd::cxx::tree::type_factory_map_instance< " << - poly_plate << ", " << char_type << " > ());" - << endl - << "::std::auto_ptr< ::xsd::cxx::tree::type > tmp (" << endl - << "tfm.create (" << endl + poly_plate << ", " << char_type << " > ().create (" << endl << strlit (e.name ()) << "," << endl << strlit (e.namespace_().name ()) << "," << endl << "&::xsd::cxx::tree::factory_impl< " << type << " >," << endl @@ -431,15 +425,9 @@ namespace CXX if (poly) { - // aCC cannot handle an inline call to type_factory_map_instance. - // - os << "::xsd::cxx::tree::type_factory_map< " << char_type << - " >& tfm (" << endl + os << "::std::auto_ptr< ::xsd::cxx::tree::type > tmp (" << endl << "::xsd::cxx::tree::type_factory_map_instance< " << - poly_plate << ", " << char_type << " > ());" - << endl - << "::std::auto_ptr< ::xsd::cxx::tree::type > tmp (" << endl - << "tfm.create (" << endl + poly_plate << ", " << char_type << " > ().create (" << endl << strlit (e.name ()) << "," << endl << strlit (e.namespace_().name ()) << "," << endl << "&::xsd::cxx::tree::factory_impl< " << type << " >," << endl diff --git a/xsd/cxx/tree/serialization-source.cxx b/xsd/cxx/tree/serialization-source.cxx index 49369c8..f4d5eac 100644 --- a/xsd/cxx/tree/serialization-source.cxx +++ b/xsd/cxx/tree/serialization-source.cxx @@ -312,8 +312,6 @@ namespace CXX os << "// " << comment (e.name ()) << endl << "//" << endl; - // aCC cannot handle an inline call to type_serializer_map_instance. - // if (poly) { os << "{" @@ -1144,18 +1142,11 @@ namespace CXX if (poly) { - // aCC cannot handle an inline call to - // type_serializer_map_instance. - // os << "}" << "else" << "{" - << "::xsd::cxx::tree::type_serializer_map< " << char_type - << " >& tsm (" << endl << "::xsd::cxx::tree::type_serializer_map_instance< " << - poly_plate << ", " << char_type << " > ());" - << endl - << "tsm.serialize (" << endl + poly_plate << ", " << char_type << " > ().serialize (" << endl << strlit (e.name ()) << "," << endl << strlit (e.namespace_().name ()) << "," << endl << "e, n, s);" @@ -1175,37 +1166,23 @@ namespace CXX if (poly) { - // aCC cannot handle an inline call to - // type_serializer_map_instance as well as the direct - // auto_ptr assignment. - // os << dom_auto_ptr << "< " << xerces_ns << "::DOMDocument > d;" << endl << "if (typeid (" << type_name (e) << ") == typeid (s))" << "{" - << dom_auto_ptr << "< " << xerces_ns << - "::DOMDocument > r (" << endl - << "::xsd::cxx::xml::dom::serialize< " << + << "d = ::xsd::cxx::xml::dom::serialize< " << char_type << " > (" << endl << strlit (e.name ()) << "," << endl << strlit (ns) << "," << endl - << "m, f));" - << "d = r;" + << "m, f);" << "}" << "else" << "{" - << "::xsd::cxx::tree::type_serializer_map< " << char_type - << " >& tsm (" << endl - << "::xsd::cxx::tree::type_serializer_map_instance< " << - poly_plate << ", " << char_type << " > ());" - << endl - << dom_auto_ptr << "< " << xerces_ns << - "::DOMDocument > r (" << endl - << "tsm.serialize (" << endl + << "d = ::xsd::cxx::tree::type_serializer_map_instance< " << + poly_plate << ", " << char_type << " > ().serialize (" << endl << strlit (e.name ()) << "," << endl << strlit (e.namespace_().name ()) << "," << endl - << "m, s, f));" - << "d = r;" + << "m, s, f);" << "}"; } else diff --git a/xsd/cxx/tree/stream-source.cxx b/xsd/cxx/tree/stream-source.cxx index a070ae7..23cb473 100644 --- a/xsd/cxx/tree/stream-source.cxx +++ b/xsd/cxx/tree/stream-source.cxx @@ -234,8 +234,6 @@ namespace CXX SemanticGraph::Type& t (e.type ()); bool poly (polymorphic && polymorphic_p (t) && !anonymous_p (t)); - // aCC cannot handle an inline call to std_ostream_map_instance. - // if (poly) { os << "{" diff --git a/xsd/cxx/tree/tree-source.cxx b/xsd/cxx/tree/tree-source.cxx index 9c40b5d..8f41a37 100644 --- a/xsd/cxx/tree/tree-source.cxx +++ b/xsd/cxx/tree/tree-source.cxx @@ -720,16 +720,10 @@ namespace CXX if (poly) { - // aCC cannot handle an inline call to type_factory_map_instance. - // os << "{" - << "::xsd::cxx::tree::type_factory_map< " << char_type << - " >& tfm (" << endl - << "::xsd::cxx::tree::type_factory_map_instance< " << - poly_plate << ", " << char_type << " > ());" - << endl << "::std::auto_ptr< ::xsd::cxx::tree::type > tmp (" << endl - << "tfm.create (" << endl + << "::xsd::cxx::tree::type_factory_map_instance< " << + poly_plate << ", " << char_type << " > ().create (" << endl << strlit (e.name ()) << "," << endl << (e.qualified_p () ? strlit (e.namespace_ ().name ()) @@ -1879,8 +1873,6 @@ namespace CXX } else { - // aCC cannot handle an inline call to comparison_map_instance. - // os << "{" << "::xsd::cxx::tree::comparison_map< " << char_type << " >& cm (" << endl -- cgit v1.1