apply Julian's patch to fix install-info warnings

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

diff --git a/flower/file-cookie.cc b/flower/file-cookie.cc
index c173b087bcbb664ea28d19a14050e82b4f7d5beb..bedb100a00b26b4ac246e7948dd4c3166795f8f2 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;
@@ -14,12 +15,10 @@ extern "C" {
   }
 
   void *
-  lily_fopencookie (void *cookie, char const *modes,
-                   lily_cookie_io_functions_t io_funcs)
+  lily_fopencookie (void *cookie,
+                   char const * /* modes */,
+                   lily_cookie_io_functions_t /* io_funcs */)
   {
-    (void) cookie;
-    (void) modes;
-    (void) io_funcs;
     assert (is_memory_stream (cookie));
     return (FILE *) cookie;
   }