From: Anton Korobeynikov Date: Wed, 20 Feb 2008 11:28:26 +0000 (+0000) Subject: Get rid of hash_map in llvmc X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=44a2a79f1865807cf976932fac00648f60edfdbe;p=oota-llvm.git Get rid of hash_map in llvmc git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47374 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/tools/llvmc/Configuration.cpp b/tools/llvmc/Configuration.cpp index 8d48d4de85c..1aa047dde0d 100644 --- a/tools/llvmc/Configuration.cpp +++ b/tools/llvmc/Configuration.cpp @@ -609,7 +609,6 @@ LLVMC_ConfigDataProvider::~LLVMC_ConfigDataProvider() ++cIt; delete cd; } - Configurations.clear(); } CompilerDriver::ConfigData* @@ -627,7 +626,7 @@ LLVMC_ConfigDataProvider::ProvideConfigData(const std::string& filetype) { result = ReadConfigData(filetype); // If we got one, cache it if (result != 0) - Configurations.insert(std::make_pair(filetype,result)); + Configurations[filetype] = result; } return result; // Might return 0 } diff --git a/tools/llvmc/Configuration.h b/tools/llvmc/Configuration.h index 12d0a956beb..410e9af77e7 100644 --- a/tools/llvmc/Configuration.h +++ b/tools/llvmc/Configuration.h @@ -15,8 +15,8 @@ #ifndef LLVM_TOOLS_LLVMC_CONFIGDATA_H #define LLVM_TOOLS_LLVMC_CONFIGDATA_H +#include "llvm/ADT/StringMap.h" #include "CompilerDriver.h" -#include namespace llvm { /// This class provides the high level interface to the LLVM Compiler Driver. @@ -52,7 +52,7 @@ namespace llvm { /// @{ private: /// @brief This type is used internally to hold the configuration data. - typedef hash_map ConfigDataMap; + typedef StringMap ConfigDataMap; ConfigDataMap Configurations; ///< The cache of configurations sys::Path configDir; /// @}