aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Kremenek <kremenek@apple.com>2011-03-22 20:16:19 +0000
committerTed Kremenek <kremenek@apple.com>2011-03-22 20:16:19 +0000
commit4ee9926671913ea6189ef9840a244d7c4385a7d5 (patch)
treec4d85fcaa04e1b43fd87f5fcde73e9a82495424f
parentab5824e97666ca7a91ed3013524cee18420866f1 (diff)
Hopefully fix VS build by not using std::vector::data().
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@128105 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--tools/libclang/CIndex.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp
index ddde439806..c9a923cfc5 100644
--- a/tools/libclang/CIndex.cpp
+++ b/tools/libclang/CIndex.cpp
@@ -2456,12 +2456,14 @@ static void clang_parseTranslationUnit_Impl(void *UserData) {
unsigned NumErrors = Diags->getClient()->getNumErrors();
llvm::OwningPtr<ASTUnit> Unit(
- ASTUnit::LoadFromCommandLine(Args->data(), Args->data() + Args->size(),
+ ASTUnit::LoadFromCommandLine(Args->size() ? &(*Args)[0] : 0
+ /* vector::data() not portable */,
+ Args->size() ? (&(*Args)[0] + Args->size()) :0,
Diags,
CXXIdx->getClangResourcesPath(),
CXXIdx->getOnlyLocalDecls(),
/*CaptureDiagnostics=*/true,
- RemappedFiles->data(),
+ RemappedFiles->size() ? &(*RemappedFiles)[0]:0,
RemappedFiles->size(),
/*RemappedFilesKeepOriginalName=*/true,
PrecompilePreamble,
@@ -2600,7 +2602,8 @@ static void clang_reparseTranslationUnit_Impl(void *UserData) {
Buffer));
}
- if (!CXXUnit->Reparse(RemappedFiles->data(), RemappedFiles->size()))
+ if (!CXXUnit->Reparse(RemappedFiles->size() ? &(*RemappedFiles)[0] : 0,
+ RemappedFiles->size()))
RTUI->result = 0;
}