summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Gohman <gohman@apple.com>2007-11-19 15:30:20 +0000
committerDan Gohman <gohman@apple.com>2007-11-19 15:30:20 +0000
commitadf3eab7735741926c67e6fc12b952500c45a9ba (patch)
treeb1208a03d570ac65caa07e63818e89b8a3bc2daa
parent089617d9e3acc242151a007e7a051ed2fb200b1f (diff)
downloadllvm-adf3eab7735741926c67e6fc12b952500c45a9ba.tar.gz
llvm-adf3eab7735741926c67e6fc12b952500c45a9ba.tar.bz2
llvm-adf3eab7735741926c67e6fc12b952500c45a9ba.tar.xz
Add explicit keywords.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44234 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/ADT/StringMap.h12
-rw-r--r--include/llvm/Analysis/ScalarEvolutionExpressions.h6
-rw-r--r--include/llvm/Bitcode/Serialize.h2
-rw-r--r--lib/Bitcode/Reader/BitcodeReader.cpp2
-rw-r--r--lib/Bitcode/Writer/BitcodeWriterPass.cpp3
-rw-r--r--lib/Transforms/Scalar/CorrelatedExprs.cpp8
6 files changed, 17 insertions, 16 deletions
diff --git a/include/llvm/ADT/StringMap.h b/include/llvm/ADT/StringMap.h
index 895d62b1e6..5c47604db4 100644
--- a/include/llvm/ADT/StringMap.h
+++ b/include/llvm/ADT/StringMap.h
@@ -28,7 +28,7 @@ namespace llvm {
class StringMapEntryBase {
unsigned StrLen;
public:
- StringMapEntryBase(unsigned Len) : StrLen(Len) {}
+ explicit StringMapEntryBase(unsigned Len) : StrLen(Len) {}
unsigned getKeyLength() const { return StrLen; }
};
@@ -55,7 +55,7 @@ protected:
unsigned NumTombstones;
unsigned ItemSize;
protected:
- StringMapImpl(unsigned itemSize) : ItemSize(itemSize) {
+ explicit StringMapImpl(unsigned itemSize) : ItemSize(itemSize) {
// Initialize the map with zero buckets to allocation.
TheTable = 0;
NumBuckets = 0;
@@ -115,7 +115,7 @@ template<typename ValueTy>
class StringMapEntry : public StringMapEntryBase {
ValueTy Val;
public:
- StringMapEntry(unsigned StrLen)
+ explicit StringMapEntry(unsigned StrLen)
: StringMapEntryBase(StrLen), Val() {}
StringMapEntry(unsigned StrLen, const ValueTy &V)
: StringMapEntryBase(StrLen), Val(V) {}
@@ -204,7 +204,7 @@ class StringMap : public StringMapImpl {
typedef StringMapEntry<ValueTy> MapEntryTy;
public:
StringMap() : StringMapImpl(sizeof(MapEntryTy)) {}
- StringMap(unsigned InitialSize)
+ explicit StringMap(unsigned InitialSize)
: StringMapImpl(InitialSize, sizeof(MapEntryTy)) {}
AllocatorTy &getAllocator() { return Allocator; }
@@ -314,8 +314,8 @@ class StringMapConstIterator {
protected:
StringMapImpl::ItemBucket *Ptr;
public:
- StringMapConstIterator(StringMapImpl::ItemBucket *Bucket,
- bool NoAdvance = false)
+ explicit StringMapConstIterator(StringMapImpl::ItemBucket *Bucket,
+ bool NoAdvance = false)
: Ptr(Bucket) {
if (!NoAdvance) AdvancePastEmptyBuckets();
}
diff --git a/include/llvm/Analysis/ScalarEvolutionExpressions.h b/include/llvm/Analysis/ScalarEvolutionExpressions.h
index 7fbeff7de0..fb69a90fe7 100644
--- a/include/llvm/Analysis/ScalarEvolutionExpressions.h
+++ b/include/llvm/Analysis/ScalarEvolutionExpressions.h
@@ -285,7 +285,7 @@ namespace llvm {
class SCEVAddExpr : public SCEVCommutativeExpr {
friend class ScalarEvolution;
- SCEVAddExpr(const std::vector<SCEVHandle> &ops)
+ explicit SCEVAddExpr(const std::vector<SCEVHandle> &ops)
: SCEVCommutativeExpr(scAddExpr, ops) {
}
@@ -305,7 +305,7 @@ namespace llvm {
class SCEVMulExpr : public SCEVCommutativeExpr {
friend class ScalarEvolution;
- SCEVMulExpr(const std::vector<SCEVHandle> &ops)
+ explicit SCEVMulExpr(const std::vector<SCEVHandle> &ops)
: SCEVCommutativeExpr(scMulExpr, ops) {
}
@@ -468,7 +468,7 @@ namespace llvm {
friend class ScalarEvolution;
Value *V;
- SCEVUnknown(Value *v) : SCEV(scUnknown), V(v) {}
+ explicit SCEVUnknown(Value *v) : SCEV(scUnknown), V(v) {}
protected:
~SCEVUnknown();
diff --git a/include/llvm/Bitcode/Serialize.h b/include/llvm/Bitcode/Serialize.h
index 60d9cb2c99..7b6d8226a0 100644
--- a/include/llvm/Bitcode/Serialize.h
+++ b/include/llvm/Bitcode/Serialize.h
@@ -31,7 +31,7 @@ class Serializer {
MapTy PtrMap;
public:
- Serializer(BitstreamWriter& stream);
+ explicit Serializer(BitstreamWriter& stream);
~Serializer();
template <typename T>
diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index 0bacf0fe70..aa78e7c4dc 100644
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -123,7 +123,7 @@ namespace {
void operator=(const ConstantPlaceHolder &); // DO NOT IMPLEMENT
public:
Use Op;
- ConstantPlaceHolder(const Type *Ty)
+ explicit ConstantPlaceHolder(const Type *Ty)
: ConstantExpr(Ty, Instruction::UserOp1, &Op, 1),
Op(UndefValue::get(Type::Int32Ty), this) {
}
diff --git a/lib/Bitcode/Writer/BitcodeWriterPass.cpp b/lib/Bitcode/Writer/BitcodeWriterPass.cpp
index 8de7ffb2db..57512045e0 100644
--- a/lib/Bitcode/Writer/BitcodeWriterPass.cpp
+++ b/lib/Bitcode/Writer/BitcodeWriterPass.cpp
@@ -20,7 +20,8 @@ namespace {
std::ostream &Out; // ostream to print on
public:
static char ID; // Pass identifcation, replacement for typeid
- WriteBitcodePass(std::ostream &o) : ModulePass((intptr_t) &ID), Out(o) {}
+ explicit WriteBitcodePass(std::ostream &o)
+ : ModulePass((intptr_t) &ID), Out(o) {}
const char *getPassName() const { return "Bitcode Writer"; }
diff --git a/lib/Transforms/Scalar/CorrelatedExprs.cpp b/lib/Transforms/Scalar/CorrelatedExprs.cpp
index 6933fab3cf..42c4055ae6 100644
--- a/lib/Transforms/Scalar/CorrelatedExprs.cpp
+++ b/lib/Transforms/Scalar/CorrelatedExprs.cpp
@@ -57,7 +57,7 @@ namespace {
Value *Val; // Relation to what value?
unsigned Rel; // SetCC or ICmp relation, or Add if no information
public:
- Relation(Value *V) : Val(V), Rel(Instruction::Add) {}
+ explicit Relation(Value *V) : Val(V), Rel(Instruction::Add) {}
bool operator<(const Relation &R) const { return Val < R.Val; }
Value *getValue() const { return Val; }
unsigned getRelation() const { return Rel; }
@@ -112,7 +112,7 @@ namespace {
//
Value *Replacement;
public:
- ValueInfo(const Type *Ty)
+ explicit ValueInfo(const Type *Ty)
: Bounds(Ty->isInteger() ? cast<IntegerType>(Ty)->getBitWidth() : 32),
Replacement(0) {}
@@ -146,7 +146,7 @@ namespace {
return *I;
// Insert and return the new relationship...
- return *Relationships.insert(I, V);
+ return *Relationships.insert(I, Relation(V));
}
const Relation *requestRelation(Value *V) const {
@@ -176,7 +176,7 @@ namespace {
typedef std::map<Value*, ValueInfo> ValueMapTy;
ValueMapTy ValueMap;
public:
- RegionInfo(BasicBlock *bb) : BB(bb) {}
+ explicit RegionInfo(BasicBlock *bb) : BB(bb) {}
// getEntryBlock - Return the block that dominates all of the members of
// this region.