diff options
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Tests/ExportImport/Import/A/check_lib_nosoname.cmake | 2 | ||||
| -rw-r--r-- | Tests/ExportImport/Import/A/check_lib_soname.cmake | 2 | ||||
| -rw-r--r-- | Tests/Plugin/check_mod_soname.cmake | 2 | ||||
| -rw-r--r-- | Tests/Plugin/src/example_exe.cxx | 20 | ||||
| -rw-r--r-- | Tests/SwiftMix/SwiftMain.swift | 4 | ||||
| -rw-r--r-- | Tests/SwiftOnly/main.swift | 2 |
7 files changed, 17 insertions, 17 deletions
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f7d1ba6..ed72665 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 3) -set(CMake_VERSION_PATCH 20150901) +set(CMake_VERSION_PATCH 20150902) #set(CMake_VERSION_RC 1) diff --git a/Tests/ExportImport/Import/A/check_lib_nosoname.cmake b/Tests/ExportImport/Import/A/check_lib_nosoname.cmake index 6261ff4..613391e 100644 --- a/Tests/ExportImport/Import/A/check_lib_nosoname.cmake +++ b/Tests/ExportImport/Import/A/check_lib_nosoname.cmake @@ -1,5 +1,5 @@ execute_process(COMMAND ${readelf} -d ${lib} OUTPUT_FILE ${lib}.readelf.txt) -file(STRINGS ${lib}.readelf.txt soname REGEX "\\(SONAME\\)") +file(STRINGS ${lib}.readelf.txt soname REGEX "SONAME") if(soname) message(FATAL_ERROR "${lib} has soname but should not:\n ${soname}") else() diff --git a/Tests/ExportImport/Import/A/check_lib_soname.cmake b/Tests/ExportImport/Import/A/check_lib_soname.cmake index 7794e80..a3c4b54 100644 --- a/Tests/ExportImport/Import/A/check_lib_soname.cmake +++ b/Tests/ExportImport/Import/A/check_lib_soname.cmake @@ -1,5 +1,5 @@ execute_process(COMMAND ${readelf} -d ${lib} OUTPUT_FILE ${lib}.readelf.txt) -file(STRINGS ${lib}.readelf.txt soname REGEX "\\(SONAME\\)") +file(STRINGS ${lib}.readelf.txt soname REGEX "SONAME") if(soname) message(STATUS "${lib} has soname as expected:\n ${soname}") else() diff --git a/Tests/Plugin/check_mod_soname.cmake b/Tests/Plugin/check_mod_soname.cmake index 21a33b1..eeededa 100644 --- a/Tests/Plugin/check_mod_soname.cmake +++ b/Tests/Plugin/check_mod_soname.cmake @@ -1,5 +1,5 @@ execute_process(COMMAND ${readelf} -d ${mod} OUTPUT_FILE ${mod}.readelf.txt) -file(STRINGS ${mod}.readelf.txt soname REGEX "\\(SONAME\\)") +file(STRINGS ${mod}.readelf.txt soname REGEX "SONAME") if(soname) message(FATAL_ERROR "${mod} has soname but should not:\n ${soname}") else() 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); diff --git a/Tests/SwiftMix/SwiftMain.swift b/Tests/SwiftMix/SwiftMain.swift index 9af9883..7e7c4ab 100644 --- a/Tests/SwiftMix/SwiftMain.swift +++ b/Tests/SwiftMix/SwiftMain.swift @@ -1,9 +1,9 @@ @objc class SwiftMainClass { class func SwiftMain(argc:Int, argv:UnsafePointer<UnsafePointer<CChar>>) -> Int32 { - println("argc: \(argc)") + dump("argc: \(argc)") for (var i = 0; i < argc; ++i) { var argi = String.fromCString(argv[i]) - println("arg[\(i)]: \(argi)"); + dump("arg[\(i)]: \(argi)"); } return 0; } diff --git a/Tests/SwiftOnly/main.swift b/Tests/SwiftOnly/main.swift index 67be986..28560d0 100644 --- a/Tests/SwiftOnly/main.swift +++ b/Tests/SwiftOnly/main.swift @@ -1 +1 @@ -println("SwiftOnly") +dump("SwiftOnly") |