Reapply r110396, with fixes to appease the Linux buildbot gods.

[oota-llvm.git] / lib / Transforms / IPO / MergeFunctions.cpp

diff --git a/lib/Transforms/IPO/MergeFunctions.cpp b/lib/Transforms/IPO/MergeFunctions.cpp
index 3c4e2ef74ce5ef970df8ed70eff659fe116b4716..21e9d6ad424ba50d8d90720b55e6a578681e2e14 100644 (file)
--- a/lib/Transforms/IPO/MergeFunctions.cpp
+++ b/lib/Transforms/IPO/MergeFunctions.cpp
@@ -75,7 +75,7 @@ namespace {
   ///
   struct MergeFunctions : public ModulePass {
     static char ID; // Pass identification, replacement for typeid
   ///
   struct MergeFunctions : public ModulePass {
     static char ID; // Pass identification, replacement for typeid

-    MergeFunctions() : ModulePass(&ID) {}
+    MergeFunctions() : ModulePass(ID) {}

 
     bool runOnModule(Module &M);
   };
 
     bool runOnModule(Module &M);
   };