From 8a2f16b5b08e45cc12ba0eb361e4daa9c0e22562 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 15 Oct 2008 05:40:15 +0000 Subject: [PATCH] publish FileStream etc. --- dtool/src/dtoolutil/pandaFileStream.I | 30 +++++++++++++-------------- dtool/src/dtoolutil/pandaFileStream.h | 6 +++--- panda/src/express/config_express.N | 3 +++ panda/src/express/config_express.h | 1 + 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dtool/src/dtoolutil/pandaFileStream.I b/dtool/src/dtoolutil/pandaFileStream.I index 142ece9967..31f658dfb1 100644 --- a/dtool/src/dtoolutil/pandaFileStream.I +++ b/dtool/src/dtoolutil/pandaFileStream.I @@ -15,7 +15,7 @@ //////////////////////////////////////////////////////////////////// // Function: IFileStream::Constructor -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE IFileStream:: @@ -24,7 +24,7 @@ IFileStream() : istream(&_buf) { //////////////////////////////////////////////////////////////////// // Function: IFileStream::Constructor -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE IFileStream:: @@ -34,7 +34,7 @@ IFileStream(const char *filename, ios::openmode mode) : istream(&_buf) { //////////////////////////////////////////////////////////////////// // Function: IFileStream::Destructor -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE IFileStream:: @@ -44,7 +44,7 @@ INLINE IFileStream:: //////////////////////////////////////////////////////////////////// // Function: IFileStream::open -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE void IFileStream:: @@ -58,7 +58,7 @@ open(const char *filename, ios::openmode mode) { //////////////////////////////////////////////////////////////////// // Function: IFileStream::close -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE void IFileStream:: @@ -68,7 +68,7 @@ close() { //////////////////////////////////////////////////////////////////// // Function: OFileStream::Constructor -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE OFileStream:: @@ -77,7 +77,7 @@ OFileStream() : ostream(&_buf) { //////////////////////////////////////////////////////////////////// // Function: OFileStream::Constructor -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE OFileStream:: @@ -87,7 +87,7 @@ OFileStream(const char *filename, ios::openmode mode) : ostream(&_buf) { //////////////////////////////////////////////////////////////////// // Function: OFileStream::Destructor -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE OFileStream:: @@ -97,7 +97,7 @@ INLINE OFileStream:: //////////////////////////////////////////////////////////////////// // Function: OFileStream::open -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE void OFileStream:: @@ -111,7 +111,7 @@ open(const char *filename, ios::openmode mode) { //////////////////////////////////////////////////////////////////// // Function: OFileStream::close -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE void OFileStream:: @@ -121,7 +121,7 @@ close() { //////////////////////////////////////////////////////////////////// // Function: FileStream::Constructor -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE FileStream:: @@ -130,7 +130,7 @@ FileStream() : iostream(&_buf) { //////////////////////////////////////////////////////////////////// // Function: FileStream::Constructor -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE FileStream:: @@ -140,7 +140,7 @@ FileStream(const char *filename, ios::openmode mode) : iostream(&_buf) { //////////////////////////////////////////////////////////////////// // Function: FileStream::Destructor -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE FileStream:: @@ -150,7 +150,7 @@ INLINE FileStream:: //////////////////////////////////////////////////////////////////// // Function: FileStream::open -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE void FileStream:: @@ -164,7 +164,7 @@ open(const char *filename, ios::openmode mode) { //////////////////////////////////////////////////////////////////// // Function: FileStream::close -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE void FileStream:: diff --git a/dtool/src/dtoolutil/pandaFileStream.h b/dtool/src/dtoolutil/pandaFileStream.h index f1dbc5165d..99929a79d5 100644 --- a/dtool/src/dtoolutil/pandaFileStream.h +++ b/dtool/src/dtoolutil/pandaFileStream.h @@ -31,7 +31,7 @@ // entire process, on I/O waits). //////////////////////////////////////////////////////////////////// class EXPCL_DTOOL IFileStream : public istream { -public: +PUBLISHED: INLINE IFileStream(); INLINE IFileStream(const char *filename, ios::openmode mode = ios::in); INLINE ~IFileStream(); @@ -53,7 +53,7 @@ private: // entire process, on I/O waits). //////////////////////////////////////////////////////////////////// class EXPCL_DTOOL OFileStream : public ostream { -public: +PUBLISHED: INLINE OFileStream(); INLINE OFileStream(const char *filename, ios::openmode mode = ios::out); INLINE ~OFileStream(); @@ -75,7 +75,7 @@ private: // rather than the entire process, on I/O waits). //////////////////////////////////////////////////////////////////// class EXPCL_DTOOL FileStream : public iostream { -public: +PUBLISHED: INLINE FileStream(); INLINE FileStream(const char *filename, ios::openmode mode = ios::in); INLINE ~FileStream(); diff --git a/panda/src/express/config_express.N b/panda/src/express/config_express.N index fbc98fa0ad..774d205a37 100644 --- a/panda/src/express/config_express.N +++ b/panda/src/express/config_express.N @@ -13,6 +13,9 @@ forcetype TypeRegistry forcetype StreamReader forcetype StreamWriter forcetype NeverFreeMemory +forcetype IFileStream +forcetype OFileStream +forcetype FileStream forcetype ConfigExpress renametype ConfigExpress ConfigExpress diff --git a/panda/src/express/config_express.h b/panda/src/express/config_express.h index a11729fd71..abc91ac944 100644 --- a/panda/src/express/config_express.h +++ b/panda/src/express/config_express.h @@ -23,6 +23,7 @@ // interrogate. #include "pandaSystem.h" #include "globPattern.h" +#include "pandaFileStream.h" #include "configFlags.h" #include "configPage.h" #include "configPageManager.h"