From 12317a643bdd521085204a031dc57a3ce3685508 Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Fri, 7 Apr 2000 23:10:09 +0000
Subject: [PATCH] ICU-348 align c++ class field declaration and initialization
 order

X-SVN-Rev: 1096
---
 icu4c/source/i18n/calendar.cpp       | 25 +++++++++++++------------
 icu4c/source/i18n/unicode/fieldpos.h | 12 ++++++------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/icu4c/source/i18n/calendar.cpp b/icu4c/source/i18n/calendar.cpp
index 82a6e9419c..a916630897 100644
--- a/icu4c/source/i18n/calendar.cpp
+++ b/icu4c/source/i18n/calendar.cpp
@@ -27,6 +27,7 @@
 #include "cpputils.h"
 #include "unicode/resbund.h"
 #include "unicode/gregocal.h"
+#include "unicode/calendar.h"
 
 // Resource bundle tags read by this class
 const char* Calendar::kDateTimeElements = "DateTimeElements";
@@ -84,13 +85,13 @@ const char* Calendar::kDateTimeElements = "DateTimeElements";
 // -------------------------------------
 
 Calendar::Calendar(UErrorCode& success)
-:   fTime(0),
-    fIsTimeSet(FALSE),
+:   fIsTimeSet(FALSE),
     fAreFieldsSet(FALSE),
     fAreAllFieldsSet(FALSE),
+    fNextStamp(kMinimumUserStamp),
+    fTime(0),
     fLenient(TRUE),
-    fZone(0),
-    fNextStamp(kMinimumUserStamp)
+    fZone(0)
 {
     clear();
     fZone = TimeZone::createDefault();
@@ -100,13 +101,13 @@ Calendar::Calendar(UErrorCode& success)
 // -------------------------------------
 
 Calendar::Calendar(TimeZone* zone, const Locale& aLocale, UErrorCode& success)
-:   fTime(0),
-    fIsTimeSet(FALSE),
+:   fIsTimeSet(FALSE),
     fAreFieldsSet(FALSE),
     fAreAllFieldsSet(FALSE),
+    fNextStamp(kMinimumUserStamp),
+    fTime(0),
     fLenient(TRUE),
-    fZone(0),
-    fNextStamp(kMinimumUserStamp)
+    fZone(0)
 {
     if(zone == 0) {
         success = U_ILLEGAL_ARGUMENT_ERROR;
@@ -122,13 +123,13 @@ Calendar::Calendar(TimeZone* zone, const Locale& aLocale, UErrorCode& success)
 // -------------------------------------
 
 Calendar::Calendar(const TimeZone& zone, const Locale& aLocale, UErrorCode& success)
-:   fTime(0),
-    fIsTimeSet(FALSE),
+:   fIsTimeSet(FALSE),
     fAreFieldsSet(FALSE),
     fAreAllFieldsSet(FALSE),
+    fNextStamp(kMinimumUserStamp),
+    fTime(0),
     fLenient(TRUE),
-    fZone(0),
-    fNextStamp(kMinimumUserStamp)
+    fZone(0)
 {
     clear();
     fZone = zone.clone();
diff --git a/icu4c/source/i18n/unicode/fieldpos.h b/icu4c/source/i18n/unicode/fieldpos.h
index 841bdcc1a4..2827417a5e 100644
--- a/icu4c/source/i18n/unicode/fieldpos.h
+++ b/icu4c/source/i18n/unicode/fieldpos.h
@@ -192,17 +192,17 @@ private:
      */
     int32_t fField;
 
-    /**
-     * Output: End offset of field in text.
-     * If the field does not occur in the text, 0 is returned.
-     */
-    int32_t fEndIndex;
-
     /**
      * Output: Start offset of field in text.
      * If the field does not occur in the text, 0 is returned.
      */
     int32_t fBeginIndex;
+
+    /**
+     * Output: End offset of field in text.
+     * If the field does not occur in the text, 0 is returned.
+     */
+    int32_t fEndIndex;
 };
 
 inline FieldPosition&