diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-12-16 19:54:05 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-12-16 19:54:05 +0000 |
| commit | 7de3401f5f8c2a61476a3623e9802f973764fc27 (patch) | |
| tree | 59322de2099c9879b4a10a298ecf6e6b03a63ace /include/gtest/gtest.h | |
| parent | 348b01a2d08593bd4cb9739a83038143f860edff (diff) | |
| download | googletest-7de3401f5f8c2a61476a3623e9802f973764fc27.tar.gz | |
Turns on -Wshadow (by Preston Jackson).
git-svn-id: http://googletest.googlecode.com/svn/trunk@350 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'include/gtest/gtest.h')
| -rw-r--r-- | include/gtest/gtest.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index 33e2f7f..c7df7f0 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -457,8 +457,8 @@ class TestProperty { // C'tor. TestProperty does NOT have a default constructor. // Always use this constructor (with parameters) to create a // TestProperty object. - TestProperty(const char* key, const char* value) : - key_(key), value_(value) { + TestProperty(const char* a_key, const char* a_value) : + key_(a_key), value_(a_value) { } // Gets the user supplied key. |