Mercurial > octave-libtiff

comparison libinterp/corefcn/c-file-ptr-stream.h @ 21183:e7fda94aec6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate OCTAVE_CXX_ISO_COMPLIANT_LIBRARY macro * m4/acinclude.m4 (OCTAVE_CXX_ISO_COMPLIANT_LIBRARY): Delete macro definition. * configure.ac: Don't use it. * c-file-ptr-stream.h, c-file-ptr-stream.cc, oct-fstrm.cc: Always assume CXX_ISO_COMPLIANT_LIBRARY is true.
author John W. Eaton <jwe@octave.org>
date Wed, 03 Feb 2016 16:50:38 -0500
parents f7084eae3318
children fcac5dbbf9ed
comparison
equal deleted inserted replaced
21182:82a44483dbff 21183:e7fda94aec6b
30 class 30 class
31 c_file_ptr_buf : public std::streambuf 31 c_file_ptr_buf : public std::streambuf
32 { 32 {
33 public: 33 public:
34 34
35 #if ! defined (CXX_ISO_COMPLIANT_LIBRARY)
36 typedef int int_type;
37 #else
38 typedef std::streambuf::int_type int_type; 35 typedef std::streambuf::int_type int_type;
39 #endif
40 36
41 typedef int (*close_fcn) (FILE *); 37 typedef int (*close_fcn) (FILE *);
42 38
43 FILE* stdiofile (void) { return f; } 39 FILE* stdiofile (void) { return f; }
44 40
150 class 146 class
151 c_zfile_ptr_buf : public std::streambuf 147 c_zfile_ptr_buf : public std::streambuf
152 { 148 {
153 public: 149 public:
154 150
155 #if ! defined (CXX_ISO_COMPLIANT_LIBRARY)
156 typedef int int_type;
157 #else
158 typedef std::streambuf::int_type int_type; 151 typedef std::streambuf::int_type int_type;
159 #endif
160 152
161 typedef int (*close_fcn) (gzFile); 153 typedef int (*close_fcn) (gzFile);
162 154
163 gzFile stdiofile (void) { return f; } 155 gzFile stdiofile (void) { return f; }
164 156