# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1454970852 18000
# Node ID 19a619ac950883d8341090cd13b7b3e3b4040639
# Parent  2e64b5899d1f4be195b1081da6aefbfb84bd4e44
rename FLOAT_TRUNCATE to OCTAVE_FLOAT_TRUNCATE

* oct-cmplx.h, oct-conf-post.in.h: Rename FLOAT_TRUNCATE to
OCTAVE_FLOAT_TRUNCATE.

diff -r 2e64b5899d1f -r 19a619ac9508 liboctave/util/oct-cmplx.h
--- a/liboctave/util/oct-cmplx.h	Mon Feb 08 21:29:57 2016 -0800
+++ b/liboctave/util/oct-cmplx.h	Mon Feb 08 17:34:12 2016 -0500
@@ -44,12 +44,12 @@
 template <typename T> \
 inline bool operator OP (const std::complex<T>& a, const std::complex<T>& b) \
 { \
-  FLOAT_TRUNCATE const T ax = std::abs (a); \
-  FLOAT_TRUNCATE const T bx = std::abs (b); \
+  OCTAVE_FLOAT_TRUNCATE const T ax = std::abs (a); \
+  OCTAVE_FLOAT_TRUNCATE const T bx = std::abs (b); \
   if (ax == bx) \
     { \
-      FLOAT_TRUNCATE const T ay = std::arg (a); \
-      FLOAT_TRUNCATE const T by = std::arg (b); \
+      OCTAVE_FLOAT_TRUNCATE const T ay = std::arg (a); \
+      OCTAVE_FLOAT_TRUNCATE const T by = std::arg (b); \
       if (ay == static_cast<T> (-M_PI)) \
         { \
           if (by != static_cast<T> (-M_PI)) \
@@ -67,11 +67,11 @@
 template <typename T> \
 inline bool operator OP (const std::complex<T>& a, T b) \
 { \
-  FLOAT_TRUNCATE const T ax = std::abs (a); \
-  FLOAT_TRUNCATE const T bx = std::abs (b); \
+  OCTAVE_FLOAT_TRUNCATE const T ax = std::abs (a); \
+  OCTAVE_FLOAT_TRUNCATE const T bx = std::abs (b); \
   if (ax == bx) \
     { \
-      FLOAT_TRUNCATE const T ay = std::arg (a); \
+      OCTAVE_FLOAT_TRUNCATE const T ay = std::arg (a); \
       if (ay == static_cast<T> (-M_PI)) \
         return static_cast<T> (M_PI) OP 0; \
       return ay OP 0; \
@@ -82,11 +82,11 @@
 template <typename T> \
 inline bool operator OP (T a, const std::complex<T>& b) \
 { \
-  FLOAT_TRUNCATE const T ax = std::abs (a); \
-  FLOAT_TRUNCATE const T bx = std::abs (b); \
+  OCTAVE_FLOAT_TRUNCATE const T ax = std::abs (a); \
+  OCTAVE_FLOAT_TRUNCATE const T bx = std::abs (b); \
   if (ax == bx) \
     { \
-      FLOAT_TRUNCATE const T by = std::arg (b); \
+      OCTAVE_FLOAT_TRUNCATE const T by = std::arg (b); \
       if (by == static_cast<T> (-M_PI)) \
         return 0 OP static_cast<T> (M_PI); \
       return 0 OP by; \
diff -r 2e64b5899d1f -r 19a619ac9508 oct-conf-post.in.h
--- a/oct-conf-post.in.h	Mon Feb 08 21:29:57 2016 -0800
+++ b/oct-conf-post.in.h	Mon Feb 08 17:34:12 2016 -0500
@@ -183,9 +183,9 @@
 #endif
 
 #if defined (ENABLE_FLOAT_TRUNCATE)
-#  define FLOAT_TRUNCATE volatile
+#  define OCTAVE_FLOAT_TRUNCATE volatile
 #else
-#  define FLOAT_TRUNCATE
+#  define OCTAVE_FLOAT_TRUNCATE
 #endif
 
 /* oct-types.h */