Browse Source

Corrected flags type to int

merge-requests/37/head
eidheim 8 years ago
parent
commit
7114f695ab
  1. 12
      src/TranslationUnit.cc
  2. 10
      src/TranslationUnit.h

12
src/TranslationUnit.cc

@ -10,7 +10,7 @@ using namespace std; //TODO: remove
clangmm::TranslationUnit::TranslationUnit(Index &index, const std::string &file_path, clangmm::TranslationUnit::TranslationUnit(Index &index, const std::string &file_path,
const std::vector<std::string> &command_line_args, const std::vector<std::string> &command_line_args,
const std::string &buffer, unsigned flags) { const std::string &buffer, int flags) {
std::vector<const char*> args; std::vector<const char*> args;
for(auto &a: command_line_args) { for(auto &a: command_line_args) {
args.push_back(a.c_str()); args.push_back(a.c_str());
@ -27,7 +27,7 @@ clangmm::TranslationUnit::TranslationUnit(Index &index, const std::string &file_
clangmm::TranslationUnit::TranslationUnit(Index &index, const std::string &file_path, clangmm::TranslationUnit::TranslationUnit(Index &index, const std::string &file_path,
const std::vector<std::string> &command_line_args, const std::vector<std::string> &command_line_args,
unsigned flags) { int flags) {
std::vector<const char*> args; std::vector<const char*> args;
for(auto &a: command_line_args) { for(auto &a: command_line_args) {
args.push_back(a.c_str()); args.push_back(a.c_str());
@ -43,7 +43,7 @@ clangmm::TranslationUnit::~TranslationUnit() {
void clangmm::TranslationUnit::parse(Index &index, const std::string &file_path, void clangmm::TranslationUnit::parse(Index &index, const std::string &file_path,
const std::vector<std::string> &command_line_args, const std::vector<std::string> &command_line_args,
const std::map<std::string, std::string> &buffers, unsigned flags) { const std::map<std::string, std::string> &buffers, int flags) {
std::vector<CXUnsavedFile> files; std::vector<CXUnsavedFile> files;
for (auto &buffer : buffers) { for (auto &buffer : buffers) {
CXUnsavedFile file; CXUnsavedFile file;
@ -60,7 +60,7 @@ void clangmm::TranslationUnit::parse(Index &index, const std::string &file_path,
args.size(), files.data(), files.size(), flags); args.size(), files.data(), files.size(), flags);
} }
int clangmm::TranslationUnit::reparse(const std::string &buffer, unsigned flags) { int clangmm::TranslationUnit::reparse(const std::string &buffer, int flags) {
CXUnsavedFile files[1]; CXUnsavedFile files[1];
auto file_path=to_string(clang_getTranslationUnitSpelling(cx_tu)); auto file_path=to_string(clang_getTranslationUnitSpelling(cx_tu));
@ -72,8 +72,8 @@ int clangmm::TranslationUnit::reparse(const std::string &buffer, unsigned flags)
return clang_reparseTranslationUnit(cx_tu, 1, files, flags); return clang_reparseTranslationUnit(cx_tu, 1, files, flags);
} }
unsigned clangmm::TranslationUnit::DefaultFlags() { int clangmm::TranslationUnit::DefaultFlags() {
auto flags=CXTranslationUnit_CacheCompletionResults | CXTranslationUnit_PrecompiledPreamble | CXTranslationUnit_Incomplete | CXTranslationUnit_IncludeBriefCommentsInCodeCompletion; int flags=CXTranslationUnit_CacheCompletionResults | CXTranslationUnit_PrecompiledPreamble | CXTranslationUnit_Incomplete | CXTranslationUnit_IncludeBriefCommentsInCodeCompletion;
#if CINDEX_VERSION_MAJOR>0 || (CINDEX_VERSION_MAJOR==0 && CINDEX_VERSION_MINOR>=35) #if CINDEX_VERSION_MAJOR>0 || (CINDEX_VERSION_MAJOR==0 && CINDEX_VERSION_MINOR>=35)
flags|=CXTranslationUnit_KeepGoing; flags|=CXTranslationUnit_KeepGoing;
#endif #endif

10
src/TranslationUnit.h

@ -17,21 +17,21 @@ namespace clangmm {
TranslationUnit(Index &index, const std::string &file_path, TranslationUnit(Index &index, const std::string &file_path,
const std::vector<std::string> &command_line_args, const std::vector<std::string> &command_line_args,
const std::string &buffer, const std::string &buffer,
unsigned flags=DefaultFlags()); int flags=DefaultFlags());
TranslationUnit(Index &index, const std::string &file_path, TranslationUnit(Index &index, const std::string &file_path,
const std::vector<std::string> &command_line_args, const std::vector<std::string> &command_line_args,
unsigned flags=DefaultFlags()); int flags=DefaultFlags());
~TranslationUnit(); ~TranslationUnit();
int reparse(const std::string &buffer, unsigned flags=DefaultFlags()); int reparse(const std::string &buffer, int flags=DefaultFlags());
static unsigned DefaultFlags(); static int DefaultFlags();
void parse(Index &index, void parse(Index &index,
const std::string &file_path, const std::string &file_path,
const std::vector<std::string> &command_line_args, const std::vector<std::string> &command_line_args,
const std::map<std::string, std::string> &buffers, const std::map<std::string, std::string> &buffers,
unsigned flags=DefaultFlags()); int flags=DefaultFlags());
CodeCompleteResults get_code_completions(const std::string &buffer, CodeCompleteResults get_code_completions(const std::string &buffer,
unsigned line_number, unsigned column); unsigned line_number, unsigned column);

Loading…
Cancel
Save