Prep for merging 3.4: Undo changes from 3.3 branch

include/clang/Sema/Template.h

 //===------- SemaTemplate.h - C++ Templates ---------------------*- C++ -*-===/
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //===----------------------------------------------------------------------===/
 //
 //  This file provides types used in the semantic analysis of C++ templates.
 //
@@ skipping 76 matching lines @@
       assert(Depth < TemplateArgumentLists.size());
       assert(Index < TemplateArgumentLists[getNumLevels() - Depth - 1].size());
       const_cast<TemplateArgument&>(
                 TemplateArgumentLists[getNumLevels() - Depth - 1][Index])
         = Arg;
     }
     
     /// \brief Add a new outermost level to the multi-level template argument 
     /// list.
     void addOuterTemplateArguments(const TemplateArgumentList *TemplateArgs) {
-      addOuterTemplateArguments(ArgList(TemplateArgs->data(),
-                                        TemplateArgs->size()));
+      TemplateArgumentLists.push_back(ArgList(TemplateArgs->data(),
+                                              TemplateArgs->size()));
     }
     
     /// \brief Add a new outmost level to the multi-level template argument
     /// list.
     void addOuterTemplateArguments(const TemplateArgument *Args, 
                                    unsigned NumArgs) {
-      addOuterTemplateArguments(ArgList(Args, NumArgs));
+      TemplateArgumentLists.push_back(ArgList(Args, NumArgs));
     }
-
-    /// \brief Add a new outmost level to the multi-level template argument
-    /// list.
-    void addOuterTemplateArguments(ArgList Args) {
-      TemplateArgumentLists.push_back(Args);
-    }
-
+    
     /// \brief Retrieve the innermost template argument list.
     const ArgList &getInnermost() const { 
       return TemplateArgumentLists.front(); 
     }
   };
   
   /// \brief The context in which partial ordering of function templates occurs.
   enum TPOC {
     /// \brief Partial ordering of function templates for a function call.
     TPOC_Call,
@@ skipping 379 matching lines @@
     Decl *InstantiateTypedefNameDecl(TypedefNameDecl *D, bool IsTypeAlias);
     ClassTemplatePartialSpecializationDecl *
     InstantiateClassTemplatePartialSpecialization(
                                               ClassTemplateDecl *ClassTemplate,
                            ClassTemplatePartialSpecializationDecl *PartialSpec);
     void InstantiateEnumDefinition(EnumDecl *Enum, EnumDecl *Pattern);
   };  
 }
 
 #endif // LLVM_CLANG_SEMA_TEMPLATE_H