Changes in libcfa/src/iostream.hfa [85d8153:6c5d92f]

File:

• libcfa/src/iostream.hfa (modified) (10 diffs)

libcfa/src/iostream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Apr 24 09:28:56 2021
-// Update Count     : 393
+// Last Modified On : Tue Apr 20 19:09:44 2021
+// Update Count     : 385
 //
 
@@ -22 +22 @@
 
 
-trait basic_ostream( ostype & ) {
+trait ostream( ostype & ) {
         // private
         bool sepPrt$( ostype & );                                                       // get separator state (on/off)
@@ -47 +47 @@
         void sepSetTuple( ostype &, const char [] );            // set tuple separator to string (15 character maximum)
 
-        void ends( ostype & );                                                          // end of output statement
+        void ends( ostype & os );                                                       // end of output statement
+        int fail( ostype & );
+        int flush( ostype & );
+        void open( ostype & os, const char name[], const char mode[] );
+        void close( ostype & os );
+        ostype & write( ostype &, const char [], size_t );
         int fmt( ostype &, const char format[], ... ) __attribute__(( format(printf, 2, 3) ));
-        int flush( ostype & );
-}; // basic_ostream
-        
-trait ostream( ostype & | basic_ostream( ostype ) ) {
-        bool fail( ostype & );                                                          // operation failed?
-        void open( ostype &, const char name[], const char mode[] );
-        void close( ostype & );
-        ostype & write( ostype &, const char [], size_t );
-        void acquire( ostype & );                                                       // concurrent access
+        void acquire( ostype & );
 }; // ostream
 
@@ -70 +67 @@
 // implement writable for intrinsic types
 
-forall( ostype & | basic_ostream( ostype ) ) {
+forall( ostype & | ostream( ostype ) ) {
         ostype & ?|?( ostype &, bool );
         void ?|?( ostype &, bool );
@@ -141 +138 @@
         ostype & nlOn( ostype & );
         ostype & nlOff( ostype & );
-} // distribution
-
-forall( ostype & | ostream( ostype ) ) {
         ostype & acquire( ostype & );
 } // distribution
@@ -202 +196 @@
         _Ostream_Manip(T) & sign( _Ostream_Manip(T) & fmt ) { fmt.flags.sign = true; return fmt; } \
 } /* distribution */ \
-forall( ostype & | basic_ostream( ostype ) ) { \
+forall( ostype & | ostream( ostype ) ) { \
         ostype & ?|?( ostype & os, _Ostream_Manip(T) f ); \
         void ?|?( ostype & os, _Ostream_Manip(T) f ); \
@@ -247 +241 @@
         _Ostream_Manip(T) & unit( _Ostream_Manip(T) & fmt ) { fmt.flags.nobsdp = true; return fmt; } \
 } /* distribution */ \
-forall( ostype & | basic_ostream( ostype ) ) { \
+forall( ostype & | ostream( ostype ) ) { \
         ostype & ?|?( ostype & os, _Ostream_Manip(T) f ); \
         void ?|?( ostype & os, _Ostream_Manip(T) f ); \
@@ -267 +261 @@
         _Ostream_Manip(char) & nobase( _Ostream_Manip(char) & fmt ) { fmt.flags.nobsdp = true; return fmt; }
 } // distribution
-forall( ostype & | basic_ostream( ostype ) ) {
+forall( ostype & | ostream( ostype ) ) {
         ostype & ?|?( ostype & os, _Ostream_Manip(char) f );
         void ?|?( ostype & os, _Ostream_Manip(char) f );
@@ -285 +279 @@
         _Ostream_Manip(const char *) & nobase( _Ostream_Manip(const char *) & fmt ) { fmt.flags.nobsdp = true; return fmt; }
 } // distribution
-forall( ostype & | basic_ostream( ostype ) ) {
+forall( ostype & | ostream( ostype ) ) {
         ostype & ?|?( ostype & os, _Ostream_Manip(const char *) f );
         void ?|?( ostype & os, _Ostream_Manip(const char *) f );
@@ -300 +294 @@
 
         void ends( istype & os );                                                       // end of output statement
-        bool fail( istype & );
+        int fail( istype & );
         int eof( istype & );
         void open( istype & is, const char name[] );