mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
Move StringStream from downloader to express
It is more generally useful than just in the HTTP code, and I need to use i t somewhere in express.
This commit is contained in:
parent
1a1648682a
commit
b2d327f268
@ -3738,7 +3738,6 @@ OPTS=['DIR:panda/src/downloader', 'OPENSSL', 'ZLIB']
|
||||
IGATEFILES=GetDirectoryContents('panda/src/downloader', ["*.h", "*_composite*.cxx"])
|
||||
TargetAdd('libp3downloader.in', opts=OPTS, input=IGATEFILES)
|
||||
TargetAdd('libp3downloader.in', opts=['IMOD:panda3d.core', 'ILIB:libp3downloader', 'SRCDIR:panda/src/downloader'])
|
||||
PyTargetAdd('p3downloader_stringStream_ext.obj', opts=OPTS, input='stringStream_ext.cxx')
|
||||
|
||||
#
|
||||
# DIRECTORY: panda/metalibs/pandaexpress/
|
||||
@ -4361,7 +4360,6 @@ if (not RUNTIME):
|
||||
PyTargetAdd('core.pyd', input='p3prc_ext_composite.obj')
|
||||
|
||||
PyTargetAdd('core.pyd', input='libp3downloader_igate.obj')
|
||||
PyTargetAdd('core.pyd', input='p3downloader_stringStream_ext.obj')
|
||||
PyTargetAdd('core.pyd', input='p3express_ext_composite.obj')
|
||||
PyTargetAdd('core.pyd', input='libp3express_igate.obj')
|
||||
|
||||
|
@ -13,8 +13,6 @@
|
||||
#include "multiplexStreamBuf.cxx"
|
||||
#include "patcher.cxx"
|
||||
#include "socketStream.cxx"
|
||||
#include "stringStreamBuf.cxx"
|
||||
#include "stringStream.cxx"
|
||||
#include "urlSpec.cxx"
|
||||
#include "virtualFileHTTP.cxx"
|
||||
#include "virtualFileMountHTTP.cxx"
|
||||
|
@ -4,6 +4,8 @@
|
||||
#include "pta_float.cxx"
|
||||
#include "ramfile.cxx"
|
||||
#include "referenceCount.cxx"
|
||||
#include "stringStreamBuf.cxx"
|
||||
#include "stringStream.cxx"
|
||||
#include "subfileInfo.cxx"
|
||||
#include "subStream.cxx"
|
||||
#include "subStreamBuf.cxx"
|
||||
|
@ -1,4 +1,5 @@
|
||||
#include "memoryUsagePointers_ext.cxx"
|
||||
#include "ramfile_ext.cxx"
|
||||
#include "stringStream_ext.cxx"
|
||||
#include "virtualFileSystem_ext.cxx"
|
||||
#include "virtualFile_ext.cxx"
|
||||
|
@ -24,7 +24,7 @@
|
||||
* buffer, which can be retrieved and/or set as a string in Python 2 or a
|
||||
* bytes object in Python 3.
|
||||
*/
|
||||
class EXPCL_PANDA_DOWNLOADER StringStream : public std::iostream {
|
||||
class EXPCL_PANDA_EXPRESS StringStream : public std::iostream {
|
||||
public:
|
||||
INLINE StringStream(const std::string &source);
|
||||
INLINE StringStream(vector_uchar source);
|
@ -22,7 +22,7 @@
|
||||
* to a memory buffer, whose contents can be appended to or extracted at any
|
||||
* time by application code.
|
||||
*/
|
||||
class EXPCL_PANDA_DOWNLOADER StringStreamBuf : public std::streambuf {
|
||||
class EXPCL_PANDA_EXPRESS StringStreamBuf : public std::streambuf {
|
||||
public:
|
||||
StringStreamBuf();
|
||||
virtual ~StringStreamBuf();
|
Loading…
x
Reference in New Issue
Block a user