From b2d327f268e20ff4cc1e425815ee7571d5972d4f Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 10 Jul 2019 13:44:33 +0200 Subject: [PATCH] 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. --- makepanda/makepanda.py | 2 -- panda/src/downloader/p3downloader_composite2.cxx | 2 -- panda/src/express/p3express_composite2.cxx | 2 ++ panda/src/express/p3express_ext_composite.cxx | 1 + panda/src/{downloader => express}/stringStream.I | 0 panda/src/{downloader => express}/stringStream.cxx | 0 panda/src/{downloader => express}/stringStream.h | 2 +- panda/src/{downloader => express}/stringStreamBuf.I | 0 panda/src/{downloader => express}/stringStreamBuf.cxx | 0 panda/src/{downloader => express}/stringStreamBuf.h | 2 +- panda/src/{downloader => express}/stringStream_ext.cxx | 0 panda/src/{downloader => express}/stringStream_ext.h | 0 12 files changed, 5 insertions(+), 6 deletions(-) rename panda/src/{downloader => express}/stringStream.I (100%) rename panda/src/{downloader => express}/stringStream.cxx (100%) rename panda/src/{downloader => express}/stringStream.h (95%) rename panda/src/{downloader => express}/stringStreamBuf.I (100%) rename panda/src/{downloader => express}/stringStreamBuf.cxx (100%) rename panda/src/{downloader => express}/stringStreamBuf.h (94%) rename panda/src/{downloader => express}/stringStream_ext.cxx (100%) rename panda/src/{downloader => express}/stringStream_ext.h (100%) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 5d5fb7a742..eacc82bcc0 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -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') diff --git a/panda/src/downloader/p3downloader_composite2.cxx b/panda/src/downloader/p3downloader_composite2.cxx index b06e28e4bb..4afed2e40a 100644 --- a/panda/src/downloader/p3downloader_composite2.cxx +++ b/panda/src/downloader/p3downloader_composite2.cxx @@ -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" diff --git a/panda/src/express/p3express_composite2.cxx b/panda/src/express/p3express_composite2.cxx index 29b1da723e..1d7a081996 100644 --- a/panda/src/express/p3express_composite2.cxx +++ b/panda/src/express/p3express_composite2.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" diff --git a/panda/src/express/p3express_ext_composite.cxx b/panda/src/express/p3express_ext_composite.cxx index ee104077cb..a8f3311753 100644 --- a/panda/src/express/p3express_ext_composite.cxx +++ b/panda/src/express/p3express_ext_composite.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" diff --git a/panda/src/downloader/stringStream.I b/panda/src/express/stringStream.I similarity index 100% rename from panda/src/downloader/stringStream.I rename to panda/src/express/stringStream.I diff --git a/panda/src/downloader/stringStream.cxx b/panda/src/express/stringStream.cxx similarity index 100% rename from panda/src/downloader/stringStream.cxx rename to panda/src/express/stringStream.cxx diff --git a/panda/src/downloader/stringStream.h b/panda/src/express/stringStream.h similarity index 95% rename from panda/src/downloader/stringStream.h rename to panda/src/express/stringStream.h index d7a0e8bc98..79c10f38ed 100644 --- a/panda/src/downloader/stringStream.h +++ b/panda/src/express/stringStream.h @@ -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); diff --git a/panda/src/downloader/stringStreamBuf.I b/panda/src/express/stringStreamBuf.I similarity index 100% rename from panda/src/downloader/stringStreamBuf.I rename to panda/src/express/stringStreamBuf.I diff --git a/panda/src/downloader/stringStreamBuf.cxx b/panda/src/express/stringStreamBuf.cxx similarity index 100% rename from panda/src/downloader/stringStreamBuf.cxx rename to panda/src/express/stringStreamBuf.cxx diff --git a/panda/src/downloader/stringStreamBuf.h b/panda/src/express/stringStreamBuf.h similarity index 94% rename from panda/src/downloader/stringStreamBuf.h rename to panda/src/express/stringStreamBuf.h index 333e945197..f404f1e2ec 100644 --- a/panda/src/downloader/stringStreamBuf.h +++ b/panda/src/express/stringStreamBuf.h @@ -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(); diff --git a/panda/src/downloader/stringStream_ext.cxx b/panda/src/express/stringStream_ext.cxx similarity index 100% rename from panda/src/downloader/stringStream_ext.cxx rename to panda/src/express/stringStream_ext.cxx diff --git a/panda/src/downloader/stringStream_ext.h b/panda/src/express/stringStream_ext.h similarity index 100% rename from panda/src/downloader/stringStream_ext.h rename to panda/src/express/stringStream_ext.h