commit 8393335b955da7340c9f19b1b4b2d6c0c2c04be7
author Craig Cornelius <ccornelius@google.com> Fri Jun 14 14:20:29 2013 -0700
committer Elliott Hughes <enh@google.com> Thu Jul 18 13:41:55 2013 -0700
tree 4aa5c26fef6de3d738bd696106fc265791220c2b
parent 8fd45e08f1054d80a356ef8aa05659a2ba84707c

Update ICU4C to version 51.1.

Change-Id: I50b7fdc22eb09ee9a3b5d0704183d3fe5f371338

i18n/olsontz.cpp

diff --git a/i18n/olsontz.cpp b/i18n/olsontz.cpp
index 992cfe3..826eb1f 100644
--- a/i18n/olsontz.cpp
+++ b/i18n/olsontz.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-* Copyright (c) 2003-2012, International Business Machines
+* Copyright (c) 2003-2013, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
@@ -25,6 +25,7 @@
 #include <float.h> // DBL_MAX
 #include "uresimp.h" // struct UResourceBundle
 #include "zonemeta.h"
+#include "umutex.h"
 
 #ifdef U_DEBUG_TZ
 # include <stdio.h>
@@ -399,7 +400,7 @@
 
 void
 OlsonTimeZone::getOffsetFromLocal(UDate date, int32_t nonExistingTimeOpt, int32_t duplicatedTimeOpt,
-                                  int32_t& rawoff, int32_t& dstoff, UErrorCode& ec) /*const*/ {
+                                  int32_t& rawoff, int32_t& dstoff, UErrorCode& ec) const {
     if (U_FAILURE(ec)) {
         return;
     }
@@ -571,7 +572,7 @@
     // Return TRUE if DST is observed at any time during the current
     // year.
     for (int16_t i = 0; i < transitionCount(); ++i) {
-        double transition = transitionTimeInSeconds(i);
+        double transition = (double)transitionTimeInSeconds(i);
         if (transition >= limit) {
             break;
         }
@@ -680,6 +681,28 @@
     clearTransitionRules();
 }
 
+/*
+ * Lazy transition rules initializer
+ */
+static UMutex gLock = U_MUTEX_INITIALIZER;
+
+void
+OlsonTimeZone::checkTransitionRules(UErrorCode& status) const {
+    if (U_FAILURE(status)) {
+        return;
+    }
+    UBool initialized;
+    UMTX_CHECK(&gLock, transitionRulesInitialized, initialized);
+    if (!initialized) {
+        umtx_lock(&gLock);
+        if (!transitionRulesInitialized) {
+            OlsonTimeZone *ncThis = const_cast<OlsonTimeZone*>(this);
+            ncThis->initTransitionRules(status);
+        }
+        umtx_unlock(&gLock);
+    }
+}
+
 void
 OlsonTimeZone::initTransitionRules(UErrorCode& status) {
     if(U_FAILURE(status)) {
@@ -860,9 +883,9 @@
 }
 
 UBool
-OlsonTimeZone::getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ {
+OlsonTimeZone::getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const {
     UErrorCode status = U_ZERO_ERROR;
-    initTransitionRules(status);
+    checkTransitionRules(status);
     if (U_FAILURE(status)) {
         return FALSE;
     }
@@ -925,9 +948,9 @@
 }
 
 UBool
-OlsonTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ {
+OlsonTimeZone::getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) const {
     UErrorCode status = U_ZERO_ERROR;
-    initTransitionRules(status);
+    checkTransitionRules(status);
     if (U_FAILURE(status)) {
         return FALSE;
     }
@@ -986,11 +1009,11 @@
 }
 
 int32_t
-OlsonTimeZone::countTransitionRules(UErrorCode& status) /*const*/ {
+OlsonTimeZone::countTransitionRules(UErrorCode& status) const {
     if (U_FAILURE(status)) {
         return 0;
     }
-    initTransitionRules(status);
+    checkTransitionRules(status);
     if (U_FAILURE(status)) {
         return 0;
     }
@@ -1019,11 +1042,11 @@
 OlsonTimeZone::getTimeZoneRules(const InitialTimeZoneRule*& initial,
                                 const TimeZoneRule* trsrules[],
                                 int32_t& trscount,
-                                UErrorCode& status) /*const*/ {
+                                UErrorCode& status) const {
     if (U_FAILURE(status)) {
         return;
     }
-    initTransitionRules(status);
+    checkTransitionRules(status);
     if (U_FAILURE(status)) {
         return;
     }