CPP: Remove uses of std::{cerr,endl} in production code.

They generated static initializers on Clang/Mac.

This also adds the previously missing <algorithm> include in unicodetext.cc
causing a compilation error on VS2013.

This is a squash of (very slightly modified) patches contributed by thakis@ and
yosin@.

R=roes@google.com

Review URL: https://codereview.appspot.com/14930044

git-svn-id: http://libphonenumber.googlecode.com/svn/trunk/cpp/src/phonenumbers@621 ee073f10-1060-11df-b6a4-87a95322a99c

1 files changed, 2 insertions, 9 deletions

diff --git a/phonenumberutil.cc b/phonenumberutil.cc
index d966a35..fcca95f 100644
--- a/phonenumberutil.cc
+++ b/phonenumberutil.cc
@@ -17,14 +17,11 @@
 
 #include "phonenumbers/phonenumberutil.h"
 
-#include <string.h>
 #include <algorithm>
 #include <cctype>
-#include <fstream>
-#include <iostream>
+#include <cstring>
 #include <iterator>
 #include <map>
-#include <sstream>
 #include <utility>
 #include <vector>
 
@@ -55,12 +52,8 @@
 namespace i18n {
 namespace phonenumbers {
 
-using std::cerr;
-using std::endl;
-using std::ifstream;
 using std::make_pair;
 using std::sort;
-using std::stringstream;
 
 using google::protobuf::RepeatedPtrField;
 
@@ -118,7 +111,7 @@ const char kSingleExtnSymbolsForMatching[] =
 
 bool LoadCompiledInMetadata(PhoneMetadataCollection* metadata) {
   if (!metadata->ParseFromArray(metadata_get(), metadata_size())) {
-    cerr << "Could not parse binary data." << endl;
+    LOG(ERROR) << "Could not parse binary data.";
     return false;
   }
   return true;