[Rcpp-commits] r3999 - in pkg/Rcpp: . inst/include/Rcpp/iostream

[noreply at r-forge.r-project.org]

Author: romain
Date: 2012-11-20 13:22:11 +0100 (Tue, 20 Nov 2012)
New Revision: 3999

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/include/Rcpp/iostream/Rostream.h
Log:
solaris related fix

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-11-19 20:11:32 UTC (rev 3998)
+++ pkg/Rcpp/ChangeLog	2012-11-20 12:22:11 UTC (rev 3999)
@@ -1,3 +1,8 @@
+2012-11-20  Romain Francois <romain at r-enthusiasts.com>
+
+        * include/Rcpp/iostream/Rostream.h: change order of initiaization in 
+        ctor. was making solaris compiler unhappy
+
 2012-11-19  JJ Allaire <jj at rstudio.org>
 
         * src/AttributesParser.h: support for argument default values

Modified: pkg/Rcpp/inst/include/Rcpp/iostream/Rostream.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/iostream/Rostream.h	2012-11-19 20:11:32 UTC (rev 3998)
+++ pkg/Rcpp/inst/include/Rcpp/iostream/Rostream.h	2012-11-20 12:22:11 UTC (rev 3999)
@@ -33,11 +33,10 @@
 
     class Rostream : public std::ostream {
     public:
-        Rostream(bool output) : std::ostream(&buf), buf(output) {}
-        
-    protected:
-        Rstreambuf buf;
-	
+        Rostream(bool output) : buf(output), std::ostream(&buf) {}
+    
+    private:
+        Rstreambuf buf ;
     };
     
     // declare global variable