diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Tests/Plugin | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Tests/Plugin')
-rw-r--r-- | Tests/Plugin/include/example.h | 15 | ||||
-rw-r--r-- | Tests/Plugin/src/example_exe.cxx | 35 | ||||
-rw-r--r-- | Tests/Plugin/src/example_mod_1.c | 8 |
3 files changed, 26 insertions, 32 deletions
diff --git a/Tests/Plugin/include/example.h b/Tests/Plugin/include/example.h index 1d7e8c0..87d992e 100644 --- a/Tests/Plugin/include/example.h +++ b/Tests/Plugin/include/example.h @@ -2,18 +2,17 @@ #define example_h #if defined(_WIN32) || defined(__CYGWIN__) -# if defined(example_exe_EXPORTS) -# define EXAMPLE_EXPORT __declspec(dllexport) -# else -# define EXAMPLE_EXPORT __declspec(dllimport) -# endif +#if defined(example_exe_EXPORTS) +#define EXAMPLE_EXPORT __declspec(dllexport) #else -# define EXAMPLE_EXPORT +#define EXAMPLE_EXPORT __declspec(dllimport) +#endif +#else +#define EXAMPLE_EXPORT #endif #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif EXAMPLE_EXPORT int example_exe_function(void); diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx index fd23e8f..857ad54 100644 --- a/Tests/Plugin/src/example_exe.cxx +++ b/Tests/Plugin/src/example_exe.cxx @@ -17,9 +17,9 @@ extern "C" int example_exe_function() } #ifdef CMAKE_INTDIR -# define CONFIG_DIR "/" CMAKE_INTDIR +#define CONFIG_DIR "/" CMAKE_INTDIR #else -# define CONFIG_DIR "" +#define CONFIG_DIR "" #endif int main() @@ -30,32 +30,27 @@ int main() libName += kwsys::DynamicLoader::LibExtension(); kwsys::DynamicLoader::LibraryHandle handle = kwsys::DynamicLoader::OpenLibrary(libName.c_str()); - if(!handle) - { - std::cerr << "Could not open plugin \"" - << libName.c_str() << "\"!" << std::endl; + if (!handle) { + std::cerr << "Could not open plugin \"" << libName.c_str() << "\"!" + << std::endl; return 1; - } + } kwsys::DynamicLoader::SymbolPointer sym = kwsys::DynamicLoader::GetSymbolAddress(handle, "example_mod_1_function"); - if(!sym) - { - std::cerr - << "Could not get plugin symbol \"example_mod_1_function\"!" - << std::endl; + if (!sym) { + std::cerr << "Could not get plugin symbol \"example_mod_1_function\"!" + << std::endl; return 1; - } + } #ifdef __WATCOMC__ - int(__cdecl *f)(int) = (int(__cdecl *)(int))(sym); + int(__cdecl * f)(int) = (int(__cdecl*)(int))(sym); #else - int(*f)(int) = reinterpret_cast<int(*)(int)>(sym); + int (*f)(int) = reinterpret_cast<int (*)(int)>(sym); #endif - if(f(456) != (123+456)) - { - std::cerr << "Incorrect return value from plugin!" - << std::endl; + if (f(456) != (123 + 456)) { + std::cerr << "Incorrect return value from plugin!" << std::endl; return 1; - } + } kwsys::DynamicLoader::CloseLibrary(handle); return 0; } diff --git a/Tests/Plugin/src/example_mod_1.c b/Tests/Plugin/src/example_mod_1.c index 1fc7338..a5dd984 100644 --- a/Tests/Plugin/src/example_mod_1.c +++ b/Tests/Plugin/src/example_mod_1.c @@ -3,15 +3,15 @@ #include <stdio.h> #if defined(_WIN32) -# define MODULE_EXPORT __declspec(dllexport) +#define MODULE_EXPORT __declspec(dllexport) #else -# define MODULE_EXPORT +#define MODULE_EXPORT #endif #ifdef __WATCOMC__ -# define MODULE_CCONV __cdecl +#define MODULE_CCONV __cdecl #else -# define MODULE_CCONV +#define MODULE_CCONV #endif MODULE_EXPORT int MODULE_CCONV example_mod_1_function(int n) |