From 83b22013e3b1ecb5579c3b604abd7daaecb0df0a Mon Sep 17 00:00:00 2001 From: Romain Deterre Date: Thu, 11 Oct 2018 11:20:51 -0400 Subject: [PATCH] Fix compilation error on MSYS2 systems --- src/indexer.cc | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/indexer.cc b/src/indexer.cc index 1b9aaac1..b86302c4 100644 --- a/src/indexer.cc +++ b/src/indexer.cc @@ -13,6 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#define __STDC_FORMAT_MACROS + #include "indexer.h" #include "clang_complete.hh" @@ -762,8 +764,8 @@ public: switch (D->getKind()) { case Decl::CXXConversion: // *operator* int => *operator int* case Decl::CXXDestructor: // *~*A => *~A* - case Decl::CXXMethod: // *operator*= => *operator=* - case Decl::Function: // operator delete + case Decl::CXXMethod: // *operator*= => *operator=* + case Decl::Function: // operator delete if (Loc.isFileID()) { SourceRange R = cast(OrigD)->getNameInfo().getSourceRange(); @@ -793,7 +795,7 @@ public: GetSymbolKind(cast(SemDC), entity->def.parent_kind); } else if (is_decl) { DeclRef &dr = entity->declarations.emplace_back(); - static_cast(dr) = {{loc, role}, lid}; + static_cast(dr) = {{loc, role}, lid}; SourceRange R = OrigD->getSourceRange(); dr.extent = R.getBegin().isFileID() ? FromTokenRange(SM, Lang, R) : loc; } else { @@ -1303,13 +1305,13 @@ Index(CompletionManager *completion, WorkingFiles *wfiles, VFS *vfs, { llvm::CrashRecoveryContext CRC; auto parse = [&]() { - if (!Action->BeginSourceFile(*Clang, Clang->getFrontendOpts().Inputs[0])) - return; - if (!Action->Execute()) - return; - Action->EndSourceFile(); - ok = true; - }; + if (!Action->BeginSourceFile(*Clang, Clang->getFrontendOpts().Inputs[0])) + return; + if (!Action->Execute()) + return; + Action->EndSourceFile(); + ok = true; + }; if (!CRC.RunSafely(parse)) { LOG_S(ERROR) << "clang crashed for " << file; return {};