diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-08-29 13:54:07 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-08-29 13:54:07 +0000 |
| commit | 8fb05461c77dd82e4ce019d25a438678d14bda0b (patch) | |
| tree | f73ce4f04dfdbc23a63ebd4440bf472c66dd55a6 /cppe/include/IceE/BasicStream.h | |
| parent | windows fix for http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1274 (diff) | |
| download | ice-8fb05461c77dd82e4ce019d25a438678d14bda0b.tar.bz2 ice-8fb05461c77dd82e4ce019d25a438678d14bda0b.tar.xz ice-8fb05461c77dd82e4ce019d25a438678d14bda0b.zip | |
bug 1316: rename auto_array to ScopedArray
Diffstat (limited to 'cppe/include/IceE/BasicStream.h')
| -rw-r--r-- | cppe/include/IceE/BasicStream.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cppe/include/IceE/BasicStream.h b/cppe/include/IceE/BasicStream.h index a94e3a42b3a..ca8600aad59 100644 --- a/cppe/include/IceE/BasicStream.h +++ b/cppe/include/IceE/BasicStream.h @@ -13,7 +13,6 @@ #include <IceE/ProxyF.h> #include <IceE/Buffer.h> -#include <IceE/AutoArray.h> #include <IceE/Protocol.h> #include <IceE/Unicode.h> #include <IceE/StringConverter.h> @@ -406,13 +405,13 @@ public: v = *i++; } void read(std::vector<bool>&); - void read(std::pair<const bool*, const bool*>&, IceUtil::auto_array<bool>&); + bool* read(std::pair<const bool*, const bool*>&); void write(Ice::Short); void read(Ice::Short&); void write(const Ice::Short*, const Ice::Short*); void read(std::vector<Ice::Short>&); - void read(std::pair<const Ice::Short*, const Ice::Short*>&, IceUtil::auto_array<Ice::Short>&); + Ice::Short* read(std::pair<const Ice::Short*, const Ice::Short*>&); void write(Ice::Int v) // Inlined for performance reasons. @@ -460,25 +459,25 @@ public: void write(const Ice::Int*, const Ice::Int*); void read(std::vector<Ice::Int>&); - void read(std::pair<const Ice::Int*, const Ice::Int*>&, IceUtil::auto_array<Ice::Int>&); + Ice::Int* read(std::pair<const Ice::Int*, const Ice::Int*>&); void write(Ice::Long); void read(Ice::Long&); void write(const Ice::Long*, const Ice::Long*); void read(std::vector<Ice::Long>&); - void read(std::pair<const Ice::Long*, const Ice::Long*>&, IceUtil::auto_array<Ice::Long>&); + Ice::Long* read(std::pair<const Ice::Long*, const Ice::Long*>&); void write(Ice::Float); void read(Ice::Float&); void write(const Ice::Float*, const Ice::Float*); void read(std::vector<Ice::Float>&); - void read(std::pair<const Ice::Float*, const Ice::Float*>&, IceUtil::auto_array<Ice::Float>&); + Ice::Float* read(std::pair<const Ice::Float*, const Ice::Float*>&); void write(Ice::Double); void read(Ice::Double&); void write(const Ice::Double*, const Ice::Double*); void read(std::vector<Ice::Double>&); - void read(std::pair<const Ice::Double*, const Ice::Double*>&, IceUtil::auto_array<Ice::Double>&); + Ice::Double* read(std::pair<const Ice::Double*, const Ice::Double*>&); // // NOTE: This function is not implemented. It is declared here to |