Mercurial > octave-nkf

changeset 7979:ff6c1534b522

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[mq]: log2
author Jaroslav Hajek <highegg@gmail.com>
date Fri, 25 Jul 2008 10:56:38 +0200
parents f8514786c490
children b224a9a9ccf1
files liboctave/ChangeLog liboctave/lo-math.h
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Sun Jul 27 22:38:08 2008 +0200
+++ b/liboctave/ChangeLog	Fri Jul 25 10:56:38 2008 +0200
@@ -1,3 +1,7 @@
+2008-07-28  Jaroslav Hajek <highegg@gmail.com>
+
+	* lo-math.h: Ensure log2 is undefined from cmath in C++ mode.
+
 2008-07-21  Michael Goffioul  <michael.goffioul@gmail.com>
 
 	* oct-mutex.h (octave_base_mutex::octave_base_mutex): Initialize
--- a/liboctave/lo-math.h	Sun Jul 27 22:38:08 2008 +0200
+++ b/liboctave/lo-math.h	Fri Jul 25 10:56:38 2008 +0200
@@ -25,6 +25,10 @@
 
 #if defined (__cplusplus)
 #include <cmath>
+// if #undef log2 is missing in cmath, undef it here
+#if defined (log2)
+#undef log2
+#endif
 #else
 #include <math.h>
 #endif