diff --git a/cpp/src/phonenumberutil.cc b/cpp/src/phonenumberutil.cc index 4034f9e63..05f11cc20 100644 --- a/cpp/src/phonenumberutil.cc +++ b/cpp/src/phonenumberutil.cc @@ -190,6 +190,14 @@ scoped_ptr first_group_capturing_pattern; scoped_ptr carrier_code_pattern; +bool LoadCompiledInMetadata(PhoneMetadataCollection* metadata) { + if (!metadata->ParseFromArray(metadata_get(), metadata_size())) { + cerr << "Could not parse binary data." << endl; + return false; + } + return true; +} + // Returns a pointer to the description inside the metadata of the appropriate // type. const PhoneNumberDesc* GetNumberDescByType( @@ -654,14 +662,6 @@ PhoneNumberUtil::ValidationResult TestNumberLengthAgainstPattern( } // namespace -bool PhoneNumberUtil::LoadMetadata(PhoneMetadataCollection* metadata) { - if (!metadata->ParseFromArray(metadata_get(), metadata_size())) { - cerr << "Could not parse binary data." << endl; - return false; - } - return true; -} - void PhoneNumberUtil::SetLoggerAdapter(LoggerAdapter* logger_adapter) { logger.reset(logger_adapter); } @@ -675,8 +675,8 @@ PhoneNumberUtil::PhoneNumberUtil() SetLoggerAdapter(new DefaultLogger()); } PhoneMetadataCollection metadata_collection; - if (!LoadMetadata(&metadata_collection)) { - logger->Fatal("Could not load metadata"); + if (!LoadCompiledInMetadata(&metadata_collection)) { + logger->Fatal("Could not parse compiled-in metadata"); return; } // Storing data in a temporary map to make it easier to find other regions diff --git a/cpp/src/phonenumberutil.h b/cpp/src/phonenumberutil.h index 14bd28f14..7aa995369 100644 --- a/cpp/src/phonenumberutil.h +++ b/cpp/src/phonenumberutil.h @@ -545,8 +545,6 @@ class PhoneNumberUtil { // Region codes are ISO 3166-1 two-letter country code strings. scoped_ptr > region_to_metadata_map_; - bool LoadMetadata(PhoneMetadataCollection* metadata); - PhoneNumberUtil(); ~PhoneNumberUtil();