From aa50718d6e84063924269d4045ebb9d0297d9960 Mon Sep 17 00:00:00 2001 From: Philippe Liard Date: Tue, 29 Nov 2011 09:23:58 +0000 Subject: [PATCH] CPP: Fix logger and asyoutypeformatter unit test to let the latest release build in Chromium. --- cpp/src/phonenumbers/default_logger.h | 9 +++++++++ cpp/test/phonenumbers/asyoutypeformatter_test.cc | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cpp/src/phonenumbers/default_logger.h b/cpp/src/phonenumbers/default_logger.h index 706ebf682..1cde2a50b 100644 --- a/cpp/src/phonenumbers/default_logger.h +++ b/cpp/src/phonenumbers/default_logger.h @@ -22,6 +22,15 @@ namespace i18n { namespace phonenumbers { +// There is no Logger in the new base implementation - provide a NOP one. +class Logger { + public: + Logger() {} + virtual ~Logger() {} + + static void set_logger_impl(Logger*) {} +}; + // If Google base/ is used, LOG() and VLOG() from base/logging.h are used // therefore the default logger implementation (StdoutLogger) instantiated in // phonenumberutil will actually never be used. Thus provide a dummy diff --git a/cpp/test/phonenumbers/asyoutypeformatter_test.cc b/cpp/test/phonenumbers/asyoutypeformatter_test.cc index 7f7a436fa..05847ec59 100644 --- a/cpp/test/phonenumbers/asyoutypeformatter_test.cc +++ b/cpp/test/phonenumbers/asyoutypeformatter_test.cc @@ -34,7 +34,7 @@ class AsYouTypeFormatterTest : public testing::Test { } const PhoneMetadata* GetCurrentMetadata() const { - return CHECK_NOTNULL(formatter_.get())->current_metadata_; + return formatter_.get()->current_metadata_; } int ConvertUnicodeStringPosition(const UnicodeString& s, int pos) const {