diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2009-04-12 16:06:13 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2009-04-12 16:06:13 +0200 |
commit | 205ef24bc692e0958f2e379f3d8fd18c0e8e2eaa (patch) | |
tree | dc77991d548032abb8009c853bb226f5b5a77efa | |
parent | b11451f35bf449a76d1f777b6629b25f46f6ff95 (diff) |
Use the actual sequence template names
Can't use their using-declarations from the xml_schema namespace
because of the broken eVC++ 4.0.
-rw-r--r-- | libxsde/xsde/cxx/hybrid/sequence.hxx | 6 | ||||
-rw-r--r-- | tests/cxx/hybrid/sequences/driver.cxx | 1 | ||||
-rw-r--r-- | xsde/cxx/hybrid/elements.cxx | 13 | ||||
-rw-r--r-- | xsde/cxx/hybrid/tree-forward.cxx | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/libxsde/xsde/cxx/hybrid/sequence.hxx b/libxsde/xsde/cxx/hybrid/sequence.hxx index 251b448..3c052e3 100644 --- a/libxsde/xsde/cxx/hybrid/sequence.hxx +++ b/libxsde/xsde/cxx/hybrid/sequence.hxx @@ -830,12 +830,6 @@ namespace xsde #endif }; - - // String sequence. - // - using cxx::string_sequence; - - // Custom data sequence. // class data_sequence: public sequence_base diff --git a/tests/cxx/hybrid/sequences/driver.cxx b/tests/cxx/hybrid/sequences/driver.cxx index 441e73b..9358c19 100644 --- a/tests/cxx/hybrid/sequences/driver.cxx +++ b/tests/cxx/hybrid/sequences/driver.cxx @@ -17,6 +17,7 @@ #include <xsde/cxx/hybrid/sequence.hxx> using std::string; +using namespace xsde::cxx; using namespace xsde::cxx::hybrid; void data_destructor (void* p, size_t) diff --git a/xsde/cxx/hybrid/elements.cxx b/xsde/cxx/hybrid/elements.cxx index 4edbc06..679a63d 100644 --- a/xsde/cxx/hybrid/elements.cxx +++ b/xsde/cxx/hybrid/elements.cxx @@ -62,11 +62,14 @@ namespace CXX string_type = L"::xsde::cxx::ro_string"; - pod_seq_ = xs_ns + L"::pod_sequence"; - fix_seq_ = xs_ns + L"::fix_sequence"; - var_seq_ = xs_ns + L"::var_sequence"; - str_seq_ = xs_ns + L"::string_sequence"; - data_seq_ = xs_ns + L"::data_sequence"; + // Can't use names from the xml_schema namespace because of + // eVC++ 4.0. + // + pod_seq_ = L"::xsde::cxx::hybrid::pod_sequence"; + fix_seq_ = L"::xsde::cxx::hybrid::fix_sequence"; + var_seq_ = L"::xsde::cxx::hybrid::var_sequence"; + str_seq_ = L"::xsde::cxx::string_sequence"; + data_seq_ = L"::xsde::cxx::hybrid::data_sequence"; if (!ostreams.empty ()) { diff --git a/xsde/cxx/hybrid/tree-forward.cxx b/xsde/cxx/hybrid/tree-forward.cxx index 9bcb6f5..17a4916 100644 --- a/xsde/cxx/hybrid/tree-forward.cxx +++ b/xsde/cxx/hybrid/tree-forward.cxx @@ -599,7 +599,7 @@ namespace CXX << "using ::xsde::cxx::hybrid::pod_sequence;" << "using ::xsde::cxx::hybrid::fix_sequence;" << "using ::xsde::cxx::hybrid::var_sequence;" - << "using ::xsde::cxx::hybrid::string_sequence;" + << "using ::xsde::cxx::string_sequence;" << "using ::xsde::cxx::hybrid::data_sequence;"; // Data representation stream types. |