diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-09-24 17:01:05 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-09-24 17:01:05 -0400 |
| commit | cc15ebed97ad43d9f2b04e73c8555ac4b2a3a0a3 (patch) | |
| tree | ccf84d02fe6defae4995259028d4bacd4a403ee4 /cpp/src/Ice/StreamI.h | |
| parent | Partial fix for ICE-3393: (diff) | |
| download | ice-cc15ebed97ad43d9f2b04e73c8555ac4b2a3a0a3.tar.bz2 ice-cc15ebed97ad43d9f2b04e73c8555ac4b2a3a0a3.tar.xz ice-cc15ebed97ad43d9f2b04e73c8555ac4b2a3a0a3.zip | |
Replaced optionalType in StreamTrait<> by a bool fixedLength member
and updated slice2cpp accordingly
No longer rely on assert / static_assert to detect incorrect use of
base StreamOptionalHelper: now, the code no longer compiles
vector<bool> is now handled like a built-in type: InputStream and
OutputStream have now read / write vector<bool>& functions. The default
implementation (StreamI) simply delegates to the same functions on
BasicStream.
Diffstat (limited to 'cpp/src/Ice/StreamI.h')
| -rw-r--r-- | cpp/src/Ice/StreamI.h | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h index ba0d103a640..496b01aeb19 100644 --- a/cpp/src/Ice/StreamI.h +++ b/cpp/src/Ice/StreamI.h @@ -30,8 +30,8 @@ class InputStreamI : public InputStream { public: - InputStreamI(const CommunicatorPtr&, const std::vector< Byte >&); - InputStreamI(const CommunicatorPtr&, const std::pair< const Byte*, const Byte* >&); + InputStreamI(const CommunicatorPtr&, const std::vector<Byte>&); + InputStreamI(const CommunicatorPtr&, const std::pair<const Byte*, const Byte*>&); virtual ~InputStreamI(); virtual CommunicatorPtr communicator() const; @@ -70,16 +70,17 @@ public: virtual void skip(Ice::Int); virtual void skipSize(); - virtual void read(bool& v); - virtual void read(Byte& v); - virtual void read(Short& v); - virtual void read(Int& v); - virtual void read(Long& v); - virtual void read(Float& v); - virtual void read(Double& v); - virtual void read(std::string& v, bool convert = true); + virtual void read(bool&); + virtual void read(Byte&); + virtual void read(Short&); + virtual void read(Int&); + virtual void read(Long&); + virtual void read(Float&); + virtual void read(Double&); + virtual void read(std::string&, bool = true); virtual void read(std::vector<std::string>&, bool); - virtual void read(std::wstring& v); + virtual void read(std::wstring&); + virtual void read(std::vector<bool>&); virtual void read(std::pair<const bool*, const bool*>&, ::IceUtil::ScopedArray<bool>&); virtual void read(std::pair<const Byte*, const Byte*>&); virtual void read(std::pair<const Short*, const Short*>&, ::IceUtil::ScopedArray<Short>&); @@ -132,9 +133,9 @@ public: virtual void write(Double); virtual void write(const std::string&, bool = true); virtual void write(const std::vector<std::string>&, bool); - virtual void write(const char* v, bool = true); - virtual void write(const std::wstring& v); - + virtual void write(const char*, bool = true); + virtual void write(const std::wstring&); + virtual void write(const std::vector<bool>&); virtual void write(const bool*, const bool*); virtual void write(const Byte*, const Byte*); virtual void write(const Short*, const Short*); |