3 files changed, 4 insertions, 3 deletions
diff --git a/lib/Transforms/Scalar/IndVarSimplify.cpp b/lib/Transforms/Scalar/IndVarSimplify.cpp
index 00249807ca..7ad8ef403c 100644
--- a/lib/Transforms/Scalar/IndVarSimplify.cpp
+++ b/lib/Transforms/Scalar/IndVarSimplify.cpp
@@ -66,7 +66,7 @@ namespace {
 
     Instruction *InsertPt;
 
-    friend class SCEVVisitor<SCEVExpander, Value*>;
+    friend struct SCEVVisitor<SCEVExpander, Value*>;
   public:
     SCEVExpander(ScalarEvolution &se, LoopInfo &li) : SE(se), LI(li) {}
 
diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp
index aa57159b6e..82d00b472a 100644
--- a/lib/Transforms/Scalar/SCCP.cpp
+++ b/lib/Transforms/Scalar/SCCP.cpp
@@ -135,7 +135,7 @@ public:
   // The implementation of this class
   //
 private:
-  friend class InstVisitor<SCCP>;        // Allow callbacks from visitor
+  friend struct InstVisitor<SCCP>;        // Allow callbacks from visitor
 
   // markConstant - Make a value be marked as "constant".  If the value
   // is not already a constant, add it to the instruction work list so that 
diff --git a/lib/Transforms/TransformInternals.h b/lib/Transforms/TransformInternals.h
index 3b80146a27..b5747c9130 100644
--- a/lib/Transforms/TransformInternals.h
+++ b/lib/Transforms/TransformInternals.h
@@ -90,7 +90,8 @@ public:
 
 typedef std::map<const Value*, const Type*> ValueTypeCache;
 
-struct ValueMapCache {
+class ValueMapCache {
+public:
   // Operands mapped - Contains an entry if the first value (the user) has had
   // the second value (the operand) mapped already.
   //