[Cmake-commits] CMake branch, next, updated. v3.1.0-1601-gcf0d9e8

[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  cf0d9e84916ebbcd14fd3df5fd8b9b856c1edb5b (commit)
       via  b1dfbc0de54b5721e073d8363aeb4d8f4fa09ed2 (commit)
      from  7b5da14d074e365b812802b0b8c1be8aedf770fd (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=cf0d9e84916ebbcd14fd3df5fd8b9b856c1edb5b
commit cf0d9e84916ebbcd14fd3df5fd8b9b856c1edb5b
Merge: 7b5da14 b1dfbc0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 9 04:00:18 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 9 04:00:18 2015 -0500

    Merge topic 'drop-ancient-workarounds' into next
    
    b1dfbc0d Minor fixes.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1dfbc0de54b5721e073d8363aeb4d8f4fa09ed2
commit b1dfbc0de54b5721e073d8363aeb4d8f4fa09ed2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 9 09:59:27 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jan 9 09:59:27 2015 +0100

    Minor fixes.

diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx
index c1fe404..4a99e50 100644
--- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx
+++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx
@@ -24,7 +24,7 @@
 #endif
 #define cmCPackLogger(logType, msg)                                     \
   do {                                                                  \
-  std::ostringstream cmCPackLog_msg;                                       \
+  std::ostringstream cmCPackLog_msg;                                    \
   cmCPackLog_msg << msg;                                                \
   if(Generator) {                                                       \
   Generator->Logger->Log(logType, __FILE__, __LINE__,                   \
diff --git a/Source/CPack/IFW/cmCPackIFWPackage.cxx b/Source/CPack/IFW/cmCPackIFWPackage.cxx
index 86f8a52..38cef87 100644
--- a/Source/CPack/IFW/cmCPackIFWPackage.cxx
+++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx
@@ -25,7 +25,7 @@
 #endif
 #define cmCPackLogger(logType, msg)                                     \
   do {                                                                  \
-  std::ostringstream cmCPackLog_msg;                                       \
+  std::ostringstream cmCPackLog_msg;                                    \
   cmCPackLog_msg << msg;                                                \
   if(Generator) {                                                       \
   Generator->Logger->Log(logType, __FILE__, __LINE__,                   \
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index 2df8dd9..8a22131 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@ -862,7 +862,8 @@ WriteDistributionFile(const char* metapackageFile)
 //----------------------------------------------------------------------
 void
 cmCPackPackageMakerGenerator::
-CreateChoiceOutline(const cmCPackComponentGroup& group, std::ostringstream& out)
+CreateChoiceOutline(const cmCPackComponentGroup& group,
+                    std::ostringstream& out)
 {
   out << "<line choice=\"" << group.Name << "Choice\">" << std::endl;
   std::vector<cmCPackComponentGroup*>::const_iterator groupIt;

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

Summary of changes:
 Source/CPack/IFW/cmCPackIFWInstaller.cxx      |    2 +-
 Source/CPack/IFW/cmCPackIFWPackage.cxx        |    2 +-
 Source/CPack/cmCPackPackageMakerGenerator.cxx |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake