[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6232-gcbbeae4

[Nils Gladitz]

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  cbbeae4d1d4a91035222ec4178503492d0cb4b7f (commit)
       via  6bfa079634cc8ee3b0effed0e753737c36ee1d98 (commit)
      from  3148250b14264a869874d0d56f2b3ad8a232722e (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=cbbeae4d1d4a91035222ec4178503492d0cb4b7f
commit cbbeae4d1d4a91035222ec4178503492d0cb4b7f
Merge: 3148250 6bfa079
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Dec 17 08:14:14 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 17 08:14:14 2013 -0500

    Merge topic 'wix-fragment-injection' into next
    
    6bfa079 CPackWiX: fix borland warning


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6bfa079634cc8ee3b0effed0e753737c36ee1d98
commit 6bfa079634cc8ee3b0effed0e753737c36ee1d98
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Dec 17 14:13:46 2013 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Dec 17 14:13:46 2013 +0100

    CPackWiX: fix borland warning

diff --git a/Source/CPack/WiX/cmWIXPatchParser.cxx b/Source/CPack/WiX/cmWIXPatchParser.cxx
index 1db566d..0a3b3bc 100644
--- a/Source/CPack/WiX/cmWIXPatchParser.cxx
+++ b/Source/CPack/WiX/cmWIXPatchParser.cxx
@@ -53,7 +53,7 @@ void cmWIXPatchParser::StartElement(const char *name, const char **atts)
       if(name_str == "CPackWiXFragment")
         {
         state = INSIDE_FRAGMENT;
-        StartFragment(name_str, atts);
+        StartFragment(atts);
         }
       else
         {
@@ -81,8 +81,7 @@ void cmWIXPatchParser::StartElement(const char *name, const char **atts)
     }
 }
 
-void cmWIXPatchParser::StartFragment(const std::string& name,
-  const char **attributes)
+void cmWIXPatchParser::StartFragment(const char **attributes)
 {
   for(size_t i = 0; attributes[i]; i += 2)
     {
diff --git a/Source/CPack/WiX/cmWIXPatchParser.h b/Source/CPack/WiX/cmWIXPatchParser.h
index 89159b4..4fa5e6f 100644
--- a/Source/CPack/WiX/cmWIXPatchParser.h
+++ b/Source/CPack/WiX/cmWIXPatchParser.h
@@ -45,8 +45,7 @@ public:
 private:
   virtual void StartElement(const char *name, const char **atts);
 
-  void StartFragment(
-    const std::string& name, const char **attributes);
+  void StartFragment(const char **attributes);
 
   virtual void EndElement(const char *name);
   virtual void ReportError(int line, int column, const char* msg);

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

Summary of changes:
 Source/CPack/WiX/cmWIXPatchParser.cxx |    5 ++---
 Source/CPack/WiX/cmWIXPatchParser.h   |    3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake