diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-11 11:30:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 11:30:51 -0500 |
| commit | 836c419c0d8ebc5797e3da4698058d77a108cb90 (patch) | |
| tree | a515c7742577192e3bcf7c01fe2c843f00d3b510 | |
| parent | cac5d7ce1a50c5c890a0b20fcaddd2360ec10f8f (diff) | |
| parent | 1d757db65cd12679c2d2213aa3430809b6566ef2 (diff) | |
| download | googletest-836c419c0d8ebc5797e3da4698058d77a108cb90.tar.gz googletest-836c419c0d8ebc5797e3da4698058d77a108cb90.tar.bz2 googletest-836c419c0d8ebc5797e3da4698058d77a108cb90.zip | |
Merge pull request #1398 from gennadiycivil/master
more cleanup
| -rw-r--r-- | googletest/include/gtest/gtest-message.h | 1 | ||||
| -rw-r--r-- | googletest/src/gtest-filepath.cc | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/googletest/include/gtest/gtest-message.h b/googletest/include/gtest/gtest-message.h index fe879bca..8bc28d28 100644 --- a/googletest/include/gtest/gtest-message.h +++ b/googletest/include/gtest/gtest-message.h @@ -196,7 +196,6 @@ class GTEST_API_ Message { std::string GetString() const; private: - #if GTEST_OS_SYMBIAN // These are needed as the Nokia Symbian Compiler cannot decide between // const T& and const T* in a function template. The Nokia compiler _can_ diff --git a/googletest/src/gtest-filepath.cc b/googletest/src/gtest-filepath.cc index 0292dc11..a1fc0e37 100644 --- a/googletest/src/gtest-filepath.cc +++ b/googletest/src/gtest-filepath.cc @@ -26,14 +26,12 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: keith.ray@gmail.com (Keith Ray) -#include "gtest/gtest-message.h" #include "gtest/internal/gtest-filepath.h" -#include "gtest/internal/gtest-port.h" #include <stdlib.h> +#include "gtest/internal/gtest-port.h" +#include "gtest/gtest-message.h" #if GTEST_OS_WINDOWS_MOBILE # include <windows.h> @@ -48,6 +46,8 @@ # include <climits> // Some Linux distributions define PATH_MAX here. #endif // GTEST_OS_WINDOWS_MOBILE +#include "gtest/internal/gtest-string.h" + #if GTEST_OS_WINDOWS # define GTEST_PATH_MAX_ _MAX_PATH #elif defined(PATH_MAX) @@ -58,8 +58,6 @@ # define GTEST_PATH_MAX_ _POSIX_PATH_MAX #endif // GTEST_OS_WINDOWS -#include "gtest/internal/gtest-string.h" - namespace testing { namespace internal { |