[Cmake-commits] CMake branch, next, updated. v2.8.7-3185-g5a3413f

[Brad King]

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  5a3413f8c7ad7995e44b8c306c00cba57902d62c (commit)
       via  e927743eed9cd3c6858ef48f44421626137e0851 (commit)
      from  a2183f1165fe7de45e2d3f3a9fc70e2d8e9f3554 (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=5a3413f8c7ad7995e44b8c306c00cba57902d62c
commit 5a3413f8c7ad7995e44b8c306c00cba57902d62c
Merge: a2183f1 e927743
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 16 10:03:20 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 16 10:03:20 2012 -0400

    Merge topic 'ninja-generator' into next
    
    e927743 Ninja: Avoid using 'this' in member initializers


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e927743eed9cd3c6858ef48f44421626137e0851
commit e927743eed9cd3c6858ef48f44421626137e0851
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 16 09:58:32 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 16 09:58:32 2012 -0400

    Ninja: Avoid using 'this' in member initializers
    
    VS complains
    
     warning C4355: 'this' : used in base member initializer list
    
    so initialize the member in the constructor body instead.

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 439f734..9242181 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -27,8 +27,8 @@ cmNinjaNormalTargetGenerator(cmTarget* target)
   , TargetNameReal()
   , TargetNameImport()
   , TargetNamePDB()
-  , TargetLinkLanguage(target->GetLinkerLanguage(this->GetConfigName()))
 {
+  this->TargetLinkLanguage = target->GetLinkerLanguage(this->GetConfigName());
   if (target->GetType() == cmTarget::EXECUTABLE)
     target->GetExecutableNames(this->TargetNameOut,
                                this->TargetNameReal,

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

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


hooks/post-receive
-- 
CMake