summaryrefslogtreecommitdiffstats
path: root/include/gtest/internal/gtest-string.h
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-11-04 17:56:23 (GMT)
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-11-04 17:56:23 (GMT)
commit8965a6a0d2165f32e6413594bba6367f271f51e7 (patch)
treeab0e0f5e0fd23697673ec2e0edca67079375dd2c /include/gtest/internal/gtest-string.h
parent829402edcffe712ed4c79412ca020525cd8295ad (diff)
downloadgoogletest-8965a6a0d2165f32e6413594bba6367f271f51e7.zip
googletest-8965a6a0d2165f32e6413594bba6367f271f51e7.tar.gz
googletest-8965a6a0d2165f32e6413594bba6367f271f51e7.tar.bz2
Improves conformance to the Google C++ Style Guide (by Greg Miller).
Diffstat (limited to 'include/gtest/internal/gtest-string.h')
-rw-r--r--include/gtest/internal/gtest-string.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/gtest/internal/gtest-string.h b/include/gtest/internal/gtest-string.h
index dc3a07b..a902450 100644
--- a/include/gtest/internal/gtest-string.h
+++ b/include/gtest/internal/gtest-string.h
@@ -47,10 +47,10 @@
#endif
#include <string.h>
-#include "gtest/internal/gtest-port.h"
-
#include <string>
+#include "gtest/internal/gtest-port.h"
+
namespace testing {
namespace internal {
@@ -223,14 +223,14 @@ class GTEST_API_ String {
// Converting a ::std::string or ::string containing an embedded NUL
// character to a String will result in the prefix up to the first
// NUL character.
- String(const ::std::string& str) {
+ String(const ::std::string& str) { // NOLINT
ConstructNonNull(str.c_str(), str.length());
}
operator ::std::string() const { return ::std::string(c_str(), length()); }
#if GTEST_HAS_GLOBAL_STRING
- String(const ::string& str) {
+ String(const ::string& str) { // NOLINT
ConstructNonNull(str.c_str(), str.length());
}