[llvm-commits] CVS: llvm/lib/VMCore/Dominators.cpp IntrinsicInst.cpp

[Reid Spencer]

Changes in directory llvm/lib/VMCore:

Dominators.cpp updated: 1.70 -> 1.71
IntrinsicInst.cpp updated: 1.5 -> 1.6
---
Log message:

For PR780: http://llvm.cs.uiuc.edu/PR780 :
1. Fix the macros in IncludeFile.h to put everything in the llvm namespace
2. Replace the previous explicit mechanism in all the .h and .cpp files
   with the macros in IncludeFile.h
This gets us a consistent mechanism throughout LLVM for ensuring linkage.
Next step is to make sure its used in enough places.


---
Diffs of the changes:  (+4 -6)

 Dominators.cpp    |    4 ++--
 IntrinsicInst.cpp |    6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)


Index: llvm/lib/VMCore/Dominators.cpp
diff -u llvm/lib/VMCore/Dominators.cpp:1.70 llvm/lib/VMCore/Dominators.cpp:1.71
--- llvm/lib/VMCore/Dominators.cpp:1.70	Thu Jun  1 02:02:51 2006
+++ llvm/lib/VMCore/Dominators.cpp	Wed Jun  7 17:00:26 2006
@@ -304,8 +304,6 @@
   return false;
 }
 
-int DominatorSet::stub;
-
 namespace llvm {
 static std::ostream &operator<<(std::ostream &o,
                                 const std::set<BasicBlock*> &BBs) {
@@ -933,3 +931,5 @@
   }
   o << "\n";
 }
+
+DEFINING_FILE_FOR(DominatorSet)


Index: llvm/lib/VMCore/IntrinsicInst.cpp
diff -u llvm/lib/VMCore/IntrinsicInst.cpp:1.5 llvm/lib/VMCore/IntrinsicInst.cpp:1.6
--- llvm/lib/VMCore/IntrinsicInst.cpp:1.5	Wed Jun  7 15:00:19 2006
+++ llvm/lib/VMCore/IntrinsicInst.cpp	Wed Jun  7 17:00:26 2006
@@ -71,7 +71,5 @@
 }
 
 //===----------------------------------------------------------------------===//
-/// LinkIntrinsicInstStub -- This is a hack to make sure that programs that
-/// #include IntrinsicInst.h also link this file. See Support/IncludeFile.h
-/// for further details.
-char llvm::LinkIntrinsicInstStub;
+/// Ensure that users of IntrinsicInst.h will link with this module.
+DEFINING_FILE_FOR(IntrinsicInst)