- #include <iostream> since its not in Value.h any more.

- constify use of Type* returned from symbol table.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14615 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index b050493ec6f79d1dfc43f7389e76443759f59aa9..b241d9e333db6eb03781e171825efedc371d42a8 100644 (file)
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -23,6 +23,8 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/iOther.h"
 #include "llvm/Assembly/Writer.h"
+#include <iostream>
+
 using namespace llvm;
 
 // Error - Simple wrapper function to conditionally assign to E and return true.
@@ -183,7 +185,7 @@ static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) {
 
   for ( ; TI != TE; ++TI ) {
     const std::string &Name = TI->first;
-    Type *RHS = TI->second;
+    const Type *RHS = TI->second;
 
     // Check to see if this type name is already in the dest module...
     Type *Entry = DestST->lookupType(Name);

diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp
index b050493ec6f79d1dfc43f7389e76443759f59aa9..b241d9e333db6eb03781e171825efedc371d42a8 100644 (file)
--- a/lib/VMCore/Linker.cpp
+++ b/lib/VMCore/Linker.cpp
@@ -23,6 +23,8 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/iOther.h"
 #include "llvm/Assembly/Writer.h"
+#include <iostream>
+
 using namespace llvm;
 
 // Error - Simple wrapper function to conditionally assign to E and return true.
@@ -183,7 +185,7 @@ static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) {
 
   for ( ; TI != TE; ++TI ) {
     const std::string &Name = TI->first;
-    Type *RHS = TI->second;
+    const Type *RHS = TI->second;
 
     // Check to see if this type name is already in the dest module...
     Type *Entry = DestST->lookupType(Name);