summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/string_piece.cc1
-rw-r--r--base/string_piece.h7
-rw-r--r--base/string_piece_unittest.cc1
3 files changed, 3 insertions, 6 deletions
diff --git a/base/string_piece.cc b/base/string_piece.cc
index b9dbea1..1acb0cb 100644
--- a/base/string_piece.cc
+++ b/base/string_piece.cc
@@ -213,4 +213,3 @@ StringPiece StringPiece::substr(size_type pos, size_type n) const {
}
const StringPiece::size_type StringPiece::npos = size_type(-1);
-
diff --git a/base/string_piece.h b/base/string_piece.h
index 4575fda..fe10806 100644
--- a/base/string_piece.h
+++ b/base/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_STRING_PIECE_H_
+#define BASE_STRING_PIECE_H_
#include <algorithm>
#include <iosfwd>
@@ -181,5 +181,4 @@ inline bool operator>=(const StringPiece& x, const StringPiece& y) {
// allow StringPiece to be logged (needed for unit testing).
extern std::ostream& operator<<(std::ostream& o, const StringPiece& piece);
-#endif // BASE_STRING_PIECE_H__
-
+#endif // BASE_STRING_PIECE_H_
diff --git a/base/string_piece_unittest.cc b/base/string_piece_unittest.cc
index e7015c6..ff62d46 100644
--- a/base/string_piece_unittest.cc
+++ b/base/string_piece_unittest.cc
@@ -538,4 +538,3 @@ TEST(StringPieceTest, HeterogenousStringPieceEquals) {
ASSERT_TRUE(StringPiece("hello") == std::string("hello"));
ASSERT_TRUE("hello" == StringPiece("hello"));
}
-