Fixes for PR341

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

1 files changed, 3 insertions, 11 deletions

diff --git a/include/llvm/Assembly/CachedWriter.h b/include/llvm/Assembly/CachedWriter.h
index 1306e37921..f5c947be52 100644
--- a/include/llvm/Assembly/CachedWriter.h
+++ b/include/llvm/Assembly/CachedWriter.h
@@ -20,15 +20,12 @@
 #include "llvm/Value.h"
 #include <iostream>
 
-namespace {
-class SlotMachine;     // Internal private class
-}
-
 namespace llvm {
 
 class Module;
 class PointerType;
 class AssemblyWriter;  // Internal private class
+class SlotMachine;
 
 class CachedWriter {
   AssemblyWriter *AW;
@@ -53,14 +50,9 @@ public:
   // setModule - Invalidate internal state, use the new module instead.
   void setModule(const Module *M);
 
-  CachedWriter &operator<<(const Value *V);
-
-  inline CachedWriter &operator<<(const Value &X) {
-    return *this << &X;
-  }
+  CachedWriter &operator<<(const Value &V);
 
-  CachedWriter &operator<<(const Type *X);
-  inline CachedWriter &operator<<(const PointerType *X);
+  CachedWriter &operator<<(const Type &X);
 
   inline CachedWriter &operator<<(std::ostream &(&Manip)(std::ostream &)) {
     Out << Manip; return *this;