summaryrefslogtreecommitdiffstats
path: root/Tests/ExportImport/Export
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 14:34:04 (GMT)
committerBrad King <brad.king@kitware.com>2016-05-16 20:05:19 (GMT)
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Tests/ExportImport/Export
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadCMake-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/ExportImport/Export')
-rw-r--r--Tests/ExportImport/Export/Interface/headeronly/headeronly.h5
-rw-r--r--Tests/ExportImport/Export/empty.cpp5
-rw-r--r--Tests/ExportImport/Export/systemlib.cpp1
-rw-r--r--Tests/ExportImport/Export/systemlib.h4
-rw-r--r--Tests/ExportImport/Export/testExe1.c22
-rw-r--r--Tests/ExportImport/Export/testExe1lib.c5
-rw-r--r--Tests/ExportImport/Export/testExe2.c9
-rw-r--r--Tests/ExportImport/Export/testExe2lib.c13
-rw-r--r--Tests/ExportImport/Export/testExe2libImp.c9
-rw-r--r--Tests/ExportImport/Export/testExe3.c22
-rw-r--r--Tests/ExportImport/Export/testExe4.c22
-rw-r--r--Tests/ExportImport/Export/testLib1.c5
-rw-r--r--Tests/ExportImport/Export/testLib2.c5
-rw-r--r--Tests/ExportImport/Export/testLib3.c13
-rw-r--r--Tests/ExportImport/Export/testLib3Imp.c13
-rw-r--r--Tests/ExportImport/Export/testLib3ImpDep.c9
-rw-r--r--Tests/ExportImport/Export/testLib4.c9
-rw-r--r--Tests/ExportImport/Export/testLib5.c9
-rw-r--r--Tests/ExportImport/Export/testLib7.c5
-rw-r--r--Tests/ExportImport/Export/testLibAbs1.c5
-rw-r--r--Tests/ExportImport/Export/testLibCycleA1.c5
-rw-r--r--Tests/ExportImport/Export/testLibCycleA2.c5
-rw-r--r--Tests/ExportImport/Export/testLibCycleA3.c5
-rw-r--r--Tests/ExportImport/Export/testLibCycleB1.c5
-rw-r--r--Tests/ExportImport/Export/testLibCycleB2.c5
-rw-r--r--Tests/ExportImport/Export/testLibCycleB3.c5
-rw-r--r--Tests/ExportImport/Export/testLibDepends.c7
-rw-r--r--Tests/ExportImport/Export/testLibNoSONAME.c9
-rw-r--r--Tests/ExportImport/Export/testLibPerConfigDest.c5
-rw-r--r--Tests/ExportImport/Export/testLibRequired.c5
-rw-r--r--Tests/ExportImport/Export/testStaticLibRequiredPrivate.c5
31 files changed, 156 insertions, 95 deletions
diff --git a/Tests/ExportImport/Export/Interface/headeronly/headeronly.h b/Tests/ExportImport/Export/Interface/headeronly/headeronly.h
index 3673c21..92bfecd 100644
--- a/Tests/ExportImport/Export/Interface/headeronly/headeronly.h
+++ b/Tests/ExportImport/Export/Interface/headeronly/headeronly.h
@@ -1,5 +1,8 @@
-enum { one };
+enum
+{
+ one
+};
struct HeaderOnly
{
diff --git a/Tests/ExportImport/Export/empty.cpp b/Tests/ExportImport/Export/empty.cpp
index 1787013..11ec041 100644
--- a/Tests/ExportImport/Export/empty.cpp
+++ b/Tests/ExportImport/Export/empty.cpp
@@ -1,4 +1,7 @@
#ifdef _WIN32
__declspec(dllexport)
#endif
-int empty() { return 0; }
+ int empty()
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/systemlib.cpp b/Tests/ExportImport/Export/systemlib.cpp
index ec45148..a9e6179 100644
--- a/Tests/ExportImport/Export/systemlib.cpp
+++ b/Tests/ExportImport/Export/systemlib.cpp
@@ -3,5 +3,4 @@
SystemStruct::SystemStruct()
{
-
}
diff --git a/Tests/ExportImport/Export/systemlib.h b/Tests/ExportImport/Export/systemlib.h
index f7900c0..6fd00d5 100644
--- a/Tests/ExportImport/Export/systemlib.h
+++ b/Tests/ExportImport/Export/systemlib.h
@@ -3,9 +3,9 @@
#define SYSTEMLIB_H
#if defined(_WIN32) || defined(__CYGWIN__)
-# define systemlib_EXPORT __declspec(dllexport)
+#define systemlib_EXPORT __declspec(dllexport)
#else
-# define systemlib_EXPORT
+#define systemlib_EXPORT
#endif
struct systemlib_EXPORT SystemStruct
diff --git a/Tests/ExportImport/Export/testExe1.c b/Tests/ExportImport/Export/testExe1.c
index e00fac7..5fbb892 100644
--- a/Tests/ExportImport/Export/testExe1.c
+++ b/Tests/ExportImport/Export/testExe1.c
@@ -4,22 +4,18 @@ extern int testExe1lib(void);
int main(int argc, const char* argv[])
{
- if(argc < 2)
- {
+ if (argc < 2) {
fprintf(stderr, "Must specify output file.\n");
return 1;
- }
+ }
{
- FILE* f = fopen(argv[1], "w");
- if(f)
- {
- fprintf(f, "int generated_by_testExe1() { return 0; }\n");
- fclose(f);
- }
- else
- {
- fprintf(stderr, "Error writing to %s\n", argv[1]);
- return 1;
+ FILE* f = fopen(argv[1], "w");
+ if (f) {
+ fprintf(f, "int generated_by_testExe1() { return 0; }\n");
+ fclose(f);
+ } else {
+ fprintf(stderr, "Error writing to %s\n", argv[1]);
+ return 1;
}
}
return testExe1lib();
diff --git a/Tests/ExportImport/Export/testExe1lib.c b/Tests/ExportImport/Export/testExe1lib.c
index 7ad48a3..4bb3325 100644
--- a/Tests/ExportImport/Export/testExe1lib.c
+++ b/Tests/ExportImport/Export/testExe1lib.c
@@ -1 +1,4 @@
-int testExe1lib(void) { return 0; }
+int testExe1lib(void)
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/testExe2.c b/Tests/ExportImport/Export/testExe2.c
index f7d9345..f8976c4 100644
--- a/Tests/ExportImport/Export/testExe2.c
+++ b/Tests/ExportImport/Export/testExe2.c
@@ -1,10 +1,13 @@
#if defined(_WIN32) || defined(__CYGWIN__)
-# define testExe2_EXPORT __declspec(dllexport)
+#define testExe2_EXPORT __declspec(dllexport)
#else
-# define testExe2_EXPORT
+#define testExe2_EXPORT
#endif
-testExe2_EXPORT int testExe2Func(void) { return 123; }
+testExe2_EXPORT int testExe2Func(void)
+{
+ return 123;
+}
int main()
{
diff --git a/Tests/ExportImport/Export/testExe2lib.c b/Tests/ExportImport/Export/testExe2lib.c
index 1991439..2a5a77b 100644
--- a/Tests/ExportImport/Export/testExe2lib.c
+++ b/Tests/ExportImport/Export/testExe2lib.c
@@ -1,10 +1,13 @@
#if defined(_WIN32) || defined(__CYGWIN__)
-# define testExe2lib_EXPORT __declspec(dllexport)
-# define testExe2libImp_IMPORT __declspec(dllimport)
+#define testExe2lib_EXPORT __declspec(dllexport)
+#define testExe2libImp_IMPORT __declspec(dllimport)
#else
-# define testExe2lib_EXPORT
-# define testExe2libImp_IMPORT
+#define testExe2lib_EXPORT
+#define testExe2libImp_IMPORT
#endif
testExe2libImp_IMPORT int testExe2libImp(void);
-testExe2lib_EXPORT int testExe2lib(void) { return testExe2libImp(); }
+testExe2lib_EXPORT int testExe2lib(void)
+{
+ return testExe2libImp();
+}
diff --git a/Tests/ExportImport/Export/testExe2libImp.c b/Tests/ExportImport/Export/testExe2libImp.c
index f5a23af..aba914b 100644
--- a/Tests/ExportImport/Export/testExe2libImp.c
+++ b/Tests/ExportImport/Export/testExe2libImp.c
@@ -1,7 +1,10 @@
#if defined(_WIN32) || defined(__CYGWIN__)
-# define testExe2libImp_EXPORT __declspec(dllexport)
+#define testExe2libImp_EXPORT __declspec(dllexport)
#else
-# define testExe2libImp_EXPORT
+#define testExe2libImp_EXPORT
#endif
-testExe2libImp_EXPORT int testExe2libImp(void) { return 0; }
+testExe2libImp_EXPORT int testExe2libImp(void)
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/testExe3.c b/Tests/ExportImport/Export/testExe3.c
index 895e2fc..2b07576 100644
--- a/Tests/ExportImport/Export/testExe3.c
+++ b/Tests/ExportImport/Export/testExe3.c
@@ -2,22 +2,18 @@
int main(int argc, const char* argv[])
{
- if(argc < 2)
- {
+ if (argc < 2) {
fprintf(stderr, "Must specify output file.\n");
return 1;
- }
+ }
{
- FILE* f = fopen(argv[1], "w");
- if(f)
- {
- fprintf(f, "int generated_by_testExe3() { return 0; }\n");
- fclose(f);
- }
- else
- {
- fprintf(stderr, "Error writing to %s\n", argv[1]);
- return 1;
+ FILE* f = fopen(argv[1], "w");
+ if (f) {
+ fprintf(f, "int generated_by_testExe3() { return 0; }\n");
+ fclose(f);
+ } else {
+ fprintf(stderr, "Error writing to %s\n", argv[1]);
+ return 1;
}
}
return 0;
diff --git a/Tests/ExportImport/Export/testExe4.c b/Tests/ExportImport/Export/testExe4.c
index 731057e..422ab3d 100644
--- a/Tests/ExportImport/Export/testExe4.c
+++ b/Tests/ExportImport/Export/testExe4.c
@@ -2,22 +2,18 @@
int main(int argc, const char* argv[])
{
- if(argc < 2)
- {
+ if (argc < 2) {
fprintf(stderr, "Must specify output file.\n");
return 1;
- }
+ }
{
- FILE* f = fopen(argv[1], "w");
- if(f)
- {
- fprintf(f, "int generated_by_testExe4() { return 0; }\n");
- fclose(f);
- }
- else
- {
- fprintf(stderr, "Error writing to %s\n", argv[1]);
- return 1;
+ FILE* f = fopen(argv[1], "w");
+ if (f) {
+ fprintf(f, "int generated_by_testExe4() { return 0; }\n");
+ fclose(f);
+ } else {
+ fprintf(stderr, "Error writing to %s\n", argv[1]);
+ return 1;
}
}
return 0;
diff --git a/Tests/ExportImport/Export/testLib1.c b/Tests/ExportImport/Export/testLib1.c
index 35bb1e5..5002963 100644
--- a/Tests/ExportImport/Export/testLib1.c
+++ b/Tests/ExportImport/Export/testLib1.c
@@ -1 +1,4 @@
-int testLib1(void) { return 0; }
+int testLib1(void)
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/testLib2.c b/Tests/ExportImport/Export/testLib2.c
index aabc0d3..7a5206f 100644
--- a/Tests/ExportImport/Export/testLib2.c
+++ b/Tests/ExportImport/Export/testLib2.c
@@ -1,4 +1,7 @@
extern int testLib1(void);
-int testLib2(void) { return testLib1(); }
+int testLib2(void)
+{
+ return testLib1();
+}
diff --git a/Tests/ExportImport/Export/testLib3.c b/Tests/ExportImport/Export/testLib3.c
index 31cec94..cacac81 100644
--- a/Tests/ExportImport/Export/testLib3.c
+++ b/Tests/ExportImport/Export/testLib3.c
@@ -1,10 +1,13 @@
#if defined(_WIN32) || defined(__CYGWIN__)
-# define testLib3_EXPORT __declspec(dllexport)
-# define testLib3Imp_IMPORT __declspec(dllimport)
+#define testLib3_EXPORT __declspec(dllexport)
+#define testLib3Imp_IMPORT __declspec(dllimport)
#else
-# define testLib3_EXPORT
-# define testLib3Imp_IMPORT
+#define testLib3_EXPORT
+#define testLib3Imp_IMPORT
#endif
testLib3Imp_IMPORT int testLib3Imp(void);
-testLib3_EXPORT int testLib3(void) { return testLib3Imp(); }
+testLib3_EXPORT int testLib3(void)
+{
+ return testLib3Imp();
+}
diff --git a/Tests/ExportImport/Export/testLib3Imp.c b/Tests/ExportImport/Export/testLib3Imp.c
index c27bccd..3d836da 100644
--- a/Tests/ExportImport/Export/testLib3Imp.c
+++ b/Tests/ExportImport/Export/testLib3Imp.c
@@ -1,10 +1,13 @@
#if defined(_WIN32) || defined(__CYGWIN__)
-# define testLib3Imp_EXPORT __declspec(dllexport)
-# define testLib3ImpDep_IMPORT __declspec(dllimport)
+#define testLib3Imp_EXPORT __declspec(dllexport)
+#define testLib3ImpDep_IMPORT __declspec(dllimport)
#else
-# define testLib3Imp_EXPORT
-# define testLib3ImpDep_IMPORT
+#define testLib3Imp_EXPORT
+#define testLib3ImpDep_IMPORT
#endif
testLib3ImpDep_IMPORT int testLib3ImpDep(void);
-testLib3Imp_EXPORT int testLib3Imp(void) { return testLib3ImpDep(); }
+testLib3Imp_EXPORT int testLib3Imp(void)
+{
+ return testLib3ImpDep();
+}
diff --git a/Tests/ExportImport/Export/testLib3ImpDep.c b/Tests/ExportImport/Export/testLib3ImpDep.c
index 578ac30..b824e03 100644
--- a/Tests/ExportImport/Export/testLib3ImpDep.c
+++ b/Tests/ExportImport/Export/testLib3ImpDep.c
@@ -1,7 +1,10 @@
#if defined(_WIN32) || defined(__CYGWIN__)
-# define testLib3ImpDep_EXPORT __declspec(dllexport)
+#define testLib3ImpDep_EXPORT __declspec(dllexport)
#else
-# define testLib3ImpDep_EXPORT
+#define testLib3ImpDep_EXPORT
#endif
-testLib3ImpDep_EXPORT int testLib3ImpDep(void) { return 0; }
+testLib3ImpDep_EXPORT int testLib3ImpDep(void)
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/testLib4.c b/Tests/ExportImport/Export/testLib4.c
index 846b438..0e583b1 100644
--- a/Tests/ExportImport/Export/testLib4.c
+++ b/Tests/ExportImport/Export/testLib4.c
@@ -1,7 +1,10 @@
#if defined(_WIN32) || defined(__CYGWIN__)
-# define testLib4_EXPORT __declspec(dllexport)
+#define testLib4_EXPORT __declspec(dllexport)
#else
-# define testLib4_EXPORT
+#define testLib4_EXPORT
#endif
-testLib4_EXPORT int testLib4(void) { return 0; }
+testLib4_EXPORT int testLib4(void)
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/testLib5.c b/Tests/ExportImport/Export/testLib5.c
index 20a8215..7c61fc0 100644
--- a/Tests/ExportImport/Export/testLib5.c
+++ b/Tests/ExportImport/Export/testLib5.c
@@ -1,7 +1,10 @@
#if defined(_WIN32) || defined(__CYGWIN__)
-# define testLib5_EXPORT __declspec(dllexport)
+#define testLib5_EXPORT __declspec(dllexport)
#else
-# define testLib5_EXPORT
+#define testLib5_EXPORT
#endif
-testLib5_EXPORT int testLib5(void) { return 0; }
+testLib5_EXPORT int testLib5(void)
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/testLib7.c b/Tests/ExportImport/Export/testLib7.c
index 7acae9e..de85c1a 100644
--- a/Tests/ExportImport/Export/testLib7.c
+++ b/Tests/ExportImport/Export/testLib7.c
@@ -1 +1,4 @@
-int testLib7(void) { return 0; }
+int testLib7(void)
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/testLibAbs1.c b/Tests/ExportImport/Export/testLibAbs1.c
index 34aec75..c214b62 100644
--- a/Tests/ExportImport/Export/testLibAbs1.c
+++ b/Tests/ExportImport/Export/testLibAbs1.c
@@ -1 +1,4 @@
-int testLibAbs1(void) { return 0; }
+int testLibAbs1(void)
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/testLibCycleA1.c b/Tests/ExportImport/Export/testLibCycleA1.c
index 3db9e53..cfbf0e1 100644
--- a/Tests/ExportImport/Export/testLibCycleA1.c
+++ b/Tests/ExportImport/Export/testLibCycleA1.c
@@ -1,2 +1,5 @@
extern int testLibCycleB1(void);
-int testLibCycleA1(void) { return testLibCycleB1(); }
+int testLibCycleA1(void)
+{
+ return testLibCycleB1();
+}
diff --git a/Tests/ExportImport/Export/testLibCycleA2.c b/Tests/ExportImport/Export/testLibCycleA2.c
index 29ad46d..93c9fb6 100644
--- a/Tests/ExportImport/Export/testLibCycleA2.c
+++ b/Tests/ExportImport/Export/testLibCycleA2.c
@@ -1,2 +1,5 @@
extern int testLibCycleB2(void);
-int testLibCycleA2(void) { return testLibCycleB2(); }
+int testLibCycleA2(void)
+{
+ return testLibCycleB2();
+}
diff --git a/Tests/ExportImport/Export/testLibCycleA3.c b/Tests/ExportImport/Export/testLibCycleA3.c
index 565447b..468c044 100644
--- a/Tests/ExportImport/Export/testLibCycleA3.c
+++ b/Tests/ExportImport/Export/testLibCycleA3.c
@@ -1,2 +1,5 @@
extern int testLibCycleB3(void);
-int testLibCycleA3(void) { return testLibCycleB3(); }
+int testLibCycleA3(void)
+{
+ return testLibCycleB3();
+}
diff --git a/Tests/ExportImport/Export/testLibCycleB1.c b/Tests/ExportImport/Export/testLibCycleB1.c
index 36cb7b0..d152857 100644
--- a/Tests/ExportImport/Export/testLibCycleB1.c
+++ b/Tests/ExportImport/Export/testLibCycleB1.c
@@ -1,2 +1,5 @@
extern int testLibCycleA2(void);
-int testLibCycleB1(void) { return testLibCycleA2(); }
+int testLibCycleB1(void)
+{
+ return testLibCycleA2();
+}
diff --git a/Tests/ExportImport/Export/testLibCycleB2.c b/Tests/ExportImport/Export/testLibCycleB2.c
index ff12093..18cd4f6 100644
--- a/Tests/ExportImport/Export/testLibCycleB2.c
+++ b/Tests/ExportImport/Export/testLibCycleB2.c
@@ -1,2 +1,5 @@
extern int testLibCycleA3(void);
-int testLibCycleB2(void) { return testLibCycleA3(); }
+int testLibCycleB2(void)
+{
+ return testLibCycleA3();
+}
diff --git a/Tests/ExportImport/Export/testLibCycleB3.c b/Tests/ExportImport/Export/testLibCycleB3.c
index ca8d470..a281c69 100644
--- a/Tests/ExportImport/Export/testLibCycleB3.c
+++ b/Tests/ExportImport/Export/testLibCycleB3.c
@@ -1 +1,4 @@
-int testLibCycleB3(void) { return 0; }
+int testLibCycleB3(void)
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/testLibDepends.c b/Tests/ExportImport/Export/testLibDepends.c
index 3c7774ee..c896c10 100644
--- a/Tests/ExportImport/Export/testLibDepends.c
+++ b/Tests/ExportImport/Export/testLibDepends.c
@@ -18,8 +18,7 @@
extern int testLibRequired(void);
extern int testStaticLibRequiredPrivate(void);
-int testLibDepends(void) {
- return testLibRequired()
- + testStaticLibRequiredPrivate()
- ;
+int testLibDepends(void)
+{
+ return testLibRequired() + testStaticLibRequiredPrivate();
}
diff --git a/Tests/ExportImport/Export/testLibNoSONAME.c b/Tests/ExportImport/Export/testLibNoSONAME.c
index 2193e1f..30acc83 100644
--- a/Tests/ExportImport/Export/testLibNoSONAME.c
+++ b/Tests/ExportImport/Export/testLibNoSONAME.c
@@ -1,7 +1,10 @@
#if defined(_WIN32) || defined(__CYGWIN__)
-# define testLibNoSONAME_EXPORT __declspec(dllexport)
+#define testLibNoSONAME_EXPORT __declspec(dllexport)
#else
-# define testLibNoSONAME_EXPORT
+#define testLibNoSONAME_EXPORT
#endif
-testLibNoSONAME_EXPORT int testLibNoSONAME(void) { return 0; }
+testLibNoSONAME_EXPORT int testLibNoSONAME(void)
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/testLibPerConfigDest.c b/Tests/ExportImport/Export/testLibPerConfigDest.c
index c7113fc..903e040 100644
--- a/Tests/ExportImport/Export/testLibPerConfigDest.c
+++ b/Tests/ExportImport/Export/testLibPerConfigDest.c
@@ -1 +1,4 @@
-int testLibPerConfigDest(void) { return 0; }
+int testLibPerConfigDest(void)
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/testLibRequired.c b/Tests/ExportImport/Export/testLibRequired.c
index e126d44..24f320c 100644
--- a/Tests/ExportImport/Export/testLibRequired.c
+++ b/Tests/ExportImport/Export/testLibRequired.c
@@ -1 +1,4 @@
-int testLibRequired(void) { return 0; }
+int testLibRequired(void)
+{
+ return 0;
+}
diff --git a/Tests/ExportImport/Export/testStaticLibRequiredPrivate.c b/Tests/ExportImport/Export/testStaticLibRequiredPrivate.c
index 28a2675..5597fb4 100644
--- a/Tests/ExportImport/Export/testStaticLibRequiredPrivate.c
+++ b/Tests/ExportImport/Export/testStaticLibRequiredPrivate.c
@@ -1 +1,4 @@
-int testStaticLibRequiredPrivate(void) { return 0; }
+int testStaticLibRequiredPrivate(void)
+{
+ return 0;
+}