Made wxSocket compile using makefiles; #ifdefed out <<, >> operators in stream.cpp
for USE_SERIALL; included io.h for VC++ in socket.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -99,7 +99,9 @@ class WXDLLEXPORT wxInputStream {
|
||||
wxInputStream& operator>>(int& i);
|
||||
wxInputStream& operator>>(long& i);
|
||||
wxInputStream& operator>>(float& i);
|
||||
#if USE_SERIAL
|
||||
wxInputStream& operator>>(wxObject *& obj);
|
||||
#endif
|
||||
|
||||
wxInputStream& operator>>(unsigned char& c) { return operator>>((char&)c); }
|
||||
wxInputStream& operator>>(unsigned short& i) { return operator>>((short&)i); }
|
||||
@@ -150,7 +152,9 @@ class WXDLLEXPORT wxOutputStream {
|
||||
wxOutputStream& operator<<(int i);
|
||||
wxOutputStream& operator<<(long i);
|
||||
wxOutputStream& operator<<(double f);
|
||||
#if USE_SERIAL
|
||||
wxOutputStream& operator<<(wxObject& obj);
|
||||
#endif
|
||||
|
||||
wxOutputStream& operator<<(float f) { return operator<<((double)f); }
|
||||
wxOutputStream& operator<<(unsigned char c) { return operator<<((char)c); }
|
||||
|
Reference in New Issue
Block a user