From: David Hotham <david.hotham@metaswitch.com>
Date: Sun, 14 Dec 2014 14:27:03 +0000 (+0000)
Subject: Clean compile 32-bit builds
X-Git-Tag: upstream/7.0.6~62
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Flibphonenumber.git;a=commitdiff_plain;h=a9bb0423ea6dba18f83a2f46a1abe87cae91e8f3

Clean compile 32-bit builds
---

diff --git a/cpp/test/phonenumbers/geocoding/area_code_map_test.cc b/cpp/test/phonenumbers/geocoding/area_code_map_test.cc
index 786c638..97369a6 100644
--- a/cpp/test/phonenumbers/geocoding/area_code_map_test.cc
+++ b/cpp/test/phonenumbers/geocoding/area_code_map_test.cc
@@ -155,20 +155,20 @@ TEST_F(AreaCodeMapTest, TestLookupNumberNY) {
 
 TEST_F(AreaCodeMapTest, TestLookupNumberCA1) {
   EXPECT_STREQ("San Mateo, CA",
-               map_US_->Lookup(MakePhoneNumber(1, 6503451234L)));
+               map_US_->Lookup(MakePhoneNumber(1, 6503451234LL)));
 }
 
 TEST_F(AreaCodeMapTest, TestLookupNumberCA2) {
-  EXPECT_STREQ("California", map_US_->Lookup(MakePhoneNumber(1, 6502531234L)));
+  EXPECT_STREQ("California", map_US_->Lookup(MakePhoneNumber(1, 6502531234LL)));
 }
 
 TEST_F(AreaCodeMapTest, TestLookupNumberTX) {
   EXPECT_STREQ("Richardson, TX",
-            map_US_->Lookup(MakePhoneNumber(1, 9724801234L)));
+            map_US_->Lookup(MakePhoneNumber(1, 9724801234LL)));
 }
 
 TEST_F(AreaCodeMapTest, TestLookupNumberNotFoundTX) {
-  EXPECT_STREQ(NULL, map_US_->Lookup(MakePhoneNumber(1, 9724811234L)));
+  EXPECT_STREQ(NULL, map_US_->Lookup(MakePhoneNumber(1, 9724811234LL)));
 }
 
 TEST_F(AreaCodeMapTest, TestLookupNumberCH) {
diff --git a/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc b/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc
index c2e1295..3931e40 100644
--- a/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc
+++ b/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc
@@ -51,12 +51,12 @@ class PhoneNumberOfflineGeocoderTest : public testing::Test {
   PhoneNumberOfflineGeocoderTest() :
     KO_NUMBER1(MakeNumber(82, 22123456UL)),
     KO_NUMBER2(MakeNumber(82, 322123456UL)),
-    KO_NUMBER3(MakeNumber(82, 6421234567UL)),
+    KO_NUMBER3(MakeNumber(82, 6421234567ULL)),
     KO_INVALID_NUMBER(MakeNumber(82, 1234UL)),
-    US_NUMBER1(MakeNumber(1, 6502530000UL)),
-    US_NUMBER2(MakeNumber(1, 6509600000UL)),
+    US_NUMBER1(MakeNumber(1, 6502530000ULL)),
+    US_NUMBER2(MakeNumber(1, 6509600000ULL)),
     US_NUMBER3(MakeNumber(1, 2128120000UL)),
-    US_NUMBER4(MakeNumber(1, 6174240000UL)),
+    US_NUMBER4(MakeNumber(1, 6174240000ULL)),
     US_INVALID_NUMBER(MakeNumber(1, 123456789UL)),
     BS_NUMBER1(MakeNumber(1, 2423651234UL)),
     AU_NUMBER(MakeNumber(61, 236618300UL)),
diff --git a/cpp/test/phonenumbers/phonenumberutil_test.cc b/cpp/test/phonenumbers/phonenumberutil_test.cc
index b8e367b..13e97df 100644
--- a/cpp/test/phonenumbers/phonenumberutil_test.cc
+++ b/cpp/test/phonenumbers/phonenumberutil_test.cc
@@ -1124,7 +1124,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumberForMobileDialing) {
   // numbers are always output in international format, but short numbers are
   // in national format.
   test_number.set_country_code(1);
-  test_number.set_national_number(6502530000L);
+  test_number.set_national_number(6502530000LL);
   phone_util_.FormatNumberForMobileDialing(
       test_number, RegionCode::US(), false, &formatted_number);
   EXPECT_EQ("+16502530000", formatted_number);