[llvm-commits] CVS: llvm/include/llvm/Linker.h

[Reid Spencer]

Changes in directory llvm/include/llvm:

Linker.h updated: 1.19 -> 1.20
---
Log message:

For PR998: http://llvm.org/PR998 :
Fix an infinite loop in the Linker and a few other assorted link problems.

Patch contributed by Scott Michel. Thanks, Scott!


---
Diffs of the changes:  (+3 -2)

 Linker.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Index: llvm/include/llvm/Linker.h
diff -u llvm/include/llvm/Linker.h:1.19 llvm/include/llvm/Linker.h:1.20
--- llvm/include/llvm/Linker.h:1.19	Wed Feb 22 10:23:42 2006
+++ llvm/include/llvm/Linker.h	Sat Nov 11 05:54:25 2006
@@ -239,8 +239,9 @@
     /// @returns True if an error occurs, false otherwise.
     /// @brief Link in a module.
     bool LinkInModule(
-      Module* Src     ///< Module linked into \p Dest
-    ) { return LinkModules(Composite, Src, &Error); }
+      Module* Src,              ///< Module linked into \p Dest
+      std::string* ErrorMsg = 0 /// Error/diagnostic string
+    ) { return LinkModules(Composite, Src, ErrorMsg ); }
 
     /// This is the heart of the linker. This method will take unconditional
     /// control of the \p Src module and link it into the \p Dest module. The