diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2009-03-16 11:11:54 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2009-03-16 11:11:54 +0200 |
commit | 0d62005a3ff3b62d02c2eb3fd8644e0e19b202e8 (patch) | |
tree | 6cda0acea2d58cff3649af8a43e92fe024e4861d /libxsde/xsde/cxx/hybrid/cdr | |
parent | f793c66692ef717ffec874b5002a9d95aef3485e (diff) |
Change sequence names to be consistent with documentation
The *_seq names were changed to *_sequence. Also, the generated
code now uses sequence names from the xml_schema namespace instead
of the implementation namespaces (xsde::cxx::hybrid).
Diffstat (limited to 'libxsde/xsde/cxx/hybrid/cdr')
-rw-r--r-- | libxsde/xsde/cxx/hybrid/cdr/istream.hxx | 12 | ||||
-rw-r--r-- | libxsde/xsde/cxx/hybrid/cdr/istream.txx | 14 | ||||
-rw-r--r-- | libxsde/xsde/cxx/hybrid/cdr/ostream.hxx | 12 | ||||
-rw-r--r-- | libxsde/xsde/cxx/hybrid/cdr/ostream.txx | 24 |
4 files changed, 31 insertions, 31 deletions
diff --git a/libxsde/xsde/cxx/hybrid/cdr/istream.hxx b/libxsde/xsde/cxx/hybrid/cdr/istream.hxx index 484010b..db61f88 100644 --- a/libxsde/xsde/cxx/hybrid/cdr/istream.hxx +++ b/libxsde/xsde/cxx/hybrid/cdr/istream.hxx @@ -155,22 +155,22 @@ namespace xsde #ifdef XSDE_EXCEPTIONS template <typename T> - void operator>> (icdrstream&, pod_seq<T>&); + void operator>> (icdrstream&, pod_sequence<T>&); template <typename T> - void operator>> (icdrstream&, fix_seq<T>&); + void operator>> (icdrstream&, fix_sequence<T>&); template <typename T> - void operator>> (icdrstream&, var_seq<T>&); + void operator>> (icdrstream&, var_sequence<T>&); #else template <typename T> - bool operator>> (icdrstream&, pod_seq<T>&); + bool operator>> (icdrstream&, pod_sequence<T>&); template <typename T> - bool operator>> (icdrstream&, fix_seq<T>&); + bool operator>> (icdrstream&, fix_sequence<T>&); template <typename T> - bool operator>> (icdrstream&, var_seq<T>&); + bool operator>> (icdrstream&, var_sequence<T>&); #endif } } diff --git a/libxsde/xsde/cxx/hybrid/cdr/istream.txx b/libxsde/xsde/cxx/hybrid/cdr/istream.txx index 9afc5f5..8ad16f0 100644 --- a/libxsde/xsde/cxx/hybrid/cdr/istream.txx +++ b/libxsde/xsde/cxx/hybrid/cdr/istream.txx @@ -13,7 +13,7 @@ namespace xsde template <typename T> void - operator>> (icdrstream& s, pod_seq<T>& x) + operator>> (icdrstream& s, pod_sequence<T>& x) { size_t n; icdrstream::as_size as_size (n); @@ -36,7 +36,7 @@ namespace xsde template <typename T> void - operator>> (icdrstream& s, fix_seq<T>& x) + operator>> (icdrstream& s, fix_sequence<T>& x) { size_t n; icdrstream::as_size as_size (n); @@ -59,7 +59,7 @@ namespace xsde template <typename T> void - operator>> (icdrstream& s, var_seq<T>& x) + operator>> (icdrstream& s, var_sequence<T>& x) { size_t n; icdrstream::as_size as_size (n); @@ -74,7 +74,7 @@ namespace xsde while (n--) { T* p = new T; - typename var_seq<T>::guard g (p); + typename var_sequence<T>::guard g (p); s >> *p; g.release (); x.push_back (p); @@ -86,7 +86,7 @@ namespace xsde template <typename T> bool - operator>> (icdrstream& s, pod_seq<T>& x) + operator>> (icdrstream& s, pod_sequence<T>& x) { size_t n; icdrstream::as_size as_size (n); @@ -114,7 +114,7 @@ namespace xsde template <typename T> bool - operator>> (icdrstream& s, fix_seq<T>& x) + operator>> (icdrstream& s, fix_sequence<T>& x) { size_t n; icdrstream::as_size as_size (n); @@ -142,7 +142,7 @@ namespace xsde template <typename T> bool - operator>> (icdrstream& s, var_seq<T>& x) + operator>> (icdrstream& s, var_sequence<T>& x) { size_t n; icdrstream::as_size as_size (n); diff --git a/libxsde/xsde/cxx/hybrid/cdr/ostream.hxx b/libxsde/xsde/cxx/hybrid/cdr/ostream.hxx index 6b33fe0..851882e 100644 --- a/libxsde/xsde/cxx/hybrid/cdr/ostream.hxx +++ b/libxsde/xsde/cxx/hybrid/cdr/ostream.hxx @@ -155,22 +155,22 @@ namespace xsde #ifdef XSDE_EXCEPTIONS template <typename T> - void operator<< (ocdrstream&, const pod_seq<T>&); + void operator<< (ocdrstream&, const pod_sequence<T>&); template <typename T> - void operator<< (ocdrstream&, const fix_seq<T>&); + void operator<< (ocdrstream&, const fix_sequence<T>&); template <typename T> - void operator<< (ocdrstream&, const var_seq<T>&); + void operator<< (ocdrstream&, const var_sequence<T>&); #else template <typename T> - bool operator<< (ocdrstream&, const pod_seq<T>&); + bool operator<< (ocdrstream&, const pod_sequence<T>&); template <typename T> - bool operator<< (ocdrstream&, const fix_seq<T>&); + bool operator<< (ocdrstream&, const fix_sequence<T>&); template <typename T> - bool operator<< (ocdrstream&, const var_seq<T>&); + bool operator<< (ocdrstream&, const var_sequence<T>&); #endif } } diff --git a/libxsde/xsde/cxx/hybrid/cdr/ostream.txx b/libxsde/xsde/cxx/hybrid/cdr/ostream.txx index 1dd40df..9527252 100644 --- a/libxsde/xsde/cxx/hybrid/cdr/ostream.txx +++ b/libxsde/xsde/cxx/hybrid/cdr/ostream.txx @@ -14,11 +14,11 @@ namespace xsde template <typename T> void - operator<< (ocdrstream& s, const pod_seq<T>& x) + operator<< (ocdrstream& s, const pod_sequence<T>& x) { s << ocdrstream::as_size (x.size ()); - for (typename pod_seq<T>::const_iterator i = x.begin (); + for (typename pod_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { s << *i; @@ -27,11 +27,11 @@ namespace xsde template <typename T> void - operator<< (ocdrstream& s, const fix_seq<T>& x) + operator<< (ocdrstream& s, const fix_sequence<T>& x) { s << ocdrstream::as_size (x.size ()); - for (typename fix_seq<T>::const_iterator i = x.begin (); + for (typename fix_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { s << *i; @@ -40,11 +40,11 @@ namespace xsde template <typename T> void - operator<< (ocdrstream& s, const var_seq<T>& x) + operator<< (ocdrstream& s, const var_sequence<T>& x) { s << ocdrstream::as_size (x.size ()); - for (typename var_seq<T>::const_iterator i = x.begin (); + for (typename var_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { s << *i; @@ -55,12 +55,12 @@ namespace xsde template <typename T> bool - operator<< (ocdrstream& s, const pod_seq<T>& x) + operator<< (ocdrstream& s, const pod_sequence<T>& x) { if (!(s << ocdrstream::as_size (x.size ()))) return false; - for (typename pod_seq<T>::const_iterator i = x.begin (); + for (typename pod_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { if (!(s << *i)) @@ -72,12 +72,12 @@ namespace xsde template <typename T> bool - operator<< (ocdrstream& s, const fix_seq<T>& x) + operator<< (ocdrstream& s, const fix_sequence<T>& x) { if (!(s << ocdrstream::as_size (x.size ()))) return false; - for (typename fix_seq<T>::const_iterator i = x.begin (); + for (typename fix_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { if (!(s << *i)) @@ -89,12 +89,12 @@ namespace xsde template <typename T> bool - operator<< (ocdrstream& s, const var_seq<T>& x) + operator<< (ocdrstream& s, const var_sequence<T>& x) { if (!(s << ocdrstream::as_size (x.size ()))) return false; - for (typename var_seq<T>::const_iterator i = x.begin (); + for (typename var_sequence<T>::const_iterator i = x.begin (); i != x.end (); ++i) { if (!(s << *i)) |