Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / flower / file-cookie.cc

diff --git a/flower/file-cookie.cc b/flower/file-cookie.cc
index b216b8a1e4f95c0941b90271a3cf35f051d44e67..49b5518f362264b6740476336b55ca6036a2eba3 100644 (file)
--- a/flower/file-cookie.cc
+++ b/flower/file-cookie.cc
@@ -1,12 +1,13 @@
 
-#include <assert.h>
+#include <cassert>
 #include <cstdio>
+using namespace std;
 
 #include "memory-stream.hh"
 
 extern "C" {
 
-  static bool
+  bool
   is_memory_stream (void *foo)
   {
     Memory_out_stream *cookie = (Memory_out_stream *) foo;
@@ -54,5 +55,4 @@ extern "C" {
     buf[0] = (char) c;
     return Memory_out_stream::writer (file, buf, 1);
   }
-
 } /* extern C */