[Cmake-commits] CMake branch, next, updated. v3.3.1-2760-g41523a9

[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  41523a932cbc67eab2d39e781e5ac095f0d03fdd (commit)
       via  d2b8229d02ff7362f36674ab3470f11aea13088e (commit)
      from  6d420db78cc25fcd4c5086662c337d5ded2b7413 (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=41523a932cbc67eab2d39e781e5ac095f0d03fdd
commit 41523a932cbc67eab2d39e781e5ac095f0d03fdd
Merge: 6d420db d2b8229
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 3 09:36:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 3 09:36:38 2015 -0400

    Merge topic 'update-kwsys' into next
    
    d2b8229d Tests: Fix Plugin test on Watcom compiler


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2b8229d02ff7362f36674ab3470f11aea13088e
commit d2b8229d02ff7362f36674ab3470f11aea13088e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 3 09:34:47 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 3 09:34:47 2015 -0400

    Tests: Fix Plugin test on Watcom compiler
    
    The Watcom compiler does not have stream operators for std::string.
    Since KWSys no longer provides the operators for us, just use c_str()
    to avoid the problem and allow the test to compile on Watcom.

diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx
index bc4b03e..12d9204 100644
--- a/Tests/Plugin/src/example_exe.cxx
+++ b/Tests/Plugin/src/example_exe.cxx
@@ -32,7 +32,7 @@ int main()
   if(!handle)
     {
     std::cerr << "Could not open plugin \""
-              << libName << "\"!" << std::endl;
+              << libName.c_str() << "\"!" << std::endl;
     return 1;
     }
   kwsys::DynamicLoader::SymbolPointer sym =

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

Summary of changes:
 Tests/Plugin/src/example_exe.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake