Add breakBeforeBlock option to IceUtilInternal::Output

1 files changed, 17 insertions, 7 deletions

diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp
index a917d3ae24a..347c7bab905 100644
--- a/cpp/src/IceUtil/OutputUtil.cpp
+++ b/cpp/src/IceUtil/OutputUtil.cpp
@@ -235,27 +235,30 @@ IceUtilInternal::OutputBase::operator!() const
 // Output
 // ----------------------------------------------------------------------
 
-IceUtilInternal::Output::Output() :
+IceUtilInternal::Output::Output(bool breakBeforeBlock) :
     OutputBase(),
     _blockStart("{"),
     _blockEnd("}"),
-    _par(-1)
+    _par(-1),
+    _breakBeforeBlock(breakBeforeBlock)
 {
 }
 
-IceUtilInternal::Output::Output(ostream& os) :
+IceUtilInternal::Output::Output(ostream& os, bool breakBeforeBlock) :
     OutputBase(os),
     _blockStart("{"),
     _blockEnd("}"),
-    _par(-1)
+    _par(-1),
+    _breakBeforeBlock(breakBeforeBlock)
 {
 }
 
-IceUtilInternal::Output::Output(const char* s) :
+IceUtilInternal::Output::Output(const char* s, bool breakBeforeBlock) :
     OutputBase(s),
     _blockStart("{"),
     _blockEnd("}"),
-    _par(-1)
+    _par(-1),
+    _breakBeforeBlock(breakBeforeBlock)
 {
 }
 
@@ -277,7 +280,14 @@ IceUtilInternal::Output::sb()
 {
     if(_blockStart.length())
     {
-        newline();
+        if(_breakBeforeBlock)
+        {
+            newline();
+        }
+        else
+        {
+            _out << ' ';
+        }
         _out << _blockStart;
     }
     ++_pos;