diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-18 16:35:15 (GMT) |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-18 16:35:15 (GMT) |
| commit | 9f894c2b36e83e9414b3369f9a4974644d843d8d (patch) | |
| tree | 560b2cb3cf39be738fc81b3487caf997a3dbe840 /scons | |
| parent | f43e4ff3ad12ace9d423cc3ce02feadb8f24fe67 (diff) | |
| download | googletest-9f894c2b36e83e9414b3369f9a4974644d843d8d.zip googletest-9f894c2b36e83e9414b3369f9a4974644d843d8d.tar.gz googletest-9f894c2b36e83e9414b3369f9a4974644d843d8d.tar.bz2 | |
Makes gtest compile cleanly with MSVC's warning 4511 & 4512 (copy ctor /
assignment operator cannot be generated) enabled.
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/SConstruct.common | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scons/SConstruct.common b/scons/SConstruct.common index 2fc0dde..193fab2 100644 --- a/scons/SConstruct.common +++ b/scons/SConstruct.common @@ -104,9 +104,6 @@ class SConstructHelper: # GTEST_IS_NULL_LITERAL_() triggers it and I cannot find # a fix. - '/wd4511', '/wd4512', - # copy ctor / assignment operator cannot be generated. - '-WX', # Treat warning as errors #'-GR-', # Disable runtime type information '-RTCs', # Enable stack-frame run-time error checks @@ -114,7 +111,8 @@ class SConstructHelper: #'-EHs', # enable C++ EH (no SEH exceptions) '-nologo', # Suppress logo line '-J', # All chars unsigned - #'-Wp64', # Detect 64-bit portability issues + #'-Wp64', # Detect 64-bit portability issues. This + # flag has been deprecated by VS 2008. '-Zi', # Produce debug information in PDB files. ], CCPDBFLAGS='', |