Merge branch 'master' into merge-2.065

Conflicts:
	dmd2/declaration.h
	dmd2/dsymbol.h
	dmd2/func.c
	gen/functions.cpp
	gen/toir.cpp
	runtime/druntime
This commit is contained in:
kai 2014-06-23 07:57:30 +02:00
commit b7615f6a28
7 changed files with 55 additions and 40 deletions

View file

@ -45,7 +45,12 @@ static void CreateDirectoryOnDisk(llvm::StringRef fileName)
if (!dir.empty() && !llvm::sys::fs::exists(dir))
{
bool Existed;
llvm::error_code ec = llvm::sys::fs::create_directory(dir, Existed);
#if LDC_LLVM_VER >= 305
std::error_code
#else
llvm::error_code
#endif
ec = llvm::sys::fs::create_directory(dir, Existed);
if (ec)
{
error(Loc(), "failed to create path to file: %s\n%s", dir.data(), ec.message().c_str());