summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorkosak <kosak@google.com>2013-12-03 23:15:40 (GMT)
committerkosak <kosak@google.com>2013-12-03 23:15:40 (GMT)
commit5d83ee08dff5775b3bc59d144bc3ea3d4fe9dfb9 (patch)
treebd8ceb355713073ae2b5d632b1ac5f45de8fc3de /test
parent37b97d1c93fb8283f8bbf54f5618c1c1e5a4726a (diff)
downloadgoogletest-5d83ee08dff5775b3bc59d144bc3ea3d4fe9dfb9.zip
googletest-5d83ee08dff5775b3bc59d144bc3ea3d4fe9dfb9.tar.gz
googletest-5d83ee08dff5775b3bc59d144bc3ea3d4fe9dfb9.tar.bz2
Fix warnings encountered with clang -Wall.
Diffstat (limited to 'test')
-rw-r--r--test/gtest-printers_test.cc1
-rw-r--r--test/gtest-unittest-api_test.cc4
2 files changed, 3 insertions, 2 deletions
diff --git a/test/gtest-printers_test.cc b/test/gtest-printers_test.cc
index 184f9d9..c2ba711 100644
--- a/test/gtest-printers_test.cc
+++ b/test/gtest-printers_test.cc
@@ -125,6 +125,7 @@ namespace foo {
class UnprintableInFoo {
public:
UnprintableInFoo() : z_(0) { memcpy(xy_, "\xEF\x12\x0\x0\x34\xAB\x0\x0", 8); }
+ double z() const { return z_; }
private:
char xy_[8];
double z_;
diff --git a/test/gtest-unittest-api_test.cc b/test/gtest-unittest-api_test.cc
index 07083e5..b1f5168 100644
--- a/test/gtest-unittest-api_test.cc
+++ b/test/gtest-unittest-api_test.cc
@@ -54,7 +54,7 @@ class UnitTestHelper {
public:
// Returns the array of pointers to all test cases sorted by the test case
// name. The caller is responsible for deleting the array.
- static TestCase const** const GetSortedTestCases() {
+ static TestCase const** GetSortedTestCases() {
UnitTest& unit_test = *UnitTest::GetInstance();
TestCase const** const test_cases =
new const TestCase*[unit_test.total_test_case_count()];
@@ -83,7 +83,7 @@ class UnitTestHelper {
// Returns the array of pointers to all tests in a particular test case
// sorted by the test name. The caller is responsible for deleting the
// array.
- static TestInfo const** const GetSortedTests(const TestCase* test_case) {
+ static TestInfo const** GetSortedTests(const TestCase* test_case) {
TestInfo const** const tests =
new const TestInfo*[test_case->total_test_count()];