Browse Source

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.
rdb 6 years ago
parent
commit
b2d327f268

+ 0 - 2
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')
 

+ 0 - 2
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"

+ 2 - 0
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"

+ 1 - 0
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"

+ 0 - 0
panda/src/downloader/stringStream.I → panda/src/express/stringStream.I


+ 0 - 0
panda/src/downloader/stringStream.cxx → panda/src/express/stringStream.cxx


+ 1 - 1
panda/src/downloader/stringStream.h → 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);

+ 0 - 0
panda/src/downloader/stringStreamBuf.I → panda/src/express/stringStreamBuf.I


+ 0 - 0
panda/src/downloader/stringStreamBuf.cxx → panda/src/express/stringStreamBuf.cxx


+ 1 - 1
panda/src/downloader/stringStreamBuf.h → 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();

+ 0 - 0
panda/src/downloader/stringStream_ext.cxx → panda/src/express/stringStream_ext.cxx


+ 0 - 0
panda/src/downloader/stringStream_ext.h → panda/src/express/stringStream_ext.h