[Cmake-commits] CMake branch, next, updated. v2.8.10.1-824-g89e1e01

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  89e1e0153c2621409c518dd73fddf268c57fcebd (commit)
       via  834c491cc9e049df6c7b67b39e235d2ea53d3bda (commit)
      from  97202381c5dd202a1d62b549061482d358b66175 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89e1e0153c2621409c518dd73fddf268c57fcebd
commit 89e1e0153c2621409c518dd73fddf268c57fcebd
Merge: 9720238 834c491
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 8 12:42:10 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 8 12:42:10 2012 -0500

    Merge topic 'fix-compiler-warnings' into next
    
    834c491 Resolve ambiguity warning regarding use of && and ||.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=834c491cc9e049df6c7b67b39e235d2ea53d3bda
commit 834c491cc9e049df6c7b67b39e235d2ea53d3bda
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 8 18:29:03 2012 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 8 18:36:27 2012 +0100

    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.

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);

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake