Reapply r108794, a fix for the failing test from last time.

[oota-llvm.git] / include / llvm / GlobalAlias.h

diff --git a/include/llvm/GlobalAlias.h b/include/llvm/GlobalAlias.h
index b106116f375062812d7713ffc506f7572c26fea4..9867c518c890ddc5b60845e6e24dafab42ed8d4a 100644 (file)
--- a/include/llvm/GlobalAlias.h
+++ b/include/llvm/GlobalAlias.h
@@ -18,6 +18,7 @@
 #include "llvm/GlobalValue.h"
 #include "llvm/OperandTraits.h"
 #include "llvm/ADT/ilist_node.h"
+#include "llvm/ADT/Twine.h"
 
 namespace llvm {
 
@@ -40,7 +41,7 @@ public:
   }
   /// GlobalAlias ctor - If a parent module is specified, the alias is
   /// automatically inserted into the end of the specified module's alias list.
-  GlobalAlias(const Type *Ty, LinkageTypes Linkage, const std::string &Name = "",
+  GlobalAlias(const Type *Ty, LinkageTypes Linkage, const Twine &Name = "",
               Constant* Aliasee = 0, Module *Parent = 0);
 
   /// Provide fast operand accessors
@@ -88,7 +89,7 @@ public:
 };
 
 template <>
-struct OperandTraits<GlobalAlias> : FixedNumOperandTraits<1> {
+struct OperandTraits<GlobalAlias> : public FixedNumOperandTraits<1> {
 };
 
 DEFINE_TRANSPARENT_OPERAND_ACCESSORS(GlobalAlias, Value)