[Cmake-commits] CMake branch, next, updated. v3.0.0-3929-gd52aaef

[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  d52aaef1123124523d285227a85e03ad8761744d (commit)
       via  be1e045f094a7096f80c7954b0d46f58935c0882 (commit)
      from  07f4230f8a1111ac89cb55dcbd2d140c371bda71 (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=d52aaef1123124523d285227a85e03ad8761744d
commit d52aaef1123124523d285227a85e03ad8761744d
Merge: 07f4230 be1e045
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 11:26:57 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 25 11:26:57 2014 -0400

    Merge topic 'libarchive-encoding' into next
    
    be1e045f cmSystemTools: Fix function call paren balance in conditional block


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be1e045f094a7096f80c7954b0d46f58935c0882
commit be1e045f094a7096f80c7954b0d46f58935c0882
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 11:26:35 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 25 11:27:00 2014 -0400

    cmSystemTools: Fix function call paren balance in conditional block
    
    Move the close paren outside the conditions to avoid having two close
    parens for one open paren.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 537ae8b..ed0cb4c 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1741,10 +1741,11 @@ bool extract_tar(const char* outFileName, bool verbose,
                              archive_error_string(ext));
         cmSystemTools::Error("Current file: ",
 #if cmsys_STL_HAS_WSTRING
-          cmsys::Encoding::ToNarrow(archive_entry_pathname_w(entry)).c_str());
+          cmsys::Encoding::ToNarrow(archive_entry_pathname_w(entry)).c_str()
 #else
-          archive_entry_pathname(entry));
+          archive_entry_pathname(entry)
 #endif
+          );
         break;
         }
       }

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

Summary of changes:
 Source/cmSystemTools.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake