From 0e5cc07f839027d377ae1fdbf824ee3d3331e0bc Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 9 Sep 2008 00:13:09 +0000 Subject: [PATCH] pandaFileStream --- direct/src/dcparser/dcFile.cxx | 4 ++-- direct/src/dcparser/dcbase.h | 3 +++ direct/src/directdServer/directdServer.cxx | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/direct/src/dcparser/dcFile.cxx b/direct/src/dcparser/dcFile.cxx index ea72249cd8..2fca478b7c 100644 --- a/direct/src/dcparser/dcFile.cxx +++ b/direct/src/dcparser/dcFile.cxx @@ -153,7 +153,7 @@ read(Filename filename) { #else // WITHIN_PANDA - ifstream in; + pifstream in; in.open(filename.c_str()); if (!in) { @@ -204,7 +204,7 @@ read(istream &in, const string &filename) { //////////////////////////////////////////////////////////////////// bool DCFile:: write(Filename filename, bool brief) const { - ofstream out; + pofstream out; #ifdef WITHIN_PANDA filename.set_text(); diff --git a/direct/src/dcparser/dcbase.h b/direct/src/dcparser/dcbase.h index cd3ef5623c..0e99efea8c 100644 --- a/direct/src/dcparser/dcbase.h +++ b/direct/src/dcparser/dcbase.h @@ -115,6 +115,9 @@ typedef unsigned char PN_uint8; typedef unsigned short PN_uint16; typedef unsigned int PN_uint32; +typedef ifstream pifstream; +typedef ofstream pofstream; +typedef fstream pfstream; #endif // WITHIN_PANDA diff --git a/direct/src/directdServer/directdServer.cxx b/direct/src/directdServer/directdServer.cxx index d272cc75f6..c368460da5 100644 --- a/direct/src/directdServer/directdServer.cxx +++ b/direct/src/directdServer/directdServer.cxx @@ -61,7 +61,7 @@ DirectDServer::handle_command(const string& cmd) { void DirectDServer::read_command(string& cmd) { try { - ifstream f; + pifstream f; f.open("directdCommand", ios::in | ios::binary); stringstream ss; const int buf_size=512;