[Cmake-commits] CMake branch, next, updated. v3.1.0-1590-g28f8d0d

[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  28f8d0dd27a6d2cb9bdd743d728d00af1a9830ff (commit)
       via  9c2cc86733790f2c8a8b585ea33ca9f594c81e27 (commit)
      from  b9c9643a979378511a4f758afe66b3077ccc7c76 (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=28f8d0dd27a6d2cb9bdd743d728d00af1a9830ff
commit 28f8d0dd27a6d2cb9bdd743d728d00af1a9830ff
Merge: b9c9643 9c2cc86
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 8 18:07:04 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 8 18:07:04 2015 -0500

    Merge topic 'drop-ancient-workarounds' into next
    
    9c2cc867 Fix build on Mac.


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

    Fix build on Mac.

diff --git a/Source/CPack/cmCPackDragNDropGenerator.h b/Source/CPack/cmCPackDragNDropGenerator.h
index 62218d4..1c84d49 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.h
+++ b/Source/CPack/cmCPackDragNDropGenerator.h
@@ -33,7 +33,7 @@ protected:
   bool SupportsComponentInstallation() const;
 
 
-  bool CopyFile(std::ostringstream& source, cmOStringStream& target);
+  bool CopyFile(std::ostringstream& source, std::ostringstream& target);
   bool RunCommand(std::ostringstream& command, std::string* output = 0);
 
   std::string

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

Summary of changes:
 Source/CPack/cmCPackDragNDropGenerator.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake