Update of /cvsroot/boost/boost/boost/iostreams/device
In directory
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19574/boost/iostreams/device
Modified Files:
file.hpp file_descriptor.hpp mapped_file.hpp null.hpp
Log Message:
Added Kim Barrett's patches that merge the changes from 1.33.1 into cvs HEAD.
Index: file.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/iostreams/device/file.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- file.hpp 24 Aug 2005 23:37:14 -0000 1.11
+++ file.hpp 26 May 2007 12:42:42 -0000 1.12
@@ -51,9 +51,9 @@
BOOST_IOS::in | BOOST_IOS::out );
std::streamsize read(char_type* s, std::streamsize n);
std::streamsize write(const char_type* s, std::streamsize n);
- stream_offset seek( stream_offset off, BOOST_IOS::seekdir way,
- BOOST_IOS::openmode which =
- BOOST_IOS::in | BOOST_IOS::out );
+ std::streampos seek( stream_offset off, BOOST_IOS::seekdir way,
+ BOOST_IOS::openmode which =
+ BOOST_IOS::in | BOOST_IOS::out );
void open( const std::string& path,
BOOST_IOS::openmode mode =
BOOST_IOS::in | BOOST_IOS::out,
@@ -154,7 +154,7 @@
{ return pimpl_->file_.sputn(s, n); }
template<typename Ch>
-stream_offset basic_file<Ch>::seek
+std::streampos basic_file<Ch>::seek
( stream_offset off, BOOST_IOS::seekdir way,
BOOST_IOS::openmode )
{ return iostreams::seek(pimpl_->file_, off, way); }
Index: file_descriptor.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/iostreams/device/file_descriptor.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- file_descriptor.hpp 24 Aug 2005 23:37:14 -0000 1.12
+++ file_descriptor.hpp 26 May 2007 12:42:42 -0000 1.13
@@ -63,7 +63,7 @@
bool is_open() const { return pimpl_->flags_ != 0; }
std::streamsize read(char_type* s, std::streamsize n);
std::streamsize write(const char_type* s, std::streamsize n);
- stream_offset seek(stream_offset off, BOOST_IOS::seekdir way);
+ std::streampos seek(stream_offset off, BOOST_IOS::seekdir way);
void close();
private:
struct impl {
Index: mapped_file.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/iostreams/device/mapped_file.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- mapped_file.hpp 30 May 2005 07:33:56 -0000 1.15
+++ mapped_file.hpp 26 May 2007 12:42:42 -0000 1.16
@@ -137,7 +137,7 @@
//------------------Definition of
mapped_file---------------------------------//
-class mapped_file {
+class BOOST_IOSTREAMS_DECL mapped_file {
private:
typedef mapped_file_source delegate_type;
delegate_type delegate_;
@@ -202,7 +202,7 @@
static int alignment() { return mapped_file_source::alignment(); }
};
-struct mapped_file_sink : private mapped_file {
+struct BOOST_IOSTREAMS_DECL mapped_file_sink : private mapped_file {
friend struct operations<mapped_file_sink>;
typedef char char_type;
struct category
Index: null.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/iostreams/device/null.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- null.hpp 20 May 2005 04:11:11 -0000 1.9
+++ null.hpp 26 May 2007 12:42:42 -0000 1.10
@@ -30,9 +30,9 @@
{ };
std::streamsize read(Ch*, std::streamsize) { return 0; }
std::streamsize write(const Ch*, std::streamsize n) { return n; }
- stream_offset seek( stream_offset, BOOST_IOS::seekdir,
- BOOST_IOS::openmode =
- BOOST_IOS::in | BOOST_IOS::out )
+ std::streampos seek( stream_offset, BOOST_IOS::seekdir,
+ BOOST_IOS::openmode =
+ BOOST_IOS::in | BOOST_IOS::out )
{ return -1; }
void close(BOOST_IOS::openmode = BOOST_IOS::in | BOOST_IOS::out) { }
};
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
