1 files changed, 12 insertions, 13 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_enum.cc b/src/google/protobuf/compiler/csharp/csharp_enum.cc
index 27643e61..0e8f9836 100644
--- a/src/google/protobuf/compiler/csharp/csharp_enum.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_enum.cc
@@ -40,7 +40,6 @@
 
 #include <google/protobuf/compiler/csharp/csharp_enum.h>
 #include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_writer.h>
 
 using google::protobuf::internal::scoped_ptr;
 
@@ -57,20 +56,20 @@ EnumGenerator::EnumGenerator(const EnumDescriptor* descriptor) :
 EnumGenerator::~EnumGenerator() {
 }
 
-void EnumGenerator::Generate(Writer* writer) {
-  WriteGeneratedCodeAttributes(writer);
-  writer->WriteLine("$0$ enum $1$ {",
-                    class_access_level(),
-                    descriptor_->name());
-  writer->Indent();
+void EnumGenerator::Generate(io::Printer* printer) {
+  WriteGeneratedCodeAttributes(printer);
+  printer->Print("$access_level$ enum $name$ {\n",
+                 "access_level", class_access_level(),
+                 "name", descriptor_->name());
+  printer->Indent();
   for (int i = 0; i < descriptor_->value_count(); i++) {
-      writer->WriteLine("$0$ = $1$,",
-                       descriptor_->value(i)->name(),
-                       SimpleItoa(descriptor_->value(i)->number()));
+    printer->Print("$name$ = $number$,\n",
+                   "name", descriptor_->value(i)->name(),
+                   "number", SimpleItoa(descriptor_->value(i)->number()));
   }
-  writer->Outdent();
-  writer->WriteLine("}");
-  writer->WriteLine();
+  printer->Outdent();
+  printer->Print("}\n");
+  printer->Print("\n");
 }
 
 }  // namespace csharp