Changeset cc18e17 for libcfa/src

Timestamp:

Mar 16, 2021, 11:14:28 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

386af65

Parents:

a196885 (diff), 05e29f0 (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:

libcfa/src

Files:

• concurrency/clib/cfathread.cfa (modified) (2 diffs)
• concurrency/clib/cfathread.h (modified) (1 diff)
• stdhdr/math.h (modified) (1 diff)

libcfa/src/concurrency/clib/cfathread.cfa

@@ -115 +115 @@
         int cfathread_join( cfathread_t thrd, void ** retval ) {
                 void * ret = join( *thrd ).ret;
-                delete( thrd );
+                ^( *thrd ){};
+                free(thrd);
                 if(retval) {
                         *retval = ret;
@@ -250 +251 @@
         }
 
-        void cfathread_suspendFD(int) {
-                abort | "Suspending File Descriptors is not supported";
-        }
-
-        void cfathread_resumeFD (int) {
-                abort | "Resuming File Descriptors is not supported";
-        }
-
-}
+}

libcfa/src/concurrency/clib/cfathread.h

@@ -105 +105 @@
         ssize_t cfathread_read(int fildes, void *buf, size_t nbyte);
 
-        void cfathread_suspendFD(int fd);
-        void cfathread_resumeFD (int fd);
-
 #if defined(__cforall) || defined(__cplusplus)
 }

libcfa/src/stdhdr/math.h

@@ -10 +10 @@
 // Created On       : Mon Jul  4 23:25:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 15 14:02:03 2021
-// Update Count     : 17
+// Last Modified On : Fri Feb  7 19:05:27 2020
+// Update Count     : 15
 // 
 
 extern "C" {
+#if ! defined( exception )                                                              // nesting ?
+#define exception ``exception                                                   // make keyword an identifier
+#define __CFA_MATH_H__
+#endif
 
 #include_next <math.h>                                                                  // has internal check for multiple expansion
 
+#if defined( exception ) && defined( __CFA_MATH_H__ )   // reset only if set
+#undef exception
+#undef __CFA_MATH_H__
+#endif
 } // extern "C"