gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't expose SmallVector (which needs DataTypes.h).

Browse Source 
Use vector instead.


git-svn-id: http://root.cern.ch/svn/root/trunk@48691 27541ba8-7e3a-0410-8455-c3a389f83636
This commit is contained in:
Axel Naumann 2013-02-25 15:54:36 +00:00
parent 5279835d41
commit b364112d1d
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/cling/Interpreter/Interpreter.h
View File

@ -10,10 +10,10 @@
#include "cling/Interpreter/InvocationOptions.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include <string>
#include <vector>
namespace llvm {
class raw_ostream;
@ -22,6 +22,7 @@ namespace llvm {
class LLVMContext;
class Module;
class Type;
template <typename T> class SmallVectorImpl;
namespace sys {
class DynamicLibrary;
@ -251,7 +252,7 @@ namespace cling {
///\brief Static object, which are bound to unloading of certain declaration
/// to be destructed.
///
llvm::SmallVector<CXAAtExitElement, 20> m_AtExitFuncs;
std::vector<CXAAtExitElement> m_AtExitFuncs;
///\brief DynamicLibraries loaded by this Interpreter.
///
@ -259,7 +260,7 @@ namespace cling {
///\brief Information about loaded files.
///
llvm::SmallVector<LoadedFileInfo*, 200> m_LoadedFiles;
std::vector<LoadedFileInfo*> m_LoadedFiles;
///\brief Try to load a library file via the llvm::Linker.
///
@ -579,7 +580,7 @@ namespace cling {
///\brief Get the collection of loaded files.
///
const llvm::SmallVectorImpl<LoadedFileInfo*>& getLoadedFiles() const {
const std::vector<LoadedFileInfo*>& getLoadedFiles() const {
return m_LoadedFiles; }
bool isPrintingAST() const { return m_PrintAST; }

2
lib/Interpreter/Interpreter.cpp
View File

@ -121,6 +121,8 @@ namespace cling {
m_RawInputEnabled(false) {
m_DyLibs.reset(new DynLibSetImpl());
m_AtExitFuncs.reserve(200);
m_LoadedFiles.reserve(20);
m_LLVMContext.reset(new llvm::LLVMContext);
std::vector<unsigned> LeftoverArgsIdx;

3
lib/MetaProcessor/MetaSema.cpp
View File

@ -15,6 +15,7 @@
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Serialization/ASTReader.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Path.h"
@ -150,7 +151,7 @@ namespace cling {
}
void MetaSema::actOnfilesCommand() const {
typedef llvm::SmallVectorImpl<Interpreter::LoadedFileInfo*> LoadedFiles_t;
typedef std::vector<Interpreter::LoadedFileInfo*> LoadedFiles_t;
const LoadedFiles_t& LoadedFiles = m_Interpreter.getLoadedFiles();
for (LoadedFiles_t::const_iterator I = LoadedFiles.begin(),
E = LoadedFiles.end(); I != E; ++I) {