* The grand 2005-2006 replace.

[lilypond.git] / flower / stringutil.cc

diff --git a/flower/stringutil.cc b/flower/stringutil.cc
index f3c2906c2797f7eb9f05962125db269378c88e80..f586031f8ecf5c990062c90b9451d6365bb2f639 100644 (file)
--- a/flower/stringutil.cc
+++ b/flower/stringutil.cc
@@ -1,14 +1,14 @@
 /*
-  stringutil.cc -- generate non-inline members. 
+  stringutil.cc -- generate non-inline members.
 
   This should be in a separate file, because one can include the .icc
   only once.
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl> */
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl> */
 
-#ifdef STRING_DEBUG 
+#ifdef STRING_DEBUG
 #define memmove mymemmove
 #endif
 
@@ -22,19 +22,21 @@
 
 #define INLINE
 
-#include "string-handle.hh"
 #include "string-data.hh"
 #include "string.hh"
+
 #include "string-data.icc"
 #include "string-handle.icc"
 #include "string.icc"
 
 #ifdef STRING_DEBUG
 #include <sys/types.h>
-#include <memory.h>
-void* 
-mymemmove (void* dest, void const* src, size_t n)
+#include <memory>
+using namespace std;
+
+void *
+mymemmove (void *dest, void const *src, size_t n)
 {
-       return memcpy (dest, src, n); 
+  return memcpy (dest, src, n);
 }
 #endif