cleanup some long-dead code

[oota-llvm.git] / include / llvm / Linker.h

diff --git a/include/llvm/Linker.h b/include/llvm/Linker.h
index ea981f565287d5eb08a9e6b787eda9fc7d8b09c8..9f4c8c25f6db4309ea3148b4473f824eab220c6d 100644 (file)
--- a/include/llvm/Linker.h
+++ b/include/llvm/Linker.h
@@ -1,13 +1,23 @@
-//===- llvm/Transforms/Linker.h - Module Linker Interface --------*- C++ -*--=//
+//===- llvm/Transforms/Utils/Linker.h - Module Linker Interface -*- C++ -*-===//
+// 
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// 
+//===----------------------------------------------------------------------===//
 //
 // This file defines the interface to the module linker.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TRANSFORMATIONS_LINKER_H
-#define LLVM_TRANSFORMATIONS_LINKER_H
+#ifndef LLVM_TRANSFORMATIONS_UTILS_LINKER_H
+#define LLVM_TRANSFORMATIONS_UTILS_LINKER_H
 
 #include <string>
+
+namespace llvm {
+
 class Module;
 
 // LinkModules - This function links two modules together, with the resulting
@@ -15,6 +25,9 @@ class Module;
 // error occurs, true is returned and ErrorMsg (if not null) is set to indicate
 // the problem.
 //
-bool LinkModules(Module *Dest, const Module *Src, string *ErrorMsg = 0);
+bool LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg = 0);
+
+} // End llvm namespace
 
 #endif
+