summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgraehl <graehl@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-07-21 00:20:06 +0000
committergraehl <graehl@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-07-21 00:20:06 +0000
commita875e8dc40128a3b876dfc0387aa64bb669fabd4 (patch)
treec499d5282f9110c80942cb19ce887265fbef51c3
parentf6cd72d39cdc7a034b36ad73d613f6f268826e48 (diff)
gzstream
git-svn-id: https://ws10smt.googlecode.com/svn/trunk@351 ec762483-ff6d-05da-a07a-a48fb63a330f
-rw-r--r--decoder/gzstream.cc10
-rw-r--r--decoder/gzstream.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/decoder/gzstream.cc b/decoder/gzstream.cc
index aa015bff..9678355b 100644
--- a/decoder/gzstream.cc
+++ b/decoder/gzstream.cc
@@ -18,17 +18,17 @@
// ============================================================================
//
// File : gzstream.C
-// Revision : $Revision: 1.1 $
-// Revision_date : $Date: 2006/03/30 04:05:52 $
+// Revision : $Revision: 1.7 $
+// Revision_date : $Date: 2003/01/08 14:41:27 $
// Author(s) : Deepak Bandyopadhyay, Lutz Kettner
//
// Standard streambuf implementation following Nicolai Josuttis, "The
// Standard C++ Library".
// ============================================================================
-#include "gzstream.h"
+#include <gzstream.h>
#include <iostream>
-#include <cstring>
+#include <cstring> // for memcpy
#include <stdexcept>
#ifdef GZSTREAM_NAMESPACE
@@ -96,7 +96,7 @@ int gzstreambuf::underflow() { // used for input buffer only
int n_putback = gptr() - eback();
if ( n_putback > 4)
n_putback = 4;
- memcpy( buffer + (4 - n_putback), gptr() - n_putback, n_putback);
+ std::memcpy( buffer + (4 - n_putback), gptr() - n_putback, n_putback);
int num = gzread( file, buffer+4, bufferSize-4);
if (num <= 0) // ERROR or EOF
diff --git a/decoder/gzstream.h b/decoder/gzstream.h
index 5c709490..a7effd90 100644
--- a/decoder/gzstream.h
+++ b/decoder/gzstream.h
@@ -18,8 +18,8 @@
// ============================================================================
//
// File : gzstream.h
-// Revision : $Revision: 1.1 $
-// Revision_date : $Date: 2006/03/30 04:05:52 $
+// Revision : $Revision: 1.5 $
+// Revision_date : $Date: 2002/04/26 23:30:15 $
// Author(s) : Deepak Bandyopadhyay, Lutz Kettner
//
// Standard streambuf implementation following Nicolai Josuttis, "The