Merge with master

[lilypond.git] / flower / memory-stream.cc

diff --git a/flower/memory-stream.cc b/flower/memory-stream.cc
index 0fcedb75651041cdded14512e604fcf13723b2aa..863f4bd4def2de6fb785178de84d495ed70e9937 100644 (file)
--- a/flower/memory-stream.cc
+++ b/flower/memory-stream.cc
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstring>
+#include <cstdlib>
+using namespace std;
 
 #include "memory-stream.hh"