summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphilip.liard@gmail.com <philip.liard@gmail.com@ee073f10-1060-11df-b6a4-87a95322a99c>2013-05-07 12:59:58 +0000
committerphilip.liard@gmail.com <philip.liard@gmail.com@ee073f10-1060-11df-b6a4-87a95322a99c>2013-05-07 12:59:58 +0000
commitde41ee57fc42757aaa958909a2cb1ff6af5d9356 (patch)
tree5a5e3ca8f1b215bd13f40d5f3224014310c834a9
parentfa6ddeed736e42c266027a0d7b696909083d066b (diff)
downloadphonenumbers-de41ee57fc42757aaa958909a2cb1ff6af5d9356.tar.gz
CPP: Make use of alternate format controlled at compile time.
This is needed to use a recent revision of libphonenumber in Chromium without building with alternate formats. BUG=http://crbug.com/236272 R=jia.shao.peng@gmail.com Review URL: https://codereview.appspot.com/9215046 git-svn-id: http://libphonenumber.googlecode.com/svn/trunk/cpp/src/phonenumbers@572 ee073f10-1060-11df-b6a4-87a95322a99c
-rw-r--r--phonenumbermatcher.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/phonenumbermatcher.cc b/phonenumbermatcher.cc
index 9446226..164221d 100644
--- a/phonenumbermatcher.cc
+++ b/phonenumbermatcher.cc
@@ -160,13 +160,18 @@ bool AllNumberGroupsRemainGrouped(
}
bool LoadAlternateFormats(PhoneMetadataCollection* alternate_formats) {
+#if defined(I18N_PHONENUMBERS_USE_ALTERNATE_FORMATS)
if (!alternate_formats->ParseFromArray(alternate_format_get(),
alternate_format_size())) {
cerr << "Could not parse binary data." << endl;
return false;
}
return true;
+#else
+ return false;
+#endif
}
+
} // namespace
class PhoneNumberMatcherRegExps : public Singleton<PhoneNumberMatcherRegExps> {