Run grand replace for 2015.

[lilypond.git] / flower / include / memory-stream.hh

diff --git a/flower/include/memory-stream.hh b/flower/include/memory-stream.hh
index e5077ffc4302460bc81eee31bc965e4b9fb4fb5c..2cce5986b58a0f7e93c7b32c93c663bd4a120a1a 100644 (file)
--- a/flower/include/memory-stream.hh
+++ b/flower/include/memory-stream.hh
@@ -1,17 +1,31 @@
 /*
-  memory-stream.hh -- declare Memory_out_stream
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef MEMORY_STREAM_HH
 #define MEMORY_STREAM_HH
 
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
+using namespace std;
+
+#include "libc-extension.hh"
+#include "file-cookie.hh"
 
 class Memory_out_stream
 {
@@ -20,20 +34,19 @@ class Memory_out_stream
   int buffer_blocks_;
   FILE *file_;
 
-  static cookie_io_functions_t functions_;
+  static lily_cookie_io_functions_t functions_;
   static const int block_size_;
 
-  static ssize_t reader (void*, char*,  size_t);
-  static ssize_t writer (void*, const char*,  size_t);
-  static int seeker (void*, off64_t *, int whence);
-  static int cleaner (void*);
-
-
 public:
-  ~Memory_out_stream ();
+  static ssize_t reader (void *, char *, size_t);
+  static ssize_t writer (void *, char const *, size_t);
+  static ssize_t seeker (void *, off64_t *, size_t);
+  static ssize_t cleaner (void *);
+
   Memory_out_stream ();
+  ~Memory_out_stream ();
   FILE *get_file () const;
-  char const *get_string() const;
+  char const *get_string () const;
   ssize_t get_length () const;
 };