changelog and news for #763, whitespace edits

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,12 @@
+2017-10-03  Dirk Eddelbuettel  <[email protected]>
+
+        * inst/include/Rcpp/iostream/Rstreambuf.h: White-space edits
+
+2017-10-02  Kirill Müller  <[email protected]>
+
+        * inst/include/Rcpp/iostream/Rstreambuf.h: Embed buffer class instance
+        in Rostream to not require run-time allocation, and please Coverity
+
 2017-09-29  Dirk Eddelbuettel  <[email protected]>
 
         * DESCRIPTION (Version, Date): Roll minor version

inst/NEWS.Rd

@@ -9,6 +9,8 @@
     \itemize{
       \item New const iterators functions \code{cbegin()} and \code{cend()}
       added to \code{MatrixRow} as well (Dan Dillon in \ghpr{750}).
+      \item The \code{Rostream} object now contains a \code{Buffer} rather than
+      allocating one (Kirill Müller in \ghpr{763}).
     }
     \item Changes in Rcpp Package:
     \itemize{

inst/include/Rcpp/iostream/Rstreambuf.h

@@ -33,54 +33,52 @@ namespace Rcpp {
         Rstreambuf(){}
 
     protected:
-        virtual std::streamsize xsputn(const char *s, std::streamsize n );
+        virtual std::streamsize xsputn(const char *s, std::streamsize n);
 
-        virtual int overflow(int c = traits_type::eof() );
+        virtual int overflow(int c = traits_type::eof());
 
-        virtual int sync()  ;
+        virtual int sync();
     };
 
     template <bool OUTPUT>
     class Rostream : public std::ostream {
-        typedef Rstreambuf<OUTPUT> Buffer ;
-        Buffer buf ;
+        typedef Rstreambuf<OUTPUT> Buffer;
+        Buffer buf;
     public:
-        Rostream() :
-            std::ostream( &buf )
-        {}
+        Rostream() : std::ostream( &buf ) {}
     };
 							// #nocov start
-    template <> inline std::streamsize Rstreambuf<true>::xsputn(const char *s, std::streamsize num ) {
-        Rprintf( "%.*s", num, s ) ;
-        return num ;
+    template <> inline std::streamsize Rstreambuf<true>::xsputn(const char *s, std::streamsize num) {
+        Rprintf("%.*s", num, s);
+        return num;
     }
-    template <> inline std::streamsize Rstreambuf<false>::xsputn(const char *s, std::streamsize num ) {
-        REprintf( "%.*s", num, s ) ;
-        return num ;
+    template <> inline std::streamsize Rstreambuf<false>::xsputn(const char *s, std::streamsize num) {
+        REprintf("%.*s", num, s);
+        return num;
     }
 
-    template <> inline int Rstreambuf<true>::overflow(int c ) {
+    template <> inline int Rstreambuf<true>::overflow(int c) {
         if (c != traits_type::eof()) {
             char_type ch = traits_type::to_char_type(c);
             return xsputn(&ch, 1) == 1 ? c : traits_type::eof();
         }
         return c;
     }
-    template <> inline int Rstreambuf<false>::overflow(int c ) {
+    template <> inline int Rstreambuf<false>::overflow(int c) {
         if (c != traits_type::eof()) {
             char_type ch = traits_type::to_char_type(c);
             return xsputn(&ch, 1) == 1 ? c : traits_type::eof();
         }
         return c;
     }
 
-    template <> inline int Rstreambuf<true>::sync(){
-        ::R_FlushConsole() ;
-        return 0 ;
+    template <> inline int Rstreambuf<true>::sync() {
+        ::R_FlushConsole();
+        return 0;
     }
-    template <> inline int Rstreambuf<false>::sync(){
-        ::R_FlushConsole() ;
-        return 0 ;
+    template <> inline int Rstreambuf<false>::sync() {
+        ::R_FlushConsole();
+        return 0;
     }								// #nocov end
     static Rostream<true>  Rcout;
     static Rostream<false> Rcerr;