From 82d31da4f84b2bddd24da4ee968c11d48c03159b Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Fri, 30 Sep 2011 02:51:17 +0000
Subject: [PATCH] JMustache now requires fewer machinations to get sensible
 newline behavior.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6719 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/presents/tools/cpp/marshaller_h.mustache    | 4 +---
 .../threerings/presents/tools/cpp/streamable_h.mustache    | 7 ++-----
 .../resources/com/threerings/presents/tools/provider.tmpl  | 1 -
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/com/threerings/presents/tools/cpp/marshaller_h.mustache b/src/main/resources/com/threerings/presents/tools/cpp/marshaller_h.mustache
index 453452661..68f9fd658 100644
--- a/src/main/resources/com/threerings/presents/tools/cpp/marshaller_h.mustache
+++ b/src/main/resources/com/threerings/presents/tools/cpp/marshaller_h.mustache
@@ -12,7 +12,6 @@
 
 {{#namespaces}}namespace {{this}} { {{/namespaces}}
 
-
 class {{name}} : public presents::data::InvocationMarshaller, public boost::enable_shared_from_this<{{name}}> {
 public:
     DECLARE_STREAMABLE();
@@ -26,5 +25,4 @@ protected:
     Shared<{{name}}> getSharedThis();
 };
 
-{{#namespaces}}
-}{{/namespaces}}
+{{#namespaces}}}{{/namespaces}}
diff --git a/src/main/resources/com/threerings/presents/tools/cpp/streamable_h.mustache b/src/main/resources/com/threerings/presents/tools/cpp/streamable_h.mustache
index 3ddac4ad5..0d6e4ec19 100644
--- a/src/main/resources/com/threerings/presents/tools/cpp/streamable_h.mustache
+++ b/src/main/resources/com/threerings/presents/tools/cpp/streamable_h.mustache
@@ -9,9 +9,7 @@
 #include "{{this}}"
 {{/includes}}
 
-{{#namespaces}}
-namespace {{this}} { {{/namespaces}}
-
+{{#namespaces}}namespace {{this}} { {{/namespaces}}
 
 class {{name}} : public {{super}} {
 public:
@@ -25,5 +23,4 @@ public:
     virtual void writeObject(ObjectOutputStream& out) const;
 };
 
-{{#namespaces}}
-}{{/namespaces}}
+{{#namespaces}}}{{/namespaces}}
diff --git a/src/main/resources/com/threerings/presents/tools/provider.tmpl b/src/main/resources/com/threerings/presents/tools/provider.tmpl
index 0f7ffc45f..1107521af 100644
--- a/src/main/resources/com/threerings/presents/tools/provider.tmpl
+++ b/src/main/resources/com/threerings/presents/tools/provider.tmpl
@@ -20,7 +20,6 @@ public interface {{name}}Provider extends InvocationProvider
      * Handles a {@link {{name}}Service#{{method.name}}} request.
      */
     {{typeParams}}void {{method.name}} ({{callerType}} caller{{#hasArgs}}, {{/hasArgs}}{{getArgList}}){{^listenerArgs.isEmpty}}
-
         throws InvocationException{{/listenerArgs.isEmpty}};
 {{/methods}}
 }