Run `make grand-replace'.

[lilypond.git] / flower / libc-extension.cc

diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index 7b9b5d7821c265389a6a07e6ac793c65c376321a..697c527c447f8d57117361bb0f7940c12e2b665b 100644 (file)
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -3,7 +3,7 @@
 
   source file of the flowerlib
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -11,6 +11,9 @@
 #include <cstdio>
 #include <cstring>
 #include <cctype>
+#include <cassert>
+
+using namespace std;
 
 #include "libc-extension.hh"
 
@@ -36,25 +39,6 @@ strnupr (char *start, int n)
   return start;
 }
 
-/*
-  There are some strange problems with round() on early glibcs.
-*/
-double
-my_round (double x)
-{
-  return floor (x -0.5)+ 1.0;
-}
-
-#ifndef isinf
-#if !HAVE_ISINF
-int
-isinf (double x)
-{
-  return x && (x == x/ 2);
-}
-#endif
-#endif
-
 #if !HAVE_MEMMEM
 
 /** locate a substring. #memmem# finds the first occurrence of
@@ -132,6 +116,27 @@ memrev (unsigned char *byte, int length)
   return byte;
 }
 
+/*
+  There are some strange problems with round() on early glibcs.
+*/
+double
+my_round (double x)
+{
+  return floor (x -0.5)+ 1.0;
+}
+
+/* namespace std { */
+  
+#ifndef isinf
+#if !HAVE_ISINF
+int
+isinf (double x)
+{
+  return x && (x == x/ 2);
+}
+#endif
+#endif
+
 #if ! HAVE_SNPRINTF
 int
 snprintf (char *str, size_t n, char const *format, ...)
@@ -157,3 +162,4 @@ vsnprintf (char *str, size_t n, char const *format, va_list args)
 }
 #endif
 
+/* } namespace std */