[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1756-g8b3719a

[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  8b3719a394a3102a2ed13684abfbe5248d5caf11 (commit)
       via  7625dd1593098f6797e0e6e2c68cd4386089ab7f (commit)
      from  dff30c4ebefc40c35607c4f992ce35ff34e7cd52 (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=8b3719a394a3102a2ed13684abfbe5248d5caf11
commit 8b3719a394a3102a2ed13684abfbe5248d5caf11
Merge: dff30c4 7625dd1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 24 11:40:24 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 24 11:40:24 2013 -0500

    Merge topic 'compatible-interface-strings' into next
    
    7625dd1 Don't use default arguments to templated methods.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7625dd1593098f6797e0e6e2c68cd4386089ab7f
commit 7625dd1593098f6797e0e6e2c68cd4386089ab7f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 24 17:38:52 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 24 17:38:52 2013 +0100

    Don't use default arguments to templated methods.
    
    MSVC 2010 can't handle them.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 4e85876..e3be510 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4513,7 +4513,7 @@ void cmTarget::AddLinkDependentTargetsForProperties(
 //----------------------------------------------------------------------------
 template<typename PropertyType>
 PropertyType getTypedProperty(cmTarget *tgt, const char *prop,
-                              PropertyType * = 0);
+                              PropertyType *);
 
 //----------------------------------------------------------------------------
 template<>
@@ -4558,9 +4558,10 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget *tgt,
                                           const std::string &p,
                                           const char *config,
                                           const char *defaultValue,
-                                          PropertyType * = 0)
+                                          PropertyType *)
 {
-  PropertyType propContent = getTypedProperty<PropertyType>(tgt, p.c_str());
+  PropertyType propContent = getTypedProperty<PropertyType>(tgt, p.c_str(),
+                                                            0);
   const bool explicitlySet = tgt->GetProperties()
                                   .find(p.c_str())
                                   != tgt->GetProperties().end();
@@ -4596,7 +4597,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget *tgt,
                             != li->Target->GetProperties().end();
     PropertyType ifacePropContent =
                     getTypedProperty<PropertyType>(li->Target,
-                              ("INTERFACE_" + p).c_str());
+                              ("INTERFACE_" + p).c_str(), 0);
     if (explicitlySet)
       {
       if (ifaceIsSet)
@@ -4692,7 +4693,8 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget *tgt,
 bool cmTarget::GetLinkInterfaceDependentBoolProperty(const std::string &p,
                                                      const char *config)
 {
-  return checkInterfacePropertyCompatibility<bool>(this, p, config, "FALSE");
+  return checkInterfacePropertyCompatibility<bool>(this, p, config, "FALSE",
+                                                   0);
 }
 
 //----------------------------------------------------------------------------
@@ -4703,7 +4705,7 @@ const char * cmTarget::GetLinkInterfaceDependentStringProperty(
   return checkInterfacePropertyCompatibility<const char *>(this,
                                                            p,
                                                            config,
-                                                           "empty");
+                                                           "empty", 0);
 }
 
 //----------------------------------------------------------------------------
@@ -5505,7 +5507,7 @@ template<typename PropertyType>
 PropertyType getLinkInterfaceDependentProperty(cmTarget *tgt,
                                                const std::string prop,
                                                const char *config,
-                                               PropertyType * = 0);
+                                               PropertyType *);
 
 template<>
 bool getLinkInterfaceDependentProperty(cmTarget *tgt,
@@ -5530,7 +5532,7 @@ void checkPropertyConsistency(cmTarget *depender, cmTarget *dependee,
                               const char *propName,
                               std::set<cmStdString> &emitted,
                               const char *config,
-                              PropertyType * = 0)
+                              PropertyType *)
 {
   const char *prop = dependee->GetProperty(propName);
   if (!prop)
@@ -5558,7 +5560,8 @@ void checkPropertyConsistency(cmTarget *depender, cmTarget *dependee,
       }
     if(emitted.insert(*pi).second)
       {
-      getLinkInterfaceDependentProperty<PropertyType>(depender, *pi, config);
+      getLinkInterfaceDependentProperty<PropertyType>(depender, *pi, config,
+                                                      0);
       if (cmSystemTools::GetErrorOccuredFlag())
         {
         return;
@@ -5586,14 +5589,14 @@ void cmTarget::CheckPropertyCompatibility(cmComputeLinkInformation *info,
 
     checkPropertyConsistency<bool>(this, li->Target,
                                    "COMPATIBLE_INTERFACE_BOOL",
-                                   emitted, config);
+                                   emitted, config, 0);
     if (cmSystemTools::GetErrorOccuredFlag())
       {
       return;
       }
     checkPropertyConsistency<const char *>(this, li->Target,
                                            "COMPATIBLE_INTERFACE_STRING",
-                                           emitted, config);
+                                           emitted, config, 0);
     if (cmSystemTools::GetErrorOccuredFlag())
       {
       return;

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

Summary of changes:
 Source/cmTarget.cxx |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake