diff options
author | Rui Ueyama <ruiu@google.com> | 2015-04-08 21:59:04 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2015-04-08 21:59:04 +0000 |
commit | 1a6ec936161eedc5c7b7cb36bfed5bec65bd1e06 (patch) | |
tree | 059a4e20a5259f7c9a1d08a3406c6d7cc123909e /lld/lib/Core/File.cpp | |
parent | 2f05640409b54e2803f3d54167d27ed24fae1707 (diff) | |
download | bcm5719-llvm-1a6ec936161eedc5c7b7cb36bfed5bec65bd1e06.tar.gz bcm5719-llvm-1a6ec936161eedc5c7b7cb36bfed5bec65bd1e06.zip |
Merge atom_collection_vector with atom_collection.
atom_collection_vector is the only derived class of atom_collection.
This patch merges the two.
llvm-svn: 234443
Diffstat (limited to 'lld/lib/Core/File.cpp')
-rw-r--r-- | lld/lib/Core/File.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lld/lib/Core/File.cpp b/lld/lib/Core/File.cpp index f07d2cc2674..6ada51601c8 100644 --- a/lld/lib/Core/File.cpp +++ b/lld/lib/Core/File.cpp @@ -15,10 +15,10 @@ namespace lld { File::~File() {} -File::atom_collection_vector<DefinedAtom> File::_noDefinedAtoms; -File::atom_collection_vector<UndefinedAtom> File::_noUndefinedAtoms; -File::atom_collection_vector<SharedLibraryAtom> File::_noSharedLibraryAtoms; -File::atom_collection_vector<AbsoluteAtom> File::_noAbsoluteAtoms; +File::atom_collection<DefinedAtom> File::_noDefinedAtoms; +File::atom_collection<UndefinedAtom> File::_noUndefinedAtoms; +File::atom_collection<SharedLibraryAtom> File::_noSharedLibraryAtoms; +File::atom_collection<AbsoluteAtom> File::_noAbsoluteAtoms; std::error_code File::parse() { std::lock_guard<std::mutex> lock(_parseMutex); |