diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-08-10 20:56:46 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-08-10 20:56:46 +0000 |
| commit | e74f3c0ce6c16908a8690824704f148ecaf7ddb1 (patch) | |
| tree | 5ad027f0d59b8283acffd87d9d61d2a59e686bfc /include | |
| parent | d6662add687f20cffa0755e410efbb40de4dcf23 (diff) | |
Rename ConvertType to ConvertConstant to avoid a name conflict on llvm-gcc.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78596 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/Constants.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/llvm/Constants.h b/include/llvm/Constants.h index a365949937..df13291922 100644 --- a/include/llvm/Constants.h +++ b/include/llvm/Constants.h @@ -38,7 +38,7 @@ class VectorType; template<class ConstantClass, class TypeClass, class ValType> struct ConstantCreator; template<class ConstantClass, class TypeClass> -struct ConvertType; +struct ConvertConstant; //===----------------------------------------------------------------------===// /// This is the shared class of boolean and integer constants. This class @@ -552,7 +552,7 @@ public: class ConstantExpr : public Constant { friend struct ConstantCreator<ConstantExpr,Type, std::pair<unsigned, std::vector<Constant*> > >; - friend struct ConvertType<ConstantExpr, Type>; + friend struct ConvertConstant<ConstantExpr, Type>; protected: ConstantExpr(const Type *ty, unsigned Opcode, Use *Ops, unsigned NumOps) |