Changeset ff29f08 for src/libcfa/iostream

Timestamp:

May 18, 2018, 2:09:21 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into with_gc

File:

• src/libcfa/iostream (modified) (2 diffs)

src/libcfa/iostream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr 12 14:34:37 2018
-// Update Count     : 150
+// Last Modified On : Sat Apr 28 13:08:24 2018
+// Update Count     : 152
 //
 
@@ -80 +80 @@
 
 forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype &, const char * );
-forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype &, const char16_t * );
+//forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype &, const char16_t * );
 #if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous
-forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype &, const char32_t * );
+//forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype &, const char32_t * );
 #endif // ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 )
-forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype &, const wchar_t * );
+//forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype &, const wchar_t * );
 forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype &, const void * );