Move inline c-tors after non-inline functions to help VxWorks 5.x

27 files changed, 81 insertions, 85 deletions

diff --git a/libxsde/xsde/cxx/serializer/non-validating/date-time.hxx b/libxsde/xsde/cxx/serializer/non-validating/date-time.hxx
index 9174133..6d73d58 100644
--- a/libxsde/xsde/cxx/serializer/non-validating/date-time.hxx
+++ b/libxsde/xsde/cxx/serializer/non-validating/date-time.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct date_time_simpl: date_time_sskel
 #endif
         {
-          date_time_simpl ();
-
           virtual void
           pre (const date_time&);
 
           virtual void
           _serialize_content ();
 
+          date_time_simpl (); // Keep it last.
+
         protected:
           date_time value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/non-validating/date.hxx b/libxsde/xsde/cxx/serializer/non-validating/date.hxx
index 845f5ec..ec10c19 100644
--- a/libxsde/xsde/cxx/serializer/non-validating/date.hxx
+++ b/libxsde/xsde/cxx/serializer/non-validating/date.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct date_simpl: date_sskel
 #endif
         {
-          date_simpl ();
-
           virtual void
           pre (const date&);
 
           virtual void
           _serialize_content ();
 
+          date_simpl (); // Keep it last.
+
         protected:
           date value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/non-validating/decimal.hxx b/libxsde/xsde/cxx/serializer/non-validating/decimal.hxx
index 82853b1..c9b4c4e 100644
--- a/libxsde/xsde/cxx/serializer/non-validating/decimal.hxx
+++ b/libxsde/xsde/cxx/serializer/non-validating/decimal.hxx
@@ -24,18 +24,17 @@ namespace xsde
         struct decimal_simpl: decimal_sskel
 #endif
         {
-#ifdef DBL_DIG
-          decimal_simpl (unsigned int precision = DBL_DIG);
-#else
-          decimal_simpl (unsigned int precision = 15)
-#endif
-
           virtual void
           pre (double);
 
           virtual void
           _serialize_content ();
 
+#ifdef DBL_DIG
+          decimal_simpl (unsigned int precision = DBL_DIG); // Keep it last.
+#else
+          decimal_simpl (unsigned int precision = 15)
+#endif
         protected:
           unsigned int precision_;
           double value_;
diff --git a/libxsde/xsde/cxx/serializer/non-validating/double.hxx b/libxsde/xsde/cxx/serializer/non-validating/double.hxx
index 601628d..f88ca64 100644
--- a/libxsde/xsde/cxx/serializer/non-validating/double.hxx
+++ b/libxsde/xsde/cxx/serializer/non-validating/double.hxx
@@ -24,6 +24,12 @@ namespace xsde
         struct double_simpl: double_sskel
 #endif
         {
+          virtual void
+          pre (double);
+
+          virtual void
+          _serialize_content ();
+
           enum notation
           {
             notation_auto,
@@ -33,18 +39,12 @@ namespace xsde
 
 #ifdef DBL_DIG
           double_simpl (notation = notation_auto,
-                        unsigned int precision = DBL_DIG);
+                        unsigned int precision = DBL_DIG); // Keep it last.
 #else
           double_simpl (notation = notation_auto,
                         unsigned int precision = 15)
 #endif
 
-          virtual void
-          pre (double);
-
-          virtual void
-          _serialize_content ();
-
         protected:
           notation notation_;
           unsigned int precision_;
diff --git a/libxsde/xsde/cxx/serializer/non-validating/duration.hxx b/libxsde/xsde/cxx/serializer/non-validating/duration.hxx
index 9c2d896..691ec7e 100644
--- a/libxsde/xsde/cxx/serializer/non-validating/duration.hxx
+++ b/libxsde/xsde/cxx/serializer/non-validating/duration.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct duration_simpl: duration_sskel
 #endif
         {
-          duration_simpl ();
-
           virtual void
           pre (const duration&);
 
           virtual void
           _serialize_content ();
 
+          duration_simpl (); // Keep it last.
+
         protected:
           duration value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/non-validating/float.hxx b/libxsde/xsde/cxx/serializer/non-validating/float.hxx
index edf2778..80b2449 100644
--- a/libxsde/xsde/cxx/serializer/non-validating/float.hxx
+++ b/libxsde/xsde/cxx/serializer/non-validating/float.hxx
@@ -24,6 +24,12 @@ namespace xsde
         struct float_simpl: float_sskel
 #endif
         {
+          virtual void
+          pre (float);
+
+          virtual void
+          _serialize_content ();
+
           enum notation
           {
             notation_auto,
@@ -33,18 +39,11 @@ namespace xsde
 
 #ifdef FLT_DIG
           float_simpl (notation = notation_auto,
-                       unsigned int precision = FLT_DIG);
+                       unsigned int precision = FLT_DIG); // Keep it last.
 #else
           float_simpl (notation = notation_auto,
                        unsigned int precision = 6)
 #endif
-
-          virtual void
-          pre (float);
-
-          virtual void
-          _serialize_content ();
-
         protected:
           notation notation_;
           unsigned int precision_;
diff --git a/libxsde/xsde/cxx/serializer/non-validating/gday.hxx b/libxsde/xsde/cxx/serializer/non-validating/gday.hxx
index 602b36d..d95b02b 100644
--- a/libxsde/xsde/cxx/serializer/non-validating/gday.hxx
+++ b/libxsde/xsde/cxx/serializer/non-validating/gday.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct gday_simpl: gday_sskel
 #endif
         {
-          gday_simpl ();
-
           virtual void
           pre (const gday&);
 
           virtual void
           _serialize_content ();
 
+          gday_simpl (); // Keep it last.
+
         protected:
           gday value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/non-validating/gmonth-day.hxx b/libxsde/xsde/cxx/serializer/non-validating/gmonth-day.hxx
index 417d606..47b0ac3 100644
--- a/libxsde/xsde/cxx/serializer/non-validating/gmonth-day.hxx
+++ b/libxsde/xsde/cxx/serializer/non-validating/gmonth-day.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct gmonth_day_simpl: gmonth_day_sskel
 #endif
         {
-          gmonth_day_simpl ();
-
           virtual void
           pre (const gmonth_day&);
 
           virtual void
           _serialize_content ();
 
+          gmonth_day_simpl (); // Keep it last.
+
         protected:
           gmonth_day value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/non-validating/gmonth.hxx b/libxsde/xsde/cxx/serializer/non-validating/gmonth.hxx
index 6b29a64..70e5feb 100644
--- a/libxsde/xsde/cxx/serializer/non-validating/gmonth.hxx
+++ b/libxsde/xsde/cxx/serializer/non-validating/gmonth.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct gmonth_simpl: gmonth_sskel
 #endif
         {
-          gmonth_simpl ();
-
           virtual void
           pre (const gmonth&);
 
           virtual void
           _serialize_content ();
 
+          gmonth_simpl (); // Keep it last.
+
         protected:
           gmonth value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/non-validating/gyear-month.hxx b/libxsde/xsde/cxx/serializer/non-validating/gyear-month.hxx
index 68c2f45..f874cca 100644
--- a/libxsde/xsde/cxx/serializer/non-validating/gyear-month.hxx
+++ b/libxsde/xsde/cxx/serializer/non-validating/gyear-month.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct gyear_month_simpl: gyear_month_sskel
 #endif
         {
-          gyear_month_simpl ();
-
           virtual void
           pre (const gyear_month&);
 
           virtual void
           _serialize_content ();
 
+          gyear_month_simpl (); // Keep it last.
+
         protected:
           gyear_month value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/non-validating/gyear.hxx b/libxsde/xsde/cxx/serializer/non-validating/gyear.hxx
index a003e48..4219530 100644
--- a/libxsde/xsde/cxx/serializer/non-validating/gyear.hxx
+++ b/libxsde/xsde/cxx/serializer/non-validating/gyear.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct gyear_simpl: gyear_sskel
 #endif
         {
-          gyear_simpl ();
-
           virtual void
           pre (const gyear&);
 
           virtual void
           _serialize_content ();
 
+          gyear_simpl (); // Keep it last.
+
         protected:
           gyear value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/non-validating/qname-stl.hxx b/libxsde/xsde/cxx/serializer/non-validating/qname-stl.hxx
index 2427b19..7d6fb15 100644
--- a/libxsde/xsde/cxx/serializer/non-validating/qname-stl.hxx
+++ b/libxsde/xsde/cxx/serializer/non-validating/qname-stl.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct qname_simpl: qname_sskel
 #endif
         {
-          qname_simpl ();
-
           virtual void
           pre (const qname&);
 
           virtual void
           _serialize_content ();
 
+          qname_simpl (); // Keep it last.
+
         protected:
           qname value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/non-validating/time.hxx b/libxsde/xsde/cxx/serializer/non-validating/time.hxx
index ca06efa..acd6192 100644
--- a/libxsde/xsde/cxx/serializer/non-validating/time.hxx
+++ b/libxsde/xsde/cxx/serializer/non-validating/time.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct time_simpl: time_sskel
 #endif
         {
-          time_simpl ();
-
           virtual void
           pre (const time&);
 
           virtual void
           _serialize_content ();
 
+          time_simpl (); // Keep it last.
+
         protected:
           time value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/validating/date-time.hxx b/libxsde/xsde/cxx/serializer/validating/date-time.hxx
index 004cc42..2051a52 100644
--- a/libxsde/xsde/cxx/serializer/validating/date-time.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/date-time.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct date_time_simpl: date_time_sskel
 #endif
         {
-          date_time_simpl ();
-
           virtual void
           pre (const date_time&);
 
           virtual void
           _serialize_content ();
 
+          date_time_simpl (); // Keep it last.
+
         protected:
           date_time value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/validating/date.hxx b/libxsde/xsde/cxx/serializer/validating/date.hxx
index a50026f..61cbe94 100644
--- a/libxsde/xsde/cxx/serializer/validating/date.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/date.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct date_simpl: date_sskel
 #endif
         {
-          date_simpl ();
-
           virtual void
           pre (const date&);
 
           virtual void
           _serialize_content ();
 
+          date_simpl (); // Keep it last.
+
         protected:
           date value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/validating/decimal.hxx b/libxsde/xsde/cxx/serializer/validating/decimal.hxx
index a4817c9..bdefa52 100644
--- a/libxsde/xsde/cxx/serializer/validating/decimal.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/decimal.hxx
@@ -24,18 +24,17 @@ namespace xsde
         struct decimal_simpl: decimal_sskel
 #endif
         {
-#ifdef DBL_DIG
-          decimal_simpl (unsigned int precision = DBL_DIG);
-#else
-          decimal_simpl (unsigned int precision = 15)
-#endif
-
           virtual void
           pre (double);
 
           virtual void
           _serialize_content ();
 
+#ifdef DBL_DIG
+          decimal_simpl (unsigned int precision = DBL_DIG); // Keep it last.
+#else
+          decimal_simpl (unsigned int precision = 15)
+#endif
         protected:
           unsigned int precision_;
           double value_;
diff --git a/libxsde/xsde/cxx/serializer/validating/double.hxx b/libxsde/xsde/cxx/serializer/validating/double.hxx
index 6d8c282..019fdd7 100644
--- a/libxsde/xsde/cxx/serializer/validating/double.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/double.hxx
@@ -24,6 +24,12 @@ namespace xsde
         struct double_simpl: double_sskel
 #endif
         {
+          virtual void
+          pre (double);
+
+          virtual void
+          _serialize_content ();
+
           enum notation
           {
             notation_auto,
@@ -33,18 +39,11 @@ namespace xsde
 
 #ifdef DBL_DIG
           double_simpl (notation = notation_auto,
-                        unsigned int precision = DBL_DIG);
+                        unsigned int precision = DBL_DIG); // Keep it last.
 #else
           double_simpl (notation = notation_auto,
                         unsigned int precision = 15)
 #endif
-
-          virtual void
-          pre (double);
-
-          virtual void
-          _serialize_content ();
-
         protected:
           notation notation_;
           unsigned int precision_;
diff --git a/libxsde/xsde/cxx/serializer/validating/duration.hxx b/libxsde/xsde/cxx/serializer/validating/duration.hxx
index de6c42f..3770d12 100644
--- a/libxsde/xsde/cxx/serializer/validating/duration.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/duration.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct duration_simpl: duration_sskel
 #endif
         {
-          duration_simpl ();
-
           virtual void
           pre (const duration&);
 
           virtual void
           _serialize_content ();
 
+          duration_simpl (); // Keep it last.
+
         protected:
           duration value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/validating/float.hxx b/libxsde/xsde/cxx/serializer/validating/float.hxx
index e052b31..2474cd2 100644
--- a/libxsde/xsde/cxx/serializer/validating/float.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/float.hxx
@@ -24,6 +24,12 @@ namespace xsde
         struct float_simpl: float_sskel
 #endif
         {
+          virtual void
+          pre (float);
+
+          virtual void
+          _serialize_content ();
+
           enum notation
           {
             notation_auto,
@@ -33,18 +39,12 @@ namespace xsde
 
 #ifdef FLT_DIG
           float_simpl (notation = notation_auto,
-                       unsigned int precision = FLT_DIG);
+                       unsigned int precision = FLT_DIG); // Keep it last.
 #else
           float_simpl (notation = notation_auto,
                        unsigned int precision = 6)
 #endif
 
-          virtual void
-          pre (float);
-
-          virtual void
-          _serialize_content ();
-
         protected:
           notation notation_;
           unsigned int precision_;
diff --git a/libxsde/xsde/cxx/serializer/validating/gday.hxx b/libxsde/xsde/cxx/serializer/validating/gday.hxx
index c35a707..593eabf 100644
--- a/libxsde/xsde/cxx/serializer/validating/gday.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/gday.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct gday_simpl: gday_sskel
 #endif
         {
-          gday_simpl ();
-
           virtual void
           pre (const gday&);
 
           virtual void
           _serialize_content ();
 
+          gday_simpl (); // Keep it last.
+
         protected:
           gday value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/validating/gmonth-day.hxx b/libxsde/xsde/cxx/serializer/validating/gmonth-day.hxx
index 1ac30f0..07640d9 100644
--- a/libxsde/xsde/cxx/serializer/validating/gmonth-day.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/gmonth-day.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct gmonth_day_simpl: gmonth_day_sskel
 #endif
         {
-          gmonth_day_simpl ();
-
           virtual void
           pre (const gmonth_day&);
 
           virtual void
           _serialize_content ();
 
+          gmonth_day_simpl (); // Keep it last.
+
         protected:
           gmonth_day value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/validating/gmonth.hxx b/libxsde/xsde/cxx/serializer/validating/gmonth.hxx
index f7bac89..34bb339 100644
--- a/libxsde/xsde/cxx/serializer/validating/gmonth.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/gmonth.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct gmonth_simpl: gmonth_sskel
 #endif
         {
-          gmonth_simpl ();
-
           virtual void
           pre (const gmonth&);
 
           virtual void
           _serialize_content ();
 
+          gmonth_simpl (); // Keep it last.
+
         protected:
           gmonth value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/validating/gyear-month.hxx b/libxsde/xsde/cxx/serializer/validating/gyear-month.hxx
index 07b7a59..832808f 100644
--- a/libxsde/xsde/cxx/serializer/validating/gyear-month.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/gyear-month.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct gyear_month_simpl: gyear_month_sskel
 #endif
         {
-          gyear_month_simpl ();
-
           virtual void
           pre (const gyear_month&);
 
           virtual void
           _serialize_content ();
 
+          gyear_month_simpl (); // Keep it last.
+
         protected:
           gyear_month value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/validating/gyear.hxx b/libxsde/xsde/cxx/serializer/validating/gyear.hxx
index a56a2e0..ab0e1b1 100644
--- a/libxsde/xsde/cxx/serializer/validating/gyear.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/gyear.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct gyear_simpl: gyear_sskel
 #endif
         {
-          gyear_simpl ();
-
           virtual void
           pre (const gyear&);
 
           virtual void
           _serialize_content ();
 
+          gyear_simpl (); // Keep it last.
+
         protected:
           gyear value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/validating/qname-stl.hxx b/libxsde/xsde/cxx/serializer/validating/qname-stl.hxx
index 341c65f..caca15c 100644
--- a/libxsde/xsde/cxx/serializer/validating/qname-stl.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/qname-stl.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct qname_simpl: qname_sskel
 #endif
         {
-          qname_simpl ();
-
           virtual void
           pre (const qname&);
 
           virtual void
           _serialize_content ();
 
+          qname_simpl (); // Keep it last.
+
         protected:
           qname value_;
         };
diff --git a/libxsde/xsde/cxx/serializer/validating/time-zone.hxx b/libxsde/xsde/cxx/serializer/validating/time-zone.hxx
index b2100e4..a48cbd1 100644
--- a/libxsde/xsde/cxx/serializer/validating/time-zone.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/time-zone.hxx
@@ -18,9 +18,6 @@ namespace xsde
       {
         namespace bits
         {
-          bool
-          valid_time_zone (const time_zone&);
-
           // Returns 0 in case of a failure and the number of
           // characters written otherwise. The buffer should
           // have space for at least 7 characters. Note that
@@ -29,6 +26,9 @@ namespace xsde
           //
           int
           serialize_time_zone (char* s, const time_zone&);
+
+          bool
+          valid_time_zone (const time_zone&);
         }
       }
     }
diff --git a/libxsde/xsde/cxx/serializer/validating/time.hxx b/libxsde/xsde/cxx/serializer/validating/time.hxx
index 6c09fbf..a9b5bb1 100644
--- a/libxsde/xsde/cxx/serializer/validating/time.hxx
+++ b/libxsde/xsde/cxx/serializer/validating/time.hxx
@@ -22,14 +22,14 @@ namespace xsde
         struct time_simpl: time_sskel
 #endif
         {
-          time_simpl ();
-
           virtual void
           pre (const time&);
 
           virtual void
           _serialize_content ();
 
+          time_simpl ();
+
         protected:
           time value_;
         };