From 93fed47dbf8e6bc3d39d3f769cb5039551747257 Mon Sep 17 00:00:00 2001 From: vladlosev Date: Fri, 4 Nov 2011 17:56:23 +0000 Subject: Improves conformance to the Google C++ Style Guide (by Greg Miller). git-svn-id: http://googletest.googlecode.com/svn/trunk@607 861a406c-534a-0410-8894-cb66d6ee9925 --- include/gtest/internal/gtest-string.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/gtest/internal/gtest-string.h') 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 -#include "gtest/internal/gtest-port.h" - #include +#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()); } -- cgit v1.2.1