diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-11-08 17:29:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-11-13 18:26:10 (GMT) |
| commit | 21e8a08bcf91c4a7908502d3d9e3f9fa18aa0724 (patch) | |
| tree | 34af5ceaf84c635db1465a2914085709acf302f0 | |
| parent | 5f6432f2537203084a40f0d204a5643091f6a915 (diff) | |
| download | CMake-21e8a08bcf91c4a7908502d3d9e3f9fa18aa0724.zip CMake-21e8a08bcf91c4a7908502d3d9e3f9fa18aa0724.tar.gz CMake-21e8a08bcf91c4a7908502d3d9e3f9fa18aa0724.tar.bz2 | |
Resolve ambiguity warning regarding use of && and ||.
This is not ambiguous to the compiler, but it may seem ambiguous to
the reader.
From reading 3a53005f (Build object library targets in VS), 5484550a
(Detect and set Unicode character set in VS 10), and 9e01aefd (VS:
Add support for WinRT project properties (#12930)), this appears to
be the intentional semantic.
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index ddef365..d3b3950 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -428,8 +428,8 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues() mfcLine += useOfMfcValue + "</UseOfMfc>\n"; this->WriteString(mfcLine.c_str(), 2); - if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY && - this->ClOptions[*i]->UsingUnicode() || + if((this->Target->GetType() <= cmTarget::OBJECT_LIBRARY && + this->ClOptions[*i]->UsingUnicode()) || this->Target->GetPropertyAsBool("VS_WINRT_EXTENSIONS")) { this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2); |