[lld] r184589 - Removed unnecessary "class" keyword.
Rui Ueyama
ruiu at google.com
Fri Jun 21 12:59:15 PDT 2013
Author: ruiu
Date: Fri Jun 21 14:59:15 2013
New Revision: 184589
URL: http://llvm.org/viewvc/llvm-project?rev=184589&view=rev
Log:
Removed unnecessary "class" keyword.
Modified:
lld/trunk/include/lld/Core/InputFiles.h
lld/trunk/include/lld/Core/Resolver.h
lld/trunk/lib/Core/Resolver.cpp
lld/trunk/lib/ReaderWriter/ELF/Atoms.h
lld/trunk/lib/ReaderWriter/MachO/WriterMachO.cpp
lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp
lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp
Modified: lld/trunk/include/lld/Core/InputFiles.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/InputFiles.h?rev=184589&r1=184588&r2=184589&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/InputFiles.h (original)
+++ lld/trunk/include/lld/Core/InputFiles.h Fri Jun 21 14:59:15 2013
@@ -28,11 +28,11 @@ public:
class Handler {
public:
virtual ~Handler() {}
- virtual void doFile(const class File &) = 0;
- virtual void doDefinedAtom(const class DefinedAtom &) = 0;
- virtual void doUndefinedAtom(const class UndefinedAtom &) = 0;
- virtual void doSharedLibraryAtom(const class SharedLibraryAtom &) = 0;
- virtual void doAbsoluteAtom(const class AbsoluteAtom &) = 0;
+ virtual void doFile(const File &) = 0;
+ virtual void doDefinedAtom(const DefinedAtom &) = 0;
+ virtual void doUndefinedAtom(const UndefinedAtom &) = 0;
+ virtual void doSharedLibraryAtom(const SharedLibraryAtom &) = 0;
+ virtual void doAbsoluteAtom(const AbsoluteAtom &) = 0;
};
InputFiles();
Modified: lld/trunk/include/lld/Core/Resolver.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Resolver.h?rev=184589&r1=184588&r2=184589&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/Resolver.h (original)
+++ lld/trunk/include/lld/Core/Resolver.h Fri Jun 21 14:59:15 2013
@@ -36,10 +36,10 @@ public:
}
// InputFiles::Handler methods
- virtual void doDefinedAtom(const class DefinedAtom&);
- virtual void doUndefinedAtom(const class UndefinedAtom&);
- virtual void doSharedLibraryAtom(const class SharedLibraryAtom &);
- virtual void doAbsoluteAtom(const class AbsoluteAtom &);
+ virtual void doDefinedAtom(const DefinedAtom&);
+ virtual void doUndefinedAtom(const UndefinedAtom&);
+ virtual void doSharedLibraryAtom(const SharedLibraryAtom &);
+ virtual void doAbsoluteAtom(const AbsoluteAtom &);
virtual void doFile(const File&);
/// @brief do work of merging and resolving and return list
@@ -87,7 +87,7 @@ private:
virtual DefinedAtomRange definedAtoms();
private:
- friend class Resolver;
+ friend Resolver;
atom_collection_vector<DefinedAtom> _definedAtoms;
atom_collection_vector<UndefinedAtom> _undefinedAtoms;
atom_collection_vector<SharedLibraryAtom> _sharedLibraryAtoms;
Modified: lld/trunk/lib/Core/Resolver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/Resolver.cpp?rev=184589&r1=184588&r2=184589&view=diff
==============================================================================
--- lld/trunk/lib/Core/Resolver.cpp (original)
+++ lld/trunk/lib/Core/Resolver.cpp Fri Jun 21 14:59:15 2013
@@ -88,7 +88,7 @@ void Resolver::doFile(const File &file)
}
-void Resolver::doUndefinedAtom(const class UndefinedAtom& atom) {
+void Resolver::doUndefinedAtom(const UndefinedAtom& atom) {
DEBUG_WITH_TYPE("resolver", llvm::dbgs()
<< " UndefinedAtom: "
<< llvm::format("0x%09lX", &atom)
Modified: lld/trunk/lib/ReaderWriter/ELF/Atoms.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Atoms.h?rev=184589&r1=184588&r2=184589&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Atoms.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Atoms.h Fri Jun 21 14:59:15 2013
@@ -511,7 +511,7 @@ public:
_contentData(contentData), _offset(offset) {
}
- virtual const class ELFFile<ELFT> &file() const {
+ virtual const ELFFile<ELFT> &file() const {
return _owningFile;
}
Modified: lld/trunk/lib/ReaderWriter/MachO/WriterMachO.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/WriterMachO.cpp?rev=184589&r1=184588&r2=184589&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/WriterMachO.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/WriterMachO.cpp Fri Jun 21 14:59:15 2013
@@ -42,6 +42,9 @@
namespace lld {
namespace mach_o {
+class LoadCommandPaddingChunk;
+class SymbolStringsChunk;
+class MachOWriter;
//
// A mach-o file consists of some meta data (header and load commands),
@@ -104,7 +107,7 @@ class SectionChunk : public Chunk {
public:
static SectionChunk* make(DefinedAtom::ContentType,
const MachOTargetInfo &ti,
- class MachOWriter &writer);
+ MachOWriter &writer);
virtual StringRef segmentName() const;
virtual bool occupiesNoDiskSpace();
virtual void write(uint8_t *fileBuffer);
@@ -126,12 +129,12 @@ private:
StringRef sect,
uint32_t flags,
const MachOTargetInfo &ti,
- class MachOWriter &writer);
+ MachOWriter &writer);
StringRef _segmentName;
StringRef _sectionName;
const MachOTargetInfo &_targetInfo;
- class MachOWriter &_writer;
+ MachOWriter &_writer;
uint32_t _flags;
uint32_t _permissions;
std::vector<AtomInfo> _atoms;
@@ -170,7 +173,7 @@ class LoadCommandsChunk : public Chunk {
public:
LoadCommandsChunk(MachHeaderChunk&,
const MachOTargetInfo &,
- class MachOWriter&);
+ MachOWriter&);
virtual StringRef segmentName() const;
virtual void write(uint8_t *fileBuffer);
virtual const char* info();
@@ -179,7 +182,7 @@ public:
void updateLoadCommandContent(const lld::File &file);
private:
- friend class LoadCommandPaddingChunk;
+ friend LoadCommandPaddingChunk;
void addLoadCommand(load_command* lc);
void setMachOSection(SectionChunk *chunk,
@@ -196,7 +199,7 @@ private:
MachHeaderChunk &_mh;
const MachOTargetInfo &_targetInfo;
- class MachOWriter &_writer;
+ MachOWriter &_writer;
segment_command *_linkEditSegment;
symtab_command *_symbolTableLoadCommand;
entry_point_command *_entryPointLoadCommand;
@@ -247,7 +250,7 @@ public:
//
class DyldInfoChunk : public LinkEditChunk {
public:
- DyldInfoChunk(class MachOWriter &);
+ DyldInfoChunk(MachOWriter &);
virtual void write(uint8_t *fileBuffer);
protected:
@@ -255,7 +258,7 @@ protected:
void append_uleb128(uint64_t);
void append_string(StringRef);
- class MachOWriter &_writer;
+ MachOWriter &_writer;
std::vector<uint8_t> _bytes;
};
@@ -267,7 +270,7 @@ protected:
//
class BindingInfoChunk : public DyldInfoChunk {
public:
- BindingInfoChunk(class MachOWriter &);
+ BindingInfoChunk(MachOWriter &);
virtual void computeSize(const lld::File &file,
const std::vector<SectionChunk*>&);
virtual const char* info();
@@ -281,7 +284,7 @@ public:
//
class LazyBindingInfoChunk : public DyldInfoChunk {
public:
- LazyBindingInfoChunk(class MachOWriter &);
+ LazyBindingInfoChunk(MachOWriter &);
virtual void computeSize(const lld::File &file,
const std::vector<SectionChunk*>&);
virtual const char* info();
@@ -296,7 +299,7 @@ private:
//
class SymbolTableChunk : public LinkEditChunk {
public:
- SymbolTableChunk(class SymbolStringsChunk&, MachOWriter&);
+ SymbolTableChunk(SymbolStringsChunk&, MachOWriter&);
virtual void write(uint8_t *fileBuffer);
virtual void computeSize(const lld::File &file,
const std::vector<SectionChunk*>&);
@@ -353,9 +356,9 @@ public:
bool use64BitMachO() const;
private:
- friend class LoadCommandsChunk;
- friend class LazyBindingInfoChunk;
- friend class BindingInfoChunk;
+ friend LoadCommandsChunk;
+ friend LazyBindingInfoChunk;
+ friend BindingInfoChunk;
void build(const lld::File &file);
void createChunks(const lld::File &file);
Modified: lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp?rev=184589&r1=184588&r2=184589&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp (original)
+++ lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp Fri Jun 21 14:59:15 2013
@@ -43,7 +43,7 @@ public:
const NativeDefinedAtomIvarsV1* ivarData)
: _file(&f), _ivarData(ivarData) { }
- virtual const class lld::File& file() const;
+ virtual const lld::File& file() const;
virtual uint64_t ordinal() const;
@@ -370,11 +370,11 @@ public:
virtual const TargetInfo &getTargetInfo() const { return _targetInfo; }
private:
- friend class NativeDefinedAtomV1;
- friend class NativeUndefinedAtomV1;
- friend class NativeSharedLibraryAtomV1;
- friend class NativeAbsoluteAtomV1;
- friend class NativeReferenceV1;
+ friend NativeDefinedAtomV1;
+ friend NativeUndefinedAtomV1;
+ friend NativeSharedLibraryAtomV1;
+ friend NativeAbsoluteAtomV1;
+ friend NativeReferenceV1;
// instantiate array of DefinedAtoms from v1 ivar data in file
error_code processDefinedAtomsV1(const uint8_t *base,
@@ -797,7 +797,7 @@ private:
const TargetInfo &_targetInfo;
};
-inline const class lld::File &NativeDefinedAtomV1::file() const {
+inline const lld::File &NativeDefinedAtomV1::file() const {
return *_file;
}
@@ -851,7 +851,7 @@ void NativeDefinedAtomV1::incrementItera
it = reinterpret_cast<const void*>(index);
}
-inline const class lld::File& NativeUndefinedAtomV1::file() const {
+inline const lld::File& NativeUndefinedAtomV1::file() const {
return *_file;
}
@@ -862,7 +862,7 @@ inline StringRef NativeUndefinedAtomV1::
-inline const class lld::File& NativeSharedLibraryAtomV1::file() const {
+inline const lld::File& NativeSharedLibraryAtomV1::file() const {
return *_file;
}
@@ -876,7 +876,7 @@ inline StringRef NativeSharedLibraryAtom
-inline const class lld::File& NativeAbsoluteAtomV1::file() const {
+inline const lld::File& NativeAbsoluteAtomV1::file() const {
return *_file;
}
Modified: lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp?rev=184589&r1=184588&r2=184589&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp (original)
+++ lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp Fri Jun 21 14:59:15 2013
@@ -369,7 +369,7 @@ private:
}
// append atom cotent to content pool and return offset
- uint32_t getContentOffset(const class DefinedAtom& atom) {
+ uint32_t getContentOffset(const DefinedAtom& atom) {
if ((atom.contentType() == DefinedAtom::typeZeroFill ) ||
(atom.contentType() == DefinedAtom::typeZeroFillFast))
return 0;
@@ -380,7 +380,7 @@ private:
}
// reuse existing attributes entry or create a new one and return offet
- uint32_t getAttributeOffset(const class DefinedAtom& atom) {
+ uint32_t getAttributeOffset(const DefinedAtom& atom) {
NativeAtomAttributesV1 attrs;
computeAttributesV1(atom, attrs);
for(unsigned int i=0; i < _attributes.size(); ++i) {
@@ -395,7 +395,7 @@ private:
return result;
}
- uint32_t getAttributeOffset(const class AbsoluteAtom& atom) {
+ uint32_t getAttributeOffset(const AbsoluteAtom& atom) {
NativeAtomAttributesV1 attrs;
computeAbsoluteAttributes(atom, attrs);
for(unsigned int i=0; i < _absAttributes.size(); ++i) {
@@ -410,7 +410,7 @@ private:
return result;
}
- uint32_t sectionNameOffset(const class DefinedAtom& atom) {
+ uint32_t sectionNameOffset(const DefinedAtom& atom) {
// if section based on content, then no custom section name available
if ( atom.sectionChoice() == DefinedAtom::sectionBasedOnContent )
return 0;
@@ -428,8 +428,8 @@ private:
return result;
}
- void computeAttributesV1(const class DefinedAtom& atom,
- NativeAtomAttributesV1& attrs) {
+ void computeAttributesV1(const DefinedAtom& atom,
+ NativeAtomAttributesV1& attrs) {
attrs.sectionNameOffset = sectionNameOffset(atom);
attrs.align2 = atom.alignment().powerOf2;
attrs.alignModulus = atom.alignment().modulus;
@@ -444,8 +444,8 @@ private:
attrs.alias = atom.isAlias();
}
- void computeAbsoluteAttributes(const class AbsoluteAtom& atom,
- NativeAtomAttributesV1& attrs) {
+ void computeAbsoluteAttributes(const AbsoluteAtom& atom,
+ NativeAtomAttributesV1& attrs) {
attrs.scope = atom.scope();
}
More information about the llvm-commits
mailing list