mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-28 01:49:23 -05:00
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.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#ifndef A_DEF
|
||||
# error "A_DEF not defined"
|
||||
#error "A_DEF not defined"
|
||||
#endif
|
||||
#ifdef B_DEF
|
||||
# error "B_DEF must not be defined"
|
||||
#error "B_DEF must not be defined"
|
||||
#endif
|
||||
|
||||
@@ -1,2 +1,5 @@
|
||||
#include "a.h"
|
||||
int a2(void) { return 0; }
|
||||
int a2(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
#ifdef A_DEF
|
||||
# error "A_DEF must not be defined"
|
||||
#error "A_DEF must not be defined"
|
||||
#endif
|
||||
#ifndef B_DEF
|
||||
# error "B_DEF not defined"
|
||||
#error "B_DEF not defined"
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && defined(Bexport)
|
||||
# define EXPORT_B __declspec(dllexport)
|
||||
#define EXPORT_B __declspec(dllexport)
|
||||
#else
|
||||
# define EXPORT_B
|
||||
#define EXPORT_B
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && defined(SHARED_B)
|
||||
# define IMPORT_B __declspec(dllimport)
|
||||
#define IMPORT_B __declspec(dllimport)
|
||||
#else
|
||||
# define IMPORT_B
|
||||
#define IMPORT_B
|
||||
#endif
|
||||
|
||||
@@ -1,2 +1,5 @@
|
||||
#include "b.h"
|
||||
EXPORT_B int b1(void) { return 0; }
|
||||
EXPORT_B int b1(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,2 +1,5 @@
|
||||
#include "b.h"
|
||||
EXPORT_B int b2(void) { return 0; }
|
||||
EXPORT_B int b2(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1 +1,4 @@
|
||||
int a(void) { return 0; }
|
||||
int a(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1 +1,4 @@
|
||||
extern "C" int acxx(void) { return 0; }
|
||||
extern "C" int acxx(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#if defined(_WIN32) && defined(Cshared_EXPORTS)
|
||||
# define EXPORT_C __declspec(dllexport)
|
||||
#define EXPORT_C __declspec(dllexport)
|
||||
#else
|
||||
# define EXPORT_C
|
||||
#define EXPORT_C
|
||||
#endif
|
||||
|
||||
extern int a1(void);
|
||||
@@ -10,10 +10,5 @@ extern int b1(void);
|
||||
extern int b2(void);
|
||||
EXPORT_C int c(void)
|
||||
{
|
||||
return 0
|
||||
+ a1()
|
||||
+ a2()
|
||||
+ b1()
|
||||
+ b2()
|
||||
;
|
||||
return 0 + a1() + a2() + b1() + b2();
|
||||
}
|
||||
|
||||
@@ -1 +1,4 @@
|
||||
int dummy(void) {return 0;}
|
||||
int dummy(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,16 +1,12 @@
|
||||
#if defined(_WIN32) && defined(SHARED_C)
|
||||
# define IMPORT_C __declspec(dllimport)
|
||||
#define IMPORT_C __declspec(dllimport)
|
||||
#else
|
||||
# define IMPORT_C
|
||||
#define IMPORT_C
|
||||
#endif
|
||||
extern IMPORT_C int b1(void);
|
||||
extern IMPORT_C int b2(void);
|
||||
extern IMPORT_C int c(void);
|
||||
int main(void)
|
||||
{
|
||||
return 0
|
||||
+ c()
|
||||
+ b1()
|
||||
+ b2()
|
||||
;
|
||||
return 0 + c() + b1() + b2();
|
||||
}
|
||||
|
||||
@@ -11,10 +11,7 @@ int main(void)
|
||||
{
|
||||
return 0
|
||||
#ifndef NO_A
|
||||
+ a1()
|
||||
+ a2()
|
||||
+ a1() + a2()
|
||||
#endif
|
||||
+ b1()
|
||||
+ b2()
|
||||
;
|
||||
+ b1() + b2();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user