4 files changed, 16 insertions, 10 deletions
diff --git a/utils/TableGen/CodeGenTarget.h b/utils/TableGen/CodeGenTarget.h
index d74e887..ac5306e 100644
--- a/utils/TableGen/CodeGenTarget.h
+++ b/utils/TableGen/CodeGenTarget.h
@@ -26,7 +26,7 @@ namespace llvm {
 
 class Record;
 class RecordKeeper;
-class CodeGenRegister;
+struct CodeGenRegister;
 
 /// getValueType - Return the MVT::ValueType that the specified TableGen record
 /// corresponds to.
diff --git a/utils/TableGen/InstrInfoEmitter.h b/utils/TableGen/InstrInfoEmitter.h
index 87a140b..bf7da34 100644
--- a/utils/TableGen/InstrInfoEmitter.h
+++ b/utils/TableGen/InstrInfoEmitter.h
@@ -22,7 +22,7 @@ namespace llvm {
 class StringInit;
 class IntInit;
 class ListInit;
-class CodeGenInstruction;
+struct CodeGenInstruction;
 
 class InstrInfoEmitter : public TableGenBackend {
   RecordKeeper &Records;
diff --git a/utils/TableGen/InstrSelectorEmitter.h b/utils/TableGen/InstrSelectorEmitter.h
index 156e722..302a98a 100644
--- a/utils/TableGen/InstrSelectorEmitter.h
+++ b/utils/TableGen/InstrSelectorEmitter.h
@@ -24,7 +24,7 @@
 namespace llvm {
 
 class DagInit;
-class Init;
+struct Init;
 class InstrSelectorEmitter;
 
 /// NodeType - Represents Information parsed from the DagNode entries.
diff --git a/utils/TableGen/Record.h b/utils/TableGen/Record.h
index e88497f..9bd8708 100644
--- a/utils/TableGen/Record.h
+++ b/utils/TableGen/Record.h
@@ -34,7 +34,7 @@ class DagRecTy;
 class RecordRecTy;
 
 // Init subclasses...
-class Init;
+struct Init;
 class UnsetInit;
 class BitInit;
 class BitsInit;
@@ -107,7 +107,8 @@ inline std::ostream &operator<<(std::ostream &OS, const RecTy &Ty) {
 
 /// BitRecTy - 'bit' - Represent a single bit
 ///
-struct BitRecTy : public RecTy {
+class BitRecTy : public RecTy {
+public:
   Init *convertValue(UnsetInit *UI) { return (Init*)UI; }
   Init *convertValue(BitInit *BI) { return (Init*)BI; }
   Init *convertValue(BitsInit *BI);
@@ -157,7 +158,8 @@ public:
 
 /// IntRecTy - 'int' - Represent an integer value of no particular size
 ///
-struct IntRecTy : public RecTy {
+class IntRecTy : public RecTy {
+public:
   Init *convertValue(UnsetInit *UI) { return (Init*)UI; }
   Init *convertValue(IntInit *II) { return (Init*)II; }
   Init *convertValue(BitInit *BI);
@@ -177,7 +179,8 @@ struct IntRecTy : public RecTy {
 
 /// StringRecTy - 'string' - Represent an string value
 ///
-struct StringRecTy : public RecTy {
+class StringRecTy : public RecTy {
+public:
   Init *convertValue(UnsetInit *UI) { return (Init*)UI; }
   Init *convertValue(StringInit *SI) { return (Init*)SI; }
   Init *convertValue(TypedInit *TI);
@@ -219,7 +222,8 @@ public:
 
 /// CodeRecTy - 'code' - Represent an code fragment, function or method.
 ///
-struct CodeRecTy : public RecTy {
+class CodeRecTy : public RecTy {
+public:
   Init *convertValue(UnsetInit *UI) { return (Init*)UI; }
   Init *convertValue( CodeInit *CI) { return (Init*)CI; }
   Init *convertValue(TypedInit *TI);
@@ -234,7 +238,8 @@ struct CodeRecTy : public RecTy {
 
 /// DagRecTy - 'dag' - Represent a dag fragment
 ///
-struct DagRecTy : public RecTy {
+class DagRecTy : public RecTy {
+public:
   Init *convertValue(UnsetInit *UI) { return (Init*)UI; }
   Init *convertValue( DagInit *CI) { return (Init*)CI; }
   Init *convertValue(TypedInit *TI);
@@ -343,7 +348,8 @@ inline std::ostream &operator<<(std::ostream &OS, const Init &I) {
 
 /// UnsetInit - ? - Represents an uninitialized value
 ///
-struct UnsetInit : public Init {
+class UnsetInit : public Init {
+public:
   virtual Init *convertInitializerTo(RecTy *Ty) {
     return Ty->convertValue(this);
   }