Index: src/libcfa/iostream
===================================================================
--- src/libcfa/iostream	(revision 90c3b1c9b36943edd6040aac93c3da9265b218a4)
+++ src/libcfa/iostream	(revision 6635c74de4f9c9e0fcd036b6a3fd012d355e65d4)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 16:44:32 2016
-// Update Count     : 81
+// Last Modified On : Wed Mar  2 18:05:27 2016
+// Update Count     : 85
 //
 
@@ -19,5 +19,5 @@
 #include "iterator"
 
-context ostream( dtype ostype ) {
+trait ostream( dtype ostype ) {
 	_Bool sepPrt( ostype * );
 	void sepOn( ostype * );
@@ -35,5 +35,5 @@
 };
 
-context writeable( type T ) {
+trait writeable( otype T ) {
 	forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, T );
 };
@@ -69,13 +69,13 @@
 
 // writes the range [begin, end) to the given stream
-forall( type elt_type | writeable( elt_type ), type iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) )
+forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) )
 void write( iterator_type begin, iterator_type end, os_type *os );
 
-forall( type elt_type | writeable( elt_type ), type iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) )
+forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) )
 void write_reverse( iterator_type begin, iterator_type end, os_type *os );
 
 //---------------------------------------
 
-context istream( dtype istype ) {
+trait istream( dtype istype ) {
 	int fail( istype * );
 	int eof( istype * );
@@ -87,5 +87,5 @@
 };
 
-context readable( type T ) {
+trait readable( otype T ) {
 	forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, T );
 };