Index: libcfa/src/enum.cfa
===================================================================
--- libcfa/src/enum.cfa	(revision b8e047a4229d594036e98f1f35d359049e3c7b27)
+++ libcfa/src/enum.cfa	(revision b12e4adafec0b1555ac53553d12acbcfb9a69558)
@@ -117,4 +117,4 @@
 		return os | label( e );
 	}
-	OSTYPE_VOID_IMPL( E )
+	OSTYPE_VOID_IMPL( os, E )
 }
Index: libcfa/src/gmp.hfa
===================================================================
--- libcfa/src/gmp.hfa	(revision b8e047a4229d594036e98f1f35d359049e3c7b27)
+++ libcfa/src/gmp.hfa	(revision b12e4adafec0b1555ac53553d12acbcfb9a69558)
@@ -10,6 +10,6 @@
 // Created On       : Tue Apr 19 08:43:43 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 18 11:04:54 2023
-// Update Count     : 35
+// Last Modified On : Fri Aug  2 07:41:25 2024
+// Update Count     : 36
 //
 
@@ -268,5 +268,5 @@
 			return os;
 		} // ?|?
-		OSTYPE_VOID_IMPL( Int )
+		OSTYPE_VOID_IMPL( os, Int )
 	} // distribution
 } // distribution
Index: libcfa/src/iostream.cfa
===================================================================
--- libcfa/src/iostream.cfa	(revision b8e047a4229d594036e98f1f35d359049e3c7b27)
+++ libcfa/src/iostream.cfa	(revision b12e4adafec0b1555ac53553d12acbcfb9a69558)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 15 08:16:48 2024
-// Update Count     : 2020
+// Last Modified On : Fri Aug  2 07:38:44 2024
+// Update Count     : 2021
 //
 
@@ -47,5 +47,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( bool )
+	OSTYPE_VOID_IMPL( os, bool )
 
 	ostype & ?|?( ostype & os, char c ) {
@@ -54,5 +54,5 @@
 		return nosep( os );
 	} // ?|?
-	OSTYPE_VOID_IMPL( char )
+	OSTYPE_VOID_IMPL( os, char )
 
 	ostype & ?|?( ostype & os, signed char sc ) {
@@ -61,5 +61,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( signed char )
+	OSTYPE_VOID_IMPL( os, signed char )
 
 	ostype & ?|?( ostype & os, unsigned char usc ) {
@@ -68,5 +68,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( unsigned char )
+	OSTYPE_VOID_IMPL( os, unsigned char )
 
 	ostype & ?|?( ostype & os, short int si ) {
@@ -75,5 +75,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( short int )
+	OSTYPE_VOID_IMPL( os, short int )
 
 	ostype & ?|?( ostype & os, unsigned short int usi ) {
@@ -82,5 +82,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( unsigned short int )
+	OSTYPE_VOID_IMPL( os, unsigned short int )
 
 	ostype & ?|?( ostype & os, int i ) {
@@ -89,5 +89,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( int )
+	OSTYPE_VOID_IMPL( os, int )
 
 	ostype & ?|?( ostype & os, unsigned int ui ) {
@@ -96,5 +96,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( unsigned int )
+	OSTYPE_VOID_IMPL( os, unsigned int )
 
 	ostype & ?|?( ostype & os, long int li ) {
@@ -103,5 +103,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( long int )
+	OSTYPE_VOID_IMPL( os, long int )
 
 	ostype & ?|?( ostype & os, unsigned long int uli ) {
@@ -110,5 +110,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( unsigned long int )
+	OSTYPE_VOID_IMPL( os, unsigned long int )
 
 	ostype & ?|?( ostype & os, long long int lli ) {
@@ -117,5 +117,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( long long int )
+	OSTYPE_VOID_IMPL( os, long long int )
 
 	ostype & ?|?( ostype & os, unsigned long long int ulli ) {
@@ -124,5 +124,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( unsigned long long int )
+	OSTYPE_VOID_IMPL( os, unsigned long long int )
 
 	#if defined( __SIZEOF_INT128__ )
@@ -156,5 +156,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( int128 )
+	OSTYPE_VOID_IMPL( os, int128 )
 
 	ostype & ?|?( ostype & os, unsigned int128 ullli ) {
@@ -163,5 +163,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( unsigned int128 )
+	OSTYPE_VOID_IMPL( os, unsigned int128 )
 	#endif // __SIZEOF_INT128__
 
@@ -186,5 +186,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( float )
+	OSTYPE_VOID_IMPL( os, float )
 
 	ostype & ?|?( ostype & os, double d ) {
@@ -193,5 +193,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( double )
+	OSTYPE_VOID_IMPL( os, double )
 
 	ostype & ?|?( ostype & os, long double ld ) {
@@ -200,5 +200,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( long double )
+	OSTYPE_VOID_IMPL( os, long double )
 
 	ostype & ?|?( ostype & os, float _Complex fc ) {
@@ -210,5 +210,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( float _Complex )
+	OSTYPE_VOID_IMPL( os, float _Complex )
 
 	ostype & ?|?( ostype & os, double _Complex dc ) {
@@ -220,5 +220,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( double _Complex )
+	OSTYPE_VOID_IMPL( os, double _Complex )
 
 	ostype & ?|?( ostype & os, long double _Complex ldc ) {
@@ -230,5 +230,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( long double _Complex )
+	OSTYPE_VOID_IMPL( os, long double _Complex )
 
 	ostype & ?|?( ostype & os, const char s[] ) {
@@ -273,5 +273,5 @@
 //		return write( os, s, len );
 	} // ?|?
-	OSTYPE_VOID_IMPL( const char * )
+	OSTYPE_VOID_IMPL( os, const char * )
 
 // 	ostype & ?|?( ostype & os, const char16_t s[] ) {
@@ -300,5 +300,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( const void * )
+	OSTYPE_VOID_IMPL( os, const void * )
 
 	// manipulators
@@ -487,5 +487,5 @@
 		return os; \
 	} /* ?|? */ \
-	OSTYPE_VOID_IMPL( _Ostream_Manip(T) ) \
+	OSTYPE_VOID_IMPL( os, _Ostream_Manip(T) ) \
 } // distribution
 
@@ -585,5 +585,5 @@
 		return os; \
 	} /* ?|? */ \
-	OSTYPE_VOID_IMPL( _Ostream_Manip(T) ) \
+	OSTYPE_VOID_IMPL( os, _Ostream_Manip(T) ) \
 } // distribution
 
@@ -683,5 +683,5 @@
 	} /* ?|? */ \
 \
-	OSTYPE_VOID_IMPL( _Ostream_Manip(T) ) \
+	OSTYPE_VOID_IMPL( os, _Ostream_Manip(T) ) \
 } // distribution
 
@@ -718,5 +718,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( _Ostream_Manip(char) )
+	OSTYPE_VOID_IMPL( os, _Ostream_Manip(char) )
 } // distribution
 
@@ -765,5 +765,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( _Ostream_Manip(const char *) )
+	OSTYPE_VOID_IMPL( os, _Ostream_Manip(const char *) )
 } // distribution
 
Index: libcfa/src/iostream.hfa
===================================================================
--- libcfa/src/iostream.hfa	(revision b8e047a4229d594036e98f1f35d359049e3c7b27)
+++ libcfa/src/iostream.hfa	(revision b12e4adafec0b1555ac53553d12acbcfb9a69558)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 12 05:45:48 2024
-// Update Count     : 759
+// Last Modified On : Fri Aug  2 07:37:57 2024
+// Update Count     : 760
 //
 
@@ -75,5 +75,5 @@
 
 #define OSTYPE_VOID( T ) void ?|?( ostype &, T )
-#define OSTYPE_VOID_IMPL( T ) \
+#define OSTYPE_VOID_IMPL( os, T ) \
 	void ?|?( ostype & os, T t ) { \
 		(ostype &)(os | t); ends( os ); \
Index: libcfa/src/rational.cfa
===================================================================
--- libcfa/src/rational.cfa	(revision b8e047a4229d594036e98f1f35d359049e3c7b27)
+++ libcfa/src/rational.cfa	(revision b12e4adafec0b1555ac53553d12acbcfb9a69558)
@@ -10,6 +10,6 @@
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Oct  6 07:52:13 2023
-// Update Count     : 198
+// Last Modified On : Fri Aug  2 07:41:25 2024
+// Update Count     : 199
 //
 
@@ -206,5 +206,5 @@
 			return os | r.numerator | '/' | r.denominator;
 		} // ?|?
-		OSTYPE_VOID_IMPL( rational(T) )
+		OSTYPE_VOID_IMPL( os, rational(T) )
 	} // distribution
 } // distribution
Index: libcfa/src/time.cfa
===================================================================
--- libcfa/src/time.cfa	(revision b8e047a4229d594036e98f1f35d359049e3c7b27)
+++ libcfa/src/time.cfa	(revision b12e4adafec0b1555ac53553d12acbcfb9a69558)
@@ -10,6 +10,6 @@
 // Created On       : Tue Mar 27 13:33:14 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 18 10:55:01 2023
-// Update Count     : 71
+// Last Modified On : Fri Aug  2 07:41:24 2024
+// Update Count     : 72
 //
 
@@ -43,5 +43,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( Duration )
+	OSTYPE_VOID_IMPL( os, Duration )
 } // distribution
 
@@ -152,5 +152,5 @@
 		return os;
 	} // ?|?
-	OSTYPE_VOID_IMPL( Time )
+	OSTYPE_VOID_IMPL( os, Time )
 } // distribution
 
Index: libcfa/src/vec/vec2.hfa
===================================================================
--- libcfa/src/vec/vec2.hfa	(revision b8e047a4229d594036e98f1f35d359049e3c7b27)
+++ libcfa/src/vec/vec2.hfa	(revision b12e4adafec0b1555ac53553d12acbcfb9a69558)
@@ -283,4 +283,4 @@
         return os | '<' | x | ',' | y | '>';
     }
-	OSTYPE_VOID_IMPL( vec2(T) )
+	OSTYPE_VOID_IMPL( os, vec2(T) )
 }
Index: libcfa/src/vec/vec3.hfa
===================================================================
--- libcfa/src/vec/vec3.hfa	(revision b8e047a4229d594036e98f1f35d359049e3c7b27)
+++ libcfa/src/vec/vec3.hfa	(revision b12e4adafec0b1555ac53553d12acbcfb9a69558)
@@ -292,4 +292,4 @@
         return os | '<' | x | ',' | y | ',' | z | '>';
     }
-	OSTYPE_VOID_IMPL( vec3(T) )
+	OSTYPE_VOID_IMPL( os, vec3(T) )
 }
Index: libcfa/src/vec/vec4.hfa
===================================================================
--- libcfa/src/vec/vec4.hfa	(revision b8e047a4229d594036e98f1f35d359049e3c7b27)
+++ libcfa/src/vec/vec4.hfa	(revision b12e4adafec0b1555ac53553d12acbcfb9a69558)
@@ -287,5 +287,5 @@
         return os | '<' | x | ',' | y | ',' | z | ',' | w | '>';
     }
-	OSTYPE_VOID_IMPL( vec4(T) )
+	OSTYPE_VOID_IMPL( os, vec4(T) )
 }