diff options
| author | philip.liard@gmail.com <philip.liard@gmail.com@ee073f10-1060-11df-b6a4-87a95322a99c> | 2013-04-29 15:23:32 +0000 |
|---|---|---|
| committer | philip.liard@gmail.com <philip.liard@gmail.com@ee073f10-1060-11df-b6a4-87a95322a99c> | 2013-04-29 15:23:32 +0000 |
| commit | ec20c85ec068bbc488b4975e04afbe08ed898cea (patch) | |
| tree | 09d2e82838951ade26ec776d6745efe80836d374 | |
| parent | e94424b8b55e348370582e2d7bfb4ac66353269c (diff) | |
| download | android_external_libphonenumbergoogle-ec20c85ec068bbc488b4975e04afbe08ed898cea.tar.gz android_external_libphonenumbergoogle-ec20c85ec068bbc488b4975e04afbe08ed898cea.tar.bz2 android_external_libphonenumbergoogle-ec20c85ec068bbc488b4975e04afbe08ed898cea.zip | |
CPP: Move base/string_piece.* to base/strings/.
This change is needed to embed libphonenumber into Chromium past r191206.
BUG=http://crbug.com/236272
R=jia.shao.peng@gmail.com
Review URL: https://codereview.appspot.com/9014043
git-svn-id: http://libphonenumber.googlecode.com/svn/trunk@566 ee073f10-1060-11df-b6a4-87a95322a99c
| -rw-r--r-- | cpp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cpp/src/base/strings/string_piece.cc (renamed from cpp/src/base/string_piece.cc) | 2 | ||||
| -rw-r--r-- | cpp/src/base/strings/string_piece.h (renamed from cpp/src/base/string_piece.h) | 6 | ||||
| -rw-r--r-- | cpp/src/phonenumbers/utf/stringpiece.h | 3 |
4 files changed, 6 insertions, 7 deletions
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index cac9c84..8476be0 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -175,7 +175,7 @@ endif () set ( SOURCES - "src/base/string_piece.cc" + "src/base/strings/string_piece.cc" "src/phonenumbers/asyoutypeformatter.cc" "src/phonenumbers/default_logger.cc" "src/phonenumbers/logger.cc" diff --git a/cpp/src/base/string_piece.cc b/cpp/src/base/strings/string_piece.cc index 3ccb4f0..fed872fc 100644 --- a/cpp/src/base/string_piece.cc +++ b/cpp/src/base/strings/string_piece.cc @@ -6,7 +6,7 @@ #include <algorithm> #include <ostream> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" namespace base { diff --git a/cpp/src/base/string_piece.h b/cpp/src/base/strings/string_piece.h index 64326e1..28c9b94 100644 --- a/cpp/src/base/string_piece.h +++ b/cpp/src/base/strings/string_piece.h @@ -15,8 +15,8 @@ // conversions from "const char*" to "string" and back again. // -#ifndef BASE_STRING_PIECE_H_ -#define BASE_STRING_PIECE_H_ +#ifndef BASE_STRINGS_STRING_PIECE_H_ +#define BASE_STRINGS_STRING_PIECE_H_ #pragma once #include <string> @@ -189,4 +189,4 @@ inline bool operator>=(const StringPiece& x, const StringPiece& y) { } // namespace base -#endif // BASE_STRING_PIECE_H_ +#endif // BASE_STRINGS_STRING_PIECE_H_ diff --git a/cpp/src/phonenumbers/utf/stringpiece.h b/cpp/src/phonenumbers/utf/stringpiece.h index 7b56772..82196b9 100644 --- a/cpp/src/phonenumbers/utf/stringpiece.h +++ b/cpp/src/phonenumbers/utf/stringpiece.h @@ -16,8 +16,7 @@ #ifndef STRINGS_STRINGPIECE_H_ #define STRINGS_STRINGPIECE_H_ -//#include "third_party/chromium/src/base/string_piece.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" using base::StringPiece; |