diff options
Diffstat (limited to 'include/flang/Basic')
| -rw-r--r-- | include/flang/Basic/Diagnostic.h | 2 | ||||
| -rw-r--r-- | include/flang/Basic/Token.h | 2 | ||||
| -rw-r--r-- | include/flang/Basic/TokenKinds.def | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/flang/Basic/Diagnostic.h b/include/flang/Basic/Diagnostic.h index 597fc0784b..48af292adc 100644 --- a/include/flang/Basic/Diagnostic.h +++ b/include/flang/Basic/Diagnostic.h @@ -208,7 +208,7 @@ public: DiagnosticsEngine(const llvm::IntrusiveRefCntPtr<DiagnosticIDs> &D, llvm::SourceMgr *SM, DiagnosticClient *DC, bool ShouldOwnClient = true) - : Diags(D), Client(DC), OwnsDiagClient(ShouldOwnClient), SrcMgr(SM) + : Client(DC), OwnsDiagClient(ShouldOwnClient), SrcMgr(SM), Diags(D) { Reset(); } const llvm::IntrusiveRefCntPtr<DiagnosticIDs> &getDiagnosticIDs() const { diff --git a/include/flang/Basic/Token.h b/include/flang/Basic/Token.h index 8b474a3368..585a45211a 100644 --- a/include/flang/Basic/Token.h +++ b/include/flang/Basic/Token.h @@ -130,7 +130,7 @@ public: } void setLiteralData(const char *Ptr) { assert(isLiteral() && "Cannot set literal data of non-literal"); - PtrData = (void*)Ptr; + PtrData = const_cast<char*>(Ptr); } /// setFlag - Set the specified flag. diff --git a/include/flang/Basic/TokenKinds.def b/include/flang/Basic/TokenKinds.def index ea32a81e3e..ac70f7cdad 100644 --- a/include/flang/Basic/TokenKinds.def +++ b/include/flang/Basic/TokenKinds.def @@ -23,7 +23,7 @@ #ifndef FORMAT_SPEC #define FORMAT_SPEC(X, Y) TOK(fs_ ## X) #endif -#ifndef OPERATOR(X,Y) +#ifndef OPERATOR #define OPERATOR(X,Y) TOK(kw_ ## X) #endif |