3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-03-10 17:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes gtest compile without warning with gcc 4.0.3 and -Wall -Wextra.

Browse Source
This commit is contained in:
zhanyong.wan 2009-03-25 03:55:18 +00:00
parent 2c0fc6d415
commit f3c6efd8d7
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/gtest/internal/gtest-param-util.h
View File

@ -483,8 +483,8 @@ class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase {
// about a generator. // about a generator.
int AddTestCaseInstantiation(const char* instantiation_name, int AddTestCaseInstantiation(const char* instantiation_name,
GeneratorCreationFunc* func, GeneratorCreationFunc* func,
const char* file, const char* /* file */,
int line) { int /* line */) {
instantiations_.push_back(::std::make_pair(instantiation_name, func)); instantiations_.push_back(::std::make_pair(instantiation_name, func));
return 0; // Return value used only to run this method in namespace scope. return 0; // Return value used only to run this method in namespace scope.
} }

2
make/Makefile
View File

@ -23,7 +23,7 @@ USER_DIR = ../samples
CPPFLAGS += -I$(GTEST_DIR) -I$(GTEST_DIR)/include CPPFLAGS += -I$(GTEST_DIR) -I$(GTEST_DIR)/include
# Flags passed to the C++ compiler. # Flags passed to the C++ compiler.
CXXFLAGS += -g CXXFLAGS += -g -Wall -Wextra
# All tests produced by this Makefile. Remember to add new tests you # All tests produced by this Makefile. Remember to add new tests you
# created to the list. # created to the list.

2
src/gtest-death-test.cc
View File

@ -945,7 +945,7 @@ bool StackGrowsDown() {
// wrong. // wrong.
static pid_t ExecDeathTestFork(char* const* argv, int close_fd) { static pid_t ExecDeathTestFork(char* const* argv, int close_fd) {
ExecDeathTestArgs args = { argv, close_fd }; ExecDeathTestArgs args = { argv, close_fd };
pid_t child_pid; pid_t child_pid = -1;
#if GTEST_HAS_CLONE #if GTEST_HAS_CLONE
const bool use_fork = GTEST_FLAG(death_test_use_fork); const bool use_fork = GTEST_FLAG(death_test_use_fork);

13
src/gtest-filepath.cc
View File

@ -33,6 +33,7 @@
#include <gtest/internal/gtest-port.h> #include <gtest/internal/gtest-port.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
#include <windows.h> #include <windows.h>
@ -166,20 +167,19 @@ FilePath FilePath::ConcatPaths(const FilePath& directory,
// Returns true if pathname describes something findable in the file-system, // Returns true if pathname describes something findable in the file-system,
// either a file, directory, or whatever. // either a file, directory, or whatever.
bool FilePath::FileOrDirectoryExists() const { bool FilePath::FileOrDirectoryExists() const {
#if GTEST_OS_WINDOWS
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str()); LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str());
const DWORD attributes = GetFileAttributes(unicode); const DWORD attributes = GetFileAttributes(unicode);
delete [] unicode; delete [] unicode;
return attributes != kInvalidFileAttributes; return attributes != kInvalidFileAttributes;
#else #elif GTEST_OS_WINDOWS
struct _stat file_stat = {}; struct _stat file_stat = {};
return _stat(pathname_.c_str(), &file_stat) == 0; return _stat(pathname_.c_str(), &file_stat) == 0;
#endif // _WIN32_WCE
#else #else
struct stat file_stat = {}; struct stat file_stat;
memset(&file_stat, 0, sizeof(file_stat));
return stat(pathname_.c_str(), &file_stat) == 0; return stat(pathname_.c_str(), &file_stat) == 0;
#endif // GTEST_OS_WINDOWS #endif // _WIN32_WCE
} }
// Returns true if pathname describes a directory in the file-system // Returns true if pathname describes a directory in the file-system
@ -205,7 +205,8 @@ bool FilePath::DirectoryExists() const {
(_S_IFDIR & file_stat.st_mode) != 0; (_S_IFDIR & file_stat.st_mode) != 0;
#endif // _WIN32_WCE #endif // _WIN32_WCE
#else #else
struct stat file_stat = {}; struct stat file_stat;
memset(&file_stat, 0, sizeof(file_stat));
result = stat(pathname_.c_str(), &file_stat) == 0 && result = stat(pathname_.c_str(), &file_stat) == 0 &&
S_ISDIR(file_stat.st_mode); S_ISDIR(file_stat.st_mode);
#endif // GTEST_OS_WINDOWS #endif // GTEST_OS_WINDOWS