[PHP-CVS] com php-src: - Fixed build using g++ (which complains about jump that crosses initialization): ext/intl/calendar/calendar_methods.cpp

[Felipe Pena]

Commit:    82740ef31e5c8a6497fca6a37637a840ee80b030
Author:    Felipe Pena <felipe...@gmail.com>         Sun, 20 May 2012 16:17:17 
-0300
Parents:   6ea4d0d83990a405bf8a92233ddc05adba69b4e1
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=82740ef31e5c8a6497fca6a37637a840ee80b030

Log:
- Fixed build using g++ (which complains about jump that crosses initialization)

Changed paths:
  M  ext/intl/calendar/calendar_methods.cpp


Diff:
diff --git a/ext/intl/calendar/calendar_methods.cpp 
b/ext/intl/calendar/calendar_methods.cpp
index fc0a306..1e8c9e7 100644
--- a/ext/intl/calendar/calendar_methods.cpp
+++ b/ext/intl/calendar/calendar_methods.cpp
@@ -1118,6 +1118,7 @@ U_CFUNC PHP_FUNCTION(intlcal_from_date_time)
        int                             locale_str_len;
        TimeZone                *timeZone;
        UErrorCode              status                          = U_ZERO_ERROR;
+       Calendar        *cal;
        intl_error_reset(NULL TSRMLS_CC);
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|s!",
@@ -1172,7 +1173,7 @@ U_CFUNC PHP_FUNCTION(intlcal_from_date_time)
                locale_str = 
const_cast<char*>(intl_locale_get_default(TSRMLS_C));
        }
 
-       Calendar *cal = Calendar::createInstance(timeZone,
+       cal = Calendar::createInstance(timeZone,
                Locale::createFromName(locale_str), status);
        if (cal == NULL) {
                delete timeZone;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php