Misc renamings and type changes
This commit is contained in:
parent
1144ecf217
commit
fae810094c
@ -65,7 +65,7 @@ namespace cling {
|
||||
// Yes, throwing exceptions in error handlers is bad.
|
||||
// Doing nothing is pretty terrible, too.
|
||||
static void throwingHandler(void * /*user_data*/,
|
||||
const std::string& reason,
|
||||
const char* reason,
|
||||
bool /*gen_crash_diag*/);
|
||||
};
|
||||
} // end namespace cling
|
||||
|
@ -384,7 +384,7 @@ std::string cached_realpath(llvm::StringRef path, llvm::StringRef base_path = ""
|
||||
if (S_ISLNK(st_mode)) {
|
||||
llvm::StringRef symlink = cached_readlink(result.c_str());
|
||||
if (llvm::sys::path::is_relative(symlink)) {
|
||||
result.set_size(old_size);
|
||||
result.resize(old_size);
|
||||
result = cached_realpath(symlink, result, true, symlooplevel - 1);
|
||||
} else {
|
||||
result = cached_realpath(symlink, "", true, symlooplevel - 1);
|
||||
|
@ -814,7 +814,7 @@ namespace cling {
|
||||
ArrayType::Normal,
|
||||
/*IndexTypeQuals=*/0);
|
||||
|
||||
StringLiteral::StringKind Kind = StringLiteral::Ascii;
|
||||
StringLiteral::StringKind Kind = StringLiteral::Ordinary;
|
||||
Expr* Result = StringLiteral::Create(*m_Context,
|
||||
Value,
|
||||
Kind,
|
||||
|
@ -110,7 +110,7 @@ namespace cling {
|
||||
CompilationException::~CompilationException() noexcept {}
|
||||
|
||||
void CompilationException::throwingHandler(void * /*user_data*/,
|
||||
const std::string& reason,
|
||||
const char* reason,
|
||||
bool /*gen_crash_diag*/) {
|
||||
// See https://github.com/root-project/root/issues/7541 and
|
||||
// https://bugs.llvm.org/show_bug.cgi?id=49692 :
|
||||
|
@ -1149,7 +1149,7 @@ namespace cling {
|
||||
VISIT_DECL(Pointer, getPointeeType);
|
||||
VISIT_DECL(LValueReference, getPointeeType);
|
||||
VISIT_DECL(RValueReference, getPointeeType);
|
||||
VISIT_DECL(TypeOf, getUnderlyingType);
|
||||
VISIT_DECL(TypeOf, getUnmodifiedType);
|
||||
VISIT_DECL(Elaborated, getNamedType);
|
||||
VISIT_DECL(UnaryTransform, getUnderlyingType);
|
||||
#undef VISIT_DECL
|
||||
|
@ -107,7 +107,7 @@ namespace cling {
|
||||
|
||||
llvm::DenseMap<const clang::Decl*, bool> m_Visited; // fwd decl success
|
||||
std::stack<llvm::raw_ostream*> m_StreamStack;
|
||||
std::set<const char*> m_BuiltinNames;
|
||||
std::set<llvm::StringRef> m_BuiltinNames;
|
||||
IgnoreFilesFunc_t m_IgnoreFile; // Call back to ignore some top level files.
|
||||
|
||||
void printTypedefOrAliasDecl(clang::TypedefNameDecl* D);
|
||||
|
@ -1841,7 +1841,7 @@ namespace cling {
|
||||
}();
|
||||
if (!ret.isValid()) {
|
||||
std::string msg = "Error evaluating expression ";
|
||||
CompilationException::throwingHandler(nullptr, msg + DEI->getExpr(),
|
||||
CompilationException::throwingHandler(nullptr, (msg + DEI->getExpr()).c_str(),
|
||||
false /*backtrace*/);
|
||||
}
|
||||
return ret;
|
||||
|
@ -5,8 +5,8 @@ config.llvm_obj_root = "@LLVM_BINARY_DIR@"
|
||||
config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
|
||||
config.cling_src_root = "@CLING_SOURCE_DIR@"
|
||||
config.cling_obj_root = "@CLING_BINARY_DIR@"
|
||||
config.target_triple = "@TARGET_TRIPLE@"
|
||||
config.host_triple = "@TARGET_TRIPLE@"
|
||||
config.target_triple = "@LLVM_TARGET_TRIPLE@"
|
||||
config.host_triple = "@LLVM_TARGET_TRIPLE@"
|
||||
config.shlibext = "@TARGET_SHLIBEXT@"
|
||||
config.cxx_standard = "@CMAKE_CXX_STANDARD@"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user