[llvm-commits] [llvm] r91480 - in /llvm/trunk/lib/CodeGen: MachineDominators.cpp MachineLoopInfo.cpp

John McCall rjmccall at apple.com
Tue Dec 15 16:13:25 PST 2009


Author: rjmccall
Date: Tue Dec 15 18:13:24 2009
New Revision: 91480

URL: http://llvm.org/viewvc/llvm-project?rev=91480&view=rev
Log:
Explicit template instantiations must happen in the template's immediately
enclosing namespace.  Caught by clang++.


Modified:
    llvm/trunk/lib/CodeGen/MachineDominators.cpp
    llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp

Modified: llvm/trunk/lib/CodeGen/MachineDominators.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineDominators.cpp?rev=91480&r1=91479&r2=91480&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/MachineDominators.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineDominators.cpp Tue Dec 15 18:13:24 2009
@@ -17,8 +17,10 @@
 
 using namespace llvm;
 
+namespace llvm {
 TEMPLATE_INSTANTIATION(class DomTreeNodeBase<MachineBasicBlock>);
 TEMPLATE_INSTANTIATION(class DominatorTreeBase<MachineBasicBlock>);
+}
 
 char MachineDominatorTree::ID = 0;
 

Modified: llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp?rev=91480&r1=91479&r2=91480&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineLoopInfo.cpp Tue Dec 15 18:13:24 2009
@@ -19,12 +19,14 @@
 #include "llvm/CodeGen/Passes.h"
 using namespace llvm;
 
+namespace llvm {
 #define MLB class LoopBase<MachineBasicBlock, MachineLoop>
 TEMPLATE_INSTANTIATION(MLB);
 #undef MLB
 #define MLIB class LoopInfoBase<MachineBasicBlock, MachineLoop>
 TEMPLATE_INSTANTIATION(MLIB);
 #undef MLIB
+}
 
 char MachineLoopInfo::ID = 0;
 static RegisterPass<MachineLoopInfo>





More information about the llvm-commits mailing list