Changeset 3d5701e for libcfa/src/stdhdr/math.h

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• libcfa/src/stdhdr/math.h (modified) (1 diff)

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 : Thu Feb 22 18:16:07 2018
-// Update Count     : 13
+// 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 exception ``exception                                                   // make keyword an identifier
 #define __CFA_MATH_H__
 #endif