summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2019-04-08 15:51:43 (GMT)
committerBrad King <brad.king@kitware.com>2019-04-08 15:55:34 (GMT)
commit588aad93ae53b59f8eca7d854ec6fb99a87f507f (patch)
treea65571d6006335cba4ce45152376b8d7b00997a2 /src
parentf07b3e8762cb54458f0f95695ac2940c6b8a40dc (diff)
downloadCastXML-588aad93ae53b59f8eca7d854ec6fb99a87f507f.zip
CastXML-588aad93ae53b59f8eca7d854ec6fb99a87f507f.tar.gz
CastXML-588aad93ae53b59f8eca7d854ec6fb99a87f507f.tar.bz2
Revise C++ coding style using clang-format-6.0
Run the `clang-format.bash` script to update all our C and C++ code to a new style defined by `.clang-format`. Use `clang-format` version 6.0. * 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 'src')
-rw-r--r--src/Detect.cxx4
-rw-r--r--src/Output.cxx2
-rw-r--r--src/RunClang.cxx2
-rw-r--r--src/Utils.cxx2
-rw-r--r--src/castxml.cxx4
5 files changed, 8 insertions, 6 deletions
diff --git a/src/Detect.cxx b/src/Detect.cxx
index 21bfef2..2ef5ae8 100644
--- a/src/Detect.cxx
+++ b/src/Detect.cxx
@@ -40,8 +40,8 @@ static bool failedCC(const char* id, std::vector<const char*> const& args,
{
std::cerr << "error: '--castxml-cc-" << id
<< "' compiler command failed:\n\n";
- for (std::vector<const char *>::const_iterator i = args.begin(),
- e = args.end();
+ for (std::vector<const char*>::const_iterator i = args.begin(),
+ e = args.end();
i != e; ++i) {
std::cerr << " '" << *i << "'";
}
diff --git a/src/Output.cxx b/src/Output.cxx
index 9047921..2c4c25e 100644
--- a/src/Output.cxx
+++ b/src/Output.cxx
@@ -65,6 +65,7 @@ protected:
private:
typedef void (DumpQual::*bool_type)() const;
void bool_true() const {}
+
public:
bool IsConst;
bool IsVolatile;
@@ -113,6 +114,7 @@ protected:
private:
typedef void (DumpId::*bool_type)() const;
void bool_true() const {}
+
public:
unsigned int Id;
DumpQual Qual;
diff --git a/src/RunClang.cxx b/src/RunClang.cxx
index edf18a5..cf1e674 100644
--- a/src/RunClang.cxx
+++ b/src/RunClang.cxx
@@ -53,7 +53,7 @@
#if LLVM_VERSION_MAJOR > 3 || \
LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 9
-#define CASTXML_OWNS_OSTREAM
+# define CASTXML_OWNS_OSTREAM
#endif
class ASTConsumer : public clang::ASTConsumer
diff --git a/src/Utils.cxx b/src/Utils.cxx
index a7b5245..7846b0b 100644
--- a/src/Utils.cxx
+++ b/src/Utils.cxx
@@ -230,7 +230,7 @@ std::string stringReplace(std::string str, std::string const& in,
}
#if defined(_WIN32)
-#include <windows.h>
+# include <windows.h>
#endif
void suppressInteractiveErrors()
diff --git a/src/castxml.cxx b/src/castxml.cxx
index 4989857..c15804a 100644
--- a/src/castxml.cxx
+++ b/src/castxml.cxx
@@ -29,7 +29,7 @@
#include "llvm/Support/raw_ostream.h"
#if LLVM_VERSION_MAJOR >= 7
-#include "llvm/Support/InitLLVM.h"
+# include "llvm/Support/InitLLVM.h"
#endif
#include <iostream>
@@ -41,7 +41,7 @@
#if LLVM_VERSION_MAJOR > 3 || \
LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 7
-#include "llvm/Support/StringSaver.h"
+# include "llvm/Support/StringSaver.h"
#else
class StringSaver : public llvm::cl::StringSaver
{