Changeset 37218fc for src/libcfa/stdlib

Timestamp:

Apr 11, 2016, 11:51:07 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

37f0da8

Parents:

3aba311 (diff), e55ca05 (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:/u/cforall/software/cfa/cfa-cc

Conflicts:

src/Parser/ParseNode.h

File:

• src/libcfa/stdlib (modified) (4 diffs)

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 22 22:34:24 2016
-// Update Count     : 69
+// Last Modified On : Fri Apr  1 22:26:14 2016
+// Update Count     : 73
 //
 
@@ -18 +18 @@
 extern "C" {
 #include <stddef.h>                                                                             // size_t
+#include <math.h>                                                                               // floor
 } // extern "C"
 
@@ -80 +81 @@
 char abs( char );
 extern "C" {
-int abs( int );         // use default C routine for int
-} // extern
+int abs( int );                         // use default C routine for int
+} // extern "C"
 long int abs( long int );
 long long int abs( long long int );
@@ -90 +91 @@
 double _Complex abs( double _Complex );
 long double _Complex abs( long double _Complex );
+
+//---------------------------------------
+
+float floor( float );
+extern "C" {
+double floor( double );         // use C routine for double
+} // extern "C"
+long double floor( long double );
+
+float ceil( float );
+extern "C" {
+double ceil( double );          // use C routine for double
+} // extern "C"
+long double ceil( long double );
 
 //---------------------------------------