Changeset 8a5bdf0 for src/libcfa

Timestamp:

Apr 30, 2018, 2:31:18 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

4c80a75

Parents:

5248789 (diff), 5e5dbc2 (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 branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/libcfa

Files:

• iostream (modified) (2 diffs)
• iostream.c (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 * );
 

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jan 25 13:09:28 2018
-// Update Count     : 467
+// Last Modified On : Sat Apr 28 13:08:25 2018
+// Update Count     : 469
 //
 
@@ -193 +193 @@
 } // ?|?
 
-forall( dtype ostype | ostream( ostype ) )
-ostype & ?|?( ostype & os, const char16_t * str ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%ls", str );
-        return os;
-} // ?|?
-
-#if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous
-forall( dtype ostype | ostream( ostype ) )
-ostype & ?|?( ostype & os, const char32_t * str ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%ls", str );
-        return os;
-} // ?|?
-#endif // ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 )
-
-forall( dtype ostype | ostream( ostype ) )
-ostype & ?|?( ostype & os, const wchar_t * str ) {
-        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-        fmt( os, "%ls", str );
-        return os;
-} // ?|?
+// forall( dtype ostype | ostream( ostype ) )
+// ostype & ?|?( ostype & os, const char16_t * str ) {
+//      if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+//      fmt( os, "%ls", str );
+//      return os;
+// } // ?|?
+
+// #if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous
+// forall( dtype ostype | ostream( ostype ) )
+// ostype & ?|?( ostype & os, const char32_t * str ) {
+//      if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+//      fmt( os, "%ls", str );
+//      return os;
+// } // ?|?
+// #endif // ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 )
+
+// forall( dtype ostype | ostream( ostype ) )
+// ostype & ?|?( ostype & os, const wchar_t * str ) {
+//      if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+//      fmt( os, "%ls", str );
+//      return os;
+// } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )