From 07adb2836b8aa7a3872e33c285958f5937662b50 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Fri, 5 Nov 2004 22:15:36 +0000 Subject: Stop propagating method names that violate the coding standard git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17498 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvmc/Configuration.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tools/llvmc/Configuration.cpp') diff --git a/tools/llvmc/Configuration.cpp b/tools/llvmc/Configuration.cpp index 6a835e26eb..01611ad335 100644 --- a/tools/llvmc/Configuration.cpp +++ b/tools/llvmc/Configuration.cpp @@ -233,7 +233,7 @@ namespace { action.args.clear(); } else { if (token == STRING || token == OPTION) { - action.program.set_file(ConfigLexerState.StringVal); + action.program.setFile(ConfigLexerState.StringVal); } else { error("Expecting a program name"); } @@ -421,33 +421,33 @@ CompilerDriver::ConfigData* LLVMC_ConfigDataProvider::ReadConfigData(const std::string& ftype) { CompilerDriver::ConfigData* result = 0; sys::Path confFile; - if (configDir.is_empty()) { + if (configDir.isEmpty()) { // Try the environment variable const char* conf = getenv("LLVM_CONFIG_DIR"); if (conf) { - confFile.set_directory(conf); - confFile.append_file(ftype); + confFile.setDirectory(conf); + confFile.appendFile(ftype); if (!confFile.readable()) throw std::string("Configuration file for '") + ftype + "' is not available."; } else { // Try the user's home directory confFile = sys::Path::GetUserHomeDirectory(); - if (!confFile.is_empty()) { - confFile.append_directory(".llvm"); - confFile.append_directory("etc"); - confFile.append_file(ftype); + if (!confFile.isEmpty()) { + confFile.appendDirectory(".llvm"); + confFile.appendDirectory("etc"); + confFile.appendFile(ftype); if (!confFile.readable()) confFile.clear(); } - if (!confFile.is_empty()) { + if (!confFile.isEmpty()) { // Okay, try the LLVM installation directory confFile = sys::Path::GetLLVMConfigDir(); - confFile.append_file(ftype); + confFile.appendFile(ftype); if (!confFile.readable()) { // Okay, try the "standard" place confFile = sys::Path::GetLLVMDefaultConfigDir(); - confFile.append_file(ftype); + confFile.appendFile(ftype); if (!confFile.readable()) { throw std::string("Configuration file for '") + ftype + "' is not available."; @@ -457,7 +457,7 @@ LLVMC_ConfigDataProvider::ReadConfigData(const std::string& ftype) { } } else { confFile = configDir; - confFile.append_file(ftype); + confFile.appendFile(ftype); if (!confFile.readable()) throw std::string("Configuration file for '") + ftype + "' is not available."; -- cgit v1.2.3-18-g5258