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 cb09b3a0ea2bacd67523ebd85af6890b674caea8 (commit)
via 76fa8596997da889349b759990ea93dcd4c34c8f (commit)
from 2af56500e8be3074ebb58060909d070b2557e17a (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=cb09b3a0ea2bacd67523ebd85af6890b674caea8
commit cb09b3a0ea2bacd67523ebd85af6890b674caea8
Merge: 2af5650 76fa859
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Aug 31 09:50:25 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Aug 31 09:50:25 2015 -0400
Merge topic 'drop-cmsys-std-layer' into next
76fa8596 Tests: Remove use of include <kwsys/{ios,stl}> and
kwsys_{ios,stl}::
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76fa8596997da889349b759990ea93dcd4c34c8f
commit 76fa8596997da889349b759990ea93dcd4c34c8f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Aug 28 15:07:00 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Aug 31 09:50:12 2015 -0400
Tests: Remove use of include <kwsys/{ios,stl}> and kwsys_{ios,stl}::
We no longer need this compatibility layer for the compilers we support.
diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx
index 309302e..bc4b03e 100644
--- a/Tests/Plugin/src/example_exe.cxx
+++ b/Tests/Plugin/src/example_exe.cxx
@@ -3,15 +3,15 @@
#include <example_exe.h>
#include <kwsys/DynamicLoader.hxx>
-#include <kwsys/ios/iostream>
-#include <kwsys/stl/string>
+#include <iostream>
+#include <string>
#include <stdio.h>
// Implement the ABI used by plugins.
extern "C" int example_exe_function()
{
- kwsys_ios::cout << "hello" << kwsys_ios::endl;
+ std::cout << "hello" << std::endl;
return 123;
}
@@ -23,7 +23,7 @@ extern "C" int example_exe_function()
int main()
{
- kwsys_stl::string libName = EXAMPLE_EXE_PLUGIN_DIR CONFIG_DIR "/";
+ std::string libName = EXAMPLE_EXE_PLUGIN_DIR CONFIG_DIR "/";
libName += kwsys::DynamicLoader::LibPrefix();
libName += "example_mod_1";
libName += kwsys::DynamicLoader::LibExtension();
@@ -31,17 +31,17 @@ int main()
kwsys::DynamicLoader::OpenLibrary(libName.c_str());
if(!handle)
{
- kwsys_ios::cerr << "Could not open plugin \""
- << libName << "\"!" << kwsys_ios::endl;
+ std::cerr << "Could not open plugin \""
+ << libName << "\"!" << std::endl;
return 1;
}
kwsys::DynamicLoader::SymbolPointer sym =
kwsys::DynamicLoader::GetSymbolAddress(handle, "example_mod_1_function");
if(!sym)
{
- kwsys_ios::cerr
+ std::cerr
<< "Could not get plugin symbol \"example_mod_1_function\"!"
- << kwsys_ios::endl;
+ << std::endl;
return 1;
}
#ifdef __WATCOMC__
@@ -51,8 +51,8 @@ int main()
#endif
if(f(456) != (123+456))
{
- kwsys_ios::cerr << "Incorrect return value from plugin!"
- << kwsys_ios::endl;
+ std::cerr << "Incorrect return value from plugin!"
+ << std::endl;
return 1;
}
kwsys::DynamicLoader::CloseLibrary(handle);
-----------------------------------------------------------------------
Summary of changes:
Tests/Plugin/src/example_exe.cxx | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
